From bugzilla at busybox.net Tue Mar 1 09:49:12 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 01 Mar 2022 09:49:12 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 --- Comment #5 from Frank Rogall --- Bug still exists in 2021.11.2 with nodejs-14.18.3 Ubuntu 20.04.3 LTS -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 1 14:20:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 01 Mar 2022 14:20:11 +0000 Subject: [Buildroot] [Bug 14621] New: RISC-V External Toolchain build fails for latest riscv-gnu-toolchain Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14621 Bug ID: 14621 Summary: RISC-V External Toolchain build fails for latest riscv-gnu-toolchain Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: noahhuetter at gmail.com CC: buildroot at uclibc.org Target Milestone: --- I want to use the RISC-V GNU toolchain as external toolchain from [1] to use in buildroot. When I specify it and start the build process, the first package fails to link with the message libpthread.so: read failed. Is a directory. Buildroot creates a symlink in the sysroot of output/host that points to `../../` which is a directory. On older versions with GCC 8 it works. riscv-gnu-toolchain: tag: 2022.02.25 buildroot: 2022.02-rc3 host: Linux 3.10.0-1160.42.2.el7.x86_64 [1]: https://github.com/riscv-collab/riscv-gnu-toolchain -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Tue Mar 1 18:31:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Mar 2022 19:31:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: disable man pages Message-ID: <20220301183110.925959-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: FAILED: doc/man/rygel.1 /home/giuliobenetti/autobuild/run/instance-2/output-1/host/bin/xsltproc --nonet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style ansi --stringparam man.authors.section.enabled 1 --stringparam man.copyright.section.enabled 1 -o doc/man/rygel.1 http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ../doc/man/rygel.xml I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl Fixes: - http://autobuild.buildroot.org/results/297859cdb544e980826df28b446a75d32c06d839 Signed-off-by: Fabrice Fontaine --- ...01-build-Add-man_pages-build-options.patch | 150 ++++++++++++++++++ package/rygel/rygel.mk | 1 + 2 files changed, 151 insertions(+) create mode 100644 package/rygel/0001-build-Add-man_pages-build-options.patch diff --git a/package/rygel/0001-build-Add-man_pages-build-options.patch b/package/rygel/0001-build-Add-man_pages-build-options.patch new file mode 100644 index 0000000000..cdd7cc7721 --- /dev/null +++ b/package/rygel/0001-build-Add-man_pages-build-options.patch @@ -0,0 +1,150 @@ +From 5a54c5bb1c9609b7bffe6b3e05f934030e4e990e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 26 Dec 2020 18:40:51 +0100 +Subject: [PATCH] build: Add man_pages build options + +Check if xsltproc runs succesfully and fail otherwise + +Fixes #192 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/rygel/-/commit/5a54c5bb1c9609b7bffe6b3e05f934030e4e990e] +Signed-off-by: Fabrice Fontaine +--- + doc/man/meson.build | 98 +++++++++++++++++++++++++++------------------ + doc/meson.build | 5 ++- + meson_options.txt | 1 + + 3 files changed, 64 insertions(+), 40 deletions(-) + +diff --git a/doc/man/meson.build b/doc/man/meson.build +index ef3fcfbf5..4c92eab2b 100644 +--- a/doc/man/meson.build ++++ b/doc/man/meson.build +@@ -1,43 +1,63 @@ + xsltproc = find_program('xsltproc', required: false) + + if xsltproc.found() +- xlstproc_flags = [ +- '--nonet', +- '--stringparam', 'man.output.quietly', '1', +- '--stringparam', 'funcsynopsis.style', 'ansi', +- '--stringparam', 'man.authors.section.enabled', '1', +- '--stringparam', 'man.copyright.section.enabled', '1', +- ] +- +- xsltproc_args = [ +- xsltproc, +- xlstproc_flags, +- '-o', '@OUTPUT@', +- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', +- '@INPUT@', +- ] +- +- man_input_files = [ +- 'rygel.xml', +- 'rygel.conf.xml' +- ] +- +- man_output_files = [ +- 'rygel.1', +- 'rygel.conf.5' +- ] +- +- custom_target('man 1 pages', +- input: 'rygel.xml', +- output: 'rygel.1', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man1')) +- +- custom_target('man 5 pages', +- input: 'rygel.conf.xml', +- output: 'rygel.conf.5', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man5')) ++ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' ++ ++ xlstproc_flags = [ ++ '--nonet', ++ '--stringparam', 'man.output.quietly', '1', ++ '--stringparam', 'funcsynopsis.style', 'ansi', ++ '--stringparam', 'man.authors.section.enabled', '1', ++ '--stringparam', 'man.copyright.section.enabled', '1', ++ ] ++ ++ xsltproc_args = [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '@OUTPUT@', ++ stylesheet, ++ '@INPUT@', ++ ] ++ ++ man_input_files = [ ++ 'rygel.xml', ++ 'rygel.conf.xml' ++ ] ++ ++ man_output_files = [ ++ 'rygel.1', ++ 'rygel.conf.5' ++ ] ++ ++ r = run_command( ++ [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '/dev/null', ++ stylesheet, ++ 'rygel.xml' ++ ] ++ ) ++ ++ if (r.returncode() == 0) ++ custom_target( ++ 'man 1 pages', ++ input: 'rygel.xml', ++ output: 'rygel.1', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man1') ++ ) ++ ++ custom_target( ++ 'man 5 pages', ++ input: 'rygel.conf.xml', ++ output: 'rygel.conf.5', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man5') ++ ) ++ else ++ error('Cannot bulid man pages, failed to run xsltproc') ++ endif + endif +diff --git a/doc/meson.build b/doc/meson.build +index 41c733e50..91c08fae5 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,2 +1,5 @@ +-subdir('man') ++if get_option('man_pages') ++ subdir('man') ++endif ++ + subdir('reference') +diff --git a/meson_options.txt b/meson_options.txt +index cb604c4e9..c60ff1a9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') + option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') ++option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') + option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') + option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) + option('engines', type : 'array', choices : ['simple', 'gstreamer']) +-- +GitLab + diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index bfcd5df3c6..e05297456d 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -26,6 +26,7 @@ RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ -Dintrospection=enabled \ + -Dman_pages=false \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih -- 2.34.1 From bugzilla at busybox.net Tue Mar 1 19:49:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 01 Mar 2022 19:49:59 +0000 Subject: [Buildroot] [Bug 14631] New: host-go-bootstrap: go not being built for package in external tree Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 Bug ID: 14631 Summary: host-go-bootstrap: go not being built for package in external tree Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: contact at martb.dev CC: buildroot at uclibc.org Target Milestone: --- Hey, running on 2022.02-rc2. I tried adding a local go package inside my external tree using the following stripped down config. Config.in (included correctly, showing up inside menuconfig) ``` config BR2_PACKAGE_APOGEE bool "apogee" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS help my help string ``` .mk ``` APOGEE_SITE = $(BR2_EXTERNAL_MYTREE_PATH)/src/apogee APOGEE_SITE_METHOD = local APOGEE_BUILD_TARGETS = cmd/apogee APOGEE_INSTALL_BINS = apogee APOGEE_GOMOD = "/apogee" ... $(eval $(golang-package)) ``` Whenever i try building this package i get: ``` /bin/sh: Line 1: /home//Schreibtisch//mytree/output/host/bin/go: File or directory not found ``` Building a different go package like tinifier seems to trigger the bootstrap build fine though. Is this some limitation due to the "local" site source or due to the external tree im using? Kind regards Martin -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Tue Mar 1 22:34:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Mar 2022 23:34:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ace: bump to version 7.0.6 Message-ID: <20220301223416.947624-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/ace/ace.hash | 5 ++++- package/ace/ace.mk | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/ace/ace.hash b/package/ace/ace.hash index 92fd42e131..2387927879 100644 --- a/package/ace/ace.hash +++ b/package/ace/ace.hash @@ -1,3 +1,6 @@ +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 + # Locally Computed: -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk index 8df89d8c6f..7299f0d40c 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -4,8 +4,8 @@ # ################################################################################ -ACE_VERSION = 7.0.1 -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_VERSION = 7.0.6 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions ACE_LICENSE = DOC ACE_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 1 22:51:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Mar 2022 23:51:07 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libfreeglut: bump to version 3.2.2 Message-ID: <20220301225107.988549-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...ropped-up-with-the-release-of-gcc-10.patch | 69 ------------------- package/libfreeglut/libfreeglut.hash | 10 +-- package/libfreeglut/libfreeglut.mk | 2 +- 3 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch deleted file mode 100644 index e98e71537f..0000000000 --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 -From: jtsiomb -Date: Fri, 21 Feb 2020 22:25:31 +0000 -Subject: [PATCH] Work-around for an issue which cropped up with the release of - gcc-10. In their infinite wisdom, they decided to build with -fno-common as - default from now on, breaking every piece of C code which used to declare - common symbols in header files, as was the convention since the dawn of time. - We now have to duplicate all declarations to an arbitrary source file, and - change the header-file ones to prefix them with extern. - -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk at 1863 7f0cb862-5218-0410-a997-914c9d46530a -[Retrieved from: -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] -Signed-off-by: Fabrice Fontaine ---- - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c -index 38b0acbb..54b4285b 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index 2771cbde2f..ce9fb9e299 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ +md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz +sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz # Locally computed -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING +sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 379de3121b..484b0f4b97 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.1 +LIBFREEGLUT_VERSION = 3.2.2 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut LIBFREEGLUT_LICENSE = MIT -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 1 23:05:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 00:05:04 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/parted: bump to version 3.4 Message-ID: <20220301230504.1000454-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://git.savannah.gnu.org/cgit/parted.git/tree/NEWS?h=v3.4 Signed-off-by: Fabrice Fontaine --- package/parted/parted.hash | 4 ++-- package/parted/parted.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 2c466eb8d2..392436ec4b 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz +sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz # Locally calculated -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 66940fc516..23158179e4 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.3 +PARTED_VERSION = 3.4 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 1 23:21:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 00:21:11 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libscrypt: bump to version 1.22 Message-ID: <20220301232111.1092975-1-fontaine.fabrice@gmail.com> - Drop patch and use {C,LD}FLAGS_EXTRA which are available since https://github.com/technion/libscrypt/commit/bdfec26744122e8f52a58bc086c89b27faaf5888 - While at it, also move PREFIX to LIBSCRYPT_MAKE_OPTS as advocated by Arnout in https://patchwork.ozlabs.org/project/buildroot/patch/20220221172900.1937856-1-fontaine.fabrice at gmail.com/ - Update indentation in hash file (two spaces) https://github.com/technion/libscrypt/compare/v1.21...v1.22 Signed-off-by: Fabrice Fontaine --- ...ions-to-CFLAGS-and-LDFLAGS-variables.patch | 34 ------------------- package/libscrypt/libscrypt.hash | 4 +-- package/libscrypt/libscrypt.mk | 14 +++++--- 3 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch deleted file mode 100644 index a023a6fe1c..0000000000 --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Tue, 14 Mar 2017 09:23:51 +0100 -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This also removes a number of hard-coded CFLAGS, leaving it up to the -user to pass appropriate optimization/hardening flags. - -Signed-off-by: Stefan S?rensen ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7022a4a..3098a9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d - INSTALL_DATA ?= install - - CC?=gcc --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version -+override CFLAGS+=-fPIC -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - CFLAGS_EXTRA?=-Wl,-rpath=. - - all: reference --- -2.7.4 - diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash index fda63d1c0d..fcdc4bbeeb 100644 --- a/package/libscrypt/libscrypt.hash +++ b/package/libscrypt/libscrypt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index fa89ed31bc..d28bd4e900 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -4,23 +4,29 @@ # ################################################################################ -LIBSCRYPT_VERSION = 1.21 +LIBSCRYPT_VERSION = 1.22 LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) LIBSCRYPT_LICENSE = BSD-2-Clause LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES +LIBSCRYPT_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ + PREFIX=/usr + define LIBSCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) endef define LIBSCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(STAGING_DIR) install endef define LIBSCRYPT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) install endef -- 2.34.1 From stefan at agner.ch Wed Mar 2 10:32:06 2022 From: stefan at agner.ch (Stefan Agner) Date: Wed, 2 Mar 2022 11:32:06 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: Add Intel WiFi 22000 series Message-ID: <200a0dbe075eee7e2c6d309e8a00d68f74b671c7.1646217112.git.stefan@agner.ch> Add Intel WiFi 22000 series firmware. This firmware supports WiFi 6 models like AX200/AX201/AX210. Signed-off-by: Stefan Agner --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index c94ffe24de..c9294956cc 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 + bool "Intel Wireless 22000 series" + help + Firmware files for the Intel Wifi 22000 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c..6502b90e2d 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -- 2.35.1 From bernd.kuhls at t-online.de Wed Mar 2 17:34:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 2 Mar 2022 18:34:33 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.7 Message-ID: <20220302173433.28939-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c8573fafad..736dedc25e 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.6 +MESA3D_HEADERS_VERSION = 21.3.7 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d64b833100..b680411051 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html -sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz -sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html +sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz +sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 95618b2072..d0b12932c4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.6 +MESA3D_VERSION = 21.3.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From fontaine.fabrice at gmail.com Wed Mar 2 17:44:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 18:44:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf-xlib: new package Message-ID: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/gdk-pixbuf-xlib/Config.in create mode 100644 package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash create mode 100644 package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2b2cb8c357..897a4dcfee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -877,6 +877,7 @@ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ F: package/freeipmi/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index fb0595377e..85fa91190e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1492,6 +1492,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 17:44:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 18:44:56 +0100 Subject: [Buildroot] [PATCH 2/2] package/xscreensaver: add gdk-pixbuf-xlib dependency In-Reply-To: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Message-ID: <20220302174456.1641125-2-fontaine.fabrice@gmail.com> gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.0 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 787c3130ae..10b2b7012c 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index f73a75bf14..46dedc3211 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -15,6 +15,7 @@ XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ -- 2.34.1 From peter at korsgaard.com Wed Mar 2 18:36:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Mar 2022 19:36:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/seatd: security bump to version 0.6.4 In-Reply-To: <20220228213432.3289480-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Mon, 28 Feb 2022 23:34:32 +0200") References: <20220228213432.3289480-1-aperez@igalia.com> Message-ID: <87v8wwb3rt.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This release contains a security fix in seatd-launch which prevents > removal of files that the calling user did not have privileges to > remove. Release notes: > https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 2 18:36:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Mar 2022 19:36:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: disable man pages In-Reply-To: <20220301183110.925959-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Mar 2022 19:31:10 +0100") References: <20220301183110.925959-1-fontaine.fabrice@gmail.com> Message-ID: <87r17kb3rg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 0.40.2 in > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > FAILED: doc/man/rygel.1 > /home/giuliobenetti/autobuild/run/instance-2/output-1/host/bin/xsltproc > --nonet --stringparam man.output.quietly 1 --stringparam > funcsynopsis.style ansi --stringparam man.authors.section.enabled 1 > --stringparam man.copyright.section.enabled 1 -o doc/man/rygel.1 > http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl > ../doc/man/rygel.xml > I/O error : Attempt to load network entity > http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl > Fixes: > - http://autobuild.buildroot.org/results/297859cdb544e980826df28b446a75d32c06d839 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 2 18:35:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Mar 2022 19:35:26 +0100 Subject: [Buildroot] [git commit] package/seatd: security bump to version 0.6.4 Message-ID: <20220302182850.E4EA9837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41139cb0997af800c7d89213c5d89652b65ec6cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release contains a security fix in seatd-launch which prevents removal of files that the calling user did not have privileges to remove. Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 18f65d3aeb..88793b6dd5 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8 0.6.3.tar.gz +sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27d3155b2b..5382cad39b 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.3 +SEATD_VERSION = 0.6.4 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT From peter at korsgaard.com Wed Mar 2 18:35:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Mar 2022 19:35:38 +0100 Subject: [Buildroot] [git commit] package/rygel: disable man pages Message-ID: <20220302182850.EDD1D838CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3739f0bf135e1cfe9034dc2797bdef3a2c981ecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: FAILED: doc/man/rygel.1 /home/giuliobenetti/autobuild/run/instance-2/output-1/host/bin/xsltproc --nonet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style ansi --stringparam man.authors.section.enabled 1 --stringparam man.copyright.section.enabled 1 -o doc/man/rygel.1 http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ../doc/man/rygel.xml I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl Fixes: - http://autobuild.buildroot.org/results/297859cdb544e980826df28b446a75d32c06d839 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-build-Add-man_pages-build-options.patch | 150 +++++++++++++++++++++ package/rygel/rygel.mk | 1 + 2 files changed, 151 insertions(+) diff --git a/package/rygel/0001-build-Add-man_pages-build-options.patch b/package/rygel/0001-build-Add-man_pages-build-options.patch new file mode 100644 index 0000000000..cdd7cc7721 --- /dev/null +++ b/package/rygel/0001-build-Add-man_pages-build-options.patch @@ -0,0 +1,150 @@ +From 5a54c5bb1c9609b7bffe6b3e05f934030e4e990e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 26 Dec 2020 18:40:51 +0100 +Subject: [PATCH] build: Add man_pages build options + +Check if xsltproc runs succesfully and fail otherwise + +Fixes #192 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/rygel/-/commit/5a54c5bb1c9609b7bffe6b3e05f934030e4e990e] +Signed-off-by: Fabrice Fontaine +--- + doc/man/meson.build | 98 +++++++++++++++++++++++++++------------------ + doc/meson.build | 5 ++- + meson_options.txt | 1 + + 3 files changed, 64 insertions(+), 40 deletions(-) + +diff --git a/doc/man/meson.build b/doc/man/meson.build +index ef3fcfbf5..4c92eab2b 100644 +--- a/doc/man/meson.build ++++ b/doc/man/meson.build +@@ -1,43 +1,63 @@ + xsltproc = find_program('xsltproc', required: false) + + if xsltproc.found() +- xlstproc_flags = [ +- '--nonet', +- '--stringparam', 'man.output.quietly', '1', +- '--stringparam', 'funcsynopsis.style', 'ansi', +- '--stringparam', 'man.authors.section.enabled', '1', +- '--stringparam', 'man.copyright.section.enabled', '1', +- ] +- +- xsltproc_args = [ +- xsltproc, +- xlstproc_flags, +- '-o', '@OUTPUT@', +- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', +- '@INPUT@', +- ] +- +- man_input_files = [ +- 'rygel.xml', +- 'rygel.conf.xml' +- ] +- +- man_output_files = [ +- 'rygel.1', +- 'rygel.conf.5' +- ] +- +- custom_target('man 1 pages', +- input: 'rygel.xml', +- output: 'rygel.1', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man1')) +- +- custom_target('man 5 pages', +- input: 'rygel.conf.xml', +- output: 'rygel.conf.5', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man5')) ++ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' ++ ++ xlstproc_flags = [ ++ '--nonet', ++ '--stringparam', 'man.output.quietly', '1', ++ '--stringparam', 'funcsynopsis.style', 'ansi', ++ '--stringparam', 'man.authors.section.enabled', '1', ++ '--stringparam', 'man.copyright.section.enabled', '1', ++ ] ++ ++ xsltproc_args = [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '@OUTPUT@', ++ stylesheet, ++ '@INPUT@', ++ ] ++ ++ man_input_files = [ ++ 'rygel.xml', ++ 'rygel.conf.xml' ++ ] ++ ++ man_output_files = [ ++ 'rygel.1', ++ 'rygel.conf.5' ++ ] ++ ++ r = run_command( ++ [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '/dev/null', ++ stylesheet, ++ 'rygel.xml' ++ ] ++ ) ++ ++ if (r.returncode() == 0) ++ custom_target( ++ 'man 1 pages', ++ input: 'rygel.xml', ++ output: 'rygel.1', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man1') ++ ) ++ ++ custom_target( ++ 'man 5 pages', ++ input: 'rygel.conf.xml', ++ output: 'rygel.conf.5', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man5') ++ ) ++ else ++ error('Cannot bulid man pages, failed to run xsltproc') ++ endif + endif +diff --git a/doc/meson.build b/doc/meson.build +index 41c733e50..91c08fae5 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,2 +1,5 @@ +-subdir('man') ++if get_option('man_pages') ++ subdir('man') ++endif ++ + subdir('reference') +diff --git a/meson_options.txt b/meson_options.txt +index cb604c4e9..c60ff1a9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') + option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') ++option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') + option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') + option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) + option('engines', type : 'array', choices : ['simple', 'gstreamer']) +-- +GitLab + diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index bfcd5df3c6..e05297456d 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -26,6 +26,7 @@ RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ -Dintrospection=enabled \ + -Dman_pages=false \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih From fontaine.fabrice at gmail.com Wed Mar 2 18:42:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 19:42:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcamera-apps: link with -latomic if needed Message-ID: <20220302184209.2081120-1-fontaine.fabrice@gmail.com> Link with -latomic if needed to avoid the following build failure raised since the addition of the package in commit 7227d005d2435ec7b38995a6247d233ddb5ba365: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: CMakeFiles/libcamera-still.dir/libcamera_still.cpp.o: undefined reference to symbol '__atomic_fetch_sub_4@@LIBATOMIC_1.0' Fixes: - http://autobuild.buildroot.org/results/b20465140f3a5281f9b586f442b67fd400e7184a Signed-off-by: Fabrice Fontaine --- package/libcamera-apps/libcamera-apps.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 210d4e1e52..f4fc019c17 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -45,4 +45,8 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) -- 2.34.1 From ju.o at free.fr Wed Mar 2 21:01:50 2022 From: ju.o at free.fr (Julien Olivain) Date: Wed, 2 Mar 2022 22:01:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/{gnupg, gnupg2}: use gnupg2 by default Message-ID: <20220302210150.33658-1-ju.o@free.fr> This patch reverses the logic to select gnupg2 by default, while still allowing to select gnupg (v1). Quoting: https://gnupg.org/download/index.html """ GnuPG 1.4 is the old, single binary version which still support the unsafe PGP-2 keys. This branch has no dependencies on the above listed libraries or the Pinentry. However, it lacks many modern features and will receive only important updates. """ gnupg 1.4 is kept in Buildroot for now, as the package is still maintained upstream. It might still be useful is some specific cases: - it has a smaller footprint (compared to v2), - it has less dependencies (only zlib), - it has less build dependencies (can build static, no need for MMU/threads, ...) Most Linux distributions are now shipping gnupg2 by default. gnupg v1 is now more for legacy/compatibility/specific cases. There is currently only two packages selecting gnupg in Buildroot: gpgme and python-gnupg This commit also reverses the logic for those packages. Signed-off-by: Julien Olivain --- Tested with: support/testing/run-tests \ -d dl -o output_folder \ -k tests.package.test_python_gnupg.TestPythonPy3GnuPG Note: this change was quickly discussed in: https://lists.buildroot.org/pipermail/buildroot/2022-January/634021.html --- package/gnupg/Config.in | 1 - package/gnupg2/Config.in | 1 + package/libgpgme/Config.in | 2 +- package/python-gnupg/Config.in | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in index 2db46318f1..e92fca709d 100644 --- a/package/gnupg/Config.in +++ b/package/gnupg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_GNUPG bool "gnupg" - depends on !BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_ZLIB help GnuPG is the GNU project's complete and free implementation diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index ef1817ef02..9438cf69f6 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GNUPG2 depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth depends on BR2_USE_MMU # libassuan, libnpth depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_GNUPG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGCRYPT diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in index 4aabd06367..20f491b664 100644 --- a/package/libgpgme/Config.in +++ b/package/libgpgme/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBGPGME depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_USE_MMU # libassuan #gnupg is not needed to build, but at runtime. - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBASSUAN help diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in index 038a940778..54f8fb6a29 100644 --- a/package/python-gnupg/Config.in +++ b/package/python-gnupg/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_GNUPG bool "python-gnupg" - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime help A wrapper for the Gnu Privacy Guard (GPG or GnuPG). -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:17:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:17:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220302211724.2351984-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: pattern.c: In function 'is_valid_dns_name': pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code pattern.c: In function 'is_valid_dns_name_pattern': pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ Fixes: - http://autobuild.buildroot.org/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 Signed-off-by: Fabrice Fontaine --- ...src-pattern.c-fix-build-with-gcc-4.8.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch diff --git a/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..90bb02b23a --- /dev/null +++ b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,57 @@ +From 0c89dd2fa0fe50b00bca638dbbacfbd361526e0a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 21:57:52 +0100 +Subject: [PATCH] src/pattern.c: fix build with gcc 4.8 + +Fix the following build failure: + +pattern.c: In function 'is_valid_dns_name': +pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ +pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code +pattern.c: In function 'is_valid_dns_name_pattern': +pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=b2690415bfa1bc105e61b75f642fb5c1aaf0fae8] +--- + src/pattern.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/pattern.c b/src/pattern.c +index 03e23b9..928d259 100644 +--- a/src/pattern.c ++++ b/src/pattern.c +@@ -129,9 +129,9 @@ int is_valid_dns_name(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '-' && *c != '.' && +@@ -242,11 +242,11 @@ int is_valid_dns_name_pattern(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; + size_t num_wildcards = 0; + int previous_label_has_wildcard = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '*' && /* Wildcard. */ +-- +2.20.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:26:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:26:21 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libss7: bump to version 2.0.1 Message-ID: <20220302212621.2357671-1-fontaine.fabrice@gmail.com> http://downloads.asterisk.org/pub/telephony/libss7/releases/libss7-2.0.1-summary.html Signed-off-by: Fabrice Fontaine --- package/libss7/libss7.hash | 4 ++-- package/libss7/libss7.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash index 8e1d6635db..442422fcd9 100644 --- a/package/libss7/libss7.hash +++ b/package/libss7/libss7.hash @@ -1,6 +1,6 @@ # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz # License file, locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk index 151b6a61b5..faa147c78e 100644 --- a/package/libss7/libss7.mk +++ b/package/libss7/libss7.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSS7_VERSION = 2.0.0 +LIBSS7_VERSION = 2.0.1 LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases LIBSS7_LICENSE = GPL-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:44:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:44:04 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/xdotool: bump to version 3.20211022.1 Message-ID: <20220302214404.2476680-1-fontaine.fabrice@gmail.com> - Retrieve official tarball - Update indentation in hash file (two spaces) https://github.com/jordansissel/xdotool/blob/v3.20211022.1/CHANGELIST Signed-off-by: Fabrice Fontaine --- package/xdotool/xdotool.hash | 4 ++-- package/xdotool/xdotool.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/xdotool/xdotool.hash b/package/xdotool/xdotool.hash index b0d5a7582a..549e807ccc 100644 --- a/package/xdotool/xdotool.hash +++ b/package/xdotool/xdotool.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a xdotool-3.20160805.1.tar.gz -sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT +sha256 96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada xdotool-3.20211022.1.tar.gz +sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT diff --git a/package/xdotool/xdotool.mk b/package/xdotool/xdotool.mk index 5c5603bd62..c430a49d06 100644 --- a/package/xdotool/xdotool.mk +++ b/package/xdotool/xdotool.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDOTOOL_VERSION = 3.20160805.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,v$(XDOTOOL_VERSION)) +XDOTOOL_VERSION = 3.20211022.1 +XDOTOOL_SITE = https://github.com/jordansissel/xdotool/releases/download/v$(XDOTOOL_VERSION) XDOTOOL_LICENSE = BSD-3-Clause XDOTOOL_LICENSE_FILES = COPYRIGHT XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:51:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:51:31 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tree: bump to version 2.0.2 Message-ID: <20220302215131.2479736-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) http://mama.indstate.edu/users/ice/tree/changes.html Signed-off-by: Fabrice Fontaine --- package/tree/tree.hash | 4 ++-- package/tree/tree.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 6bffaa5ec0..298153c89c 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 tree-1.8.0.tgz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf tree-2.0.2.tgz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index b6c63c0244..7c111b47d2 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 1.8.0 +TREE_VERSION = 2.0.2 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://mama.indstate.edu/users/ice/tree/src TREE_LICENSE = GPL-2.0+ -- 2.34.1 From francois.perrad at gadz.org Thu Mar 3 06:12:50 2022 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Thu, 3 Mar 2022 07:12:50 +0100 Subject: [Buildroot] Buildroot 2022.02-rc3 released In-Reply-To: <87pmn6y8hv.fsf@dell.be.48ers.dk> References: <87pmn6y8hv.fsf@dell.be.48ers.dk> Message-ID: Le lun. 28 f?vr. 2022 ? 22:41, Peter Korsgaard a ?crit : > Hi, > > Buildroot 2022.02-rc3 is released - Go download it at: > > http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz > > or > > http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.xz > > These 2 links are broken. Fran?ois $ wget http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz --2022-03-03 07:11:19-- http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz Resolving buildroot.net (buildroot.net)... 140.211.167.122 Connecting to buildroot.net (buildroot.net)|140.211.167.122|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2022-03-03 07:11:19 ERROR 404: Not Found. > Or get it from Git: > > git://git.buildroot.net/buildroot > > Another week, another release candidate. > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Thu Mar 3 06:44:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 07:44:34 +0100 Subject: [Buildroot] Buildroot 2022.02-rc3 released In-Reply-To: (=?utf-8?Q?=22Fran=C3=A7ois?= Perrad"'s message of "Thu, 3 Mar 2022 07:12:50 +0100") References: <87pmn6y8hv.fsf@dell.be.48ers.dk> Message-ID: <87mti7bkml.fsf@dell.be.48ers.dk> >>>>> "Fran?ois" == Fran?ois Perrad writes: > Le lun. 28 f?vr. 2022 ? 22:41, Peter Korsgaard a > ?crit : >> Hi, >> >> Buildroot 2022.02-rc3 is released - Go download it at: >> >> http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz >> >> or >> >> http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.xz >> >> > These 2 links are broken. > Fran?ois > $ wget http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz > --2022-03-03 07:11:19-- > http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz > Resolving buildroot.net (buildroot.net)... 140.211.167.122 > Connecting to buildroot.net (buildroot.net)|140.211.167.122|:80... > connected. > HTTP request sent, awaiting response... 404 Not Found > 2022-03-03 07:11:19 ERROR 404: Not Found. Ups, something went wrong with the upload. Fixed now, thanks! -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Mar 3 07:12:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 03 Mar 2022 07:12:36 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-02 Message-ID: <20220303071242.017E860B66@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-03-02 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 57 | 9 | 0 | 66 | 2021.11.x | 25 | 1 | 0 | 26 | master | 106 | 57 | 1 | 164 | Classification of failures by reason for master ----------------------------------------------- frr-8.1 | 14 host-libselinux-3.3 | 14 bpftool-v6.7.0 | 4 python-greenlet-1.1.2 | 3 unknown | 3 google-breakpad-7515ab13768... | 2 vlc-3.0.16 | 2 android-tools-4.2.2+git2013... | 1 bluez5_utils-5.63 | 1 dnsmasq-2.86 | 1 exempi-2.6.1 | 1 file-5.41 | 1 ghostscript-9.55.0 | 1 host-go-1.17.7 | 1 libcamera-apps-2d1009e3badc... | 1 libuwsc | 1 Makefile:734: target-finalize | 1 mongodb-4.2.18 | 1 mpv-0.33.1 | 1 osm2pgsql-1.6.0 | 1 tovid-87c676f4aadb7303d2cd9... | 1 wavemon-0.9.4 | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/275851e3d79a7166fe28e0a0f8c04a4db3c4ceb3 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e1af3f9a80755384617a2eb1c137393048e7ab1b | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/4c34010da5311b93d62477f1d3a989452fe1fe6f | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/31565641bdafe8b303bade66764c428c49355072 | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/f6c5b6f65e49f28ee973046dbc31301d6be7765a | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/198183e4c2d85212ceb12ec588cd93b4f1e01c6c | arm | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 | arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/70b050ec463b8fc45cd9e886efa1d2be4bb2d737 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/4379726288f89fd53f56cafed4b4a151acea896d | ORPH nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/efefcf149af610d9be0d76f1f2bcfadceaa2f738 | powerpc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2a0bc37f535035eb24d3129982c83da3a43127cc | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2068459734556e09d5d12cefabd624d9e47c6c5f | mipsel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/592dc62c4d2d197d16367a243fd77376a7cfda7a | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0f7104f07e170f48873cb7e33993f25247191313 | riscv64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/da98920735e4597d21a7fe9d0a0dd4ab284c55d2 | powerpc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7140ed2843be622d15d7fbd1278f2c638add08f8 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8d6f6374e691362ddf70de7f41cee645024fe7c2 | mipsel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/aa01104d9e99e16d11799ccb039dc05966546327 | arm | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a0e31d4426db29c8005e144ed3201da271e437cb | riscv64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e4b5dffe5e8104e9fcb34ad8de5f980552101830 | powerpc64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/42fb90cf286a5d081b0ebedaf55d2dc14b325556 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/17a06dc06b28f4de0b48afd5c7e5f1cdca01f7ee | mipsel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/717a61b8b1b3dfcaa34dcfcc9849e7f8d4961927 | arm | ghostscript-9.55.0 | NOK | http://autobuild.buildroot.net/results/b3e5c8c98e77e5f5e3661b31ad3d192260fe3dc9 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/586b77332930f1a59ed14defcc2b2546eb327152 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ea3bc5ec1e2946e11cf449a943adbd42eed57f15 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/00d3143f485192019eda60e4246e08bfcfd0eb51 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8c846d6b962610b0ab2f0a1cb82aae3a5f386e72 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1fe5d8e9a0b2e5b8ace8273694c47b435cfdf18c | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0090c4476dbe4c6f45f07a6a41e7f951f40f0838 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c7178239648e0b48fd00937cb9d958f2291ab7b1 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/eb57c0ece7ffe66982fa4904f3603f27341de849 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1b24f64c4eee66056b550544c34a76b7cc412d70 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5122b102bbc22c772e232b69eb47c550d9a48552 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/34ee2422bf4af2112eab2b92852c27e90f3ce0db | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e110384926873327db2d56fc5bf54dd6db29b000 | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fd39bfab03356f38fc9ecdd49b8322b6084c2ca2 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/861e304e27bc94a6078f28bab19e392e10acc8b6 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/93f14e8bedcbb510a35429587b1a5bda80c20e7c | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5f981cd9a1d5fb0ab858f18b01d9b692131ab950 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/211427becf05ce040c5d6f78d1140727a9110755 | sparc | libcamera-apps-2d1009e3badc... | NOK | http://autobuild.buildroot.net/results/b20465140f3a5281f9b586f442b67fd400e7184a | arc | libuwsc | TIM | http://autobuild.buildroot.net/results/31d98d07e1fc36381548804c224a771403bb16c0 | arm | Makefile:734: target-finalize | NOK | http://autobuild.buildroot.net/results/ecf4de273c4ba888264085e6f2b69656208c6a04 | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/d252d52aa9f045e04a51110335bf3a6b1561562a | arc | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/63efa19f8bb5760ed44d18d9942954dfb376ea62 | sh4 | osm2pgsql-1.6.0 | NOK | http://autobuild.buildroot.net/results/521a28c64d9689777d9e5d4f81fc8de3c8996d92 | m68k | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5978d008d48374d74bc2137fb977f6231fce2481 | mipsel | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/db222f0ff8bc9ff7b5f4e829986cf7dc46259a57 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5f5d5cc9d90a1207a9af9608f4254f64e2a89bdc | riscv32 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/c77ede55ccb6e1db9a7a0d0c01c48cfc6c3bfb2c | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/c78687bb093854a5df3751a531fdca0bd1096423 | arm | unknown | NOK | http://autobuild.buildroot.net/results/6b896c8c38e44eba430eb71fc08ade1eb04c4649 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/977b8f322f897663003f5cee99f5a32c0ab87d5f | arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/06188ad302c5e33bcb237f70afa3483bdb3358f6 | m68k | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/d13fe134dfa53fc531b1d72642fd9a0cdcb4bf35 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/6bb7891ec0b991ec7e9532e5a568a58c8eaf554c | powerpc64 | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/846ab8364c306e1c8d0643b571bef848b7fd21a6 | Classification of failures by reason for 2021.02.x -------------------------------------------------- azure-iot-sdk-c-LTS_07_2020... | 1 erlang-jiffy-1.0.6 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 netopeer2-1.1.53 | 1 openldap-2.4.59 | 1 python-pyqt5-5.7 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | azure-iot-sdk-c-LTS_07_2020... | NOK | http://autobuild.buildroot.net/results/ed8acf7835e2c7894cf3f68fe65fb6b1315691c7 | mipsel | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/de6457a6de4f03c4a029dda7ffe17004f24f3434 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a076eee8988dca3b471daa0a63e20a0e6b1d5b12 | x86_64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/086424878b46fcbcdb56fb04a7484e69db0104a5 | riscv32 | netopeer2-1.1.53 | NOK | http://autobuild.buildroot.net/results/80bc83a1aa91be2ab61cf5b519f85131d839c519 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/c30c6ce39f7f3df0e1c112d202ecd57fbeea5821 | or1k | python-pyqt5-5.7 | NOK | http://autobuild.buildroot.net/results/de5db9a34968239662d1432c95b850367547652f | arm | unknown | NOK | http://autobuild.buildroot.net/results/9c0750573af93bacf9c4ae68063fd2f55624e1f5 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e6392e051caf3da4eb77d4456a9c3e031c76a307 | Classification of failures by reason for 2021.11.x -------------------------------------------------- openal-1.21.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/7dd952755a90cc66a59e6a78c4af3c04391de74a | Gitlab CI results for 2022-03-02 ================================ Detail of runtime-test failures for 2021.02.10 ---------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462298 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462014 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462027 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462156 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462162 | ORPH -- http://autobuild.buildroot.net From bugzilla at busybox.net Thu Mar 3 08:02:53 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 03 Mar 2022 08:02:53 +0000 Subject: [Buildroot] [Bug 14611] 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14611 --- Comment #1 from Frank Rogall --- These Bug still exists in 2022.02-rc3 INSTALL /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot/usr/include if ! support/scripts/check-kernel-headers.sh /home/fr/work/egate/x/egate/build /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot 5.16 loose; then exit 1; fi Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x make[1]: *** [package/pkg-generic.mk:332: /home/fr/work/egate/x/egate/build/linux-headers-5.15.13/.stamp_staging_installed] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Thu Mar 3 17:35:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Mar 2022 18:35:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi: bump version to 19.4 Message-ID: <20220303173516.53272-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 56e901fa17..371c375e74 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) -- 2.30.2 From bernd.kuhls at t-online.de Thu Mar 3 17:38:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Mar 2022 18:38:33 +0100 Subject: [Buildroot] [PATCH/next v2 1/1] package/kodi: bump version to 19.4 Message-ID: <20220303173833.54609-1-bernd.kuhls@t-online.de> Add dependencies to giflib, libjpeg and libpng due to https://github.com/xbmc/xbmc/pull/20462 Signed-off-by: Bernd Kuhls --- v2: added dependencies to giflib, libjpeg and libpng package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/Config.in | 3 +++ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 7 +++++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f31bf19b99..ebc95343a9 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 56e901fa17..f4c5bfc685 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,9 +6,9 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix -KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) +KODI_VERSION = 6586a6c535b72896e00733f25fde93980d5f0cca KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ -- 2.30.2 From bernd.kuhls at t-online.de Thu Mar 3 17:41:21 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Mar 2022 18:41:21 +0100 Subject: [Buildroot] [PATCH/next v3 1/1] package/kodi: bump version to 19.4 Message-ID: <20220303174121.55867-1-bernd.kuhls@t-online.de> Add dependencies to giflib, libjpeg and libpng due to https://github.com/xbmc/xbmc/pull/20462 Signed-off-by: Bernd Kuhls --- v3: removed remnants from internal patch, sorry for the noise v2: added dependencies to giflib, libjpeg and libpng package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/Config.in | 3 +++ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 5 ++++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f31bf19b99..ebc95343a9 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 56e901fa17..7326cd536d 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ -- 2.30.2 From geomatsi at gmail.com Thu Mar 3 19:19:45 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Thu, 3 Mar 2022 22:19:45 +0300 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix libwpa_client.so build Message-ID: <20220303191945.3952450-1-geomatsi@gmail.com> Build target libwpa_client.so is not built regardless of whether the option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that fixes wpa_supplicant build regression. Fixes: http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ Signed-off-by: Sergey Matyukevich --- Hi all, Note that the patch has been posted to hostapd mailing list and discussed, but not yet accepted: https://patchwork.ozlabs.org/project/hostap/patch/20220222085219.3996729-1-geomatsi at gmail.com/ Regards, Sergey ...le-options-for-libwpa_client.so-and-.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch new file mode 100644 index 0000000000..156d0e7e2c --- /dev/null +++ b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch @@ -0,0 +1,68 @@ +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Sun, 20 Feb 2022 10:12:28 +0300 +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced regression into wpa_supplicant build process. Build +target libwpa_client.so is not built regardless of whether the option +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config +option is used before it is imported from the configuration file. +Moving its usage after including build.rules does not help: variable +ALL is processed by build.rules and further changes are not applied. +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as +expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +This commit re-enables options adding both build targets to _all +dependencies. + +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..e384cc6b8 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/wpa_supplicant at .service + ALL += systemd/wpa_supplicant-nl80211 at .service + ALL += systemd/wpa_supplicant-wired at .service + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 + -- 2.35.1 From peter at korsgaard.com Thu Mar 3 21:27:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 22:27:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 In-Reply-To: <20220302211724.2351984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 22:17:24 +0100") References: <20220302211724.2351984-1-fontaine.fabrice@gmail.com> Message-ID: <87o82mafq9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > pattern.c: In function 'is_valid_dns_name': > pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (const char *c = value;; c++) > ^ > pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code > pattern.c: In function 'is_valid_dns_name_pattern': > pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (const char *c = value;; c++) > ^ > Fixes: > - http://autobuild.buildroot.org/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 3 21:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 22:26:01 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220303212029.865F083901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=610f52f3bea153a3293e67b95f7c4f31e74d2ffd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: pattern.c: In function 'is_valid_dns_name': pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code pattern.c: In function 'is_valid_dns_name_pattern': pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ Fixes: - http://autobuild.buildroot.org/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...0004-src-pattern.c-fix-build-with-gcc-4.8.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..90bb02b23a --- /dev/null +++ b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,57 @@ +From 0c89dd2fa0fe50b00bca638dbbacfbd361526e0a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 21:57:52 +0100 +Subject: [PATCH] src/pattern.c: fix build with gcc 4.8 + +Fix the following build failure: + +pattern.c: In function 'is_valid_dns_name': +pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ +pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code +pattern.c: In function 'is_valid_dns_name_pattern': +pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=b2690415bfa1bc105e61b75f642fb5c1aaf0fae8] +--- + src/pattern.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/pattern.c b/src/pattern.c +index 03e23b9..928d259 100644 +--- a/src/pattern.c ++++ b/src/pattern.c +@@ -129,9 +129,9 @@ int is_valid_dns_name(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '-' && *c != '.' && +@@ -242,11 +242,11 @@ int is_valid_dns_name_pattern(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; + size_t num_wildcards = 0; + int previous_label_has_wildcard = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '*' && /* Wildcard. */ +-- +2.20.1 + From peter at korsgaard.com Thu Mar 3 21:57:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 22:57:46 +0100 Subject: [Buildroot] [git commit] package/linux-headers: default to 5.15 series for _HEADERS_AS_KERNEL / KERNEL_LATEST_VERSION Message-ID: <20220303215200.D1F5E8144C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dc3cfbff11934a3b29f8b2b98aed22ec01e7c42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes #14611 BR2_KERNEL_HEADERS_LATEST_VERSION selects a 5.15.x series kernel (as that is current LTS), but support for 5.16.x kernel headers has been added, so by default the "custom kernel headers series" option ends up with 5.16.x (the first option), leading to confusing errors: Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x As a help, default to the correct 5.15.x series when this combination is used. Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 248a9a2d97..8543f1cd21 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -127,6 +127,8 @@ endif choice bool "Custom kernel headers series" + default BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 if \ + (BR2_KERNEL_HEADERS_AS_KERNEL && BR2_LINUX_KERNEL_LATEST_VERSION) depends on BR2_KERNEL_HEADERS_VERSION || BR2_KERNEL_HEADERS_AS_KERNEL || \ BR2_KERNEL_HEADERS_CUSTOM_TARBALL || BR2_KERNEL_HEADERS_CUSTOM_GIT help From bugzilla at busybox.net Thu Mar 3 22:00:42 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 03 Mar 2022 22:00:42 +0000 Subject: [Buildroot] [Bug 14611] 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14611 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Peter Korsgaard --- Fixed in git, thanks: https://git.buildroot.org/buildroot/commit/?id=5dc3cfbff11934a3b29f8b2b98aed22ec01e7c42 -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Thu Mar 3 22:09:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 23:09:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf-xlib: new package In-Reply-To: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:55 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Message-ID: <87k0daadsk.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Deprecated Xlib integration for GdkPixbuf. > gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since > version 2.42.0 and > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c > resulting in the following "hidden" warnings with xscreensaver since > commit a7b51ed3013c919b293deb95299e33363fb9df70: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 3 22:10:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 23:10:12 +0100 Subject: [Buildroot] [PATCH 2/2] package/xscreensaver: add gdk-pixbuf-xlib dependency In-Reply-To: <20220302174456.1641125-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:56 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> <20220302174456.1641125-2-fontaine.fabrice@gmail.com> Message-ID: <87fsnyadrv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version > 2.42.0 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the 2.42.2, not 2.42.0. > following "hidden" warnings: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 3 22:08:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 23:08:05 +0100 Subject: [Buildroot] [git commit] package/xscreensaver: add gdk-pixbuf-xlib dependency Message-ID: <20220303220221.C157F81D5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35f02050be12b86cdd2220e09c72fd2586346068 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.2 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 787c3130ae..10b2b7012c 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index f73a75bf14..46dedc3211 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -15,6 +15,7 @@ XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ From peter at korsgaard.com Thu Mar 3 22:03:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 23:03:03 +0100 Subject: [Buildroot] [git commit] package/gdk-pixbuf-xlib: new package Message-ID: <20220303220221.B764C819DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=559df4ef2888efda8a0142a9b61a1206e6ab0fff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..b7a7c8771c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -877,6 +877,7 @@ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ F: package/freeipmi/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..8d2d550a64 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1492,6 +1492,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) From christian at paral.in Fri Mar 4 04:25:02 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 3 Mar 2022 20:25:02 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.8 Message-ID: <20220304042502.56629-1-christian@paral.in> go1.17.8 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. https://go.dev/doc/devel/release#go1.17.minor Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index fdf342e602..85e6adfb8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz +sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 56a21dfe55..3df16c9a68 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.7 +GO_VERSION = 1.17.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.35.1 From yegorslists at googlemail.com Fri Mar 4 08:48:48 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Fri, 4 Mar 2022 09:48:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix libwpa_client.so build In-Reply-To: <20220303191945.3952450-1-geomatsi@gmail.com> References: <20220303191945.3952450-1-geomatsi@gmail.com> Message-ID: Hi Sergey, all, On Thu, Mar 3, 2022 at 8:19 PM Sergey Matyukevich wrote: > > Build target libwpa_client.so is not built regardless of whether the > option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that > fixes wpa_supplicant build regression. > > Fixes: > http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ > http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ > > Signed-off-by: Sergey Matyukevich Tested-by: Yegor Yefremov The patch was already merged upstream. Yegor > --- > > Hi all, > > Note that the patch has been posted to hostapd mailing list > and discussed, but not yet accepted: > > https://patchwork.ozlabs.org/project/hostap/patch/20220222085219.3996729-1-geomatsi at gmail.com/ > > Regards, > Sergey > > ...le-options-for-libwpa_client.so-and-.patch | 68 +++++++++++++++++++ > 1 file changed, 68 insertions(+) > create mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch > > diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch > new file mode 100644 > index 0000000000..156d0e7e2c > --- /dev/null > +++ b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch > @@ -0,0 +1,68 @@ > +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 > +From: Sergey Matyukevich > +Date: Sun, 20 Feb 2022 10:12:28 +0300 > +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase > + > +Commit a41a29192e5d ("build: Pull common fragments into a build.rules > +file") introduced regression into wpa_supplicant build process. Build > +target libwpa_client.so is not built regardless of whether the option > +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config > +option is used before it is imported from the configuration file. > +Moving its usage after including build.rules does not help: variable > +ALL is processed by build.rules and further changes are not applied. > +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as > +expected: wpa_passphrase is always built regardless of whether the > +option is set or not. > + > +This commit re-enables options adding both build targets to _all > +dependencies. > + > +Signed-off-by: Sergey Matyukevich > +--- > + wpa_supplicant/Makefile | 19 ++++++++++++------- > + 1 file changed, 12 insertions(+), 7 deletions(-) > + > +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > +index cb66defac..e384cc6b8 100644 > +--- a/wpa_supplicant/Makefile > ++++ b/wpa_supplicant/Makefile > +@@ -1,24 +1,29 @@ > + BINALL=wpa_supplicant wpa_cli > + > +-ifndef CONFIG_NO_WPA_PASSPHRASE > +-BINALL += wpa_passphrase > +-endif > +- > + ALL = $(BINALL) > + ALL += systemd/wpa_supplicant.service > + ALL += systemd/wpa_supplicant at .service > + ALL += systemd/wpa_supplicant-nl80211 at .service > + ALL += systemd/wpa_supplicant-wired at .service > + ALL += dbus/fi.w1.wpa_supplicant1.service > +-ifdef CONFIG_BUILD_WPA_CLIENT_SO > +-ALL += libwpa_client.so > +-endif > + > + EXTRA_TARGETS=dynamic_eap_methods > + > + CONFIG_FILE=.config > + include ../src/build.rules > + > ++ifdef CONFIG_BUILD_WPA_CLIENT_SO > ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO > ++# being set in the config which is read by build.rules > ++_all: libwpa_client.so > ++endif > ++ > ++ifndef CONFIG_NO_WPA_PASSPHRASE > ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE > ++# being set in the config which is read by build.rules > ++_all: wpa_passphrase > ++endif > ++ > + ifdef LIBS > + # If LIBS is set with some global build system defaults, clone those for > + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. > +-- > +2.35.1 > + > -- > 2.35.1 > From peter at korsgaard.com Fri Mar 4 17:09:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Mar 2022 18:09:07 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220304170907.157687-1-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..df5261e5ff 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d0813e5db4..01325348ef 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz +sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8543f1cd21..8cfbd41831 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -380,14 +380,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 - default "5.15.13" if BR2_KERNEL_HEADERS_5_15 - default "5.16" if BR2_KERNEL_HEADERS_5_16 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 + default "5.15.26" if BR2_KERNEL_HEADERS_5_15 + default "5.16.12" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ -- 2.30.2 From peter at korsgaard.com Fri Mar 4 17:10:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Mar 2022 18:10:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.8 In-Reply-To: <20220304042502.56629-1-christian@paral.in> (Christian Stewart's message of "Thu, 3 Mar 2022 20:25:02 -0800") References: <20220304042502.56629-1-christian@paral.in> Message-ID: <87bkylabke.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.17.8 includes a security fix to the regexp/syntax package, as well as bug > fixes to the compiler, runtime, the go command, and the crypto/x509, and net > packages. > https://go.dev/doc/devel/release#go1.17.minor > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 4 17:11:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Mar 2022 18:11:36 +0100 Subject: [Buildroot] [git commit] package/go: security bump to 1.17.8 Message-ID: <20220304170333.BD28382A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cd8faa8d3b525fc01c21bc03ddd617062516699 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.17.8 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. https://go.dev/doc/devel/release#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index fdf342e602..85e6adfb8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz +sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 56a21dfe55..3df16c9a68 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.7 +GO_VERSION = 1.17.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From fontaine.fabrice at gmail.com Fri Mar 4 17:24:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 18:24:39 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: remove override in conditional Message-ID: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 17:38:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 18:38:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: fix build without libvirtd Message-ID: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 7b0ed5e52e..1dc61a7549 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -39,7 +39,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -196,7 +195,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -235,7 +237,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 19:06:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 20:06:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop Message-ID: <20220304190600.4021243-1-fontaine.fabrice@gmail.com> Fix the following build failure without shell-desktop raised since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: In file included from ../tests/weston-test-client-helper.c:43: ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory 40 | #include "weston-screenshooter-client-protocol.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 Signed-off-by: Fabrice Fontaine --- ...ncy-on-screenshooter-client-protocol.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch new file mode 100644 index 0000000000..927215380e --- /dev/null +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch @@ -0,0 +1,38 @@ +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Tue, 8 Feb 2022 22:39:42 +0000 +Subject: [PATCH] tests: Add dependency on screenshooter client protocol + +Given that the test-helper code relies on the screenshooter protocol, +make sure it's available for us to build, and the dependency ensures we +build in order. + +Fixes: #588 + +Signed-off-by: Daniel Stone + +[Retrieved from: +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] +Signed-off-by: Fabrice Fontaine +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 2d464ddcc..222091cd1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -29,8 +29,9 @@ lib_test_client = static_library( + 'weston-test-client-helper.c', + 'weston-test-fixture-compositor.c', + weston_test_client_protocol_h, +- weston_screenshooter_protocol_c, + weston_test_protocol_c, ++ weston_screenshooter_client_protocol_h, ++ weston_screenshooter_protocol_c, + viewporter_client_protocol_h, + viewporter_protocol_c, + 'color_util.h', +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 19:32:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 20:32:10 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/jpeg-turbo: bump to version 2.1.3 Message-ID: <20220304193210.4025746-1-fontaine.fabrice@gmail.com> Update hash of license file (date updated with https://github.com/libjpeg-turbo/libjpeg-turbo/commit/172972394a51352d0b67c30f20041e69a98d78b7) https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.3 Signed-off-by: Fabrice Fontaine --- package/jpeg-turbo/jpeg-turbo.hash | 10 +++++----- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index de82199659..a892fd3eaa 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/ -sha1 65c51c543b1fbba6db9ff5bee474ccb0b52a929f libjpeg-turbo-2.1.2.tar.gz -md5 e181bd78884dd5392a869209bfa41d4a libjpeg-turbo-2.1.2.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.3/ +sha1 6dec48193bb27e1c07abae8230031ce9ecb1cfec libjpeg-turbo-2.1.3.tar.gz +md5 85244dedeaf06f636a9e7ddea6d236d8 libjpeg-turbo-2.1.3.tar.gz # Locally computed -sha256 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 libjpeg-turbo-2.1.2.tar.gz -sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 LICENSE.md +sha256 467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0 libjpeg-turbo-2.1.3.tar.gz +sha256 ee1eaf194d5924b6360af8a6ba6a4e1554037091f7505943300cdeec65f1aebb LICENSE.md sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index ddae019839..475eb5fa84 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.1.2 +JPEG_TURBO_VERSION = 2.1.3 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 19:40:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 20:40:02 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/faketime: bump to version 0.9.10 Message-ID: <20220304194002.4028347-1-fontaine.fabrice@gmail.com> https://github.com/wolfcw/libfaketime/releases/tag/v0.9.10 Signed-off-by: Fabrice Fontaine --- package/faketime/faketime.hash | 2 +- package/faketime/faketime.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index 0628ff9ae6..a7d8d62dba 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 729ad33b9c750a50d9c68e97b90499680a74afd1568d859c574c0fe56fe7947f faketime-0.9.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 355477ba3b..6fc684f852 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.9 +FAKETIME_VERSION = 0.9.10 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING -- 2.34.1 From buildroot at busybox.net Fri Mar 4 20:33:36 2022 From: buildroot at busybox.net (jack) Date: Sat, 05 Mar 2022 04:33:36 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220304203338.DD4AC8293F@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Fri Mar 4 20:33:36 2022 From: buildroot at uclibc.org (jack) Date: Sat, 05 Mar 2022 04:33:36 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220304203338.E51458244D@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Fri Mar 4 20:43:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 4 Mar 2022 21:43:17 +0100 Subject: [Buildroot] [git commit] package/weston: fix build without shell-desktop Message-ID: <20220304205027.7E6B182B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f3b4f9402b7f5da8f0e0840523d43ef40c3f73f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without shell-desktop raised since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: In file included from ../tests/weston-test-client-helper.c:43: ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory 40 | #include "weston-screenshooter-client-protocol.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...pendency-on-screenshooter-client-protocol.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch new file mode 100644 index 0000000000..927215380e --- /dev/null +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch @@ -0,0 +1,38 @@ +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Tue, 8 Feb 2022 22:39:42 +0000 +Subject: [PATCH] tests: Add dependency on screenshooter client protocol + +Given that the test-helper code relies on the screenshooter protocol, +make sure it's available for us to build, and the dependency ensures we +build in order. + +Fixes: #588 + +Signed-off-by: Daniel Stone + +[Retrieved from: +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] +Signed-off-by: Fabrice Fontaine +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 2d464ddcc..222091cd1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -29,8 +29,9 @@ lib_test_client = static_library( + 'weston-test-client-helper.c', + 'weston-test-fixture-compositor.c', + weston_test_client_protocol_h, +- weston_screenshooter_protocol_c, + weston_test_protocol_c, ++ weston_screenshooter_client_protocol_h, ++ weston_screenshooter_protocol_c, + viewporter_client_protocol_h, + viewporter_protocol_c, + 'color_util.h', +-- +GitLab + From yann.morin.1998 at free.fr Fri Mar 4 20:58:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 4 Mar 2022 21:58:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop In-Reply-To: <20220304190600.4021243-1-fontaine.fabrice@gmail.com> References: <20220304190600.4021243-1-fontaine.fabrice@gmail.com> Message-ID: <20220304205840.GA228549@scaer> Fabrice, All, On 2022-03-04 20:06 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure without shell-desktop raised since bump > to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and > https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: > > In file included from ../tests/weston-test-client-helper.c:43: > ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory > 40 | #include "weston-screenshooter-client-protocol.h" > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ncy-on-screenshooter-client-protocol.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch > > diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch > new file mode 100644 > index 0000000000..927215380e > --- /dev/null > +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch > @@ -0,0 +1,38 @@ > +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 > +From: Daniel Stone > +Date: Tue, 8 Feb 2022 22:39:42 +0000 > +Subject: [PATCH] tests: Add dependency on screenshooter client protocol > + > +Given that the test-helper code relies on the screenshooter protocol, > +make sure it's available for us to build, and the dependency ensures we > +build in order. > + > +Fixes: #588 > + > +Signed-off-by: Daniel Stone > + > +[Retrieved from: > +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] > +Signed-off-by: Fabrice Fontaine > +--- > + tests/meson.build | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/tests/meson.build b/tests/meson.build > +index 2d464ddcc..222091cd1 100644 > +--- a/tests/meson.build > ++++ b/tests/meson.build > +@@ -29,8 +29,9 @@ lib_test_client = static_library( > + 'weston-test-client-helper.c', > + 'weston-test-fixture-compositor.c', > + weston_test_client_protocol_h, > +- weston_screenshooter_protocol_c, > + weston_test_protocol_c, > ++ weston_screenshooter_client_protocol_h, > ++ weston_screenshooter_protocol_c, > + viewporter_client_protocol_h, > + viewporter_protocol_c, > + 'color_util.h', > +-- > +GitLab > + > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Fri Mar 4 21:38:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Mar 2022 22:38:28 +0100 Subject: [Buildroot] [PATCH/next] package/libnss: bump to version 3.76 Message-ID: <20220304213828.3870123-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 07fb340c33..b4b8be11f6 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_RTM/src/SHA256SUMS +sha256 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 nss-3.76.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a9549e48dd..2f7a265136 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.75 +LIBNSS_VERSION = 3.76 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist -- 2.25.1 From bugzilla at busybox.net Fri Mar 4 23:28:14 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 04 Mar 2022 23:28:14 +0000 Subject: [Buildroot] [Bug 14636] New: azure-iot-sdk-c: Installed headers do not compile Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14636 Bug ID: 14636 Summary: azure-iot-sdk-c: Installed headers do not compile Product: buildroot Version: 2021.02.10 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jcowgill+busybox at jcowgill.uk CC: buildroot at uclibc.org Target Milestone: --- After building azure-iot-sdk-c... test.c contains: #include Running this: $ output/host/bin/aarch64-none-linux-gnu-gcc -c test.c Gives: In file included from test.c:1: .../output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/iothub_client.h:22:10: fatal error: umock_c/umock_c_prod.h: No such file or directory 22 | #include "umock_c/umock_c_prod.h" | ^~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Most of the headers seem to depend on umock_c which isn't installed. $ find output/staging/usr/include -name umock_c $ This bug pretty much makes the package unusable. ---- It's only slightly related, but I also wonder why the headers are installed directly into "/usr/include" even though upstream installs them under "/usr/include/azureiot". -- You are receiving this mail because: You are on the CC list for the bug. From mmayer at broadcom.com Sat Mar 5 00:00:51 2022 From: mmayer at broadcom.com (Markus Mayer) Date: Fri, 4 Mar 2022 16:00:51 -0800 Subject: [Buildroot] [PATCH 0/1] linux: limit YYLTYPE kernel modification Message-ID: <20220305000052.491721-1-mmayer@broadcom.com> Hi, It took me a while to find out why our kernel builds were suddenly failing with the 2022.02-rcX sources. Oddly, building DTC for the host would error out like so: dtc-parser.y: In function `print_error': dtc-parser.y:478:17: error: `yylloc' undeclared (first use in this function); did you mean `yyalloc'? dtc-parser.y:478:17: note: each undeclared identifier is reported only once for each function it appears in dtc-lexer.lex.c: In function `yylex': dtc-lexer.l:46:18: error: `yylloc' undeclared (first use in this function); did you mean `yyalloc'? dtc-lexer.lex.c:845:2: note: in expansion of macro `YY_USER_ACTION' dtc-lexer.lex.c:939:1: note: in expansion of macro `YY_RULE_SETUP' dtc-lexer.l:46:18: note: each undeclared identifier is reported only once for each function it appears in dtc-lexer.lex.c:845:2: note: in expansion of macro `YY_USER_ACTION' dtc-lexer.lex.c:939:1: note: in expansion of macro `YY_RULE_SETUP' The kernel build that's failing is Linux 4.1 with GCC 6.3. Yes, I know. Old kernel, old toolchain. Still, this used to work, and now it doesn't. (We have newer toolchains and newer kernels, too. They seem fine.) Eventually, I tracked it down to this change: https://git.buildroot.net/buildroot/commit/?id=9b41b54be077 I think there are two issues with it. It claims to be for GCC 10+, but it is applied at all times. I believe it should be conditional upon BR2_TOOLCHAIN_GCC_AT_LEAST_10 if the intention is to fix up the sources for GCC 10 and newer. Secondly, this code works its magic completely silently and quietly. There is no indication that anything is being done to the kernel sources. That makes it really, *REALLY* challenging to figure out what's going on when things go sideways. I think an informational message to the user is absolutely crucial. At least that way it'll show up in the build logs if one searches for "YYLTYPE". That'll give the users a hint where the sources are being touched. Modifying source code like this should not happen quietly. Regards, -Markus Markus Mayer (1): linux: limit YYLTYPE kernel modification linux/linux.mk | 3 +++ 1 file changed, 3 insertions(+) -- 2.25.1 From mmayer at broadcom.com Sat Mar 5 00:22:09 2022 From: mmayer at broadcom.com (Markus Mayer) Date: Fri, 4 Mar 2022 16:22:09 -0800 Subject: [Buildroot] [PATCH 1/1] linux: limit YYLTYPE kernel modification In-Reply-To: <20220305000052.491721-1-mmayer@broadcom.com> References: <20220305000052.491721-1-mmayer@broadcom.com> Message-ID: <20220305002209.493816-1-mmayer@broadcom.com> Commit 9b41b54be07711c10ad13ce157be272ed1cf402e addresses a build issue regarding re-defined YACC symbols. Unfortunately, this can break the build for older toolchains. To prevent unintentional breakage, make the source code modification conditional on BR2_TOOLCHAIN_GCC_AT_LEAST_10. Also inform the user about the modification when it is performed, so it becomes more obvious what is happening in case of unforseen problems. Signed-off-by: Markus Mayer --- linux/linux.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 940dc2849f..382a3f679e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -293,12 +293,15 @@ endef LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) # Older versions break on gcc 10+ because of redefined symbols define LINUX_DROP_YYLLOC + @echo "Removing 'YYLTYPE yylloc;' from kernel sources..." $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' endef LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC +endif # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions -- 2.25.1 From buildroot at busybox.net Sat Mar 5 07:47:22 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: Sat, 5 Mar 2022 09:47:22 +0200 (EET) Subject: [Buildroot] Alveks Friend Message-ID: <20220305074722.8995E344165@bizzi.btv.lv> Name: ???? Veronica want to meet you! Click here: https://clck.ru/dX8h6?ulqsc ???? E-mail: buildroot at busybox.net Info: ttq6oxmg -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sat Mar 5 09:18:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 5 Mar 2022 10:18:49 +0100 Subject: [Buildroot] [PATCH 1/1] linux: limit YYLTYPE kernel modification In-Reply-To: <20220305002209.493816-1-mmayer@broadcom.com> References: <20220305000052.491721-1-mmayer@broadcom.com> <20220305002209.493816-1-mmayer@broadcom.com> Message-ID: <20220305091849.GB228549@scaer> Markus, All, On 2022-03-04 16:22 -0800, Markus Mayer spake thusly: > Commit 9b41b54be07711c10ad13ce157be272ed1cf402e addresses a build issue > regarding re-defined YACC symbols. Unfortunately, this can break the > build for older toolchains. > > To prevent unintentional breakage, make the source code modification > conditional on BR2_TOOLCHAIN_GCC_AT_LEAST_10. Also inform the user about > the modification when it is performed, so it becomes more obvious what > is happening in case of unforseen problems. > > Signed-off-by: Markus Mayer > --- > linux/linux.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 940dc2849f..382a3f679e 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -293,12 +293,15 @@ endef > > LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) That is wrong, because this is built with the _host_ compiler, not the target compiler, and BR2_TOOLCHAIN_GCC_AT_LEAST_XX is about the target compiler. So, if we wanted to make that conditional, that would have to be conditional on BR2_HOST_GCC_AT_LEAST_10 (we only have up to gcc-9 for the host for now, so we'd need to add it for gcc-10 and 11; hint: search for BR2_HOST_GCC_AT_LEAST_9, HOST_GCC_VERSION, HOSTCC_VERSION, and HOSTCC_MAX_VERSION). Furthermore, that is still wrong in your case: if you switch to a distribution that has gcc 10 (so, as host compler!), then this fixup will be applied again, and your build will break again, because your kernel is (probably) missing the following commits (of the 29 that touch scripts/dtc/ between 4.1 and e33a814e772c): $ git slog -G'YYLTYPE yylloc;' v4.1..e33a814e772cdc36436c8c188d8c42d019fda639 -- scripts/dtc/ e33a814e772cd scripts/dtc: Remove redundant YYLOC global declaration e039139be8c25 scripts/dtc: generate lexer and parser during build instead of shipping 4760597116e34 scripts/dtc: Update to upstream version 9d3649bd3be245c9 However, you still have a point: this is breaking older kernels that do not have a recent-enough bundled dtc, whether they be built with a host gcc 10+ or not... Maybe we need to find a better heuristic to detect the case when we need to apply the fix, but then I am afraid this is going to be a nightmare of so many corner cases with vendor-specific franken-kernels. I am not sure where to go from here, though... > # Older versions break on gcc 10+ because of redefined symbols > define LINUX_DROP_YYLLOC > + @echo "Removing 'YYLTYPE yylloc;' from kernel sources..." There are so many fixes and tweaks we do without informing the user. If we were to, the build would be even more verbose than it currently is. Finding a reference to yylloc in the build log would just mean grepping for it, so you would achieve about the same by running: $ make V=1 as that would print the fixup line. Regards, Yann E. MORIN. > $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ > |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' > endef > LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC > +endif > > # Older linux kernels use deprecated perl constructs in timeconst.pl > # that were removed for perl 5.22+ so it breaks on newer distributions > -- > 2.25.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 5 14:46:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:46:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: needs headers >= 4.12 In-Reply-To: <20220213193336.1102940-1-fontaine.fabrice@gmail.com> References: <20220213193336.1102940-1-fontaine.fabrice@gmail.com> Message-ID: <5a736030-ecc7-6415-2e15-f73f564f6ea5@mind.be> On 13/02/2022 20:33, Fabrice Fontaine wrote: > NETLINK_EXT_ACK is only available since kernel 4.12 and > https://github.com/torvalds/linux/commit/2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5 > resulting in the following build failure since addition of the package > in commit 3675131e6c654d7536a184db0184fde7a97040e0: > > net.c: In function 'netlink_open': > net.c:110:36: error: 'NETLINK_EXT_ACK' undeclared (first use in this function); did you mean 'NETLINK_CAP_ACK'? > 110 | if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, > | ^~~~~~~~~~~~~~~ > | NETLINK_CAP_ACK > > Fixes: > - http://autobuild.buildroot.org/results/c61678e56bd73609838747048f27068818c21150 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/bpftool/Config.in | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in > index 39475aa962..e81d874343 100644 > --- a/package/bpftool/Config.in > +++ b/package/bpftool/Config.in > @@ -5,14 +5,16 @@ config BR2_PACKAGE_BPFTOOL > depends on !BR2_STATIC_LIBS # elfutils > depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils > depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 > select BR2_PACKAGE_BINUTILS > select BR2_PACKAGE_ELFUTILS > help > bpftool is a tool for for inspection and simple manipulation > of eBPF programs and maps. > > -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" > +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" > depends on !BR2_nios2 > depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ > || !BR2_TOOLCHAIN_HAS_THREADS \ > - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) > + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ > + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 From arnout at mind.be Sat Mar 5 14:46:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:46:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: add ZABBIX_CPE_ID_VENDOR In-Reply-To: <20220213203219.1206327-1-fontaine.fabrice@gmail.com> References: <20220213203219.1206327-1-fontaine.fabrice@gmail.com> Message-ID: On 13/02/2022 21:32, Fabrice Fontaine wrote: > cpe:2.3:a:zabbix:zabbix is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Azabbix%3Azabbix > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/zabbix/zabbix.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index e72d831b46..e6564e68fd 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -9,6 +9,7 @@ ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 > ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) > ZABBIX_LICENSE = GPL-2.0+ > ZABBIX_LICENSE_FILES = README COPYING > +ZABBIX_CPE_ID_VENDOR = zabbix > > ZABBIX_DEPENDENCIES = pcre > ZABBIX_CONF_OPTS = \ From arnout at mind.be Sat Mar 5 14:47:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:47:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: add PYTHON_GNUPG_CPE_ID_VENDOR In-Reply-To: <20220213204327.1206836-1-fontaine.fabrice@gmail.com> References: <20220213204327.1206836-1-fontaine.fabrice@gmail.com> Message-ID: On 13/02/2022 21:43, Fabrice Fontaine wrote: > cpe:2.3:a:python:python-gnupg is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apython%3Apython-gnupg > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-gnupg/python-gnupg.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk > index f16910e517..fda264a0ed 100644 > --- a/package/python-gnupg/python-gnupg.mk > +++ b/package/python-gnupg/python-gnupg.mk > @@ -8,6 +8,7 @@ PYTHON_GNUPG_VERSION = 0.4.8 > PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 > PYTHON_GNUPG_LICENSE = BSD-3-Clause > PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt > +PYTHON_GNUPG_CPE_ID_VENDOR = python > PYTHON_GNUPG_SETUP_TYPE = setuptools > > $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:49:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:49:44 +0100 Subject: [Buildroot] [PATCH] package/gdb: bump 11.x version to 11.2 In-Reply-To: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> References: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> Message-ID: <94702c85-4a62-54fe-017b-eb2cd6ffa26c@mind.be> On 13/02/2022 23:01, Thomas Petazzoni via buildroot wrote: > This is a minor corrective release over GDB 11.1, fixing the following issues: > > PR sim/28302 (gdb fails to build with glibc 2.34) > PR build/28318 (std::thread support configure check does not use > CXX_DIALECT) > PR gdb/28405 (arm-none-eabi: internal-error: ptid_t > remote_target::select_thread_for_ambiguous_stop_reply(const > target_waitstatus*): Assertion `first_resumed_thread != nullptr' > failed) > PR tui/28483 ([gdb/tui] breakpoint creation not displayed) > PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) > PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) > PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) > PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) > > Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was > merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. > > Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as > commit df9ebc472a162306dee8ba6e02b99963c2babb7c? > > Drop patch 0009-gdbserver-aarch64-support.patch, which was merged > upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. > > Signed-off-by: Thomas Petazzoni Bugfix bump, so applied to master, thanks. Regards, Arnout > --- > ...sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------ > .../gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ----------- > .../11.1/0010-gdbserver-aarch64-support.patch | 320 ------------------ > ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 > ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 > .../0003-use-asm-sgidefs.h.patch | 0 > .../0004-gdbserver-fix-build-for-m68k.patch | 0 > ...fork-inferior-include-linux-ptrace.h.patch | 0 > ...etrandom-compile-for-uclibc-v1.0.35.patch} | 0 > .../0007-fix-musl-build-on-riscv.patch | 0 > ...gdbserver-Makefile.in-fix-NLS-build.patch} | 0 > package/gdb/Config.in.host | 2 +- > package/gdb/gdb.hash | 2 +- > 13 files changed, 2 insertions(+), 626 deletions(-) > delete mode 100644 package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch > delete mode 100644 package/gdb/11.1/0008-Fix-build-on-rhES5.patch > delete mode 100644 package/gdb/11.1/0010-gdbserver-aarch64-support.patch > rename package/gdb/{11.1 => 11.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) > rename package/gdb/{11.1 => 11.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) > rename package/gdb/{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch (100%) > rename package/gdb/{11.1 => 11.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) > rename package/gdb/{11.1 => 11.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) > rename package/gdb/{11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch => 11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch} (100%) > rename package/gdb/{11.1 => 11.2}/0007-fix-musl-build-on-riscv.patch (100%) > rename package/gdb/{11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch => 11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch} (100%) > > diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch > deleted file mode 100644 > index d969d98831..0000000000 > --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch > +++ /dev/null > @@ -1,110 +0,0 @@ > -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 > -From: Mike Frysinger > -Date: Sun, 3 Oct 2021 12:02:53 -0400 > -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] > - > -We map target signals to host signals so we can propagate signals > -between the host & simulated worlds. That means we need to know > -the symbolic names & values of all signals that might be sent. > - > -The tools that generate that list use signal.h and include all > -symbols that start with "SIG" so as to automatically include any > -new symbols that the C library might add. Unfortunately, this > -also picks up "SIGSTKSZ" which is not actually a signal itself, > -but a signal related setting -- it's the size of the stack when > -a signal is handled. > - > -By itself this doesn't super matter as we will never see a signal > -with that same value (since the range of valid signals tend to be > -way less than 1024, and the size of the default signal stack will > -never be that small). But with recent glibc changes that make this > -into a dynamic value instead of a compile-time constant, some users > -see build failures when building the sim. > - > -As suggested by Adam Sampson, update our scripts to ignore this > -symbol to simplify everything and avoid the build failure. > - > -Bug: https://sourceware.org/PR28302 > - > -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] > -Signed-off-by: Peter Seiderer > ---- > - sim/bfin/linux-targ-map.h | 5 +---- > - sim/common/gennltvals.py | 6 ++++-- > - sim/common/nltvals.def | 1 - > - 3 files changed, 5 insertions(+), 7 deletions(-) > - > -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h > -index e9c8c8f..0340ed5 100644 > ---- a/sim/bfin/linux-targ-map.h > -+++ b/sim/bfin/linux-targ-map.h > -@@ -30,6 +30,7 @@ echo > - # XXX: nothing uses this ? > - echo '#include ' | \ > - bfin-uclinux-gcc -E -dD -P - | \ > -+grep -v SIGSTKSZ | \ > - sed -r -n \ > - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ > - -e '$i\ \ { 0, -1, -1 }\n};' \ > -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = > - #ifdef SIG_SETMASK > - # define TARGET_LINUX_SIG_SETMASK 2 > - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, > --#endif > --#ifdef SIGSTKSZ > --# define TARGET_LINUX_SIGSTKSZ 8192 > -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, > - #endif > - { 0, -1, -1 } > - }; > -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py > -index b3e558d..bd4d7e9 100755 > ---- a/sim/common/gennltvals.py > -+++ b/sim/common/gennltvals.py > -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ > - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, > - headers: Iterable[str], > - pattern: str, > -+ filter: str = r'^$', > - target: str = None): > - """Extract constants from the specified files using a regular expression. > - > -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, > - srcfile = ''.join(f'#include <{x}>\n' for x in headers) > - syms = set() > - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') > -+ filter_pattern = re.compile(filter) > - for header in headers: > - with open(srcdir / header, 'r', encoding='utf-8') as fp: > - data = fp.read() > - for line in data.splitlines(): > - m = define_pattern.match(line) > -- if m: > -+ if m and not filter_pattern.search(line): > - syms.add(m.group(1)) > - for sym in sorted(syms): > - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' > -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): > - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') > - > - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', > -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') > -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') > - > - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', > - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') > -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def > -index 8ae8839..8bc6ae5 100644 > ---- a/sim/common/nltvals.def > -+++ b/sim/common/nltvals.def > -@@ -116,7 +116,6 @@ > - { "SIGPROF", 27 }, > - { "SIGQUIT", 3 }, > - { "SIGSEGV", 11 }, > -- { "SIGSTKSZ", 8192 }, > - { "SIGSTOP", 17 }, > - { "SIGSYS", 12 }, > - { "SIGTERM", 15 }, > --- > -2.33.1 > - > diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch > deleted file mode 100644 > index 2d4e30ffe1..0000000000 > --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch > +++ /dev/null > @@ -1,194 +0,0 @@ > -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 > -From: Tom Tromey > -Date: Wed, 12 May 2021 12:39:22 -0600 > -Subject: [PATCH] Fix build on rhES5 > - > -The rhES5 build failed due to an upstream import a while back. The > -bug here is that, while the 'personality' function exists, > -ADDR_NO_RANDOMIZE is only defined in , not > -. > - > -However, does not declare the 'personality' > -function, and and cannot > -both be included. > - > -This patch restores one of the removed configure checks and updates > -the code to check it. > - > -We had this as a local patch at AdaCore, because it seemed like there > -was no interest upstream. However, now it turns out that this fixes > -PR build/28555, so I'm sending it now. > - > -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] > -Signed-off-by: Peter Seiderer > ---- > - gdb/config.in | 4 ++++ > - gdb/configure | 16 ++++++++++++++++ > - gdb/nat/linux-personality.c | 4 ++++ > - gdbserver/config.in | 4 ++++ > - gdbserver/configure | 16 ++++++++++++++++ > - gdbsupport/common.m4 | 5 +++++ > - gdbsupport/config.in | 4 ++++ > - gdbsupport/configure | 16 ++++++++++++++++ > - 8 files changed, 69 insertions(+) > - > -diff --git a/gdb/config.in b/gdb/config.in > -index 2c30504..776bee9 100644 > ---- a/gdb/config.in > -+++ b/gdb/config.in > -@@ -96,6 +96,10 @@ > - /* define if the compiler supports basic C++11 syntax */ > - #undef HAVE_CXX11 > - > -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if > -+ you don't. */ > -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE > -+ > - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you > - don't. */ > - #undef HAVE_DECL_ASPRINTF > -diff --git a/gdb/configure b/gdb/configure > -index 5d89635..27e3194 100755 > ---- a/gdb/configure > -+++ b/gdb/configure > -@@ -13838,6 +13838,22 @@ fi > - done > - > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include > -+" > -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : > -+ ac_have_decl=1 > -+else > -+ ac_have_decl=0 > -+fi > -+ > -+cat >>confdefs.h <<_ACEOF > -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl > -+_ACEOF > -+ > -+ > - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" > - if test "x$ac_cv_have_decl_strstr" = xyes; then : > - ac_have_decl=1 > -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c > -index 9ce345b..27999fd 100644 > ---- a/gdb/nat/linux-personality.c > -+++ b/gdb/nat/linux-personality.c > -@@ -22,6 +22,10 @@ > - > - #include > - > -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE > -+# define ADDR_NO_RANDOMIZE 0x0040000 > -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ > -+ > - /* See comment on nat/linux-personality.h. */ > - > - maybe_disable_address_space_randomization:: > -diff --git a/gdbserver/config.in b/gdbserver/config.in > -index cf06c56..c9258b3 100644 > ---- a/gdbserver/config.in > -+++ b/gdbserver/config.in > -@@ -31,6 +31,10 @@ > - /* define if the compiler supports basic C++11 syntax */ > - #undef HAVE_CXX11 > - > -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if > -+ you don't. */ > -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE > -+ > - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you > - don't. */ > - #undef HAVE_DECL_ASPRINTF > -diff --git a/gdbserver/configure b/gdbserver/configure > -index b227167..d399d71 100755 > ---- a/gdbserver/configure > -+++ b/gdbserver/configure > -@@ -7131,6 +7131,22 @@ fi > - done > - > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include > -+" > -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : > -+ ac_have_decl=1 > -+else > -+ ac_have_decl=0 > -+fi > -+ > -+cat >>confdefs.h <<_ACEOF > -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl > -+_ACEOF > -+ > -+ > - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" > - if test "x$ac_cv_have_decl_strstr" = xyes; then : > - ac_have_decl=1 > -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 > -index 901c454..56a355e 100644 > ---- a/gdbsupport/common.m4 > -+++ b/gdbsupport/common.m4 > -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ > - ptrace64 sbrk setns sigaltstack sigprocmask \ > - setpgid setpgrp getrusage getauxval sigtimedwait]) > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) > -+ > - AC_CHECK_DECLS([strstr]) > - > - # ----------------------- # > -diff --git a/gdbsupport/config.in b/gdbsupport/config.in > -index f46e261..6945a62 100644 > ---- a/gdbsupport/config.in > -+++ b/gdbsupport/config.in > -@@ -28,6 +28,10 @@ > - /* define if the compiler supports basic C++11 syntax */ > - #undef HAVE_CXX11 > - > -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if > -+ you don't. */ > -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE > -+ > - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you > - don't. */ > - #undef HAVE_DECL_ASPRINTF > -diff --git a/gdbsupport/configure b/gdbsupport/configure > -index a9dd02c..243a03f 100755 > ---- a/gdbsupport/configure > -+++ b/gdbsupport/configure > -@@ -8144,6 +8144,22 @@ fi > - done > - > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include > -+" > -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : > -+ ac_have_decl=1 > -+else > -+ ac_have_decl=0 > -+fi > -+ > -+cat >>confdefs.h <<_ACEOF > -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl > -+_ACEOF > -+ > -+ > - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" > - if test "x$ac_cv_have_decl_strstr" = xyes; then : > - ac_have_decl=1 > --- > -2.33.1 > - > diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch > deleted file mode 100644 > index 3718b1b6fd..0000000000 > --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch > +++ /dev/null > @@ -1,320 +0,0 @@ > -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 > -From: Luis Machado > -Date: Fri, 29 Oct 2021 14:54:36 -0300 > -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic > - > -The current register set selection mechanism for AArch64 is static, based > -on a pre-populated array of register sets. > - > -This means that we might potentially probe register sets that are not > -available. This is OK if the kernel errors out during ptrace, but probing the > -tag_ctl register, for example, does not result in a ptrace error if the kernel > -supports the tagged address ABI but not MTE (PR 28355). > - > -Making the register set selection dynamic, based on feature checks, solves > -this and simplifies the code a bit. It allows us to list all of the register > -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. > - > -gdb/ChangeLog: > - > -2021-11-03 Luis Machado > - > - PR gdb/28355 > - > - * arch/aarch64.h (struct aarch64_features): New struct. > - > -gdbserver/ChangeLog: > - > -2021-11-03 Luis Machado > - > - PR gdb/28355 > - > - * linux-aarch64-low.cc (is_sve_tdesc): Remove. > - (aarch64_target::low_arch_setup): Rework to adjust the register sets. > - (aarch64_regsets): Update to list all register sets. > - (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. > - (aarch64_sve_regsets, aarch64_sve_regsets_info) > - (regs_info_aarch64_sve): Remove. > - (aarch64_adjust_register_sets): New. > - (aarch64_target::get_regs_info): Remove references to removed structs. > - (initialize_low_arch): Likewise. > - > -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 > -Signed-off-by: Joachim Wiberg > ---- > - gdb/arch/aarch64.h | 9 ++ > - gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- > - 4 files changed, 130 insertions(+), 85 deletions(-) > - > -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h > -index 0eb702c5b5e..95edb664b55 100644 > ---- a/gdb/arch/aarch64.h > -+++ b/gdb/arch/aarch64.h > -@@ -22,6 +22,15 @@ > - > - #include "gdbsupport/tdesc.h" > - > -+/* Holds information on what architectural features are available. This is > -+ used to select register sets. */ > -+struct aarch64_features > -+{ > -+ bool sve = false; > -+ bool pauth = false; > -+ bool mte = false; > -+}; > -+ > - /* Create the aarch64 target description. A non zero VQ value indicates both > - the presence of SVE and the Vector Quotient - the number of 128bit chunks in > - an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH > -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc > -index daccfef746e..9a8cb4169a7 100644 > ---- a/gdbserver/linux-aarch64-low.cc > -+++ b/gdbserver/linux-aarch64-low.cc > -@@ -196,16 +196,6 @@ is_64bit_tdesc (void) > - return register_size (regcache->tdesc, 0) == 8; > - } > - > --/* Return true if the regcache contains the number of SVE registers. */ > -- > --static bool > --is_sve_tdesc (void) > --{ > -- struct regcache *regcache = get_thread_regcache (current_thread, 0); > -- > -- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); > --} > -- > - static void > - aarch64_fill_gregset (struct regcache *regcache, void *buf) > - { > -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, > - *child->priv->arch_private = *parent->priv->arch_private; > - } > - > --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ > --#define AARCH64_HWCAP_PACA (1 << 30) > -- > --/* Implementation of linux target ops method "low_arch_setup". */ > -- > --void > --aarch64_target::low_arch_setup () > --{ > -- unsigned int machine; > -- int is_elf64; > -- int tid; > -- > -- tid = lwpid_of (current_thread); > -- > -- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); > -- > -- if (is_elf64) > -- { > -- uint64_t vq = aarch64_sve_get_vq (tid); > -- unsigned long hwcap = linux_get_hwcap (8); > -- unsigned long hwcap2 = linux_get_hwcap2 (8); > -- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; > -- /* MTE is AArch64-only. */ > -- bool mte_p = hwcap2 & HWCAP2_MTE; > -- > -- current_process ()->tdesc > -- = aarch64_linux_read_description (vq, pauth_p, mte_p); > -- } > -- else > -- current_process ()->tdesc = aarch32_linux_read_description (); > -- > -- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); > --} > -- > - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ > - > - static void > -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) > - return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); > - } > - > -+/* Array containing all the possible register sets for AArch64/Linux. During > -+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for > -+ validity and enabled/disabled accordingly. > -+ > -+ Their sizes are set to 0 here, but they will be adjusted later depending > -+ on whether each register set is available or not. */ > - static struct regset_info aarch64_regsets[] = > - { > -+ /* GPR registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, > -- sizeof (struct user_pt_regs), GENERAL_REGS, > -+ 0, GENERAL_REGS, > - aarch64_fill_gregset, aarch64_store_gregset }, > -+ /* Floating Point (FPU) registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, > -- sizeof (struct user_fpsimd_state), FP_REGS, > -+ 0, FP_REGS, > - aarch64_fill_fpregset, aarch64_store_fpregset > - }, > -+ /* Scalable Vector Extension (SVE) registers. */ > -+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, > -+ 0, EXTENDED_REGS, > -+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache > -+ }, > -+ /* PAC registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, > -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, > -- NULL, aarch64_store_pauthregset }, > -+ 0, OPTIONAL_REGS, > -+ nullptr, aarch64_store_pauthregset }, > -+ /* Tagged address control / MTE registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, > -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, > -- aarch64_store_mteregset }, > -+ 0, OPTIONAL_REGS, > -+ aarch64_fill_mteregset, aarch64_store_mteregset }, > - NULL_REGSET > - }; > - > -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = > - { > - aarch64_regsets, /* regsets */ > - 0, /* num_regsets */ > -- NULL, /* disabled_regsets */ > -+ nullptr, /* disabled_regsets */ > - }; > - > - static struct regs_info regs_info_aarch64 = > - { > -- NULL, /* regset_bitmap */ > -- NULL, /* usrregs */ > -+ nullptr, /* regset_bitmap */ > -+ nullptr, /* usrregs */ > - &aarch64_regsets_info, > - }; > - > --static struct regset_info aarch64_sve_regsets[] = > -+/* Given FEATURES, adjust the available register sets by setting their > -+ sizes. A size of 0 means the register set is disabled and won't be > -+ used. */ > -+ > -+static void > -+aarch64_adjust_register_sets (const struct aarch64_features &features) > - { > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, > -- sizeof (struct user_pt_regs), GENERAL_REGS, > -- aarch64_fill_gregset, aarch64_store_gregset }, > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, > -- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, > -- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache > -- }, > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, > -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, > -- NULL, aarch64_store_pauthregset }, > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, > -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, > -- aarch64_store_mteregset }, > -- NULL_REGSET > --}; > -+ struct regset_info *regset; > - > --static struct regsets_info aarch64_sve_regsets_info = > -- { > -- aarch64_sve_regsets, /* regsets. */ > -- 0, /* num_regsets. */ > -- NULL, /* disabled_regsets. */ > -- }; > -+ for (regset = aarch64_regsets; regset->size >= 0; regset++) > -+ { > -+ switch (regset->nt_type) > -+ { > -+ case NT_PRSTATUS: > -+ /* General purpose registers are always present. */ > -+ regset->size = sizeof (struct user_pt_regs); > -+ break; > -+ case NT_FPREGSET: > -+ /* This is unavailable when SVE is present. */ > -+ if (!features.sve) > -+ regset->size = sizeof (struct user_fpsimd_state); > -+ break; > -+ case NT_ARM_SVE: > -+ if (features.sve) > -+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); > -+ break; > -+ case NT_ARM_PAC_MASK: > -+ if (features.pauth) > -+ regset->size = AARCH64_PAUTH_REGS_SIZE; > -+ break; > -+ case NT_ARM_TAGGED_ADDR_CTRL: > -+ if (features.mte) > -+ regset->size = AARCH64_LINUX_SIZEOF_MTE; > -+ break; > -+ default: > -+ gdb_assert_not_reached ("Unknown register set found."); > -+ } > -+ } > -+} > - > --static struct regs_info regs_info_aarch64_sve = > -- { > -- NULL, /* regset_bitmap. */ > -- NULL, /* usrregs. */ > -- &aarch64_sve_regsets_info, > -- }; > -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ > -+#define AARCH64_HWCAP_PACA (1 << 30) > -+ > -+/* Implementation of linux target ops method "low_arch_setup". */ > -+ > -+void > -+aarch64_target::low_arch_setup () > -+{ > -+ unsigned int machine; > -+ int is_elf64; > -+ int tid; > -+ > -+ tid = lwpid_of (current_thread); > -+ > -+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); > -+ > -+ if (is_elf64) > -+ { > -+ struct aarch64_features features; > -+ > -+ uint64_t vq = aarch64_sve_get_vq (tid); > -+ features.sve = (vq > 0); > -+ /* A-profile PAC is 64-bit only. */ > -+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; > -+ /* A-profile MTE is 64-bit only. */ > -+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; > -+ > -+ current_process ()->tdesc > -+ = aarch64_linux_read_description (vq, features.pauth, features.mte); > -+ > -+ /* Adjust the register sets we should use for this particular set of > -+ features. */ > -+ aarch64_adjust_register_sets (features); > -+ } > -+ else > -+ current_process ()->tdesc = aarch32_linux_read_description (); > -+ > -+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); > -+} > - > - /* Implementation of linux target ops method "get_regs_info". */ > - > -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () > - if (!is_64bit_tdesc ()) > - return ®s_info_aarch32; > - > -- if (is_sve_tdesc ()) > -- return ®s_info_aarch64_sve; > -- > -+ /* AArch64 64-bit registers. */ > - return ®s_info_aarch64; > - } > - > -@@ -3294,5 +3311,4 @@ initialize_low_arch (void) > - initialize_low_arch_aarch32 (); > - > - initialize_regsets_info (&aarch64_regsets_info); > -- initialize_regsets_info (&aarch64_sve_regsets_info); > - } > --- > -2.27.0 > - > diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch > similarity index 100% > rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch > rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch > diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch > similarity index 100% > rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch > rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch > diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch > similarity index 100% > rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch > rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch > diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch > similarity index 100% > rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch > rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch > diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch > similarity index 100% > rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch > rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch > diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch > similarity index 100% > rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch > rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch > diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch > similarity index 100% > rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch > rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch > diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch > similarity index 100% > rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch > rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index 56999fa9e0..d3dea0b0a7 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -71,7 +71,7 @@ config BR2_GDB_VERSION > default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky > default "9.2" if BR2_GDB_VERSION_9_2 > default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB > - default "11.1" if BR2_GDB_VERSION_11 > + default "11.2" if BR2_GDB_VERSION_11 > depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB > > # recent gdb versions (>= 10) have gdbserver moved at the top-level, > diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash > index d3e83af0b9..e7933374f1 100644 > --- a/package/gdb/gdb.hash > +++ b/package/gdb/gdb.hash > @@ -1,7 +1,7 @@ > # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum > sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz > sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz > -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz > +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz > > # Locally calculated (fetched from Github) > sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From arnout at mind.be Sat Mar 5 14:50:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:50:11 +0100 Subject: [Buildroot] [PATCH] package/python-cryptography: needs cargo env when downloading In-Reply-To: <20220214102829.156331-1-yann.morin.1998@free.fr> References: <20220214102829.156331-1-yann.morin.1998@free.fr> Message-ID: <03a17198-1047-f356-908e-358a2936f899@mind.be> On 14/02/2022 11:28, Yann E. MORIN wrote: > python-cryptography is a python package, but it internally builds a rust > crate. As such, it needs to be vendored at install time. > > Currently, we only pass the path to the sub-directory where the rust > source is in the package tree, but calling cargo needs additional > variables, most notably it needs CARGO_HOME to be set in the > environment, otherwise it ends up writing in the user's own cargo home, > which is by default ~/.cargo/ > > We do not really know what variables are used at vendor tie, so we pass > the full Cargo environment, that we pass when building target packages. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Yegor Yefremov > Cc: Asaf Kahlon Applied to master, thanks. Regards, Arnout > --- > package/python-cryptography/python-cryptography.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index e642691bc5..a524f729c8 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -24,6 +24,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \ > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > + $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:50:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:50:40 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libgee: bump to version 0.20.5 In-Reply-To: <20220214102959.1740165-1-fontaine.fabrice@gmail.com> References: <20220214102959.1740165-1-fontaine.fabrice@gmail.com> Message-ID: <89896379-d684-bd0d-0017-4c0c5ed14c02@mind.be> On 14/02/2022 11:29, Fabrice Fontaine wrote: > Drop patch (already in version) and so autoreconf > > https://gitlab.gnome.org/GNOME/libgee/-/blob/0.20.5/NEWS > > Signed-off-by: Fabrice Fontaine Bugfix version bump, so applied to master, thanks. Regards, Arnout > --- > ...le.am-include-Makefile.introspection.patch | 40 ------------------- > package/libgee/libgee.hash | 4 +- > package/libgee/libgee.mk | 4 +- > 3 files changed, 3 insertions(+), 45 deletions(-) > delete mode 100644 package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch > > diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch > deleted file mode 100644 > index 0906275ae3..0000000000 > --- a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 20 Nov 2021 23:57:33 +0100 > -Subject: [PATCH] gee/Makefile.am: include Makefile.introspection > - > -Include Makefile.introspection instead of using a custom rule which will > -result in the following build failure when cross-compiling on buildroot > -because of missing --includedir: > - > -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la > -Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > -error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 > - > -Fixes: > - - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: > -https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] > ---- > - gee/Makefile.am | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/gee/Makefile.am b/gee/Makefile.am > -index 5634bcb..e0d950e 100644 > ---- a/gee/Makefile.am > -+++ b/gee/Makefile.am > -@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ > - -l $(libgee_dlname) > - Gee-0.8.gir: libgee_0_8_la_vala.stamp > - Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la > -- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ > -+ > -+-include $(INTROSPECTION_MAKEFILE) > - endif > - > - MOSTLYCLEANFILES = \ > --- > -2.33.0 > - > diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash > index 72d2c21ced..54a46f954c 100644 > --- a/package/libgee/libgee.hash > +++ b/package/libgee/libgee.hash > @@ -1,5 +1,5 @@ > -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum > -sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz > +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum > +sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz > > # Hash for license file: > sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING > diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk > index 64beef30df..7d8d3d4863 100644 > --- a/package/libgee/libgee.mk > +++ b/package/libgee/libgee.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGEE_VERSION_MAJOR = 0.20 > -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 > +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 > LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) > LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz > LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 > @@ -13,8 +13,6 @@ LIBGEE_INSTALL_STAGING = YES > LIBGEE_LICENSE = LGPL-2.1+ > LIBGEE_LICENSE_FILES = COPYING > LIBGEE_CPE_ID_VENDOR = gnome > -# We're patching gee/Makefile.am > -LIBGEE_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > LIBGEE_CONF_OPTS += --enable-introspection From arnout at mind.be Sat Mar 5 14:51:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:51:20 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) In-Reply-To: <20220214154925.6014-1-ps.report@gmx.net> References: <20220214154925.6014-1-ps.report@gmx.net> Message-ID: <2c28b619-784f-6cf5-b2e1-6cae707051be@mind.be> On 14/02/2022 16:49, Peter Seiderer wrote: > For details see [1] and [2]. > > [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog > [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes > > Signed-off-by: Peter Seiderer Bugfix bump, so applied to master, thanks. Regards, Arnout > --- > package/util-linux/util-linux.hash | 2 +- > package/util-linux/util-linux.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash > index 9c10a42dca..748a36e0be 100644 > --- a/package/util-linux/util-linux.hash > +++ b/package/util-linux/util-linux.hash > @@ -1,5 +1,5 @@ > # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc > -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz > +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz > # License files, locally calculated > sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing > sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index a25b69d910..891c17d1d9 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -8,7 +8,7 @@ > # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. > > UTIL_LINUX_VERSION_MAJOR = 2.37 > -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 > +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 > UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz > UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) > From arnout at mind.be Sat Mar 5 14:54:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:54:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: put back riscv32 patch In-Reply-To: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> References: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> Message-ID: <16d9e405-ee35-a02c-c17f-5abfd21d4b87@mind.be> On 17/02/2022 14:46, Fabrice Fontaine wrote: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 > patch resulting in the following build failure: > > In file included from thread/qmutex_linux.cpp:45, > from thread/qmutex.cpp:806: > thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > | ^~~~~~~~~~ > | _q_futex > > Fixes: > - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../qt5base/0007-Fix-build-on-riscv32.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > > diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > new file mode 100644 > index 0000000000..5561acb9ae > --- /dev/null > +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > @@ -0,0 +1,46 @@ > +From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 27 Aug 2021 16:28:32 +0200 > +Subject: Fix build on riscv32 > + > +riscv32 fails to build because __NR_futex is not defined on this > +architecture: > + > +In file included from thread/qmutex_linux.cpp:45, > + from thread/qmutex.cpp:804: > +thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > +thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > + 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > + | ^~~~~~~~~~ > + | _q_futex > + > +Pick-to: 6.1 6.2 > +Fixes: QTBUG-96067 > +Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 > +Reviewed-by: Thiago Macieira > +[Retrieved from: > +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] > +Signed-off-by: Fabrice Fontaine > +--- > + src/corelib/thread/qfutex_p.h | 5 +++++ > + 1 file changed, 5 insertions(+) > + > +diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h > +index 40482b6fc1..037207a5c0 100644 > +--- a/src/corelib/thread/qfutex_p.h > ++++ b/src/corelib/thread/qfutex_p.h > +@@ -103,6 +103,11 @@ QT_END_NAMESPACE > + // if not defined in linux/futex.h > + # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 > + > ++// RISC-V does not supply __NR_futex > ++# ifndef __NR_futex > ++# define __NR_futex __NR_futex_time64 > ++# endif > ++ > + QT_BEGIN_NAMESPACE > + namespace QtLinuxFutex { > + constexpr inline bool futexAvailable() { return true; } > +-- > +cgit v1.2.1 > + From arnout at mind.be Sat Mar 5 14:05:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:05:44 +0100 Subject: [Buildroot] [git commit] package/zabbix: add ZABBIX_CPE_ID_VENDOR Message-ID: <20220305144636.A98E9826CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff3b0a0aee9e49de9c11dbc889f718969fdbc256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:zabbix:zabbix is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Azabbix%3Azabbix Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e72d831b46..e6564e68fd 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -9,6 +9,7 @@ ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING +ZABBIX_CPE_ID_VENDOR = zabbix ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ From arnout at mind.be Sat Mar 5 14:05:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:05:55 +0100 Subject: [Buildroot] [git commit] package/python-gnupg: add PYTHON_GNUPG_CPE_ID_VENDOR Message-ID: <20220305144636.B2491826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b314ce8f7efe6c6cd6b57b35b86d7e973f2d919f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:python:python-gnupg is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apython%3Apython-gnupg Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-gnupg/python-gnupg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index f16910e517..fda264a0ed 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -8,6 +8,7 @@ PYTHON_GNUPG_VERSION = 0.4.8 PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt +PYTHON_GNUPG_CPE_ID_VENDOR = python PYTHON_GNUPG_SETUP_TYPE = setuptools $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:05:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:05:19 +0100 Subject: [Buildroot] [git commit] package/bpftool: needs headers >= 4.12 Message-ID: <20220305144636.9F725826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0d94c6104496373476919931553fe58d5e927a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master NETLINK_EXT_ACK is only available since kernel 4.12 and https://github.com/torvalds/linux/commit/2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5 resulting in the following build failure since addition of the package in commit 3675131e6c654d7536a184db0184fde7a97040e0: net.c: In function 'netlink_open': net.c:110:36: error: 'NETLINK_EXT_ACK' undeclared (first use in this function); did you mean 'NETLINK_CAP_ACK'? 110 | if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, | ^~~~~~~~~~~~~~~ | NETLINK_CAP_ACK Fixes: - http://autobuild.buildroot.org/results/c61678e56bd73609838747048f27068818c21150 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bpftool/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index 39475aa962..e81d874343 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -5,14 +5,16 @@ config BR2_PACKAGE_BPFTOOL depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 select BR2_PACKAGE_BINUTILS select BR2_PACKAGE_ELFUTILS help bpftool is a tool for for inspection and simple manipulation of eBPF programs and maps. -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 From arnout at mind.be Sat Mar 5 14:08:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:08:29 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: needs cargo env when downloading Message-ID: <20220305144636.C8B13826CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2baaf5bcd748521a3bfcc178c284bc2b302993ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-cryptography is a python package, but it internally builds a rust crate. As such, it needs to be vendored at install time. Currently, we only pass the path to the sub-directory where the rust source is in the package tree, but calling cargo needs additional variables, most notably it needs CARGO_HOME to be set in the environment, otherwise it ends up writing in the user's own cargo home, which is by default ~/.cargo/ We do not really know what variables are used at vendor time, so we pass the full Cargo environment, that we pass when building target packages. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Yegor Yefremov Cc: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cryptography/python-cryptography.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index e642691bc5..a524f729c8 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -24,6 +24,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \ PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:19:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:19:16 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: put back riscv32 patch Message-ID: <20220305144636.E3D97826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad25ca1c1f7a61a6cfaa1ef32c19f219fce82ff5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 patch resulting in the following build failure: In file included from thread/qmutex_linux.cpp:45, from thread/qmutex.cpp:806: thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); | ^~~~~~~~~~ | _q_futex Fixes: - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../qt5/qt5base/0007-Fix-build-on-riscv32.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch new file mode 100644 index 0000000000..5561acb9ae --- /dev/null +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch @@ -0,0 +1,46 @@ +From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 27 Aug 2021 16:28:32 +0200 +Subject: Fix build on riscv32 + +riscv32 fails to build because __NR_futex is not defined on this +architecture: + +In file included from thread/qmutex_linux.cpp:45, + from thread/qmutex.cpp:804: +thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': +thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? + 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); + | ^~~~~~~~~~ + | _q_futex + +Pick-to: 6.1 6.2 +Fixes: QTBUG-96067 +Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 +Reviewed-by: Thiago Macieira +[Retrieved from: +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] +Signed-off-by: Fabrice Fontaine +--- + src/corelib/thread/qfutex_p.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h +index 40482b6fc1..037207a5c0 100644 +--- a/src/corelib/thread/qfutex_p.h ++++ b/src/corelib/thread/qfutex_p.h +@@ -103,6 +103,11 @@ QT_END_NAMESPACE + // if not defined in linux/futex.h + # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 + ++// RISC-V does not supply __NR_futex ++# ifndef __NR_futex ++# define __NR_futex __NR_futex_time64 ++# endif ++ + QT_BEGIN_NAMESPACE + namespace QtLinuxFutex { + constexpr inline bool futexAvailable() { return true; } +-- +cgit v1.2.1 + From arnout at mind.be Sat Mar 5 14:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:10:36 +0100 Subject: [Buildroot] [git commit] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220305144636.DAC20826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a586f0a283cd69f436bc6d0cff484460b412a1ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..748a36e0be 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index a25b69d910..891c17d1d9 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From arnout at mind.be Sat Mar 5 14:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:09:59 +0100 Subject: [Buildroot] [git commit] package/libgee: bump to version 0.20.5 Message-ID: <20220305144636.D1A11826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10780e8d6df83d7a92b6dd3282e91fdc0ba369af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so autoreconf https://gitlab.gnome.org/GNOME/libgee/-/blob/0.20.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...akefile.am-include-Makefile.introspection.patch | 40 ---------------------- package/libgee/libgee.hash | 4 +-- package/libgee/libgee.mk | 4 +-- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch deleted file mode 100644 index 0906275ae3..0000000000 --- a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Nov 2021 23:57:33 +0100 -Subject: [PATCH] gee/Makefile.am: include Makefile.introspection - -Include Makefile.introspection instead of using a custom rule which will -result in the following build failure when cross-compiling on buildroot -because of missing --includedir: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la -Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir -error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 - -Fixes: - - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] ---- - gee/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gee/Makefile.am b/gee/Makefile.am -index 5634bcb..e0d950e 100644 ---- a/gee/Makefile.am -+++ b/gee/Makefile.am -@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ - -l $(libgee_dlname) - Gee-0.8.gir: libgee_0_8_la_vala.stamp - Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la -- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ -+ -+-include $(INTROSPECTION_MAKEFILE) - endif - - MOSTLYCLEANFILES = \ --- -2.33.0 - diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 72d2c21ced..54a46f954c 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum -sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum +sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 64beef30df..7d8d3d4863 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 @@ -13,8 +13,6 @@ LIBGEE_INSTALL_STAGING = YES LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE_FILES = COPYING LIBGEE_CPE_ID_VENDOR = gnome -# We're patching gee/Makefile.am -LIBGEE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBGEE_CONF_OPTS += --enable-introspection From arnout at mind.be Sat Mar 5 14:06:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:06:29 +0100 Subject: [Buildroot] [git commit] package/gdb: bump 11.x version to 11.2 Message-ID: <20220305144636.BE4E6826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cfbda109fc41d7567a67666f1f8a541ea1d1f61 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor corrective release over GDB 11.1, fixing the following issues: PR sim/28302 (gdb fails to build with glibc 2.34) PR build/28318 (std::thread support configure check does not use CXX_DIALECT) PR gdb/28405 (arm-none-eabi: internal-error: ptid_t remote_target::select_thread_for_ambiguous_stop_reply(const target_waitstatus*): Assertion `first_resumed_thread != nullptr' failed) PR tui/28483 ([gdb/tui] breakpoint creation not displayed) PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as commit df9ebc472a162306dee8ba6e02b99963c2babb7c? Drop patch 0009-gdbserver-aarch64-support.patch, which was merged upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------- package/gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ------------- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 --------------------- ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...efine-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-nat-fork-inferior-include-linux-ptrace.h.patch | 0 ...Fix-getrandom-compile-for-uclibc-v1.0.35.patch} | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...0008-gdbserver-Makefile.in-fix-NLS-build.patch} | 0 package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 13 files changed, 2 insertions(+), 626 deletions(-) diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch deleted file mode 100644 index d969d98831..0000000000 --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 3 Oct 2021 12:02:53 -0400 -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] - -We map target signals to host signals so we can propagate signals -between the host & simulated worlds. That means we need to know -the symbolic names & values of all signals that might be sent. - -The tools that generate that list use signal.h and include all -symbols that start with "SIG" so as to automatically include any -new symbols that the C library might add. Unfortunately, this -also picks up "SIGSTKSZ" which is not actually a signal itself, -but a signal related setting -- it's the size of the stack when -a signal is handled. - -By itself this doesn't super matter as we will never see a signal -with that same value (since the range of valid signals tend to be -way less than 1024, and the size of the default signal stack will -never be that small). But with recent glibc changes that make this -into a dynamic value instead of a compile-time constant, some users -see build failures when building the sim. - -As suggested by Adam Sampson, update our scripts to ignore this -symbol to simplify everything and avoid the build failure. - -Bug: https://sourceware.org/PR28302 - -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] -Signed-off-by: Peter Seiderer ---- - sim/bfin/linux-targ-map.h | 5 +---- - sim/common/gennltvals.py | 6 ++++-- - sim/common/nltvals.def | 1 - - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h -index e9c8c8f..0340ed5 100644 ---- a/sim/bfin/linux-targ-map.h -+++ b/sim/bfin/linux-targ-map.h -@@ -30,6 +30,7 @@ echo - # XXX: nothing uses this ? - echo '#include ' | \ - bfin-uclinux-gcc -E -dD -P - | \ -+grep -v SIGSTKSZ | \ - sed -r -n \ - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ - -e '$i\ \ { 0, -1, -1 }\n};' \ -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = - #ifdef SIG_SETMASK - # define TARGET_LINUX_SIG_SETMASK 2 - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, --#endif --#ifdef SIGSTKSZ --# define TARGET_LINUX_SIGSTKSZ 8192 -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, - #endif - { 0, -1, -1 } - }; -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py -index b3e558d..bd4d7e9 100755 ---- a/sim/common/gennltvals.py -+++ b/sim/common/gennltvals.py -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - headers: Iterable[str], - pattern: str, -+ filter: str = r'^$', - target: str = None): - """Extract constants from the specified files using a regular expression. - -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - srcfile = ''.join(f'#include <{x}>\n' for x in headers) - syms = set() - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') -+ filter_pattern = re.compile(filter) - for header in headers: - with open(srcdir / header, 'r', encoding='utf-8') as fp: - data = fp.read() - for line in data.splitlines(): - m = define_pattern.match(line) -- if m: -+ if m and not filter_pattern.search(line): - syms.add(m.group(1)) - for sym in sorted(syms): - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') - - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') - - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def -index 8ae8839..8bc6ae5 100644 ---- a/sim/common/nltvals.def -+++ b/sim/common/nltvals.def -@@ -116,7 +116,6 @@ - { "SIGPROF", 27 }, - { "SIGQUIT", 3 }, - { "SIGSEGV", 11 }, -- { "SIGSTKSZ", 8192 }, - { "SIGSTOP", 17 }, - { "SIGSYS", 12 }, - { "SIGTERM", 15 }, --- -2.33.1 - diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch deleted file mode 100644 index 2d4e30ffe1..0000000000 --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch +++ /dev/null @@ -1,194 +0,0 @@ -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Wed, 12 May 2021 12:39:22 -0600 -Subject: [PATCH] Fix build on rhES5 - -The rhES5 build failed due to an upstream import a while back. The -bug here is that, while the 'personality' function exists, -ADDR_NO_RANDOMIZE is only defined in , not -. - -However, does not declare the 'personality' -function, and and cannot -both be included. - -This patch restores one of the removed configure checks and updates -the code to check it. - -We had this as a local patch at AdaCore, because it seemed like there -was no interest upstream. However, now it turns out that this fixes -PR build/28555, so I'm sending it now. - -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] -Signed-off-by: Peter Seiderer ---- - gdb/config.in | 4 ++++ - gdb/configure | 16 ++++++++++++++++ - gdb/nat/linux-personality.c | 4 ++++ - gdbserver/config.in | 4 ++++ - gdbserver/configure | 16 ++++++++++++++++ - gdbsupport/common.m4 | 5 +++++ - gdbsupport/config.in | 4 ++++ - gdbsupport/configure | 16 ++++++++++++++++ - 8 files changed, 69 insertions(+) - -diff --git a/gdb/config.in b/gdb/config.in -index 2c30504..776bee9 100644 ---- a/gdb/config.in -+++ b/gdb/config.in -@@ -96,6 +96,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdb/configure b/gdb/configure -index 5d89635..27e3194 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -13838,6 +13838,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c -index 9ce345b..27999fd 100644 ---- a/gdb/nat/linux-personality.c -+++ b/gdb/nat/linux-personality.c -@@ -22,6 +22,10 @@ - - #include - -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE -+# define ADDR_NO_RANDOMIZE 0x0040000 -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -+ - /* See comment on nat/linux-personality.h. */ - - maybe_disable_address_space_randomization:: -diff --git a/gdbserver/config.in b/gdbserver/config.in -index cf06c56..c9258b3 100644 ---- a/gdbserver/config.in -+++ b/gdbserver/config.in -@@ -31,6 +31,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbserver/configure b/gdbserver/configure -index b227167..d399d71 100755 ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -7131,6 +7131,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 -index 901c454..56a355e 100644 ---- a/gdbsupport/common.m4 -+++ b/gdbsupport/common.m4 -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait]) - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) -+ - AC_CHECK_DECLS([strstr]) - - # ----------------------- # -diff --git a/gdbsupport/config.in b/gdbsupport/config.in -index f46e261..6945a62 100644 ---- a/gdbsupport/config.in -+++ b/gdbsupport/config.in -@@ -28,6 +28,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbsupport/configure b/gdbsupport/configure -index a9dd02c..243a03f 100755 ---- a/gdbsupport/configure -+++ b/gdbsupport/configure -@@ -8144,6 +8144,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 --- -2.33.1 - diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch deleted file mode 100644 index 3718b1b6fd..0000000000 --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch +++ /dev/null @@ -1,320 +0,0 @@ -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 -From: Luis Machado -Date: Fri, 29 Oct 2021 14:54:36 -0300 -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic - -The current register set selection mechanism for AArch64 is static, based -on a pre-populated array of register sets. - -This means that we might potentially probe register sets that are not -available. This is OK if the kernel errors out during ptrace, but probing the -tag_ctl register, for example, does not result in a ptrace error if the kernel -supports the tagged address ABI but not MTE (PR 28355). - -Making the register set selection dynamic, based on feature checks, solves -this and simplifies the code a bit. It allows us to list all of the register -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. - -gdb/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * arch/aarch64.h (struct aarch64_features): New struct. - -gdbserver/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * linux-aarch64-low.cc (is_sve_tdesc): Remove. - (aarch64_target::low_arch_setup): Rework to adjust the register sets. - (aarch64_regsets): Update to list all register sets. - (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. - (aarch64_sve_regsets, aarch64_sve_regsets_info) - (regs_info_aarch64_sve): Remove. - (aarch64_adjust_register_sets): New. - (aarch64_target::get_regs_info): Remove references to removed structs. - (initialize_low_arch): Likewise. - -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 -Signed-off-by: Joachim Wiberg ---- - gdb/arch/aarch64.h | 9 ++ - gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- - 4 files changed, 130 insertions(+), 85 deletions(-) - -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h -index 0eb702c5b5e..95edb664b55 100644 ---- a/gdb/arch/aarch64.h -+++ b/gdb/arch/aarch64.h -@@ -22,6 +22,15 @@ - - #include "gdbsupport/tdesc.h" - -+/* Holds information on what architectural features are available. This is -+ used to select register sets. */ -+struct aarch64_features -+{ -+ bool sve = false; -+ bool pauth = false; -+ bool mte = false; -+}; -+ - /* Create the aarch64 target description. A non zero VQ value indicates both - the presence of SVE and the Vector Quotient - the number of 128bit chunks in - an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc -index daccfef746e..9a8cb4169a7 100644 ---- a/gdbserver/linux-aarch64-low.cc -+++ b/gdbserver/linux-aarch64-low.cc -@@ -196,16 +196,6 @@ is_64bit_tdesc (void) - return register_size (regcache->tdesc, 0) == 8; - } - --/* Return true if the regcache contains the number of SVE registers. */ -- --static bool --is_sve_tdesc (void) --{ -- struct regcache *regcache = get_thread_regcache (current_thread, 0); -- -- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); --} -- - static void - aarch64_fill_gregset (struct regcache *regcache, void *buf) - { -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, - *child->priv->arch_private = *parent->priv->arch_private; - } - --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ --#define AARCH64_HWCAP_PACA (1 << 30) -- --/* Implementation of linux target ops method "low_arch_setup". */ -- --void --aarch64_target::low_arch_setup () --{ -- unsigned int machine; -- int is_elf64; -- int tid; -- -- tid = lwpid_of (current_thread); -- -- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -- -- if (is_elf64) -- { -- uint64_t vq = aarch64_sve_get_vq (tid); -- unsigned long hwcap = linux_get_hwcap (8); -- unsigned long hwcap2 = linux_get_hwcap2 (8); -- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; -- /* MTE is AArch64-only. */ -- bool mte_p = hwcap2 & HWCAP2_MTE; -- -- current_process ()->tdesc -- = aarch64_linux_read_description (vq, pauth_p, mte_p); -- } -- else -- current_process ()->tdesc = aarch32_linux_read_description (); -- -- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); --} -- - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ - - static void -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) - return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); - } - -+/* Array containing all the possible register sets for AArch64/Linux. During -+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for -+ validity and enabled/disabled accordingly. -+ -+ Their sizes are set to 0 here, but they will be adjusted later depending -+ on whether each register set is available or not. */ - static struct regset_info aarch64_regsets[] = - { -+ /* GPR registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -+ 0, GENERAL_REGS, - aarch64_fill_gregset, aarch64_store_gregset }, -+ /* Floating Point (FPU) registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, -- sizeof (struct user_fpsimd_state), FP_REGS, -+ 0, FP_REGS, - aarch64_fill_fpregset, aarch64_store_fpregset - }, -+ /* Scalable Vector Extension (SVE) registers. */ -+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -+ 0, EXTENDED_REGS, -+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -+ }, -+ /* PAC registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -+ 0, OPTIONAL_REGS, -+ nullptr, aarch64_store_pauthregset }, -+ /* Tagged address control / MTE registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -+ 0, OPTIONAL_REGS, -+ aarch64_fill_mteregset, aarch64_store_mteregset }, - NULL_REGSET - }; - -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = - { - aarch64_regsets, /* regsets */ - 0, /* num_regsets */ -- NULL, /* disabled_regsets */ -+ nullptr, /* disabled_regsets */ - }; - - static struct regs_info regs_info_aarch64 = - { -- NULL, /* regset_bitmap */ -- NULL, /* usrregs */ -+ nullptr, /* regset_bitmap */ -+ nullptr, /* usrregs */ - &aarch64_regsets_info, - }; - --static struct regset_info aarch64_sve_regsets[] = -+/* Given FEATURES, adjust the available register sets by setting their -+ sizes. A size of 0 means the register set is disabled and won't be -+ used. */ -+ -+static void -+aarch64_adjust_register_sets (const struct aarch64_features &features) - { -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -- aarch64_fill_gregset, aarch64_store_gregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, -- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -- }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -- NULL_REGSET --}; -+ struct regset_info *regset; - --static struct regsets_info aarch64_sve_regsets_info = -- { -- aarch64_sve_regsets, /* regsets. */ -- 0, /* num_regsets. */ -- NULL, /* disabled_regsets. */ -- }; -+ for (regset = aarch64_regsets; regset->size >= 0; regset++) -+ { -+ switch (regset->nt_type) -+ { -+ case NT_PRSTATUS: -+ /* General purpose registers are always present. */ -+ regset->size = sizeof (struct user_pt_regs); -+ break; -+ case NT_FPREGSET: -+ /* This is unavailable when SVE is present. */ -+ if (!features.sve) -+ regset->size = sizeof (struct user_fpsimd_state); -+ break; -+ case NT_ARM_SVE: -+ if (features.sve) -+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); -+ break; -+ case NT_ARM_PAC_MASK: -+ if (features.pauth) -+ regset->size = AARCH64_PAUTH_REGS_SIZE; -+ break; -+ case NT_ARM_TAGGED_ADDR_CTRL: -+ if (features.mte) -+ regset->size = AARCH64_LINUX_SIZEOF_MTE; -+ break; -+ default: -+ gdb_assert_not_reached ("Unknown register set found."); -+ } -+ } -+} - --static struct regs_info regs_info_aarch64_sve = -- { -- NULL, /* regset_bitmap. */ -- NULL, /* usrregs. */ -- &aarch64_sve_regsets_info, -- }; -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ -+#define AARCH64_HWCAP_PACA (1 << 30) -+ -+/* Implementation of linux target ops method "low_arch_setup". */ -+ -+void -+aarch64_target::low_arch_setup () -+{ -+ unsigned int machine; -+ int is_elf64; -+ int tid; -+ -+ tid = lwpid_of (current_thread); -+ -+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -+ -+ if (is_elf64) -+ { -+ struct aarch64_features features; -+ -+ uint64_t vq = aarch64_sve_get_vq (tid); -+ features.sve = (vq > 0); -+ /* A-profile PAC is 64-bit only. */ -+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; -+ /* A-profile MTE is 64-bit only. */ -+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; -+ -+ current_process ()->tdesc -+ = aarch64_linux_read_description (vq, features.pauth, features.mte); -+ -+ /* Adjust the register sets we should use for this particular set of -+ features. */ -+ aarch64_adjust_register_sets (features); -+ } -+ else -+ current_process ()->tdesc = aarch32_linux_read_description (); -+ -+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); -+} - - /* Implementation of linux target ops method "get_regs_info". */ - -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () - if (!is_64bit_tdesc ()) - return ®s_info_aarch32; - -- if (is_sve_tdesc ()) -- return ®s_info_aarch64_sve; -- -+ /* AArch64 64-bit registers. */ - return ®s_info_aarch64; - } - -@@ -3294,5 +3311,4 @@ initialize_low_arch (void) - initialize_low_arch_aarch32 (); - - initialize_regsets_info (&aarch64_regsets_info); -- initialize_regsets_info (&aarch64_sve_regsets_info); - } --- -2.27.0 - diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 56999fa9e0..d3dea0b0a7 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -71,7 +71,7 @@ config BR2_GDB_VERSION default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.1" if BR2_GDB_VERSION_11 + default "11.2" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index d3e83af0b9..e7933374f1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From arnout at mind.be Sat Mar 5 14:55:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:55:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: disable tests In-Reply-To: <20220217135539.3784058-1-fontaine.fabrice@gmail.com> References: <20220217135539.3784058-1-fontaine.fabrice@gmail.com> Message-ID: <80abb66f-709f-a91d-d183-c9a72693428a@mind.be> On 17/02/2022 14:55, Fabrice Fontaine wrote: > Disable tests to avoid the following build failure raised since bump to > version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and > https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: > > In file included from perf_memcpy32_s.c:7: > perf_private.h: In function 'rdtsc': > perf_private.h:72:3: error: 'asm' undeclared (first use in this function) > 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); > | ^~~ > > Fixes: > - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 > > Signed-off-by: Fabrice Fontaine The patch was rejected upstream, and instead the underlying issue was fixed. Care to submit the upstream patch instead? Regards, Arnout > --- > .../0001-Add-an-option-to-disable-tests.patch | 66 +++++++++++++++++++ > package/safeclib/safeclib.mk | 4 +- > 2 files changed, 69 insertions(+), 1 deletion(-) > create mode 100644 package/safeclib/0001-Add-an-option-to-disable-tests.patch > > diff --git a/package/safeclib/0001-Add-an-option-to-disable-tests.patch b/package/safeclib/0001-Add-an-option-to-disable-tests.patch > new file mode 100644 > index 0000000000..420578fe2e > --- /dev/null > +++ b/package/safeclib/0001-Add-an-option-to-disable-tests.patch > @@ -0,0 +1,66 @@ > +From 55b861a098434843f5614adcaab469defed95321 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 17 Feb 2022 14:36:51 +0100 > +Subject: [PATCH] Add an option to disable tests > + > +Add an option to disable tests which are not always needed (e.g. on > +embedded systems) and can raise the following build failure on some > +architectures such as ARM cortex-a9: > + > +In file included from perf_memcpy32_s.c:7: > +perf_private.h: In function 'rdtsc': > +perf_private.h:72:3: error: 'asm' undeclared (first use in this function) > + 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); > + | ^~~ > + > +Fixes: > + - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/rurban/safeclib/pull/115] > +--- > + Makefile.am | 6 +++++- > + configure.ac | 10 ++++++++++ > + 2 files changed, 15 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index 429a84b2..7d14afb6 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -34,7 +34,11 @@ > + ACLOCAL_AMFLAGS = -I m4 --install ${ACLOCAL_FLAGS} > + > + # Sub-directories to preform recursive make in > +-SUBDIRS = src tests > ++SUBDIRS = src > ++ > ++if ENABLE_TESTS > ++SUBDIRS += tests > ++endif > + > + # Library header files > + pkginclude_HEADERS = \ > +diff --git a/configure.ac b/configure.ac > +index b7fd03e9..8c8fbee7 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -360,6 +360,16 @@ AC_ARG_ENABLE(doc, > + esac], [enable_doc=true]) > + AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") > + > ++AC_ARG_ENABLE(tests, > ++ AS_HELP_STRING([--disable-tests], > ++ [disable tests @<:@default=no@:>@]), > ++ [case "${enableval}" in > ++ yes) enable_tests=true ;; > ++ no) enable_tests=false ;; > ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;; > ++ esac], [enable_tests=true]) > ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xtrue") > ++ > + dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, > + dnl but this is only enabled for the shared objs, and we need it in the config > + dnl for our tests. > +-- > +2.34.1 > + > diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk > index bc58c1a38c..8f909f729b 100644 > --- a/package/safeclib/safeclib.mk > +++ b/package/safeclib/safeclib.mk > @@ -11,9 +11,11 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz > SAFECLIB_LICENSE = MIT > SAFECLIB_LICENSE_FILES = COPYING > SAFECLIB_INSTALL_STAGING = YES > +# We're patching configure.ac > +SAFECLIB_AUTORECONF = YES > SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" > # -fstack-protector-strong is used by default. Disable that so the > # BR2_SSP_* options in the toolchain wrapper are used instead > -SAFECLIB_CONF_OPTS = --disable-hardening > +SAFECLIB_CONF_OPTS = --disable-hardening --disable-tests > > $(eval $(autotools-package)) From arnout at mind.be Sat Mar 5 15:01:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 16:01:55 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Message-ID: <863fa1b5-dd78-2643-580e-fb5b231e5da1@mind.be> On 17/02/2022 16:55, Marcus Hoffmann wrote: > Fixes the following error during image generation: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Arnout > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > image = "rootfs.ext4" > } > } From arnout at mind.be Sat Mar 5 15:01:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 16:01:27 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt Message-ID: <20220305145417.7A75181761@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b677a7bedb1a4c862944beeda53b104bd91cb2c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following error during image generation: ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg index c94e0bc7cc..a02166172f 100644 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ b/board/orangepi/orangepi-rk3399/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 image = "rootfs.ext4" } } From arnout at mind.be Sat Mar 5 15:09:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 16:09:24 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: support mismatched merged usr In-Reply-To: <20220215124619.563502-1-nolange79@gmail.com> References: <20220215124619.563502-1-nolange79@gmail.com> Message-ID: <2086ffec-82b8-ec71-41f0-55253c3cd8eb@mind.be> On 15/02/2022 13:46, Norbert Lange wrote: > Look at the case where the source toolchain has non-merged usr, > yet the target will have merged usr. > > sysroot/lib/ld-musl-x86_64.so.1 -> ../usr/lib/libc.so > sysroot/usr/lib/libc.so Where do you get an external toolchain with such a weird layout? Normally libc is in sysroot/lib and ld-musl*.so.1 is a symlink to either /lib/libc.so or ../lib/libc.so. Regards, Arnout > > What happens is that buildroot copies the ld-*so* symlink > into usr/lib, at which point it becomes broken. > > We now detect these broken symlinks, then try to find the target > binary in the library directories and fix the link. > > Fix the case where the lib directory is a symlink, and no ld-*so* > is installed by adding -H to find. > > Also use `cp -t` instead of some rarely used xargs tricks. > > Signed-off-by: Norbert Lange > --- > toolchain/helpers.mk | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > index ef8e9a5f64..aaf2aecd80 100644 > --- a/toolchain/helpers.mk > +++ b/toolchain/helpers.mk > @@ -135,8 +135,17 @@ copy_toolchain_sysroot = \ > $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ > done ; \ > fi ; \ > - if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > - find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ > + for i in $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -xtype l); do \ > + LINKTARGET=`readlink $$i`; \ > + rm $$i; \ > + NEWLINKTARGET=$$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/lib $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/lib -name "`basename $${LINKTARGET}`" -print -quit); \ > + if [ -n "$${NEWLINKTARGET}" -a -e "$${NEWLINKTARGET}" ]; then \ > + ln -sr $${NEWLINKTARGET} $$i; \ > + echo "Symlinking $$i -> `readlink $$i`" ; \ > + fi; \ > + done; \ > + if [[ ! $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 cp -t $(STAGING_DIR)/lib/; \ > fi ; \ > if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ > if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ From peter at korsgaard.com Sat Mar 5 16:27:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Mar 2022 17:27:55 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: remove override in conditional In-Reply-To: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:24:39 +0100") References: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> Message-ID: <8735jw9xf8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 5 16:28:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Mar 2022 17:28:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: fix build without libvirtd In-Reply-To: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:38:51 +0100") References: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> Message-ID: <87y21o8it9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without libvirtd raised since the > addition of the package in commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and > https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: > ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem > encountered: Requested the Interface driver without netcf or udev and > libvirtd support > Fixes: > - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 5 16:30:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Mar 2022 17:30:45 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series In-Reply-To: <20220304170907.157687-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 4 Mar 2022 18:09:07 +0100") References: <20220304170907.157687-1-peter@korsgaard.com> Message-ID: <87tucc8iq2.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 5 16:28:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Mar 2022 17:28:34 +0100 Subject: [Buildroot] [git commit] package/libvirt: fix build without libvirtd Message-ID: <20220305162320.04936827FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87f1dd7b52deedb5a7f50a43e4b1dd1d23313395 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 7b0ed5e52e..1dc61a7549 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -39,7 +39,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -196,7 +195,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -235,7 +237,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif From peter at korsgaard.com Sat Mar 5 16:27:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Mar 2022 17:27:04 +0100 Subject: [Buildroot] [git commit] docs/manual: remove override in conditional Message-ID: <20220305162319.F0267827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d7f852ac5afb09f0a9a0b5f441403a98bc0f410 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) From peter at korsgaard.com Sat Mar 5 16:26:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Mar 2022 17:26:53 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220305162319.E8286827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=949aee637738341690b3a29a7dc2eb7572c164f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..df5261e5ff 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d0813e5db4..01325348ef 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz +sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8543f1cd21..8cfbd41831 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -380,14 +380,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 - default "5.15.13" if BR2_KERNEL_HEADERS_5_15 - default "5.16" if BR2_KERNEL_HEADERS_5_16 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 + default "5.15.26" if BR2_KERNEL_HEADERS_5_15 + default "5.16.12" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From fontaine.fabrice at gmail.com Sat Mar 5 17:39:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Mar 2022 18:39:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.7 Message-ID: <20220305173913.229445-1-fontaine.fabrice@gmail.com> This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.34.1 From ju.o at free.fr Sat Mar 5 17:50:41 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 5 Mar 2022 18:50:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: bump to version v0.3.20 Message-ID: <20220305175041.2225915-1-ju.o@free.fr> This commit dropped a patch included upstream. The other patch was rebased. For change log since v0.3.18, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19 - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20 Signed-off-by: Julien Olivain --- Tested with: make check-package ... 0 warnings generated ./utils/test-pkg -p openblas -a ... 45 builds, 25 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...nsider-Os-when-determining-LAPACK_NO.patch | 31 ------------------- ...on-t-specify-optimization-level-bui.patch} | 9 +++--- package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 2 +- 4 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename package/openblas/{0002-Makefile.system-don-t-specify-optimization-level-bui.patch => 0001-Makefile.system-don-t-specify-optimization-level-bui.patch} (86%) diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch deleted file mode 100644 index f9278bd099..0000000000 --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:15:52 +0100 -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags - -gcc also supports -O, -Og and -Os as optimization flags. -They may be given on the make command-line by users. - -For the calculation of LAPACK_NOOPT, all such flags should be considered. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a22e16ba..fc5fe3f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ export NOFORTRAN - export NO_LAPACK - endif - --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) - - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test - --- -2.26.2 - diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 86% rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch index bcc3e0eb6a..e0c738748a 100644 --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -1,4 +1,4 @@ -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 5 Mar 2021 14:09:23 +0100 Subject: [PATCH] Makefile.system: don't specify optimization level @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. Remove the optimization level specified in openblas itself. Signed-off-by: Thomas De Schampheleire - --- Makefile.system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system -index 1e30d05a..04b0be16 100644 +index 438a8148..9de1bbd5 100644 --- a/Makefile.system +++ b/Makefile.system -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g endif ifndef COMMON_OPT @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644 override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -- -2.26.2 +2.35.1 diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a1e35f4fc4..71fc4d34c5 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz +sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..608c2f24ea 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.18 +OPENBLAS_VERSION = 0.3.20 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE -- 2.35.1 From ju.o at free.fr Sat Mar 5 20:07:30 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 5 Mar 2022 21:07:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/octave: new package Message-ID: <20220305200730.11060-1-ju.o@free.fr> GNU Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments using a language that is mostly compatible with Matlab. It may also be used as a batch-oriented language. Octave has extensive tools for solving common numerical linear algebra problems, finding the roots of nonlinear equations, integrating ordinary functions, manipulating polynomials, and integrating ordinary differential and differential-algebraic equations. It is easily extensible and customizable via user-defined functions written in Octave's own language, or using dynamically loaded modules written in C++, C, Fortran, or other languages. https://www.octave.org/ Signed-off-by: Julien Olivain --- Package tested with: make check-package ... 0 warnings generated ./utils/test-pkg -a -p octave ... 45 builds, 35 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_octave.TestOctave ... OK >From qemu_aarch64_virt_defconfig with Octave, on target: octave --eval 'oruntests general' ... [all general tests passed] --- DEVELOPERS | 2 + package/Config.in | 1 + ...-BLAS-library-integer-size-detection.patch | 40 +++++++++++++ package/octave/Config.in | 42 +++++++++++++ package/octave/octave.hash | 3 + package/octave/octave.mk | 28 +++++++++ support/testing/tests/package/test_octave.py | 60 +++++++++++++++++++ 7 files changed, 176 insertions(+) create mode 100644 package/octave/0001-Fix-BLAS-library-integer-size-detection.patch create mode 100644 package/octave/Config.in create mode 100644 package/octave/octave.hash create mode 100644 package/octave/octave.mk create mode 100644 support/testing/tests/package/test_octave.py diff --git a/DEVELOPERS b/DEVELOPERS index b7a7c8771c..af35af0bd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/octave/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ @@ -1619,6 +1620,7 @@ F: package/riscv-isa-sim/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py diff --git a/package/Config.in b/package/Config.in index 8d2d550a64..c87bf04a7e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -756,6 +756,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/octave/Config.in" source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL diff --git a/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch b/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch new file mode 100644 index 0000000000..81126c99e7 --- /dev/null +++ b/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch @@ -0,0 +1,40 @@ +From 024bea5f3f78db166d3a97aca413cc2b96619673 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Mar 2022 12:36:09 +0100 +Subject: [PATCH] Fix BLAS library integer size detection + +When cross-compiling, octave ./configure script fails to detect the BLAS +library integer size and fails with the message: + + configure: error: unrecognized BLAS library integer size + +This patch fixes this detection. + +Patch adapted from: +https://github.com/openembedded/meta-openembedded/commit/0ad153f721ef99de585c4452a997a7104f45d71d + +Signed-off-by: Julien Olivain +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 31e656fa20..a6a6350b48 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -760,6 +760,12 @@ if test $ax_blas_ok = no || test $ax_lapack_ok = no; then + AC_MSG_ERROR([BLAS and LAPACK libraries are required]) + fi + ++if ac_fn_f77_try_run "$LINENO"; then : ++ ax_blas_integer_size=8 ++else ++ ax_blas_integer_size=4 ++fi ++ + case $ax_blas_integer_size in + 4) + HAVE_64_BIT_BLAS=no +-- +2.35.1 + diff --git a/package/octave/Config.in b/package/octave/Config.in new file mode 100644 index 0000000000..b504310d19 --- /dev/null +++ b/package/octave/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_OCTAVE + bool "octave" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_FORTRAN + # Some Bootlin x86_64 toolchains (like version + # bleeding-edge-2021.11-1) has a file + # "x86_64-buildroot-linux-gnu/lib64/libgfortran.la" including + # a "dependency_libs=" entry with an incorrect absolute path + # to linquadmath.la on the bootlin build host. This breaks + # builds using libtool with libgfortran. Those toolchains are + # used by the "utils/test-pkg" script. + depends on !BR2_TOOLCHAIN_EXTERNAL_BOOTLIN || !BR2_x86_64 + select BR2_PACKAGE_OPENBLAS + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UTF + help + GNU Octave is a high-level language, primarily intended for + numerical computations. It provides a convenient command + line interface for solving linear and nonlinear problems + numerically, and for performing other numerical experiments + using a language that is mostly compatible with Matlab. It + may also be used as a batch-oriented language. Octave has + extensive tools for solving common numerical linear algebra + problems, finding the roots of nonlinear equations, + integrating ordinary functions, manipulating polynomials, + and integrating ordinary differential and + differential-algebraic equations. It is easily extensible + and customizable via user-defined functions written in + Octave's own language, or using dynamically loaded modules + written in C++, C, Fortran, or other languages. + + https://www.octave.org/ + +comment "octave needs a toolchain w/ C++11 and fortran" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_FORTRAN + +comment "octave needs the openblas package" + depends on !BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS diff --git a/package/octave/octave.hash b/package/octave/octave.hash new file mode 100644 index 0000000000..62f6aa3e80 --- /dev/null +++ b/package/octave/octave.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 40eaa1492ec1baf5084a1694288febdcba568838f4983450f8dac5819934059a octave-6.4.0.tar.lz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk new file mode 100644 index 0000000000..6048305280 --- /dev/null +++ b/package/octave/octave.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# octave +# +################################################################################ + +OCTAVE_VERSION = 6.4.0 +OCTAVE_SITE = https://ftp.gnu.org/gnu/octave +OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz +OCTAVE_LICENSE = GPL-3.0+ +OCTAVE_LICENSE_FILES = COPYING +OCTAVE_AUTORECONF = YES + +OCTAVE_CONF_OPTS = --disable-java + +OCTAVE_DEPENDENCIES = \ + host-gperf \ + openblas \ + pcre + +ifeq ($(BR2_PACKAGE_READLINE),y) +OCTAVE_CONF_OPTS += --enable-readline +OCTAVE_DEPENDENCIES += readline +else +OCTAVE_CONF_OPTS += --disable-readline +endif + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_octave.py b/support/testing/tests/package/test_octave.py new file mode 100644 index 0000000000..f218b219d8 --- /dev/null +++ b/support/testing/tests/package/test_octave.py @@ -0,0 +1,60 @@ +import os + +import infra.basetest + + +class TestOctave(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it does + # not include gfortran. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.26" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_OCTAVE=y + """ + + def octave_cmd(self, octave_expr): + return "octave --quiet --eval '{}'".format(octave_expr) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + # Check Euler identity + cmd = self.octave_cmd("assert (exp(i*pi)+1, 0, 1e-10)") + self.assertRunOk(cmd) + + # Solve equation system example from Octave homepage + octave_expr = "b = [4; 9; 2]; " + octave_expr += "A = [ 3 4 5; 1 3 1; 3 5 9 ]; " + octave_expr += "x = A \ b; " + octave_expr += "assert(x, [-1.5; 4; -1.5], 1e-10)" + cmd = self.octave_cmd(octave_expr) + self.assertRunOk(cmd) + + # Check octave can fail + cmd = self.octave_cmd("assert(false)") + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Check string output + string = "Hello World" + cmd = self.octave_cmd("printf(\"{}\\n\")".format(string)) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output, [string]) -- 2.35.1 From fontaine.fabrice at gmail.com Sat Mar 5 20:44:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Mar 2022 21:44:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220305204446.823802-1-fontaine.fabrice@gmail.com> Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ---------------------- 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) -- 2.34.1 From bugzilla at busybox.net Sun Mar 6 09:05:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 06 Mar 2022 09:05:10 +0000 Subject: [Buildroot] [Bug 14636] azure-iot-sdk-c: Installed headers do not compile In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14636 --- Comment #1 from Fabrice Fontaine --- Thanks for your bug report, can you confirm that the following patch fixes your issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220305204446.823802-1-fontaine.fabrice at gmail.com/ -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Sun Mar 6 09:13:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Mar 2022 10:13:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglfw: fiw wayland build Message-ID: <20220306091323.93313-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 3.3.6 in commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: CMake Error at CMakeLists.txt:252 (find_package): Could not find a package configuration file provided by "ECM" with any of the following names: ECMConfig.cmake ecm-config.cmake Fixes: - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 Signed-off-by: Fabrice Fontaine --- ...emove-extra-cmake-modules-dependency.patch | 121 ++++++++++++++++++ ...xt-allow-override-of-wayland-pkgdata.patch | 32 +++++ package/libglfw/Config.in | 2 + package/libglfw/libglfw.mk | 6 +- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch create mode 100644 package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch new file mode 100644 index 0000000000..d5ee7c829a --- /dev/null +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -0,0 +1,121 @@ +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From: Joel Winarske +Date: Mon, 28 Sep 2020 22:23:02 -0700 +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency + +Fixes #1774. + +[Retrieved (and backported) from: +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 4 --- + CMakeLists.txt | 16 ++++++------ + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ + 3 files changed, 45 insertions(+), 37 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42bfa1806d..394827520b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,20 +191,18 @@ endif() + # Use Wayland for window creation + #-------------------------------------------------------------------- + if (_GLFW_WAYLAND) +- find_package(ECM REQUIRED NO_MODULE) +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + +- find_package(Wayland REQUIRED Client Cursor Egl) +- find_package(WaylandScanner REQUIRED) +- find_package(WaylandProtocols 1.15 REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(Wayland REQUIRED ++ wayland-client>=0.2.7 ++ wayland-cursor>=0.2.7 ++ wayland-egl>=0.2.7 ++ xkbcommon) + + list(APPEND glfw_PKG_DEPS "wayland-client") + + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") +- +- find_package(XKBCommon REQUIRED) +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") + + include(CheckIncludeFiles) + include(CheckFunctionExists) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f2bdd883d..e834506c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) + posix_time.c posix_thread.c xkb_unicode.c + egl_context.c osmesa_context.c) + +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" +- BASENAME xdg-shell) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" +- BASENAME xdg-decoration) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" +- BASENAME viewporter) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" +- BASENAME relative-pointer-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" +- BASENAME pointer-constraints-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" +- BASENAME idle-inhibit-unstable-v1) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ ++ macro(wayland_generate protocol_file output_file) ++ add_custom_command(OUTPUT ${output_file}.h ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header ++ < ${protocol_file} > ${output_file}.h ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.h) ++ ++ add_custom_command(OUTPUT ${output_file}.c ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code ++ < ${protocol_file} > ${output_file}.c ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.c) ++ endmacro() ++ ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) ++ + elseif (_GLFW_OSMESA) + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h + posix_time.h posix_thread.h osmesa_context.h) diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch new file mode 100644 index 0000000000..4bcb5e4eb7 --- /dev/null +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -0,0 +1,32 @@ +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Mar 2022 17:59:19 +0100 +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir + +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} +(needed when cross-compiling) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glfw/glfw/pull/2053] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01f191c9..475ce882 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) + include(FindPkgConfig) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ if (NOT WAYLAND_PROTOCOLS_BASE) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ endif() + + macro(wayland_generate protocol_file output_file) + add_custom_command(OUTPUT "${output_file}.h" +-- +2.34.1 + diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 281b55df7b..e5e96036ff 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 2ba31fd674..0a3986f662 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +# Override pkg-config pkgdatadir variable, it needs the prefix +LIBGLFW_CONF_OPTS += \ + -DGLFW_USE_WAYLAND=1 \ + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 6 10:27:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Mar 2022 11:27:22 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libglfw: fix wayland build Message-ID: <20220306102722.129713-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 3.3.6 in commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: CMake Error at CMakeLists.txt:252 (find_package): Could not find a package configuration file provided by "ECM" with any of the following names: ECMConfig.cmake ecm-config.cmake Fixes: - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo in title ...emove-extra-cmake-modules-dependency.patch | 121 ++++++++++++++++++ ...xt-allow-override-of-wayland-pkgdata.patch | 32 +++++ package/libglfw/Config.in | 2 + package/libglfw/libglfw.mk | 6 +- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch create mode 100644 package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch new file mode 100644 index 0000000000..d5ee7c829a --- /dev/null +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -0,0 +1,121 @@ +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From: Joel Winarske +Date: Mon, 28 Sep 2020 22:23:02 -0700 +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency + +Fixes #1774. + +[Retrieved (and backported) from: +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 4 --- + CMakeLists.txt | 16 ++++++------ + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ + 3 files changed, 45 insertions(+), 37 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42bfa1806d..394827520b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,20 +191,18 @@ endif() + # Use Wayland for window creation + #-------------------------------------------------------------------- + if (_GLFW_WAYLAND) +- find_package(ECM REQUIRED NO_MODULE) +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + +- find_package(Wayland REQUIRED Client Cursor Egl) +- find_package(WaylandScanner REQUIRED) +- find_package(WaylandProtocols 1.15 REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(Wayland REQUIRED ++ wayland-client>=0.2.7 ++ wayland-cursor>=0.2.7 ++ wayland-egl>=0.2.7 ++ xkbcommon) + + list(APPEND glfw_PKG_DEPS "wayland-client") + + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") +- +- find_package(XKBCommon REQUIRED) +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") + + include(CheckIncludeFiles) + include(CheckFunctionExists) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f2bdd883d..e834506c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) + posix_time.c posix_thread.c xkb_unicode.c + egl_context.c osmesa_context.c) + +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" +- BASENAME xdg-shell) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" +- BASENAME xdg-decoration) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" +- BASENAME viewporter) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" +- BASENAME relative-pointer-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" +- BASENAME pointer-constraints-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" +- BASENAME idle-inhibit-unstable-v1) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ ++ macro(wayland_generate protocol_file output_file) ++ add_custom_command(OUTPUT ${output_file}.h ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header ++ < ${protocol_file} > ${output_file}.h ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.h) ++ ++ add_custom_command(OUTPUT ${output_file}.c ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code ++ < ${protocol_file} > ${output_file}.c ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.c) ++ endmacro() ++ ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) ++ + elseif (_GLFW_OSMESA) + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h + posix_time.h posix_thread.h osmesa_context.h) diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch new file mode 100644 index 0000000000..4bcb5e4eb7 --- /dev/null +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -0,0 +1,32 @@ +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Mar 2022 17:59:19 +0100 +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir + +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} +(needed when cross-compiling) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glfw/glfw/pull/2053] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01f191c9..475ce882 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) + include(FindPkgConfig) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ if (NOT WAYLAND_PROTOCOLS_BASE) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ endif() + + macro(wayland_generate protocol_file output_file) + add_custom_command(OUTPUT "${output_file}.h" +-- +2.34.1 + diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 281b55df7b..e5e96036ff 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 2ba31fd674..0a3986f662 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +# Override pkg-config pkgdatadir variable, it needs the prefix +LIBGLFW_CONF_OPTS += \ + -DGLFW_USE_WAYLAND=1 \ + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -- 2.34.1 From fperrad at gmail.com Sun Mar 6 12:09:02 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 6 Mar 2022 13:09:02 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 Message-ID: <20220306120902.132254-1-francois.perrad@gadz.org> - fix CVE-2021-30560 - remove merged patch - moved from xmlsoft.org to gnome.org Signed-off-by: Francois Perrad --- ...ml2-config-check-in-configure-script.patch | 31 ------------------- package/libxslt/libxslt.hash | 6 ++-- package/libxslt/libxslt.mk | 5 +-- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb23..000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839..39523a695 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d252..9c7be6822 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING -- 2.32.0 From jacques.samoun33 at gmail.com Sun Mar 6 12:46:54 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Sun, 6 Mar 2022 14:46:54 +0200 Subject: [Buildroot] cannot make the device_table Message-ID: Hello, despite all my tries, i just cannot make the "device_table" feature work as described in the manual. Basically, i am trying to set 666 rights to /dev/tty + add a dialout group, so i created the following file (device_table.txt" /dev/tty c 666 root dialout 5 0 - - - and have set the correct variable in menuconfig. I know for sure that the build has handled this file ... but looking at the /dev/tty, it is clear that nothing has happened, the permissions are still 600 and the dialout group has not been set. Am I missing something ? -------------- next part -------------- An HTML attachment was scrubbed... URL: From post at lespocky.de Sun Mar 6 12:44:46 2022 From: post at lespocky.de (Alexander Dahl) Date: Sun, 6 Mar 2022 13:44:46 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 In-Reply-To: <20220306120902.132254-1-francois.perrad@gadz.org> References: <20220306120902.132254-1-francois.perrad@gadz.org> Message-ID: <20220306124445.GB10202@falbala.internal.home.lespocky.de> Hello Francois, there's a typo in the subject, should read libxslt. Greets Alex On Sun, Mar 06, 2022 at 01:09:02PM +0100, Francois Perrad wrote: > - fix CVE-2021-30560 > - remove merged patch > - moved from xmlsoft.org to gnome.org > > Signed-off-by: Francois Perrad > --- > ...ml2-config-check-in-configure-script.patch | 31 ------------------- > package/libxslt/libxslt.hash | 6 ++-- > package/libxslt/libxslt.mk | 5 +-- > 3 files changed, 6 insertions(+), 36 deletions(-) > delete mode 100644 package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > > diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > deleted file mode 100644 > index 3848dcb23..000000000 > --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 > -From: Nick Wellnhofer > -Date: Fri, 15 Nov 2019 11:53:11 +0100 > -Subject: [PATCH] Fix xml2-config check in configure script > - > -A 'print' option has never been supported. After a recent change to > -libxml2, invalid options cause xml2-config to fail. > - > -[Retrieved from: > -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 3da57b18..585b9d7c 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, > - dnl test version and init our variables > - dnl > - > --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 > -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 > - then > - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) > - XMLVERS=`$XML_CONFIG --version` > --- > -GitLab > - > diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash > index 25aa30839..39523a695 100644 > --- a/package/libxslt/libxslt.hash > +++ b/package/libxslt/libxslt.hash > @@ -1,5 +1,5 @@ > -# Locally calculated after checking pgp signature > -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz > +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum > +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz > > # Hash for license file: > -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk > index d0f79d252..9c7be6822 100644 > --- a/package/libxslt/libxslt.mk > +++ b/package/libxslt/libxslt.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -LIBXSLT_VERSION = 1.1.34 > -LIBXSLT_SITE = http://xmlsoft.org/sources > +LIBXSLT_VERSION = 1.1.35 > +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz > +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 > LIBXSLT_INSTALL_STAGING = YES > LIBXSLT_LICENSE = MIT > LIBXSLT_LICENSE_FILES = COPYING > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- /"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From bugzilla at busybox.net Sun Mar 6 15:33:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 06 Mar 2022 15:33:04 +0000 Subject: [Buildroot] [Bug 14631] host-go-bootstrap: go not being built for package in external tree In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 --- Comment #1 from Fabrice Fontaine --- Hello, Thanks for your bug report, the following patch should fix your issue: https://patchwork.ozlabs.org/project/buildroot/patch/11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin at orange.com/ Unfortunately, this patch has not been applied to master yet. Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Sun Mar 6 20:28:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 21:28:55 +0100 Subject: [Buildroot] [git commit] package/libxslt: security bump to version 1.1.35 Message-ID: <20220306202200.C153082945@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acf5b437cc329a392f26e5367de1f64b3601b605 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - fix CVE-2021-30560 - remove merged patch, drop autoreconf - moved from xmlsoft.org to gnome.org - spaces in hash file Signed-off-by: Francois Perrad [yann.morin.1998 at free.fr: - drop autoreconf as no longer patching - also switch home in Config.in ] Signed-off-by: Yann E. MORIN --- ...Fix-xml2-config-check-in-configure-script.patch | 31 ---------------------- package/libxslt/Config.in | 2 +- package/libxslt/libxslt.hash | 6 ++--- package/libxslt/libxslt.mk | 7 +++-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb235..0000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index dfe5b99f04..643bce2a61 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://xmlsoft.org/xslt/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839e..39523a6953 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d2521..df0286e986 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft -# We're patching configure.ac -LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ From yann.morin.1998 at free.fr Sun Mar 6 20:32:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 21:32:40 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 In-Reply-To: <20220306120902.132254-1-francois.perrad@gadz.org> References: <20220306120902.132254-1-francois.perrad@gadz.org> Message-ID: <20220306203240.GE228549@scaer> Fran?ois, All, As noticed by Alexander: typo fixed in title On 2022-03-06 13:09 +0100, Francois Perrad spake thusly: > - fix CVE-2021-30560 > - remove merged patch ... so we can also drop the autoreconf, done. > - moved from xmlsoft.org to gnome.org ... so we can also fix it in Config.in, done. > Signed-off-by: Francois Perrad Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > --- > ...ml2-config-check-in-configure-script.patch | 31 ------------------- > package/libxslt/libxslt.hash | 6 ++-- > package/libxslt/libxslt.mk | 5 +-- > 3 files changed, 6 insertions(+), 36 deletions(-) > delete mode 100644 package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > > diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > deleted file mode 100644 > index 3848dcb23..000000000 > --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 > -From: Nick Wellnhofer > -Date: Fri, 15 Nov 2019 11:53:11 +0100 > -Subject: [PATCH] Fix xml2-config check in configure script > - > -A 'print' option has never been supported. After a recent change to > -libxml2, invalid options cause xml2-config to fail. > - > -[Retrieved from: > -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 3da57b18..585b9d7c 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, > - dnl test version and init our variables > - dnl > - > --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 > -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 > - then > - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) > - XMLVERS=`$XML_CONFIG --version` > --- > -GitLab > - > diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash > index 25aa30839..39523a695 100644 > --- a/package/libxslt/libxslt.hash > +++ b/package/libxslt/libxslt.hash > @@ -1,5 +1,5 @@ > -# Locally calculated after checking pgp signature > -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz > +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum > +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz > > # Hash for license file: > -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk > index d0f79d252..9c7be6822 100644 > --- a/package/libxslt/libxslt.mk > +++ b/package/libxslt/libxslt.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -LIBXSLT_VERSION = 1.1.34 > -LIBXSLT_SITE = http://xmlsoft.org/sources > +LIBXSLT_VERSION = 1.1.35 > +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz > +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 > LIBXSLT_INSTALL_STAGING = YES > LIBXSLT_LICENSE = MIT > LIBXSLT_LICENSE_FILES = COPYING > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 6 20:38:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 21:38:12 +0100 Subject: [Buildroot] [git commit] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220306205305.36AFE82A4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1debbb4c7eb205d3ccddaa7849e3121a4929c6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sun Mar 6 21:01:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:01:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: drop custom install rules In-Reply-To: <20220305204446.823802-1-fontaine.fabrice@gmail.com> References: <20220305204446.823802-1-fontaine.fabrice@gmail.com> Message-ID: <20220306210155.GF228549@scaer> Fabrice, All, On 2022-03-05 21:44 +0100, Fabrice Fontaine spake thusly: > Drop custom install rules which have been added since the addition of > the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are > now resulting in a broken installion > > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14636 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ---------------------- > 1 file changed, 58 deletions(-) > > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > index 3f00db3ff4..e6de8c851b 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES > AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux > AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON > > -# The project only supports building one kind of library. > -# Further the install target installs the wrong files, so we do it here: > -ifeq ($(BR2_STATIC_LIBS),y) > -AZURE_IOT_SDK_C_LIBS += \ > - uamqp/libuamqp.a \ > - c-utility/libaziotsharedutil.a \ > - iothub_client/libiothub_client.a \ > - iothub_client/libiothub_client_mqtt_ws_transport.a \ > - iothub_client/libiothub_client_amqp_ws_transport.a \ > - iothub_client/libiothub_client_http_transport.a \ > - iothub_client/libiothub_client_amqp_transport.a \ > - iothub_client/libiothub_client_mqtt_transport.a \ > - iothub_service_client/libiothub_service_client.a \ > - serializer/libserializer.a \ > - umqtt/libumqtt.a \ > - deps/uhttp/libuhttp.a \ > - deps/umock-c/libumock_c.a \ > - libparson.a > -else > -AZURE_IOT_SDK_C_LIBS += \ > - uamqp/libuamqp.so \ > - c-utility/libaziotsharedutil.so \ > - iothub_client/libiothub_client.so \ > - iothub_client/libiothub_client_mqtt_ws_transport.so \ > - iothub_client/libiothub_client_amqp_ws_transport.so \ > - iothub_client/libiothub_client_http_transport.so \ > - iothub_client/libiothub_client_amqp_transport.so \ > - iothub_client/libiothub_client_mqtt_transport.so \ > - iothub_service_client/libiothub_service_client.so \ > - serializer/libserializer.so \ > - umqtt/libumqtt.so.1.1.12 \ > - deps/uhttp/libuhttp.so \ > - deps/umock-c/libumock_c.so \ > - libparson.so > - > -define AZURE_IOT_SDK_C_CREATE_SYMLINKS > - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 > - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so > -endef > -endif > - > -define AZURE_IOT_SDK_C_INSTALL_LIBS > - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ > - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) > - ) > - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) > -endef > - > -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS > - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) > - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ > - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ > -endef > - > -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS > - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) > -endef > - > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Sun Mar 6 21:04:39 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 06 Mar 2022 21:04:39 +0000 Subject: [Buildroot] [Bug 14636] azure-iot-sdk-c: Installed headers do not compile In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14636 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED CC| |yann.morin.1998 at free.fr Status|NEW |RESOLVED --- Comment #2 from Yann E. MORIN --- James, All, Thanks for the report. We believe fis is now fixed with the patch from Fabrice applied to master: d1debbb4c7eb package/azure-iot-sdk-c: drop custom install rules Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Sun Mar 6 21:20:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:20:37 +0100 Subject: [Buildroot] [git commit] package/libglfw: fix wayland build Message-ID: <20220306211541.AFBB682983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bbb12eff3b9f9d9719c48644c2b3d563e80de48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 3.3.6 in commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: CMake Error at CMakeLists.txt:252 (find_package): Could not find a package configuration file provided by "ECM" with any of the following names: ECMConfig.cmake ecm-config.cmake Fixes: - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...and-Remove-extra-cmake-modules-dependency.patch | 121 +++++++++++++++++++++ ...sts.txt-allow-override-of-wayland-pkgdata.patch | 32 ++++++ package/libglfw/Config.in | 2 + package/libglfw/libglfw.mk | 6 +- 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch new file mode 100644 index 0000000000..d5ee7c829a --- /dev/null +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -0,0 +1,121 @@ +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From: Joel Winarske +Date: Mon, 28 Sep 2020 22:23:02 -0700 +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency + +Fixes #1774. + +[Retrieved (and backported) from: +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 4 --- + CMakeLists.txt | 16 ++++++------ + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ + 3 files changed, 45 insertions(+), 37 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42bfa1806d..394827520b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,20 +191,18 @@ endif() + # Use Wayland for window creation + #-------------------------------------------------------------------- + if (_GLFW_WAYLAND) +- find_package(ECM REQUIRED NO_MODULE) +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + +- find_package(Wayland REQUIRED Client Cursor Egl) +- find_package(WaylandScanner REQUIRED) +- find_package(WaylandProtocols 1.15 REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(Wayland REQUIRED ++ wayland-client>=0.2.7 ++ wayland-cursor>=0.2.7 ++ wayland-egl>=0.2.7 ++ xkbcommon) + + list(APPEND glfw_PKG_DEPS "wayland-client") + + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") +- +- find_package(XKBCommon REQUIRED) +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") + + include(CheckIncludeFiles) + include(CheckFunctionExists) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f2bdd883d..e834506c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) + posix_time.c posix_thread.c xkb_unicode.c + egl_context.c osmesa_context.c) + +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" +- BASENAME xdg-shell) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" +- BASENAME xdg-decoration) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" +- BASENAME viewporter) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" +- BASENAME relative-pointer-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" +- BASENAME pointer-constraints-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" +- BASENAME idle-inhibit-unstable-v1) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ ++ macro(wayland_generate protocol_file output_file) ++ add_custom_command(OUTPUT ${output_file}.h ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header ++ < ${protocol_file} > ${output_file}.h ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.h) ++ ++ add_custom_command(OUTPUT ${output_file}.c ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code ++ < ${protocol_file} > ${output_file}.c ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.c) ++ endmacro() ++ ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) ++ + elseif (_GLFW_OSMESA) + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h + posix_time.h posix_thread.h osmesa_context.h) diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch new file mode 100644 index 0000000000..4bcb5e4eb7 --- /dev/null +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -0,0 +1,32 @@ +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Mar 2022 17:59:19 +0100 +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir + +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} +(needed when cross-compiling) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glfw/glfw/pull/2053] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01f191c9..475ce882 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) + include(FindPkgConfig) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ if (NOT WAYLAND_PROTOCOLS_BASE) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ endif() + + macro(wayland_generate protocol_file output_file) + add_custom_command(OUTPUT "${output_file}.h" +-- +2.34.1 + diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 281b55df7b..e5e96036ff 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 2ba31fd674..0a3986f662 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +# Override pkg-config pkgdatadir variable, it needs the prefix +LIBGLFW_CONF_OPTS += \ + -DGLFW_USE_WAYLAND=1 \ + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) From yann.morin.1998 at free.fr Sun Mar 6 21:24:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:24:25 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libglfw: fix wayland build In-Reply-To: <20220306102722.129713-1-fontaine.fabrice@gmail.com> References: <20220306102722.129713-1-fontaine.fabrice@gmail.com> Message-ID: <20220306212425.GG228549@scaer> Fabrice, All, On 2022-03-06 11:27 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 3.3.6 in > commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: > > CMake Error at CMakeLists.txt:252 (find_package): > Could not find a package configuration file provided by "ECM" with any of > the following names: > > ECMConfig.cmake > ecm-config.cmake > > Fixes: > - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - Fix typo in title > > ...emove-extra-cmake-modules-dependency.patch | 121 ++++++++++++++++++ > ...xt-allow-override-of-wayland-pkgdata.patch | 32 +++++ > package/libglfw/Config.in | 2 + > package/libglfw/libglfw.mk | 6 +- > 4 files changed, 160 insertions(+), 1 deletion(-) > create mode 100644 package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch > create mode 100644 package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch > > diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch > new file mode 100644 > index 0000000000..d5ee7c829a > --- /dev/null > +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch > @@ -0,0 +1,121 @@ > +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 > +From: Joel Winarske > +Date: Mon, 28 Sep 2020 22:23:02 -0700 > +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency > + > +Fixes #1774. > + > +[Retrieved (and backported) from: > +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] > +Signed-off-by: Fabrice Fontaine > +--- > + .gitignore | 4 --- > + CMakeLists.txt | 16 ++++++------ > + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ > + 3 files changed, 45 insertions(+), 37 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 42bfa1806d..394827520b 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -191,20 +191,18 @@ endif() > + # Use Wayland for window creation > + #-------------------------------------------------------------------- > + if (_GLFW_WAYLAND) > +- find_package(ECM REQUIRED NO_MODULE) > +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") > + > +- find_package(Wayland REQUIRED Client Cursor Egl) > +- find_package(WaylandScanner REQUIRED) > +- find_package(WaylandProtocols 1.15 REQUIRED) > ++ include(FindPkgConfig) > ++ pkg_check_modules(Wayland REQUIRED > ++ wayland-client>=0.2.7 > ++ wayland-cursor>=0.2.7 > ++ wayland-egl>=0.2.7 > ++ xkbcommon) > + > + list(APPEND glfw_PKG_DEPS "wayland-client") > + > + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") > +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") > +- > +- find_package(XKBCommon REQUIRED) > +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") > ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") > + > + include(CheckIncludeFiles) > + include(CheckFunctionExists) > +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > +index 2f2bdd883d..e834506c6c 100644 > +--- a/src/CMakeLists.txt > ++++ b/src/CMakeLists.txt > +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) > + posix_time.c posix_thread.c xkb_unicode.c > + egl_context.c osmesa_context.c) > + > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" > +- BASENAME xdg-shell) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" > +- BASENAME xdg-decoration) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" > +- BASENAME viewporter) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" > +- BASENAME relative-pointer-unstable-v1) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" > +- BASENAME pointer-constraints-unstable-v1) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" > +- BASENAME idle-inhibit-unstable-v1) > ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) > ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) > ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) > ++ > ++ macro(wayland_generate protocol_file output_file) > ++ add_custom_command(OUTPUT ${output_file}.h > ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header > ++ < ${protocol_file} > ${output_file}.h > ++ DEPENDS ${protocol_file}) > ++ list(APPEND glfw_SOURCES ${output_file}.h) > ++ > ++ add_custom_command(OUTPUT ${output_file}.c > ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code > ++ < ${protocol_file} > ${output_file}.c > ++ DEPENDS ${protocol_file}) > ++ list(APPEND glfw_SOURCES ${output_file}.c) > ++ endmacro() > ++ > ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) > ++ > + elseif (_GLFW_OSMESA) > + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h > + posix_time.h posix_thread.h osmesa_context.h) > diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch > new file mode 100644 > index 0000000000..4bcb5e4eb7 > --- /dev/null > +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch > @@ -0,0 +1,32 @@ > +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 4 Mar 2022 17:59:19 +0100 > +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir > + > +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} > +(needed when cross-compiling) > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/glfw/glfw/pull/2053] > +--- > + src/CMakeLists.txt | 8 ++++++-- > + 1 file changed, 6 insertions(+), 2 deletions(-) > + > +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > +index 01f191c9..475ce882 100644 > +--- a/src/CMakeLists.txt > ++++ b/src/CMakeLists.txt > +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) > + include(FindPkgConfig) > + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) > + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) > +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) > ++ if (NOT WAYLAND_PROTOCOLS_BASE) > ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) > ++ endif() > + > + macro(wayland_generate protocol_file output_file) > + add_custom_command(OUTPUT "${output_file}.h" > +-- > +2.34.1 > + > diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in > index 281b55df7b..e5e96036ff 100644 > --- a/package/libglfw/Config.in > +++ b/package/libglfw/Config.in > @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW > bool "libglfw" > depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES > + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND > + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND > select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 > diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk > index 2ba31fd674..0a3986f662 100644 > --- a/package/libglfw/libglfw.mk > +++ b/package/libglfw/libglfw.mk > @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles > endif > > ifeq ($(BR2_PACKAGE_WAYLAND),y) > -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 > +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols > +# Override pkg-config pkgdatadir variable, it needs the prefix > +LIBGLFW_CONF_OPTS += \ > + -DGLFW_USE_WAYLAND=1 \ > + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols > endif > > ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 6 21:32:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:32:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 In-Reply-To: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> References: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> Message-ID: <20220306213212.GH228549@scaer> Fabrice, All, On 2022-02-22 21:40 +0100, Fabrice Fontaine spake thusly: > 2.6.0 is an maintenance and security release. > > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 You claim 'security bump' in the title, but the announcement does not seem to identify any actual security fix, as compared to 2.5.0 which did explicitly list security fixes: https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 So, I don;t think this is material for master, is it? Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/freerdp/freerdp.hash | 4 ++-- > package/freerdp/freerdp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash > index e31b8d5b96..780061bdbb 100644 > --- a/package/freerdp/freerdp.hash > +++ b/package/freerdp/freerdp.hash > @@ -1,5 +1,5 @@ > -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 > -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz > +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 > +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz > > # Locally calculated > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index c536f6cb1c..edbfb6801a 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FREERDP_VERSION = 2.5.0 > +FREERDP_VERSION = 2.6.0 > FREERDP_SITE = https://pub.freerdp.com/releases > FREERDP_DEPENDENCIES = libglib2 openssl zlib > FREERDP_LICENSE = Apache-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 6 21:43:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Mar 2022 22:43:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 In-Reply-To: <20220306213212.GH228549@scaer> References: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> <20220306213212.GH228549@scaer> Message-ID: Yann, Le dim. 6 mars 2022 ? 22:32, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-22 21:40 +0100, Fabrice Fontaine spake thusly: > > 2.6.0 is an maintenance and security release. > > > > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 > > You claim 'security bump' in the title, but the announcement does not > seem to identify any actual security fix, as compared to 2.5.0 which did > explicitly list security fixes: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 > > So, I don;t think this is material for master, is it? I don't know, indeed the announcement doesn't identify security fixes but the first sentence is "2.6.0 is an maintenance and security release." At least, a crash with wayland is fixed with: https://github.com/FreeRDP/FreeRDP/issues/7426 So feel free to apply it to next or master. > > Regards, > Yann E. MORIN. > > > Signed-off-by: Fabrice Fontaine > > --- > > package/freerdp/freerdp.hash | 4 ++-- > > package/freerdp/freerdp.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash > > index e31b8d5b96..780061bdbb 100644 > > --- a/package/freerdp/freerdp.hash > > +++ b/package/freerdp/freerdp.hash > > @@ -1,5 +1,5 @@ > > -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 > > -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz > > +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 > > +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz > > > > # Locally calculated > > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > > index c536f6cb1c..edbfb6801a 100644 > > --- a/package/freerdp/freerdp.mk > > +++ b/package/freerdp/freerdp.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -FREERDP_VERSION = 2.5.0 > > +FREERDP_VERSION = 2.6.0 > > FREERDP_SITE = https://pub.freerdp.com/releases > > FREERDP_DEPENDENCIES = libglib2 openssl zlib > > FREERDP_LICENSE = Apache-2.0 > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From joel at jms.id.au Mon Mar 7 05:28:57 2022 From: joel at jms.id.au (Joel Stanley) Date: Mon, 7 Mar 2022 15:58:57 +1030 Subject: [Buildroot] [PATCH] package/pdbg: bump version to v3.5 Message-ID: <20220307052858.1245393-1-joel@jms.id.au> Signed-off-by: Joel Stanley --- package/pdbg/pdbg.hash | 2 +- package/pdbg/pdbg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index df7ba314bfbc..58c256e6ceb2 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5b721fd5551591cd5626ccf72c8d9096d902de4da10324097a37b4763815f0d7 pdbg-3.4.tar.gz +sha256 7bdbab4e14b8cf50dbf6242955e46e58882c37b1a52671d9e6f3073885629dfa pdbg-3.5.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 5a5cfbc62d8a..871bf953f23e 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 3.4 +PDBG_VERSION = 3.5 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING -- 2.34.1 From jan.havran at audified.com Mon Mar 7 09:35:00 2022 From: jan.havran at audified.com (Jan Havran) Date: Mon, 7 Mar 2022 10:35:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack2: bump to version 1.9.20 Message-ID: - Fix URL for 'JACK DBus packaging' GitHub Wiki page. https://github.com/jackaudio/jack2/releases/tag/v1.9.18 https://github.com/jackaudio/jack2/releases/tag/v1.9.19 https://github.com/jackaudio/jack2/releases/tag/v1.9.20 Signed-off-by: Jan Havran --- package/jack2/Config.in | 4 ++-- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d5..8abdda6376 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca5..6361473cf7 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..2e55169984 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.20 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING -- 2.35.1 From bugzilla at busybox.net Mon Mar 7 10:08:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 10:08:10 +0000 Subject: [Buildroot] [Bug 14641] New: oprofile can not find the events files Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 Bug ID: 14641 Summary: oprofile can not find the events files Product: buildroot Version: 2020.02.12 Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: sergey.velykokhatko at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Hi all, We are using Intel ApolloLake AtomE3930 SOC with goldmont microarchitecture. Buildroot configure file contains the BR2_x86_64=y. When we starting the operf, we get following error: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted It looks for me a problem in OPROFILE_INSTALL_TARGET_CMDS. It copies the x86-64 for our SOC, but oprofile awaits them at i386 Architecture, s. https://docs.fedoraproject.org/en-US/fedora/f34/system-administrators-guide/monitoring-and-automation/OProfile/#s2-oprofile-events Best Regards, Sergey -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Mar 7 10:32:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 2.4.13 In-Reply-To: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 21:46:01 +0100") References: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> Message-ID: <87o82i834r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://www.mail-archive.com/haproxy at formilux.org/msg41834.html > https://www.mail-archive.com/haproxy at formilux.org/msg41698.html > https://www.mail-archive.com/haproxy at formilux.org/msg41685.html > https://www.mail-archive.com/haproxy at formilux.org/msg41618.html > https://www.mail-archive.com/haproxy at formilux.org/msg41512.html > Signed-off-by: Fabrice Fontaine Committed given the bugfixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:37:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:37:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: fix build error In-Reply-To: <20220223155128.818822-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 23 Feb 2022 16:51:28 +0100") References: <20220223155128.818822-1-bernd.kuhls@t-online.de> Message-ID: <87k0d682ve.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Add upstream commit to fix build with xorg-server 21.1 which was bumped > with commit d9185c6ba38430a017ed996c4180e141881ba570. > Fixes: > http://autobuild.buildroot.net/results/f0a/f0a0224a2b368c11236fcc7d14db5175c0a829d1/ > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:39:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:39:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-nouveau: fix build error In-Reply-To: <20220223155942.831349-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 23 Feb 2022 16:59:42 +0100") References: <20220223155942.831349-1-bernd.kuhls@t-online.de> Message-ID: <87fsnu82st.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Add upstream commit to fix build with xorg-server 21.1 which was bumped > with commit d9185c6ba38430a017ed996c4180e141881ba570. > No autobuild errors found yet. > Signed-off-by: Bernd Kuhls .. > ++++ b/src/nv_driver.c > +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) > + { > + RegionRec pixregion; > + > +- PixmapRegionInit(&pixregion, dirty->slave_dst); > ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); > + > +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); > ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); Grr, silly PC churn. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:39:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:39:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-qxl: fix build error In-Reply-To: <20220223160630.835866-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 23 Feb 2022 17:06:30 +0100") References: <20220223160630.835866-1-bernd.kuhls@t-online.de> Message-ID: <87bkyi82so.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Add upstream commit to fix build with xorg-server 21.1 which was bumped > with commit d9185c6ba38430a017ed996c4180e141881ba570. > No autobuild errors found yet. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:41:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:41:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.7 In-Reply-To: <20220305173913.229445-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Mar 2022 18:39:13 +0100") References: <20220305173913.229445-1-fontaine.fabrice@gmail.com> Message-ID: <877d9682on.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release relaxes the fix to CVE-2022-25236 (introduced with release > 2.4.5) which some of you have been waiting for, due to related > incompatibilities. > https://blog.hartwork.org/posts/expat-2-4-7-released > https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:32:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:32:34 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mach64: fix build error Message-ID: <20220307103351.338CD82A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5beea70361d08cf737c6be4fafd7f8e32b8434b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. Fixes: http://autobuild.buildroot.net/results/f0a/f0a0224a2b368c11236fcc7d14db5175c0a829d1/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...-Rename-bool-to-boolean-for-OptionInfoRec.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch new file mode 100644 index 0000000000..fe3e21f8c2 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch @@ -0,0 +1,84 @@ +From 3ab2c144ef34199ceaf95115538a67f932e76f7d Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Thu, 18 Nov 2021 13:18:25 +0000 +Subject: [PATCH] Rename bool to boolean for OptionInfoRec. + +* src/aticonfig.c: Change uses of .value.bool to .value.boolean + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/-/commit/3ab2c144ef34199ceaf95115538a67f932e76f7d + +Signed-off-by: Bernd Kuhls +--- + src/aticonfig.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/aticonfig.c b/src/aticonfig.c +index bad6474..6995b9a 100644 +--- a/src/aticonfig.c ++++ b/src/aticonfig.c +@@ -311,42 +311,42 @@ ATIProcessOptions + + (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); + +-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool +-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool +-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool +-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool +-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool +-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool +-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool +-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool +-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool ++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean ++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean ++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean ++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean ++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean ++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean ++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean ++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean ++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean + + #ifdef XF86DRI_DEVEL + +-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool ++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean + # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str + # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num + # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num +-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool ++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean + # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num + + #endif /* XF86DRI_DEVEL */ + + #ifdef TV_OUT + +-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool ++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean + # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str + + #endif /* TV_OUT */ + +-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool +-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool +-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool +-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool +-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool ++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean ++# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean ++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean ++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean ++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean + # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str +-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool +-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool ++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean ++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean + + # define ReferenceClock \ + PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq +-- +GitLab + From peter at korsgaard.com Mon Mar 7 10:41:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:41:38 +0100 Subject: [Buildroot] [git commit] package/expat: bump to version 2.4.7 Message-ID: <20220307103351.5601D82A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=402d85ef4e3d5161869d5da918ec679a9571c417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 7 10:35:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:35:34 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-nouveau: fix build error Message-ID: <20220307103351.3E4AD82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b78caa449844fa12b5dbc89bde28786999a3b238 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...nouveau-fixup-driver-for-new-X-server-ABI.patch | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch new file mode 100644 index 0000000000..96be4909e7 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch @@ -0,0 +1,68 @@ +From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commit/e80e73ced69b15662103d0fd6837db4ce6c6eb5b + +Signed-off-by: Bernd Kuhls +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b..8a1fcf9 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8..db3b112 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b6..f9ab4af 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +GitLab + From peter at korsgaard.com Mon Mar 7 10:31:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:31:54 +0100 Subject: [Buildroot] [git commit] package/haproxy: bump to version 2.4.13 Message-ID: <20220307103351.2A13F81586@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e60d4f11cd56544d6c23a1f7c3c8bbd98edbec3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.mail-archive.com/haproxy at formilux.org/msg41834.html https://www.mail-archive.com/haproxy at formilux.org/msg41698.html https://www.mail-archive.com/haproxy at formilux.org/msg41685.html https://www.mail-archive.com/haproxy at formilux.org/msg41618.html https://www.mail-archive.com/haproxy at formilux.org/msg41512.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index c29857cd9c..e3120b521f 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 -sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 +sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 33a2e92777..83d9cfee37 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Mon Mar 7 10:37:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:37:14 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-qxl: fix build error Message-ID: <20220307103351.4A66981586@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=512b329882bfb773badb6b5e5df31a38dfabd2e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Fix-a-build-error-with-Xorg-master.patch | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch new file mode 100644 index 0000000000..d3257fba20 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch @@ -0,0 +1,106 @@ +From 4e1963a812f2c1777ba5d56ea9e939a3e40a0496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Sat, 28 Aug 2021 15:38:40 +0200 +Subject: [PATCH] Fix a build error with Xorg master +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use xf86ReturnOptValBool() in get_bool_option() instead of +options[option_index].value.bool to fix a compiler error with +current Xorg xserver master branch. + +Also use xf86GetOptValInteger() in get_int_option() and +xf86GetOptValString() in get_str_option() for consistency. + +The change causes a slight performance drop during option parsing +because the passed-in index_value is no longer used as an index +into the options array. + +Instead, it's used as a token now for the standard option getter +functions which works since the index_value to the get_*_option() +functions are identical to the value of options[n].token in the +passed-in OptionInfoRec array. + +Also rename "int option_index" to "int token" for clarity in all +three functions. + +Signed-off-by: Zolt??n B??sz??rm??nyi + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/commit/4e1963a812f2c1777ba5d56ea9e939a3e40a0496 + +Signed-off-by: Bernd Kuhls +--- + src/qxl_option_helpers.c | 13 +++++++------ + src/qxl_option_helpers.h | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c +index 2aba677..7707b7c 100644 +--- a/src/qxl_option_helpers.c ++++ b/src/qxl_option_helpers.c +@@ -10,31 +10,32 @@ + + #include "qxl_option_helpers.h" + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name) + { ++ int value; + if (env_name && getenv(env_name)) { + return atoi(getenv(env_name)); + } +- return options[option_index].value.num; ++ return xf86GetOptValInteger(options, token, &value) ? value : 0; + } + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name) + { + if (getenv(env_name)) { + return getenv(env_name); + } +- return options[option_index].value.str; ++ return xf86GetOptValString(options, token); + } + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name) + { + const char* value = getenv(env_name); + + if (!value) { +- return options[option_index].value.bool; ++ return xf86ReturnOptValBool(options, token, FALSE); + } + if (strcmp(value, "0") == 0 || + strcasecmp(value, "off") == 0 || +diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h +index 7c54c72..66d0a17 100644 +--- a/src/qxl_option_helpers.h ++++ b/src/qxl_option_helpers.h +@@ -4,13 +4,13 @@ + #include + #include + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name); + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name); + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name); + + #endif // OPTION_HELPERS_H +-- +GitLab + From yann.morin at orange.com Mon Mar 7 15:42:56 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Mon, 7 Mar 2022 16:42:56 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: fix build with per-package directories Message-ID: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> From: "Yann E. MORIN" Build with per-package directory is broken, because go is not found in the PATH, when trying to download and vendor a go package. This is because FOO_DL_ENV contains $(HOST_GO_COMMON_ENV), which defines the PATH as PATH=$(BR_PATH). This is correct, except this is expanded at the time the golang-package macro is evaluated, which means PATH contains the 'global' BR_PATH, i.e.: $(O)/host/bin:$(O)/host/sbin:... However, with PPD, this does not yet exist at build time; only the per-package hoqt directory exists. We want to have it expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. At the same time, also $$-expand two other variables (even though those are benign, it is better for consistency that they be $$-expanded). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart --- package/pkg-golang.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index ddefdf1214..f1c5cfd350 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,7 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. @@ -86,7 +86,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ - $(HOST_GO_COMMON_ENV) \ + $$(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) @@ -134,7 +134,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) ) endef endif @@ -143,7 +143,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) ) endef endif -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Mon Mar 7 15:43:13 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Mon, 7 Mar 2022 16:43:13 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD Message-ID: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> From: "Yann E. MORIN" BR_GOMOD is a remnant from a previous iteration of the golang download infrastructure; it is currently used nowhere. Do not set it. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart --- package/pkg-golang.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index f1c5cfd350..0cb2ed73cc 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -87,8 +87,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ - BR_GOMOD=$$($(2)_GOMOD) + GOPROXY=direct # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From dopsi at dopsi.ch Mon Mar 7 14:13:21 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Mon, 7 Mar 2022 15:13:21 +0100 Subject: [Buildroot] [PATCH] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220307141321.307200-1-dopsi@dopsi.ch> When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: -- 2.25.1 From christian at paral.in Mon Mar 7 18:41:49 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 10:41:49 -0800 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> Message-ID: Hi Yann, On Mon, Mar 7, 2022 at 7:43 AM wrote: > > From: "Yann E. MORIN" > > BR_GOMOD is a remnant from a previous iteration of the golang download > infrastructure; it is currently used nowhere. > > Do not set it. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart > --- > package/pkg-golang.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index f1c5cfd350..0cb2ed73cc 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -87,8 +87,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD > $(2)_DOWNLOAD_POST_PROCESS = go > $(2)_DL_ENV += \ > $$(HOST_GO_COMMON_ENV) \ > - GOPROXY=direct \ > - BR_GOMOD=$$($(2)_GOMOD) > + GOPROXY=direct Reviewed-by: Christian Stewart Thanks, Christian From christian at paral.in Mon Mar 7 18:42:28 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 10:42:28 -0800 Subject: [Buildroot] [PATCH] package/pkg-golang: fix build with per-package directories In-Reply-To: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> References: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> Message-ID: Hi Yann, On Mon, Mar 7, 2022 at 7:43 AM wrote: > We want to have it expanded at the time the recipe is run, so like all > other variables, we need to $$-expand it. > > At the same time, also $$-expand two other variables (even though those > are benign, it is better for consistency that they be $$-expanded). > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart > --- > package/pkg-golang.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index ddefdf1214..f1c5cfd350 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -45,7 +45,7 @@ $(2)_BUILD_OPTS += \ > -modcacherw \ > -tags "$$($(2)_TAGS)" \ > -trimpath \ > - -p $(PARALLEL_JOBS) > + -p $$(PARALLEL_JOBS) > > # Target packages need the Go compiler on the host at download time (for > # vendoring), and at build and install time. > @@ -86,7 +86,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD > > $(2)_DOWNLOAD_POST_PROCESS = go > $(2)_DL_ENV += \ > - $(HOST_GO_COMMON_ENV) \ > + $$(HOST_GO_COMMON_ENV) \ > GOPROXY=direct \ > BR_GOMOD=$$($(2)_GOMOD) > > @@ -134,7 +134,7 @@ endif > ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > $$(foreach d,$$($(2)_INSTALL_BINS),\ > - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) > + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) > ) > endef > endif > @@ -143,7 +143,7 @@ endif > ifndef $(2)_INSTALL_CMDS > define $(2)_INSTALL_CMDS > $$(foreach d,$$($(2)_INSTALL_BINS),\ > - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) > + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) > ) Reviewed-by: Christian Stewart Thanks, Christian From bugzilla at busybox.net Mon Mar 7 19:02:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 19:02:10 +0000 Subject: [Buildroot] [Bug 14631] host-go-bootstrap: go not being built for package in external tree In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 --- Comment #2 from contact at martb.dev --- Thanks for bringing this to my attention Fabrice! Applied for now, i hope it makes its way into 2022.02 sooner or later. -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Mar 7 19:11:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:11:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent: fix build with libexecinfo In-Reply-To: <20220226103344.1850433-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 11:33:44 +0100") References: <20220226103344.1850433-1-fontaine.fabrice@gmail.com> Message-ID: <8735jt8tn7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the folllowing build failure on rtorrent raised on uclibc and musl s/folllowing/following/ > since the addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: > /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/libtorrent.so: > undefined reference to `backtrace_symbols' > Fixes: > - http://autobuild.buildroot.org/results/6cb4ba56fc0a3a8bd02b246ab9bc82edaa552ad9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:12:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:12:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: fix elf_py TLS section handling In-Reply-To: <20220226155233.2605318-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 16:52:33 +0100") References: <20220226155233.2605318-1-fontaine.fabrice@gmail.com> Message-ID: <87y21l7f0m.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on mipsel, or1k, powerpc raised > since bump to version 8.1 in commit > ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: > struct.error: unpack requires a buffer of 20 bytes > Fixes: > - http://autobuild.buildroot.org/results/74f39c6f14e3f60babdcabceb5e42656f69cdaa7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:22:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:22:57 +0100 Subject: [Buildroot] [PATCH] package/rauc: only install systemd service if built with dbus/service support In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Sun, 27 Feb 2022 19:54:14 +0000") References: Message-ID: <87tuc97ejy.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > The systemd service will try to call rauc in service mode, so it is useless > and will fail if rauc does not have such support > Signed-off-by: Nuno Gon?alves > --- > package/rauc/rauc.mk | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk > index 39f5255812..d29ef66046 100644 > --- a/package/rauc/rauc.mk > +++ b/package/rauc/rauc.mk > @@ -15,6 +15,15 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 > ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) > RAUC_CONF_OPTS += --enable-service > RAUC_DEPENDENCIES += dbus > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +# configure uses pkg-config --variable=systemdsystemunitdir systemd > +RAUC_DEPENDENCIES += systemd > +define RAUC_INSTALL_INIT_SYSTEMD > + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d > + printf '[Install]\nWantedBy=multi-user.target\n' \ > + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf Your mailer had corrupted the patch (tabs to spaces), so I couldn't apply the patch and had to manually fix it up. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:28:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:28:03 +0100 Subject: [Buildroot] [PATCH 2/2] docs: fix links to AsciiDoc In-Reply-To: <20220228163238.405627-1-theo.lebrun@bootlin.com> (=?utf-8?Q?=22Th=C3=A9o?= Lebrun via buildroot"'s message of "Mon, 28 Feb 2022 17:32:38 +0100") References: <20220228163238.405627-1-theo.lebrun@bootlin.com> Message-ID: <87pmmx7ebg.fsf@dell.be.48ers.dk> >>>>> "Th?o" == Th?o Lebrun via buildroot writes: > Links were aimed at the methods.co.nz domain, which is now returning > 404s. The current situation of AsciiDoc is unclear to me: the Fedora > package points to this website, they own asciidoc.org, Wikipedia points > to this project as well but their Git repo's README includes the > following paragraph: >> AsciiDoc.py is a legacy processor for this syntax, handling an older >> rendition of AsciiDoc. As such, this will not properly handle the >> current AsciiDoc specification. It is suggested that unless you >> specifically require the AsciiDoc.py toolchain, you should find a >> processor that handles the modern AsciiDoc syntax. > --- https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md This is listed as patch 2/2, but I don't see a 1/2? Notice that --- ends the commit message, so everything after this get dropped when applying the patch with git am. Committed with that fixed, thanks. > "AsciiDoc specification" pointing towards: > https://projects.eclipse.org/projects/asciidoc.asciidoc-lang > Signed-off-by: Th?o Lebrun > --- > docs/conf/asciidoc-text.conf | 2 +- > docs/manual/writing-rules.txt | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf > index 470bdecfc2..bb614b9d85 100644 > --- a/docs/conf/asciidoc-text.conf > +++ b/docs/conf/asciidoc-text.conf > @@ -1,5 +1,5 @@ > # Refer to following asciidoc documentation: > -# http://www.methods.co.nz/asciidoc/userguide.html > +# https://asciidoc-py.github.io/userguide.html > # In particular sections "Macros" and "Attribute References" > # > # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' > diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt > index 57ba61bdb1..84d8f76431 100644 > --- a/docs/manual/writing-rules.txt > +++ b/docs/manual/writing-rules.txt > @@ -207,10 +207,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. > === The documentation > The documentation uses the > -http://www.methods.co.nz/asciidoc/[asciidoc] format. > +https://asciidoc-py.github.io/[asciidoc] format. > For further details about the asciidoc syntax, refer to > -http://www.methods.co.nz/asciidoc/userguide.html[]. > +https://asciidoc-py.github.io/userguide.html[]. > === Support scripts > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:29:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:29:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcamera-apps: link with -latomic if needed In-Reply-To: <20220302184209.2081120-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 19:42:09 +0100") References: <20220302184209.2081120-1-fontaine.fabrice@gmail.com> Message-ID: <87lexl7e9r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Link with -latomic if needed to avoid the following build failure raised > since the addition of the package in commit > 7227d005d2435ec7b38995a6247d233ddb5ba365: > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: > CMakeFiles/libcamera-still.dir/libcamera_still.cpp.o: undefined > reference to symbol '__atomic_fetch_sub_4@@LIBATOMIC_1.0' > Fixes: > - http://autobuild.buildroot.org/results/b20465140f3a5281f9b586f442b67fd400e7184a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:21:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:21:19 +0100 Subject: [Buildroot] [git commit] package/rauc: only install systemd service if built with dbus/service support Message-ID: <20220307192114.1612F82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec532199d6b404a1e51b5ed0dfdb21b18a8a3ed5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The systemd service will try to call rauc in service mode, so it is useless and will fail if rauc does not have such support Signed-off-by: Nuno Gon??alves Signed-off-by: Peter Korsgaard --- package/rauc/rauc.mk | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..7a10470cf2 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -15,6 +15,18 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) RAUC_CONF_OPTS += --enable-service RAUC_DEPENDENCIES += dbus + +# systemd service uses dbus interface +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +# configure uses pkg-config --variable=systemdsystemunitdir systemd +RAUC_DEPENDENCIES += systemd +define RAUC_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf +endef +endif + else RAUC_CONF_OPTS += --disable-service endif @@ -33,17 +45,6 @@ else RAUC_CONF_OPTS += --disable-json endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -# configure uses pkg-config --variable=systemdsystemunitdir systemd -RAUC_DEPENDENCIES += systemd -endif - -define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d - printf '[Install]\nWantedBy=multi-user.target\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf -endef - HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \ From peter at korsgaard.com Mon Mar 7 19:10:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:10:48 +0100 Subject: [Buildroot] [git commit] package/libtorrent: fix build with libexecinfo Message-ID: <20220307192114.0474281D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=301b7c3c8120e6bd05872777b6c292ebc8230a27 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on rtorrent raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/libtorrent.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/6cb4ba56fc0a3a8bd02b246ab9bc82edaa552ad9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libtorrent/libtorrent.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk index c8310cab65..b966a72788 100644 --- a/package/libtorrent/libtorrent.mk +++ b/package/libtorrent/libtorrent.mk @@ -14,6 +14,11 @@ LIBTORRENT_INSTALL_STAGING = YES LIBTORRENT_LICENSE = GPL-2.0 LIBTORRENT_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBTORRENT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +LIBTORRENT_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBTORRENT_CONF_OPTS += --enable-openssl LIBTORRENT_DEPENDENCIES += openssl From peter at korsgaard.com Mon Mar 7 19:12:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:12:30 +0100 Subject: [Buildroot] [git commit] package/frr: fix elf_py TLS section handling Message-ID: <20220307192114.0C5C882DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c8f8b77bf2d318882c5fffb886852872ca74b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on mipsel, or1k, powerpc raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: struct.error: unpack requires a buffer of 20 bytes Fixes: - http://autobuild.buildroot.org/results/74f39c6f14e3f60babdcabceb5e42656f69cdaa7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0002-lib-fix-elf_py-TLS-section-handling.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch new file mode 100644 index 0000000000..d491cb1a7d --- /dev/null +++ b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch @@ -0,0 +1,31 @@ +From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 +From: David Lamparter +Date: Wed, 10 Nov 2021 15:30:07 +0100 +Subject: [PATCH] lib: fix elf_py TLS section handling + +... need to ignore TLS sections, their address is effectively +meaningless but can overlap other sections we actually need to access. + +Signed-off-by: David Lamparter + +[Retrieved from: +https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] +Signed-off-by: Fabrice Fontaine +--- + lib/elf_py.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/elf_py.c b/lib/elf_py.c +index 1c306893ad8..f230add6957 100644 +--- a/lib/elf_py.c ++++ b/lib/elf_py.c +@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) + Elf_Scn *scn = elf_getscn(ef->elf, i); + GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); + ++ /* virtual address is kinda meaningless for TLS sections */ ++ if (shdr->sh_flags & SHF_TLS) ++ continue; + if (addr < shdr->sh_addr || + addr >= shdr->sh_addr + shdr->sh_size) + continue; From peter at korsgaard.com Mon Mar 7 19:26:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:26:24 +0100 Subject: [Buildroot] [git commit] docs: fix links to AsciiDoc Message-ID: <20220307192114.1FA8B81D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efcb7eeabc22df47ca09e69c99f73e9183ed6cf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th??o Lebrun Signed-off-by: Peter Korsgaard --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 57ba61bdb1..84d8f76431 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -207,10 +207,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts From peter at korsgaard.com Mon Mar 7 19:28:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:28:53 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: link with -latomic if needed Message-ID: <20220307192114.288D082DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f41d47f15b63a4bbe026834478e63acba85d33fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Link with -latomic if needed to avoid the following build failure raised since the addition of the package in commit 7227d005d2435ec7b38995a6247d233ddb5ba365: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: CMakeFiles/libcamera-still.dir/libcamera_still.cpp.o: undefined reference to symbol '__atomic_fetch_sub_4@@LIBATOMIC_1.0' Fixes: - http://autobuild.buildroot.org/results/b20465140f3a5281f9b586f442b67fd400e7184a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcamera-apps/libcamera-apps.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 210d4e1e52..f4fc019c17 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -45,4 +45,8 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 7 19:33:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:33:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix libwpa_client.so build In-Reply-To: <20220303191945.3952450-1-geomatsi@gmail.com> (Sergey Matyukevich's message of "Thu, 3 Mar 2022 22:19:45 +0300") References: <20220303191945.3952450-1-geomatsi@gmail.com> Message-ID: <87h7897e31.fsf@dell.be.48ers.dk> >>>>> "Sergey" == Sergey Matyukevich writes: > Build target libwpa_client.so is not built regardless of whether the > option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that > fixes wpa_supplicant build regression. > Fixes: > http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ > http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ > Signed-off-by: Sergey Matyukevich > --- > Hi all, > Note that the patch has been posted to hostapd mailing list > and discussed, but not yet accepted: > https://patchwork.ozlabs.org/project/hostap/patch/20220222085219.3996729-1-geomatsi at gmail.com/ I see that in the mean time it has been applied, great! Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:30:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:30:24 +0100 Subject: [Buildroot] [git commit] package/wpa_supplicant: fix libwpa_client.so build Message-ID: <20220307192455.3B9FA82815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4eebf191c781a3ea6b5eb1811cc17ae92ea2fb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build target libwpa_client.so is not built regardless of whether the option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that fixes wpa_supplicant build regression. Fixes: http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ Signed-off-by: Sergey Matyukevich Tested-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- ...-enable-options-for-libwpa_client.so-and-.patch | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch new file mode 100644 index 0000000000..156d0e7e2c --- /dev/null +++ b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch @@ -0,0 +1,68 @@ +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Sun, 20 Feb 2022 10:12:28 +0300 +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced regression into wpa_supplicant build process. Build +target libwpa_client.so is not built regardless of whether the option +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config +option is used before it is imported from the configuration file. +Moving its usage after including build.rules does not help: variable +ALL is processed by build.rules and further changes are not applied. +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as +expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +This commit re-enables options adding both build targets to _all +dependencies. + +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..e384cc6b8 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/wpa_supplicant at .service + ALL += systemd/wpa_supplicant-nl80211 at .service + ALL += systemd/wpa_supplicant-wired at .service + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 + From peter at korsgaard.com Mon Mar 7 19:39:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:39:08 +0100 Subject: [Buildroot] [PATCH] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib In-Reply-To: <20220224154118.220408-1-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 16:41:18 +0100") References: <20220224154118.220408-1-romain.naour@gmail.com> Message-ID: <87czix7dsz.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > -sh: ipython: not found > ipython use a wrong shebang on the target: It looks like git ate your '# ' line, so I've added # ipython -c 'import math; math.floor(12.3)' And committed, thanks. > # head -n 1 /usr/bin/ipython > #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python > The issue come from python3-setuptools 60.0.0 that changed > SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use > its local copy of distutils. This is actually a "breaking" change [2]. > We have to override SETUPTOOLS_USE_DISTUTILS to the previous value > "stdlib" to fixes the issue. > While at it, use distutils from stdlib for the host. > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 > [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes > Signed-off-by: Romain Naour > Cc: James Hilliard > --- > package/pkg-python.mk | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index b8dc9cd9e5..e81a1a3102 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_DISTUTILS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ > $(TARGET_CONFIGURE_OPTS) \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > _python_exec_prefix=/usr > @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:38:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:38:09 +0100 Subject: [Buildroot] [git commit] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib Message-ID: <20220307193103.47D9C82A9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4386bbdf0895dbb35e02c25f42603bae9af64451 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master # ipython -c 'import math; math.floor(12.3)' -sh: ipython: not found ipython use a wrong shebang on the target: # head -n 1 /usr/bin/ipython #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python The issue come from python3-setuptools 60.0.0 that changed SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use its local copy of distutils. This is actually a "breaking" change [2]. We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to fixes the issue. While at it, use distutils from stdlib for the host. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes Signed-off-by: Romain Naour Cc: James Hilliard Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index b8dc9cd9e5..e81a1a3102 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ $(TARGET_CONFIGURE_OPTS) \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ From peter at korsgaard.com Mon Mar 7 19:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:43:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site In-Reply-To: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> (Andrei Gherghescu via buildroot's message of "Thu, 24 Feb 2022 21:36:33 +0000") References: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> Message-ID: <878rtl7dmb.fsf@dell.be.48ers.dk> >>>>> "Andrei" == Andrei Gherghescu via buildroot writes: > The http://www.directfb.org/ has been down since 2015. > Use the Buildroot backup download site. > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=13731 That bug is about readline. I guess you mean https://bugs.busybox.net/show_bug.cgi?id=13126 instead? Committed, thanks. > Signed-off-by: Andrei Gherghescu > --- > package/directfb-examples/Config.in | 6 ++++-- > package/directfb-examples/directfb-examples.mk | 2 +- > package/directfb/directfb.mk | 2 +- > 3 files changed, 6 insertions(+), 4 deletions(-) > diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in > index 216e036577..4d5de03068 100644 > --- a/package/directfb-examples/Config.in > +++ b/package/directfb-examples/Config.in > @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES > help > The DirectFB-examples package contains a set of simple > DirectFB applications that can be used to test and demonstrate > - various DirectFB features. > + various DirectFB features. As of 4 October 2015, DirectFB's > + website http://www.directfb.org/ is down. See alternative site > + listed below. > - http://directfb.org/downloads/Extras/README.DirectFB-examples > + http://elinux.org/DirectFB > diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk > index 46263da733..c8d09b3e33 100644 > --- a/package/directfb-examples/directfb-examples.mk > +++ b/package/directfb-examples/directfb-examples.mk > @@ -5,7 +5,7 @@ > ################################################################################ > DIRECTFB_EXAMPLES_VERSION = 1.7.0 > -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras > +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples > DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz > DIRECTFB_EXAMPLES_LICENSE = MIT > DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING > diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk > index 0b32162d8f..56a396ab99 100644 > --- a/package/directfb/directfb.mk > +++ b/package/directfb/directfb.mk > @@ -6,7 +6,7 @@ > DIRECTFB_VERSION_MAJOR = 1.7 > DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 > -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) > +DIRECTFB_SITE = http://sources.buildroot.net/directfb > DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz > DIRECTFB_LICENSE = LGPL-2.1+ > DIRECTFB_LICENSE_FILES = COPYING > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:41:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:41:54 +0100 Subject: [Buildroot] [git commit] package/directfb: change upstream site Message-ID: <20220307193518.DAE1C82A9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13126 Signed-off-by: Andrei Gherghescu Signed-off-by: Peter Korsgaard --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING From bugzilla at busybox.net Mon Mar 7 19:44:26 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 19:44:26 +0000 Subject: [Buildroot] [Bug 13126] make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.gz aren't tarballs In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13126 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Peter Korsgaard --- Fixed for directfb{,-examples} as well with https://git.buildroot.org/buildroot/commit/?id=89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Mar 7 19:45:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:45:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.1 In-Reply-To: <20220224232159.1103756-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 25 Feb 2022 01:21:59 +0200") References: <20220224232159.1103756-1-aperez@igalia.com> Message-ID: <874k497di8.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This is a minor release which fixes an installation path and a crash > with certain Wayland compositors. Release notes can be found at: > https://wpewebkit.org/release/cog-0.12.1.html > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:54:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:54:36 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: <20220225171148.701977-1-romain.naour@gmail.com> (Romain Naour's message of "Fri, 25 Feb 2022 18:11:48 +0100") References: <20220225171148.701977-1-romain.naour@gmail.com> Message-ID: <87zgm15yir.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both > _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot > already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first > release tag 2009.02. > _TIME_BITS is not needed for musl libc since it already year2038 > ready [2]. > The uclibc-ng libc only support time_t 32-bit (long int) so it will be > affected by the year2038 issue [3]. > Fixes (in French, chapter Buildroot 2022 and GlibC): > https://www.blaess.fr/christophe/2038 > Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc > bleeding-edge 2021.11-1 toolchain. > Before: > # date > Tue Jan 19 03:14:07 UTC 2038 > # date > Thu Jan 1 00:00:00 UTC 1970 > After: > # date > Tue Jan 19 03:14:07 UTC 2038 > # date > Tue Jan 19 03:14:08 UTC 2038 > # date > Tue Jan 19 03:14:09 UTC 2038 Ahh, good catch. Maybe something to add a runtime test for? Committed, thanks. > [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 > [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 > [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 > Signed-off-by: Romain Naour > Cc: Christophe Blaess > --- > package/Makefile.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/Makefile.in b/package/Makefile.in > index 508ea7c366..cde050ca82 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) > TARGET_HARDENED += -D_FORTIFY_SOURCE=2 > endif > -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) > TARGET_CXXFLAGS = $(TARGET_CFLAGS) > TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:52:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:52:04 +0100 Subject: [Buildroot] [git commit] package/Makefile.in: Use 64-bit time_t with glibc toolchains for > year 2038 support Message-ID: <20220307194833.7AB7B81E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e33e5908086a511294296f317f6e6f86fa84b1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first release tag 2009.02. _TIME_BITS is not needed for musl libc since it already year2038 ready [2]. The uclibc-ng libc only support time_t 32-bit (long int) so it will be affected by the year2038 issue [3]. Fixes (in French, chapter Buildroot 2022 and GlibC): https://www.blaess.fr/christophe/2038 Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc bleeding-edge 2021.11-1 toolchain. Before: # date Tue Jan 19 03:14:07 UTC 2038 # date Thu Jan 1 00:00:00 UTC 1970 After: # date Tue Jan 19 03:14:07 UTC 2038 # date Tue Jan 19 03:14:08 UTC 2038 # date Tue Jan 19 03:14:09 UTC 2038 [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 Signed-off-by: Romain Naour Cc: Christophe Blaess Signed-off-by: Peter Korsgaard --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c366..cde050ca82 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) From peter at korsgaard.com Mon Mar 7 19:45:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:45:29 +0100 Subject: [Buildroot] [git commit] package/cog: bump to version 0.12.1 Message-ID: <20220307194833.7033D81EBF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a4972a9a46738e57b66d1434f074ecfe8adc07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor release which fixes an installation path and a crash with certain Wayland compositors. Release notes can be found at: https://wpewebkit.org/release/cog-0.12.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 6a9af1845d..839b12e619 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.0.tar.xz.sums -md5 30d6f68914af0ba5c32ac14df504215a cog-0.12.0.tar.xz -sha1 de367b33fb45a1bca9e443ca5c1d6cae3833d759 cog-0.12.0.tar.xz -sha256 aad413a8aaf15d400d70f9c909a28b92b138f7b0c0d825978de8788d0d75208a cog-0.12.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums +md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz +sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz +sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 606374d9c3..2f6ef402fb 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.0 +COG_VERSION = 0.12.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 7 20:01:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:01:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> (TIAN Yuanhao's message of "Mon, 21 Feb 2022 04:06:57 -0800") References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: <87v8wp5y6x.fsf@dell.be.48ers.dk> >>>>> "TIAN" == TIAN Yuanhao writes: > Dependency on sqlite has been removed since v17.04.0-ce. > See: https://github.com/moby/moby/pull/30208 > Signed-off-by: TIAN Yuanhao Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:01:34 +0100 Subject: [Buildroot] [git commit] package/docker-engine: remove unused sqlite Message-ID: <20220307195347.0C4348103D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6105ad3f72fcb98a7d9aba543c6bb7311827c1d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 911cbfe428..1f0efb8fcc 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. From peter at korsgaard.com Mon Mar 7 20:05:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:05:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: <20220221220703.2198424-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 21 Feb 2022 23:07:03 +0100") References: <20220221220703.2198424-1-fontaine.fabrice@gmail.com> Message-ID: <87r17d5y0c.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc <= 5 raised since bump to > version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f > and > https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 > ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 > SparseArray::SparseArray() = default; > ^ > ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': > ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' > std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); > ^ > Fixes: > - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Don't set prefix in build step Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:05:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:05:34 +0100 Subject: [Buildroot] [git commit] package/re2: fix build with gcc <= 5 Message-ID: <20220307195855.785D982A9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fd3b0a523805db14682f7c559cc1c9c366ed55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc <= 5 raised since bump to version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f and https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 SparseArray::SparseArray() = default; ^ ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); ^ Fixes: - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/re2/re2.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 41392cb179..30791a68e5 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,19 +10,23 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +RE2_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef define RE2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef From peter at korsgaard.com Mon Mar 7 20:36:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:36:09 +0100 Subject: [Buildroot] [PATCH] docs/manual: Document Kconfig requirements for uboot In-Reply-To: <20220307141321.307200-1-dopsi@dopsi.ch> (Simon Doppler's message of "Mon, 7 Mar 2022 15:13:21 +0100") References: <20220307141321.307200-1-dopsi@dopsi.ch> Message-ID: <87h7895wli.fsf@dell.be.48ers.dk> >>>>> "Simon" == Simon Doppler writes: > When using uboot's legacy build system, the 'make uboot-menuconfig' > and 'make uboot-savedefconfig' targets are not available as they > are created by 'kconfig-package'. > Signed-off-by: Simon Doppler Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:36:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:36:03 +0100 Subject: [Buildroot] [git commit] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220307202940.9212782B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca9e55ad11271cb26b0bffba336cf5a0d74ba378 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler Signed-off-by: Peter Korsgaard --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: From peter at korsgaard.com Mon Mar 7 20:39:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:39:40 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> (yann morin's message of "Mon, 7 Mar 2022 16:43:13 +0100") References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> Message-ID: <87czix5wfn.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > BR_GOMOD is a remnant from a previous iteration of the golang download > infrastructure; it is currently used nowhere. > Do not set it. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:41:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:41:53 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <87czix5wfn.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Mon, 07 Mar 2022 21:39:40 +0100") References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> <87czix5wfn.fsf@dell.be.48ers.dk> Message-ID: <878rtl5wby.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> writes: >> From: "Yann E. MORIN" >> BR_GOMOD is a remnant from a previous iteration of the golang download >> infrastructure; it is currently used nowhere. >> Do not set it. >> Signed-off-by: Yann E. MORIN >> Cc: Thomas Petazzoni >> Cc: Anisse Astier >> Cc: Christian Stewart > Committed, thanks. Ups, hold that - It doesn't apply to master as it is done on top of the other pending golang fixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:47:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:47:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with gcc 4.8 In-Reply-To: <20220222175226.3086883-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 18:52:26 +0100") References: <20220222175226.3086883-1-fontaine.fabrice@gmail.com> Message-ID: <874k495w2q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since the addition > of -std=c++11 in commit b9eca021594470341bec2876edc0a27251f3f9b2: > sconex.cpp: In function 'scx::Date& scx::build_time()': > sconex.cpp:52:36: error: unable to find string literal operator 'operator"" __TIME__' > static Date s_build_time(__DATE__" "__TIME__,true); > ^ > Fixes: > - http://autobuild.buildroot.org/results/83ecf772965b4586eaea2682871a85732df7d62f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:50:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable JIT with mips32r6 In-Reply-To: <20220222201418.3087618-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 21:14:18 +0100") References: <20220222201418.3087618-1-fontaine.fabrice@gmail.com> Message-ID: <87zgm14hcx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable JIT with mips32r6 to avoid the following build failure raised > since bump to version 5.212.0-alpha4 in commit > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > /tmp/ccHw2rHQ.s:18: Error: opcode not supported on this processor: mips32r6 (mips32r6) `addi $a0,$sp,-8' > Fixes: > - http://autobuild.buildroot.org/results/5191600b463cda078203eeffae880ed989f8ac0f > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 2e96acc00f..6f8714140a 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -20,6 +20,10 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > # in the archive. > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) > +QT5WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF Looking a webkitgtk.mk we might need to disable it for older ARM and MIPS64R6 as well, but OK - That can be done later if needed. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:49:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:49:44 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: disable JIT with mips32r6 Message-ID: <20220307204241.7F26482DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6b348b3c74b829868347b827612a451851c7247 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable JIT with mips32r6 to avoid the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/ccHw2rHQ.s:18: Error: opcode not supported on this processor: mips32r6 (mips32r6) `addi $a0,$sp,-8' Fixes: - http://autobuild.buildroot.org/results/5191600b463cda078203eeffae880ed989f8ac0f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 6401c39d3d..9012a588d4 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,10 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) QT5WEBKIT_CONF_OPTS += \ -DENABLE_OPENGL=ON \ From peter at korsgaard.com Mon Mar 7 20:46:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:46:16 +0100 Subject: [Buildroot] [git commit] package/sconeserver: fix build with gcc 4.8 Message-ID: <20220307204241.764108269F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d0aedaa45b1a4711416a8b1247aed21f0614774 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since the addition of -std=c++11 in commit b9eca021594470341bec2876edc0a27251f3f9b2: sconex.cpp: In function 'scx::Date& scx::build_time()': sconex.cpp:52:36: error: unable to find string literal operator 'operator"" __TIME__' static Date s_build_time(__DATE__" "__TIME__,true); ^ Fixes: - http://autobuild.buildroot.org/results/83ecf772965b4586eaea2682871a85732df7d62f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sconeserver/0002-CMake-ify.patch | 173 +++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/package/sconeserver/0002-CMake-ify.patch b/package/sconeserver/0002-CMake-ify.patch new file mode 100644 index 0000000000..810c803469 --- /dev/null +++ b/package/sconeserver/0002-CMake-ify.patch @@ -0,0 +1,173 @@ +From 0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Mon Sep 17 00:00:00 2001 +From: Andrew Wedgbury +Date: Mon, 19 Aug 2019 21:12:59 +0000 +Subject: [PATCH] CMake-ify + +[Retrieve (and updated to only keep fix on sconex.cpp) from: +https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 5 + + CMakeLists.txt | 52 ++++ + Makefile.am | 58 ---- + autogen.sh | 8 - + bluetooth/CMakeLists.txt | 16 + + bluetooth/Makefile.am | 22 -- + config.h.in | 335 +-------------------- + configure.in | 451 ---------------------------- + debian/rules | 10 +- + debian/sconeserver-base.install | 2 +- + debian/sconeserver-dev.install | 4 +- + examples/Makefile.am | 4 - + examples/rot13/CMakeLists.txt | 9 + + examples/rot13/Makefile.am | 24 -- + examples/tuesdayonly/CMakeLists.txt | 7 + + examples/tuesdayonly/Makefile.am | 18 -- + exec/CMakeLists.txt | 9 + + exec/Makefile.am | 24 -- + forward/CMakeLists.txt | 8 + + forward/Makefile.am | 19 -- + http/CMakeLists.txt | 51 ++++ + http/Makefile.am | 58 ---- + image/CMakeLists.txt | 12 + + image/Makefile.am | 20 -- + ip/CMakeLists.txt | 9 + + ip/Makefile.am | 21 -- + ip6/CMakeLists.txt | 9 + + ip6/Makefile.am | 21 -- + local/CMakeLists.txt | 9 + + local/Makefile.am | 21 -- + location/CMakeLists.txt | 11 + + location/Makefile.am | 18 -- + main.cpp | 4 +- + markdown/CMakeLists.txt | 20 ++ + markdown/Makefile.am | 21 -- + maths/CMakeLists.txt | 32 ++ + maths/Makefile.am | 33 -- + mime/CMakeLists.txt | 8 + + mime/Makefile.am | 19 -- + mysql/CMakeLists.txt | 16 + + mysql/Makefile.am | 25 -- + rss/CMakeLists.txt | 15 + + rss/Makefile.am | 23 -- + sconeserver.cmake | 31 ++ + sconesite/CMakeLists.txt | 42 +++ + sconesite/Makefile.am | 79 ----- + sconex/Base64.cpp | 2 +- + sconex/CMakeLists.txt | 97 ++++++ + sconex/Database.cpp | 2 +- + sconex/FileDir.h | 4 +- + sconex/Makefile.am | 156 ---------- + sconex/ModuleLoader.cpp | 2 +- + sconex/Process.cpp | 8 - + sconex/RegExp.cpp | 4 - + sconex/RegExp.h | 4 +- + sconex/ScriptContext.cpp | 7 +- + sconex/ScriptTypes.cpp | 2 +- + sconex/TermBuffer.cpp | 7 +- + sconex/sconex.cpp | 4 +- + sconex/sconex.h | 176 +++-------- + sconex/utils.cpp | 4 - + server/CMakeLists.txt | 19 ++ + server/Makefile.am | 26 -- + simple/CMakeLists.txt | 15 + + simple/Makefile.am | 21 -- + smtp/CMakeLists.txt | 15 + + smtp/Makefile.am | 21 -- + sqlite/CMakeLists.txt | 23 ++ + sqlite/Makefile.am | 25 -- + ssl/CMakeLists.txt | 23 ++ + ssl/Makefile.am | 30 -- + stat/CMakeLists.txt | 17 ++ + stat/Makefile.am | 23 -- + test/CMakeLists.txt | 13 + + test/Makefile.am | 53 ---- + testbuilder/CMakeLists.txt | 23 ++ + testbuilder/Makefile.am | 36 --- + tftp/CMakeLists.txt | 17 ++ + tftp/Makefile.am | 23 -- + upstart | 13 - + 80 files changed, 695 insertions(+), 1933 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile.am + delete mode 100755 autogen.sh + create mode 100644 bluetooth/CMakeLists.txt + delete mode 100644 bluetooth/Makefile.am + delete mode 100644 configure.in + delete mode 100644 examples/Makefile.am + create mode 100644 examples/rot13/CMakeLists.txt + delete mode 100644 examples/rot13/Makefile.am + create mode 100644 examples/tuesdayonly/CMakeLists.txt + delete mode 100644 examples/tuesdayonly/Makefile.am + create mode 100644 exec/CMakeLists.txt + delete mode 100644 exec/Makefile.am + create mode 100644 forward/CMakeLists.txt + delete mode 100644 forward/Makefile.am + create mode 100644 http/CMakeLists.txt + delete mode 100644 http/Makefile.am + create mode 100644 image/CMakeLists.txt + delete mode 100644 image/Makefile.am + create mode 100644 ip/CMakeLists.txt + delete mode 100644 ip/Makefile.am + create mode 100644 ip6/CMakeLists.txt + delete mode 100644 ip6/Makefile.am + create mode 100644 local/CMakeLists.txt + delete mode 100644 local/Makefile.am + create mode 100644 location/CMakeLists.txt + delete mode 100644 location/Makefile.am + create mode 100644 markdown/CMakeLists.txt + delete mode 100644 markdown/Makefile.am + create mode 100644 maths/CMakeLists.txt + delete mode 100644 maths/Makefile.am + create mode 100644 mime/CMakeLists.txt + delete mode 100644 mime/Makefile.am + create mode 100644 mysql/CMakeLists.txt + delete mode 100644 mysql/Makefile.am + create mode 100644 rss/CMakeLists.txt + delete mode 100644 rss/Makefile.am + create mode 100644 sconeserver.cmake + create mode 100644 sconesite/CMakeLists.txt + delete mode 100644 sconesite/Makefile.am + create mode 100644 sconex/CMakeLists.txt + delete mode 100644 sconex/Makefile.am + create mode 100644 server/CMakeLists.txt + delete mode 100644 server/Makefile.am + create mode 100644 simple/CMakeLists.txt + delete mode 100644 simple/Makefile.am + create mode 100644 smtp/CMakeLists.txt + delete mode 100644 smtp/Makefile.am + create mode 100644 sqlite/CMakeLists.txt + delete mode 100644 sqlite/Makefile.am + create mode 100644 ssl/CMakeLists.txt + delete mode 100644 ssl/Makefile.am + create mode 100644 stat/CMakeLists.txt + delete mode 100644 stat/Makefile.am + create mode 100644 test/CMakeLists.txt + delete mode 100644 test/Makefile.am + create mode 100644 testbuilder/CMakeLists.txt + delete mode 100644 testbuilder/Makefile.am + create mode 100644 tftp/CMakeLists.txt + delete mode 100644 tftp/Makefile.am + delete mode 100644 upstart + +diff --git a/sconex/sconex.cpp b/sconex/sconex.cpp +index 1b9fc97..a0ba8c1 100644 +--- a/sconex/sconex.cpp ++++ b/sconex/sconex.cpp +@@ -35,7 +35,7 @@ VersionTag& version() + const std::string& sconex_copyright() + { + static std::string s_copyright = +- "Copyright (c) 2000-2017 Andrew Wedgbury "; ++ "Copyright (c) 2000-2018 Andrew Wedgbury "; + return s_copyright; + } + +@@ -49,7 +49,7 @@ const std::string& build_type() + //========================================================================= + Date& build_time() + { +- static Date s_build_time(__DATE__" "__TIME__,true); ++ static Date s_build_time( __DATE__ " " __TIME__ ,true); + return s_build_time; + } From peter at korsgaard.com Mon Mar 7 21:04:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:04:44 +0100 Subject: [Buildroot] [PATCH 1/5 v3] package/pkg-cargo: allow packages to define download environment In-Reply-To: <19116_1644506970_62052F5A_19116_77_1_cb2a6466cea018c4bf8b8877140a9f389bb7918f.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:24 +0100") References: <19116_1644506970_62052F5A_19116_77_1_cb2a6466cea018c4bf8b8877140a9f389bb7918f.1644506959.git.yann.morin@orange.com> Message-ID: <87v8wp4gpf.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, the cargo infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > We fix that by using an append-assignment. > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Acked-by: Thomas Petazzoni Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:06:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:06:40 +0100 Subject: [Buildroot] [PATCH 2/5 v3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <11477_1644506971_62052F5B_11477_140_26_81fca21f2b24da16bb9e6d3af5add173f382f242.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:25 +0100") References: <11477_1644506971_62052F5B_11477_140_26_81fca21f2b24da16bb9e6d3af5add173f382f242.1644506959.git.yann.morin@orange.com> Message-ID: <87r17d4gm7.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Some packages have their rust sources as a sub-directory, rather > than at the root of the source tree. > Do like we do for autotools-package, and use the package's _SRCDIR > rather than the top-level directory $(@D). > Additionally, in such a situation, it is more than probable that > the Cargo.toml is also present in that sub-directory, so use that > when vendoring the package. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > Changes v2 -> v3: > - always consider Cargo.toml to be in _SUBDIR (Thomas) > - add _SUBDIR to the manual (Thomas) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:07:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:07:18 +0100 Subject: [Buildroot] [PATCH 3/5 v3] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: <11363_1644506973_62052F5D_11363_173_9_da4c09036712600e0ab76db801a5a5c693bfa267.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:26 +0100") References: <11363_1644506973_62052F5D_11363_173_9_da4c09036712600e0ab76db801a5a5c693bfa267.1644506959.git.yann.morin@orange.com> Message-ID: <87mti14gl5.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, host-rustc is a download dependency, because we need cargo > for the vendoring during the download step. > However, when using a package in override-srcdir, there is no download > step, so host-rustc is not pulled in as a dependency which breaks > running the build of a single package from scratch: > $ make clean > $ make my-rust-package > [...] > [...] cargo build --offline --release --manifest-path Cargo.toml --locked > /bin/sh: cargo: command not found > We fix that by adding host-rustc as a standard dependency too. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Acked-by: Thomas Petazzoni Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:07:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:07:39 +0100 Subject: [Buildroot] [PATCH 4/5 v3] package/pkg-golang: allow packages to define download environment In-Reply-To: <1449_1644506975_62052F5F_1449_399_1_68889e1f1d960c99ade7457d58a115bf955a7b64.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:27 +0100") References: <1449_1644506975_62052F5F_1449_399_1_68889e1f1d960c99ade7457d58a115bf955a7b64.1644506959.git.yann.morin@orange.com> Message-ID: <87ilsp4gkk.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, the golang infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > We fix that by using an append-assignment. > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > Acked-by: Thomas Petazzoni > Reviewed-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:08:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:08:03 +0100 Subject: [Buildroot] [PATCH 5/5 v3] package/pkg-golang: host-go is also a build dependency In-Reply-To: <11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:28 +0100") References: <11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin@orange.com> Message-ID: <87ee3d4gjw.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, host-go is a download dependency, because we need go for the > vendoring during the download step. > However, when using a package in override-srcdir, there is no download > step, so host-go is not pulled in as a dependency, which will break the > build of a single package from scratch. > We fix that by adding host-go as a standard dependency too. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > Acked-by: Thomas Petazzoni > Reviewed-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:10:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: fix build with per-package directories In-Reply-To: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> (yann morin's message of "Mon, 7 Mar 2022 16:42:56 +0100") References: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> Message-ID: <87a6e14ggm.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Build with per-package directory is broken, because go is not found in > the PATH, when trying to download and vendor a go package. > This is because FOO_DL_ENV contains $(HOST_GO_COMMON_ENV), which defines > the PATH as PATH=$(BR_PATH). This is correct, except this is expanded at > the time the golang-package macro is evaluated, which means PATH > contains the 'global' BR_PATH, i.e.: $(O)/host/bin:$(O)/host/sbin:... > However, with PPD, this does not yet exist at build time; only the > per-package hoqt directory exists. s/hoqt/host/ > We want to have it expanded at the time the recipe is run, so like all > other variables, we need to $$-expand it. > At the same time, also $$-expand two other variables (even though those > are benign, it is better for consistency that they be $$-expanded). > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:10:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:10:07 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> (yann morin's message of "Mon, 7 Mar 2022 16:43:13 +0100") References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> Message-ID: <875yop4ggg.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > BR_GOMOD is a remnant from a previous iteration of the golang download > infrastructure; it is currently used nowhere. > Do not set it. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:04:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:04:20 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: allow packages to define download environment Message-ID: <20220307210210.D3B19826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d508d8e45a4b4afcb7f5291181393c9a249d8cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo +$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. From peter at korsgaard.com Mon Mar 7 21:07:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:07:29 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: allow packages to define download environment Message-ID: <20220307210210.EF7DC826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1ef4c1d9ad1b0fc5c94cbb7aa85347243006b64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 35bcb1673b..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) From peter at korsgaard.com Mon Mar 7 21:07:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:07:49 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: host-go is also a build dependency Message-ID: <20220307210211.04A3C82DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3539f45ca09558a22fb5816baae9088c34490380 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, host-go is a download dependency, because we need go for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-go is not pulled in as a dependency, which will break the build of a single package from scratch. We fix that by adding host-go as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 69eae02830..ddefdf1214 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -47,8 +47,10 @@ $(2)_BUILD_OPTS += \ -trimpath \ -p $(PARALLEL_JOBS) -# Target packages need the Go compiler on the host. +# Target packages need the Go compiler on the host at download time (for +# vendoring), and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-go +$(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . From peter at korsgaard.com Mon Mar 7 21:06:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:06:53 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: host-rustc is also a build dependency Message-ID: <20220307210210.E64E182DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7327aeafca93c68bcc120180d0cea1cd8cf1667 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single package from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 8b246abfed..6f5125f1d4 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo From peter at korsgaard.com Mon Mar 7 21:09:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:09:40 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: don't export unused BR_GOMOD Message-ID: <20220307210211.15E92826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48e5cc084253bbfeb3cb3957deb4e125060f5dcb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BR_GOMOD is a remnant from a previous iteration of the golang download infrastructure; it is currently used nowhere. Do not set it. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index f1c5cfd350..0cb2ed73cc 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -87,8 +87,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ - BR_GOMOD=$$($(2)_GOMOD) + GOPROXY=direct # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. From peter at korsgaard.com Mon Mar 7 21:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:04:54 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: allow building in a sub-directory Message-ID: <20220307210210.DC44F82DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b59ed35a2d08fedd8b77e4c70d10bf22a0ce1e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-cargo.txt | 5 +++++ package/pkg-cargo.mk | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 5343fbd4e6..e18fd9ce23 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -73,6 +73,11 @@ A few additional variables, specific to the Cargo infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them. +* +FOO_SUBDIR+ may contain the name of a subdirectory inside the package + that contains the Cargo.toml file. This is useful, if for example, it + is not at the root of the tree extracted by the tarball. If + +HOST_FOO_SUBDIR+ is not specified, it defaults to +FOO_SUBDIR+. + * +FOO_CARGO_ENV+ can be used to pass additional variables in the environment of +cargo+ invocations. It used at both build and installation time diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..8b246abfed 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,11 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml +ifneq ($$($(2)_SUBDIR),) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +102,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +116,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +138,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +157,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ From peter at korsgaard.com Mon Mar 7 21:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:09:08 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: fix build with per-package directories Message-ID: <20220307210211.0CBE782DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ad1437c5ec697bdef0a567ea47f1dc696a7d64d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build with per-package directory is broken, because go is not found in the PATH, when trying to download and vendor a go package. This is because FOO_DL_ENV contains $(HOST_GO_COMMON_ENV), which defines the PATH as PATH=$(BR_PATH). This is correct, except this is expanded at the time the golang-package macro is evaluated, which means PATH contains the 'global' BR_PATH, i.e.: $(O)/host/bin:$(O)/host/sbin:... However, with PPD, this does not yet exist at build time; only the per-package host directory exists. We want to have it expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. At the same time, also $$-expand two other variables (even though those are benign, it is better for consistency that they be $$-expanded). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index ddefdf1214..f1c5cfd350 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,7 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. @@ -86,7 +86,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ - $(HOST_GO_COMMON_ENV) \ + $$(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) @@ -134,7 +134,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) ) endef endif @@ -143,7 +143,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) ) endef endif From kris at embeddedTS.com Mon Mar 7 21:14:55 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Mon, 7 Mar 2022 13:14:55 -0800 Subject: [Buildroot] [PATCH 1/1] fix links to Technologic Systems web resources Message-ID: <20220307211455.9630-1-kris@embeddedTS.com> Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen --- RESEND: - Was not subscribed to Buildroot list with this email board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 2 +- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..ed2941079a 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) -- 2.11.0 From arnout at mind.be Mon Mar 7 21:22:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:22:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/pulseview: fix build with glibmm 2.68 In-Reply-To: <20220218090533.645612-1-fontaine.fabrice@gmail.com> References: <20220218090533.645612-1-fontaine.fabrice@gmail.com> Message-ID: <96905b6b-a8f7-7110-772b-bc835c219253@mind.be> On 18/02/2022 10:05, Fabrice Fontaine wrote: > Fixes: > - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../pulseview/0003-Support-glibmm-2.68.patch | 89 +++++++++++++++++++ > 1 file changed, 89 insertions(+) > create mode 100644 package/pulseview/0003-Support-glibmm-2.68.patch > > diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch > new file mode 100644 > index 0000000000..00e4e696d9 > --- /dev/null > +++ b/package/pulseview/0003-Support-glibmm-2.68.patch > @@ -0,0 +1,89 @@ > +From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 30 Dec 2021 16:19:46 +0100 > +Subject: [PATCH] Support glibmm 2.68 > + > +Support glibmm 2.68 which has been released one year ago and is the > +first stable release in the glibmm-2.68 ABI series: > +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS > + > +C++17 support is mandatory with glibmm 2.68 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: not sent yet] > +--- > + CMakeLists.txt | 23 +++++++++++++++++++---- > + INSTALL | 2 +- > + 2 files changed, 20 insertions(+), 5 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 7791b1b1..58a9cf92 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -75,7 +75,14 @@ add_subdirectory(manual) > + #------------------------------------------------------------------------------- > + > + list(APPEND PKGDEPS glib-2.0>=2.28.0) > +-list(APPEND PKGDEPS glibmm-2.4>=2.28.0) > ++ > ++set(LIBSR_GLIBMM "glibmm-2.4>=2.28.0") > ++find_package(PkgConfig) > ++pkg_check_modules(LIBSRGLIBMM24 ${LIBSR_GLIBMM}) > ++if(NOT LIBSRGLIBMM24_FOUND) > ++ set(LIBSR_GLIBMM "glibmm-2.68>=2.68.0") > ++endif() > ++list(APPEND PKGDEPS ${LIBSR_GLIBMM}) > + > + if(ENABLE_FLOW) > + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) > +@@ -93,7 +100,6 @@ if(ANDROID) > + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) > + endif() > + > +-find_package(PkgConfig) > + pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) > + if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) > + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") > +@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) > + set(PV_TITLE PulseView) > + set(PV_VERSION_STRING "0.5.0") > + > +-set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) > ++if(LIBSRGLIBMM24_FOUND) > ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) > ++else() > ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.68_VERSION}) > ++endif() > + > + include(GetGitRevisionDescription) > + > +@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) > + add_definitions(-DQT_NO_KEYWORDS) > + add_definitions(-D__STDC_LIMIT_MACROS) > + add_definitions(-Wall -Wextra) > +-add_definitions(-std=c++11) > ++if(LIBSRGLIBMM24_FOUND) > ++ add_definitions(-std=c++11) > ++else() > ++ # glibmm-2.68 reuires c++17 > ++ add_definitions(-std=c++17) > ++endif() > + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) > + if(WIN32) > + add_definitions(-Wa,-mbig-obj -O3) > +diff --git a/INSTALL b/INSTALL > +index da89be8d..8003fcfb 100644 > +--- a/INSTALL > ++++ b/INSTALL > +@@ -14,7 +14,7 @@ Requirements > + - pkg-config >= 0.22 > + - cmake >= 2.8.12 > + - libglib >= 2.28.0 > +- - glibmm-2.4 (>= 2.28.0) > ++ - glibmm-2.4 (>= 2.28.0) or glibmm-2.68 (>= 2.68.0) > + - Qt5 (>= 5.3), including the following components: > + - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools > + - Qt translation package (optional; needed at runtime, not build time) > +-- > +2.34.1 > + From arnout at mind.be Mon Mar 7 21:23:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:23:11 +0100 Subject: [Buildroot] [PATCH 2/2] package/kf5: bump to version 5.91 In-Reply-To: <20220217163655.221545-2-fontaine.fabrice@gmail.com> References: <20220217163655.221545-1-fontaine.fabrice@gmail.com> <20220217163655.221545-2-fontaine.fabrice@gmail.com> Message-ID: On 17/02/2022 17:36, Fabrice Fontaine wrote: > This bump will fix the following build failure of kf5-kcoreaddons with > python 3.10 raised since commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > CMake Error at /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/ECM/find-modules/FindPythonModuleGeneration.cmake:149 (message): > The max python version in PythonModuleGeneration must be updated. > Call Stack (most recent call first): > src/lib/CMakeLists.txt:208 (find_package) > > It will also fix the following build failure of kf5-kcoreaddons raised > since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: > > In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qchar.h:43, > from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qstring.h:49, > from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/QString:1, > from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.h:27, > from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:22: > /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qglobal.h:1274:80: note: declared here > 1274 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); > | ^~~~~ > /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp: In function 'QString KRandom::randomString(int)': > /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:76:27: error: use of deleted function 'QCharRef& QCharRef::operator=(char)' > 76 | str[i++] = char(r); > | ^ > > - Update indentation in hash file (two spaces) > - Update licenses due to > https://invent.kde.org/frameworks/kcoreaddons/-/commit/93480398b551aee572f9f1a0ee48ed45a8476580 > https://invent.kde.org/frameworks/modemmanager-qt/-/commit/8ad494d957cab343a60a61a2163f1ca23e9e3511 > https://invent.kde.org/frameworks/networkmanager-qt/-/commit/fa9ef0d84898ad5e1f28857307bd5fcb8eb38e20 > > Fixes: > - http://autobuild.buildroot.org/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 > - http://autobuild.buildroot.org/results/694a2322d9161b55f5db66d1ace57d836360ed84 > > Signed-off-by: Fabrice Fontaine Although we shouldn't be doing version bumps just before the release, this fixes a build issue and kf5 is anyway a leaf package, so applied both to master, thanks. Regards, Arnout > --- > .../kf5-extra-cmake-modules.hash | 4 ++-- > .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 17 ++++++++++++++-- > .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 20 +++++++++++++++++-- > .../kf5-modemmanager-qt.hash | 11 ++++++++-- > .../kf5-modemmanager-qt.mk | 13 ++++++++++-- > .../kf5-networkmanager-qt.hash | 11 ++++++++-- > .../kf5-networkmanager-qt.mk | 12 +++++++++-- > package/kf5/kf5.mk | 2 +- > 8 files changed, 75 insertions(+), 15 deletions(-) > > diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash > index 733e267fdb..70b776b5d7 100644 > --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash > +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz > -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS > +sha256 9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c extra-cmake-modules-5.91.0.tar.xz > +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS > diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash > index 0cd8dcfc15..e4ebf2bb39 100644 > --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash > +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash > @@ -1,3 +1,16 @@ > # Locally calculated > -sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz > -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB > +sha256 dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b kcoreaddons-5.91.0.tar.xz > + > +# Hash for license files > +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt > +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt > +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt > +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-only.txt > +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-or-later.txt > +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt > +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt > +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt > +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > +sha256 272bc0fa06a23d3c807375f95f8d6ccd98541321d2882732668ab139c16f9bf4 LICENSES/LicenseRef-Qt-Commercial.txt > +sha256 a3b538a7d81c4935d185056479d12fd43042bb9f3a21c9cbb4a8500fab8e5880 LICENSES/MPL-1.1.txt > +sha256 7dea3adab58690d8ee14775da755cd30a52649a47704ff78ae85197ae0d37c60 LICENSES/Qt-LGPL-exception-1.1.txt > diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > index 9a034ba763..e2f67f15b2 100644 > --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > @@ -7,8 +7,24 @@ > KF5_KCOREADDONS_VERSION = $(KF5_VERSION) > KF5_KCOREADDONS_SITE = $(KF5_SITE) > KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz > -KF5_KCOREADDONS_LICENSE = LGPL-2.1 > -KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB > +KF5_KCOREADDONS_LICENSE = \ > + LGPL-2.0+, LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ > + MPL.1.1 or GPL-2.0+ or LGPL-2.1+ (posix_fallocate_mac.h), \ > + LGPL-2.1 with Qt-LGPL-exception-1.1 or LicenseRef-Qt-Commercial (kprocesslist), \ > + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests) > +KF5_KCOREADDONS_LICENSE_FILES = \ > + LICENSES/GPL-2.0-only.txt \ > + LICENSES/GPL-2.0-or-later.txt \ > + LICENSES/GPL-3.0-only.txt \ > + LICENSES/LGPL-2.0-only.txt \ > + LICENSES/LGPL-2.0-or-later.txt \ > + LICENSES/LGPL-2.1-only.txt \ > + LICENSES/LGPL-3.0-only.txt \ > + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ > + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt \ > + LICENSES/LicenseRef-Qt-Commercial.txt \ > + LICENSES/MPL-1.1.txt \ > + LICENSES/Qt-LGPL-exception-1.1.txt > > KF5_KCOREADDONS_DEPENDENCIES = \ > kf5-extra-cmake-modules \ > diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash > index 408eb0c0b0..4b6c03a3bb 100644 > --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash > +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash > @@ -1,3 +1,10 @@ > # Locally calculated > -sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz > -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > +sha256 a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 modemmanager-qt-5.91.0.tar.xz > + > +# Hash for license files > +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt > +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt > +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt > +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt > +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt > +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > index 81617492c0..38c80d3da8 100644 > --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > @@ -7,8 +7,17 @@ > KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) > KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) > KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz > -KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ > -KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB > +KF5_MODEMMANAGER_QT_LICENSE = \ > + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ > + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) > + > +KF5_MODEMMANAGER_QT_LICENSE_FILES = \ > + LICENSES/GPL-2.0-only.txt \ > + LICENSES/GPL-3.0-only.txt \ > + LICENSES/LGPL-2.1-only.txt \ > + LICENSES/LGPL-3.0-only.txt \ > + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ > + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > > KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base > KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES > diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash > index 8ccada455e..de4504064f 100644 > --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash > +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash > @@ -1,3 +1,10 @@ > # Locally calculated > -sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz > -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > +sha256 2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 networkmanager-qt-5.91.0.tar.xz > + > +# Hash for license files > +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt > +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt > +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt > +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt > +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt > +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > index c383f98e9b..7adff2deb7 100644 > --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > @@ -7,8 +7,16 @@ > KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) > KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) > KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz > -KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ > -KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB > +KF5_NETWORKMANAGER_QT_LICENSE = \ > + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ > + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) > +KF5_NETWORKMANAGER_QT_LICENSE_FILES = \ > + LICENSES/GPL-2.0-only.txt \ > + LICENSES/GPL-3.0-only.txt \ > + LICENSES/LGPL-2.1-only.txt \ > + LICENSES/LGPL-3.0-only.txt \ > + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ > + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > > KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base > KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES > diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk > index 8360fc9b63..64b08bae4f 100644 > --- a/package/kf5/kf5.mk > +++ b/package/kf5/kf5.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KF5_VERSION_MAJOR = 5.47 > +KF5_VERSION_MAJOR = 5.91 > KF5_VERSION = $(KF5_VERSION_MAJOR).0 > KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) > From arnout at mind.be Mon Mar 7 21:23:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:23:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix building cargo packages on 32bit arm In-Reply-To: <20220217230638.98748-1-moritz@h6t.eu> References: <20220217230638.98748-1-moritz@h6t.eu> Message-ID: On 18/02/2022 00:06, Moritz Bitsch via buildroot wrote: > From: Moritz Bitsch > > there are duplicated symbols between rustc and gcc. Specifying > --allow-multiple-definition to the linker as workaround until > rustc is fixed. > > rust-lang issue: https://github.com/rust-lang/compiler-builtins/issues/420 > > Fixes: http://autobuild.buildroot.net/results/53f/53f5598b8e520caaa135fb4923c09da382dab329 > Signed-off-by: Moritz Bitsch Applied to master, thanks. Regards, Arnout > --- > package/pkg-cargo.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index e74a8358bc..71d695d926 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -46,6 +46,14 @@ PKG_CARGO_ENV = \ > CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ > CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc > > +# > +# This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 > +# and should be removed when fixed upstream > +# > +ifeq ($(NORMALIZED_ARCH),arm) > + PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" > +endif > + > HOST_PKG_CARGO_ENV = \ > $(PKG_COMMON_CARGO_ENV) > From arnout at mind.be Mon Mar 7 21:23:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:23:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/{hostapd, wpa_s}: modify config options handling In-Reply-To: <20220217211823.402414-1-geomatsi@gmail.com> References: <20220217211823.402414-1-geomatsi@gmail.com> Message-ID: On 17/02/2022 22:18, Sergey Matyukevich wrote: > Makefiles hostapd.mk and wpa_supplicant.mk define different macros for > different defconfig options. Options that are not listed in defconfig, > can be set using CONFIG_SET. Options that are listed in defconfig, can > be enabled or disabled using CONFIG_ENABLE or CONFIG_DISABLE. Starting > from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. > So it would be time to switch to enable/disable macros for this option. > > On the other hand, this approach looks fragile: we have to track > 'promoted' defconfig options for each hostapd/wpa_s update. This patch > removes CONFIG_SET macros, keeping only CONFIG_ENABLED/CONFIG_DISABLED. > CONFIG_SET is replaced by the additional pass over enabled options. All > such options that are not listed in defconfig, will be appended to the > configuration file. > > Fixes: > - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ > > Signed-off-by: Sergey Matyukevich Applied to master, thanks. Regards, Arnout > --- > > v1 -> v2: > > - drop patch for mesh fix > - remove CONFIG_SET macro as per suggestion by Thomas > > > package/hostapd/hostapd.mk | 20 +++++++++++++------- > package/wpa_supplicant/wpa_supplicant.mk | 9 +++++++-- > 2 files changed, 20 insertions(+), 9 deletions(-) > > diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk > index 075cb2a8d0..99f0cdf1b8 100644 > --- a/package/hostapd/hostapd.mk > +++ b/package/hostapd/hostapd.mk > @@ -15,7 +15,6 @@ HOSTAPD_LICENSE_FILES = README > > HOSTAPD_CPE_ID_VENDOR = w1.fi > HOSTAPD_SELINUX_MODULES = hostapd > -HOSTAPD_CONFIG_SET = > > HOSTAPD_CONFIG_ENABLE = \ > CONFIG_INTERNAL_LIBTOMMATH \ > @@ -83,13 +82,14 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_WPS > endif > > ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) > -HOSTAPD_CONFIG_SET += \ > - CONFIG_DPP \ > - CONFIG_SAE > HOSTAPD_CONFIG_ENABLE += \ > + CONFIG_DPP \ > + CONFIG_SAE \ > CONFIG_OWE > else > HOSTAPD_CONFIG_DISABLE += \ > + CONFIG_DPP \ > + CONFIG_SAE \ > CONFIG_OWE > endif > > @@ -98,8 +98,9 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN > endif > > ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) > -HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN > -HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL > +HOSTAPD_CONFIG_ENABLE += \ > + CONFIG_FULL_DYNAMIC_VLAN \ > + NEED_LINUX_IOCTL > endif > > ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) > @@ -123,9 +124,14 @@ define HOSTAPD_CONFIGURE_CMDS > cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) > sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ > $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ > - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ > $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ > $(HOSTAPD_CONFIG) > + # set requested configuration options not listed in hostapd defconfig > + for s in $(HOSTAPD_CONFIG_ENABLE) ; do \ > + if ! grep -q "^$${s}" $(HOSTAPD_CONFIG); then \ > + echo "$${s}=y" >> $(HOSTAPD_CONFIG) ; \ > + fi \ > + done > endef > > define HOSTAPD_BUILD_CMDS > diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk > index b414144774..f0eb36e083 100644 > --- a/package/wpa_supplicant/wpa_supplicant.mk > +++ b/package/wpa_supplicant/wpa_supplicant.mk > @@ -164,7 +164,7 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE > endif > > ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) > -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO > +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO > define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO > $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ > $(TARGET_DIR)/usr/lib/libwpa_client.so > @@ -183,9 +183,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS > cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) > sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ > $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ > - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ > $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ > $(WPA_SUPPLICANT_CONFIG) > + # set requested configuration options not listed in wpa_s defconfig > + for s in $(WPA_SUPPLICANT_CONFIG_ENABLE) ; do \ > + if ! grep -q "^$${s}" $(WPA_SUPPLICANT_CONFIG); then \ > + echo "$${s}=y" >> $(WPA_SUPPLICANT_CONFIG) ; \ > + fi \ > + done > endef > > # LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/kf5/kf5-kcoreaddons: add python3 optional dependency Message-ID: <20220307211545.EDFE482DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=338acc3d440a5ade6c0d79b86a7b67342ea3f371 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python3 is an optional dependency since the addition of the package in commit bf48bf86295bc4628bcd14fd4ca415d6971c8ab8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 76be8876cc..9a034ba763 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -10,7 +10,10 @@ KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz KF5_KCOREADDONS_LICENSE = LGPL-2.1 KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB -KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools +KF5_KCOREADDONS_DEPENDENCIES = \ + kf5-extra-cmake-modules \ + qt5tools \ + $(if $(BR2_PACKAGE_PYTHON3),python3) KF5_KCOREADDONS_INSTALL_STAGING = YES KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS) From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: fix building cargo packages on 32bit arm Message-ID: <20220307211545.E45B480118@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f439f7c60b3734d3920c32aee027c2cb73621682 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There are duplicated symbols between rustc and gcc. Specifying --allow-multiple-definition to the linker as workaround until rustc is fixed. rust-lang issue: https://github.com/rust-lang/compiler-builtins/issues/420 Fixes: http://autobuild.buildroot.net/results/53f/53f5598b8e520caaa135fb4923c09da382dab329 Signed-off-by: Moritz Bitsch Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cargo.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 6f5125f1d4..f7e3f39503 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -46,6 +46,14 @@ PKG_CARGO_ENV = \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc +# +# This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 +# and should be removed when fixed upstream +# +ifeq ($(NORMALIZED_ARCH),arm) + PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" +endif + HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/kf5: bump to version 5.91 Message-ID: <20220307211546.039E68263F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84e7062cba31f64fbca98b042d3ac1da1866418e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure of kf5-kcoreaddons with python 3.10 raised since commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: CMake Error at /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/ECM/find-modules/FindPythonModuleGeneration.cmake:149 (message): The max python version in PythonModuleGeneration must be updated. Call Stack (most recent call first): src/lib/CMakeLists.txt:208 (find_package) It will also fix the following build failure of kf5-kcoreaddons raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qchar.h:43, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qstring.h:49, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/QString:1, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.h:27, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:22: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qglobal.h:1274:80: note: declared here 1274 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); | ^~~~~ /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp: In function 'QString KRandom::randomString(int)': /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:76:27: error: use of deleted function 'QCharRef& QCharRef::operator=(char)' 76 | str[i++] = char(r); | ^ - Update indentation in hash file (two spaces) - Update licenses due to https://invent.kde.org/frameworks/kcoreaddons/-/commit/93480398b551aee572f9f1a0ee48ed45a8476580 https://invent.kde.org/frameworks/modemmanager-qt/-/commit/8ad494d957cab343a60a61a2163f1ca23e9e3511 https://invent.kde.org/frameworks/networkmanager-qt/-/commit/fa9ef0d84898ad5e1f28857307bd5fcb8eb38e20 Fixes: - http://autobuild.buildroot.org/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 - http://autobuild.buildroot.org/results/694a2322d9161b55f5db66d1ace57d836360ed84 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../kf5-extra-cmake-modules.hash | 4 ++-- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 17 +++++++++++++++-- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 20 ++++++++++++++++++-- .../kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash | 11 +++++++++-- .../kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk | 13 +++++++++++-- .../kf5-networkmanager-qt/kf5-networkmanager-qt.hash | 11 +++++++++-- .../kf5-networkmanager-qt/kf5-networkmanager-qt.mk | 12 ++++++++++-- package/kf5/kf5.mk | 2 +- 8 files changed, 75 insertions(+), 15 deletions(-) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash index 733e267fdb..70b776b5d7 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS +sha256 9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c extra-cmake-modules-5.91.0.tar.xz +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash index 0cd8dcfc15..e4ebf2bb39 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash @@ -1,3 +1,16 @@ # Locally calculated -sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b kcoreaddons-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-or-later.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt +sha256 272bc0fa06a23d3c807375f95f8d6ccd98541321d2882732668ab139c16f9bf4 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 a3b538a7d81c4935d185056479d12fd43042bb9f3a21c9cbb4a8500fab8e5880 LICENSES/MPL-1.1.txt +sha256 7dea3adab58690d8ee14775da755cd30a52649a47704ff78ae85197ae0d37c60 LICENSES/Qt-LGPL-exception-1.1.txt diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 9a034ba763..e2f67f15b2 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -7,8 +7,24 @@ KF5_KCOREADDONS_VERSION = $(KF5_VERSION) KF5_KCOREADDONS_SITE = $(KF5_SITE) KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz -KF5_KCOREADDONS_LICENSE = LGPL-2.1 -KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB +KF5_KCOREADDONS_LICENSE = \ + LGPL-2.0+, LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + MPL.1.1 or GPL-2.0+ or LGPL-2.1+ (posix_fallocate_mac.h), \ + LGPL-2.1 with Qt-LGPL-exception-1.1 or LicenseRef-Qt-Commercial (kprocesslist), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests) +KF5_KCOREADDONS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.0-only.txt \ + LICENSES/LGPL-2.0-or-later.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt \ + LICENSES/LicenseRef-Qt-Commercial.txt \ + LICENSES/MPL-1.1.txt \ + LICENSES/Qt-LGPL-exception-1.1.txt KF5_KCOREADDONS_DEPENDENCIES = \ kf5-extra-cmake-modules \ diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash index 408eb0c0b0..4b6c03a3bb 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 modemmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 81617492c0..38c80d3da8 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -7,8 +7,17 @@ KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz -KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_MODEMMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) + +KF5_MODEMMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash index 8ccada455e..de4504064f 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 networkmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk index c383f98e9b..7adff2deb7 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk @@ -7,8 +7,16 @@ KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz -KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_NETWORKMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) +KF5_NETWORKMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk index 8360fc9b63..64b08bae4f 100644 --- a/package/kf5/kf5.mk +++ b/package/kf5/kf5.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_VERSION_MAJOR = 5.47 +KF5_VERSION_MAJOR = 5.91 KF5_VERSION = $(KF5_VERSION_MAJOR).0 KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/{hostapd, wpa_s}: modify config options handling Message-ID: <20220307211545.DAB7A8263F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08f6960f53b84c6e333548b99fff04928aa454e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Makefiles hostapd.mk and wpa_supplicant.mk define different macros for different defconfig options. Options that are not listed in defconfig, can be set using CONFIG_SET. Options that are listed in defconfig, can be enabled or disabled using CONFIG_ENABLE or CONFIG_DISABLE. Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. So it would be time to switch to enable/disable macros for this option. On the other hand, this approach looks fragile: we have to track 'promoted' defconfig options for each hostapd/wpa_s update. This patch removes CONFIG_SET macros, keeping only CONFIG_ENABLED/CONFIG_DISABLED. CONFIG_SET is replaced by the additional pass over enabled options. All such options that are not listed in defconfig, will be appended to the configuration file. Fixes: - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ Signed-off-by: Sergey Matyukevich Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/hostapd/hostapd.mk | 20 +++++++++++++------- package/wpa_supplicant/wpa_supplicant.mk | 9 +++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 075cb2a8d0..99f0cdf1b8 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -15,7 +15,6 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd -HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ CONFIG_INTERNAL_LIBTOMMATH \ @@ -83,13 +82,14 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_WPS endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) -HOSTAPD_CONFIG_SET += \ - CONFIG_DPP \ - CONFIG_SAE HOSTAPD_CONFIG_ENABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE endif @@ -98,8 +98,9 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) -HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN -HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL +HOSTAPD_CONFIG_ENABLE += \ + CONFIG_FULL_DYNAMIC_VLAN \ + NEED_LINUX_IOCTL endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) @@ -123,9 +124,14 @@ define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ $(HOSTAPD_CONFIG) + # set requested configuration options not listed in hostapd defconfig + for s in $(HOSTAPD_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(HOSTAPD_CONFIG); then \ + echo "$${s}=y" >> $(HOSTAPD_CONFIG) ; \ + fi \ + done endef define HOSTAPD_BUILD_CMDS diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index b414144774..f0eb36e083 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -164,7 +164,7 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ $(TARGET_DIR)/usr/lib/libwpa_client.so @@ -183,9 +183,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ $(WPA_SUPPLICANT_CONFIG) + # set requested configuration options not listed in wpa_s defconfig + for s in $(WPA_SUPPLICANT_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(WPA_SUPPLICANT_CONFIG); then \ + echo "$${s}=y" >> $(WPA_SUPPLICANT_CONFIG) ; \ + fi \ + done endef # LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/pulseview: fix build with glibmm 2.68 Message-ID: <20220307211546.0DA8982DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c05b5e1007681f8a1d15a6194f84051e7569d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pulseview/0003-Support-glibmm-2.68.patch | 89 ++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..00e4e696d9 --- /dev/null +++ b/package/pulseview/0003-Support-glibmm-2.68.patch @@ -0,0 +1,89 @@ +From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 16:19:46 +0100 +Subject: [PATCH] Support glibmm 2.68 + +Support glibmm 2.68 which has been released one year ago and is the +first stable release in the glibmm-2.68 ABI series: +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS + +C++17 support is mandatory with glibmm 2.68 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + CMakeLists.txt | 23 +++++++++++++++++++---- + INSTALL | 2 +- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7791b1b1..58a9cf92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,14 @@ add_subdirectory(manual) + #------------------------------------------------------------------------------- + + list(APPEND PKGDEPS glib-2.0>=2.28.0) +-list(APPEND PKGDEPS glibmm-2.4>=2.28.0) ++ ++set(LIBSR_GLIBMM "glibmm-2.4>=2.28.0") ++find_package(PkgConfig) ++pkg_check_modules(LIBSRGLIBMM24 ${LIBSR_GLIBMM}) ++if(NOT LIBSRGLIBMM24_FOUND) ++ set(LIBSR_GLIBMM "glibmm-2.68>=2.68.0") ++endif() ++list(APPEND PKGDEPS ${LIBSR_GLIBMM}) + + if(ENABLE_FLOW) + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) +@@ -93,7 +100,6 @@ if(ANDROID) + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) + endif() + +-find_package(PkgConfig) + pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) + if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") +@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) + set(PV_TITLE PulseView) + set(PV_VERSION_STRING "0.5.0") + +-set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++if(LIBSRGLIBMM24_FOUND) ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++else() ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.68_VERSION}) ++endif() + + include(GetGitRevisionDescription) + +@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) + add_definitions(-DQT_NO_KEYWORDS) + add_definitions(-D__STDC_LIMIT_MACROS) + add_definitions(-Wall -Wextra) +-add_definitions(-std=c++11) ++if(LIBSRGLIBMM24_FOUND) ++ add_definitions(-std=c++11) ++else() ++ # glibmm-2.68 reuires c++17 ++ add_definitions(-std=c++17) ++endif() + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) + if(WIN32) + add_definitions(-Wa,-mbig-obj -O3) +diff --git a/INSTALL b/INSTALL +index da89be8d..8003fcfb 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -14,7 +14,7 @@ Requirements + - pkg-config >= 0.22 + - cmake >= 2.8.12 + - libglib >= 2.28.0 +- - glibmm-2.4 (>= 2.28.0) ++ - glibmm-2.4 (>= 2.28.0) or glibmm-2.68 (>= 2.68.0) + - Qt5 (>= 5.3), including the following components: + - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools + - Qt translation package (optional; needed at runtime, not build time) +-- +2.34.1 + From bugzilla at busybox.net Mon Mar 7 21:29:43 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 21:29:43 +0000 Subject: [Buildroot] [Bug 14631] host-go-bootstrap: go not being built for package in external tree In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Peter Korsgaard --- Fixed by https://git.buildroot.org/buildroot/commit/?id=3539f45ca09558a22fb5816baae9088c34490380, thanks -- You are receiving this mail because: You are on the CC list for the bug. From andrei.gherghescu at protonmail.com Mon Mar 7 21:44:47 2022 From: andrei.gherghescu at protonmail.com (Andrei N.G.) Date: Mon, 07 Mar 2022 21:44:47 +0000 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site In-Reply-To: <878rtl7dmb.fsf@dell.be.48ers.dk> References: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> <878rtl7dmb.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, Yes, indeed. Thanks for fixing the wrong url. Regards, Andrei -------- Original Message -------- On 7 Mar 2022, 20:43, Peter Korsgaard wrote: >>>>>> "Andrei" == Andrei Gherghescu via buildroot writes: > >> The http://www.directfb.org/ has been down since 2015. >> Use the Buildroot backup download site. > >> Fixes: >> - https://bugs.busybox.net/show_bug.cgi?id=13731 > > That bug is about readline. I guess you mean > https://bugs.busybox.net/show_bug.cgi?id=13126 instead? > > Committed, thanks. > >> Signed-off-by: Andrei Gherghescu >> --- >> package/directfb-examples/Config.in | 6 ++++-- >> package/directfb-examples/directfb-examples.mk | 2 +- >> package/directfb/directfb.mk | 2 +- >> 3 files changed, 6 insertions(+), 4 deletions(-) > >> diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in >> index 216e036577..4d5de03068 100644 >> --- a/package/directfb-examples/Config.in >> +++ b/package/directfb-examples/Config.in >> @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES >> help >> The DirectFB-examples package contains a set of simple >> DirectFB applications that can be used to test and demonstrate >> - various DirectFB features. >> + various DirectFB features. As of 4 October 2015, DirectFB's >> + website http://www.directfb.org/ is down. See alternative site >> + listed below. > >> - http://directfb.org/downloads/Extras/README.DirectFB-examples >> + http://elinux.org/DirectFB >> diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk >> index 46263da733..c8d09b3e33 100644 >> --- a/package/directfb-examples/directfb-examples.mk >> +++ b/package/directfb-examples/directfb-examples.mk >> @@ -5,7 +5,7 @@ >> ################################################################################ > >> DIRECTFB_EXAMPLES_VERSION = 1.7.0 >> -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras >> +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples >> DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz >> DIRECTFB_EXAMPLES_LICENSE = MIT >> DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING >> diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk >> index 0b32162d8f..56a396ab99 100644 >> --- a/package/directfb/directfb.mk >> +++ b/package/directfb/directfb.mk >> @@ -6,7 +6,7 @@ > >> DIRECTFB_VERSION_MAJOR = 1.7 >> DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 >> -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) >> +DIRECTFB_SITE = http://sources.buildroot.net/directfb >> DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz >> DIRECTFB_LICENSE = LGPL-2.1+ >> DIRECTFB_LICENSE_FILES = COPYING >> -- >> 2.35.1 > >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > Bye, Peter Korsgaard -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Mon Mar 7 21:45:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:45:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix headers install In-Reply-To: <20220218102719.693274-1-fontaine.fabrice@gmail.com> References: <20220218102719.693274-1-fontaine.fabrice@gmail.com> Message-ID: <42500a6f-bd28-a8b0-68fe-c9098fe64153@mind.be> On 18/02/2022 11:27, Fabrice Fontaine wrote: > For an unknown reason, installation of headers is broken since commit > 7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 which sets _PYTHON_PROJECT_BASE I've been trying to understand and I don't really understand what is going on either. > As _PYTHON_PROJECT_BASE value seems correct and fix its own build This still looks fishy to me though :-( Still, we need to fix this somehow and this patch indeed fixes the issue. Therefore, applied to master, thanks. Regards, Arnout > failures, use --install-headers to set install path for headers and > avoid the following build failure with python-greenlet or python-pygame: > > python-greenlet: installs files in /home/peko/autobuild/instance-0/output-1/target//home/peko/autobuild/instance-0/output-1 > > python-pygame: installs files in /home/peko/autobuild/instance-1/output-1/target//home/peko/autobuild/instance-1/output-1 > > Fixes: > - http://autobuild.buildroot.org/results/f5b52dee7e72f0a1f72b9f87723bc585743c7b31 > - http://autobuild.buildroot.org/results/9eb2685d32756864000e1b38f8a183b57f6ea528 > > Signed-off-by: Fabrice Fontaine > --- > package/pkg-python.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index b8dc9cd9e5..c4e590bd70 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -51,10 +51,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ > --executable=/usr/bin/python > > PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --root=$(TARGET_DIR) > > PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --root=$(STAGING_DIR) > > @@ -81,12 +83,14 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ > _python_exec_prefix=/usr > > PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --executable=/usr/bin/python \ > --single-version-externally-managed \ > --root=$(TARGET_DIR) > > PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --executable=/usr/bin/python \ > --single-version-externally-managed \ From arnout at mind.be Mon Mar 7 21:46:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:46:12 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: fix build failure due to previous wrong commit In-Reply-To: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> References: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> Message-ID: <67313303-db84-93cd-d96b-56db0c73976b@mind.be> On 18/02/2022 12:09, Giulio Benetti wrote: > Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but > the option was listed in the wrong place. Options must be set in the order Order doesn't matter in kconfig. The problem was the lack of quotes. Updated the commit message and applied to master, thanks. Regards, Arnout > they are specified by Config.in files. So let's move > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" right after BR2_TARGET_ROOTFS_EXT2_4=y > as it should be. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 > > Signed-off-by: Giulio Benetti > --- > configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig > index 00ccd784b5..06e03967c4 100644 > --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig > +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig > @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" > -BR2_TARGET_ROOTFS_EXT2_SIZE=120M > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" > @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y > BR2_PACKAGE_VIM=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > BR2_TARGET_AT91BOOTSTRAP3=y > BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y > BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" From arnout at mind.be Mon Mar 7 21:46:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:46:31 +0100 Subject: [Buildroot] [PATCH] package/gdb: fix when gmp is installed on the host machine In-Reply-To: <20220219154350.1552021-1-john@metanate.com> References: <20220219154350.1552021-1-john@metanate.com> Message-ID: <2fc5dae4-85a8-9197-d5ea-eebd9d77871c@mind.be> On 19/02/2022 16:43, John Keeping wrote: > gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with > /usr/lib/ which can lead to libgmp from the wrong architecture with the > result that the test fails. Even if a libgmp is found there it is now > the one that should be used. > > This is the same macro used for expat and lzma for which there are > already specific CONF_OPTS flags added here. Add the same flag for > libgmp and move the handling down so that it is logically grouped with > the other similar options. > > Note that there is no --with(out)-gmp flag to configure, as the > dependency is mandatory, so only the --with-libgmp-prefix option is > specified. > > Signed-off-by: John Keeping Applied to master, thanks. Regards, Arnout > --- > package/gdb/gdb.mk | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 05de3c14d1..9bde2beea1 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) > HOST_GDB_DEPENDENCIES += host-gmp > endif > > -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and > -# we're building the full gdb for the target, we need gmp as a > -# dependency. For now the default gdb version in Buildroot doesn't > -# require gmp. > -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) > -GDB_DEPENDENCIES += gmp > -endif > - > # When gdb sources are fetched from the binutils-gdb repository, they > # also contain the binutils sources, but binutils shouldn't be built, > # so we disable it (additionally the option --disable-install-libbfd > @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ > --without-curses > endif > > +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and > +# we're building the full gdb for the target, we need gmp as a > +# dependency. For now the default gdb version in Buildroot doesn't > +# require gmp. > +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) > +GDB_CONF_OPTS += \ > + --with-libgmp-prefix=$(STAGING_DIR)/usr > +GDB_DEPENDENCIES += gmp > +endif > + > ifeq ($(BR2_PACKAGE_GDB_SERVER),y) > GDB_CONF_OPTS += --enable-gdbserver > GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Mar 7 21:39:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:39:48 +0100 Subject: [Buildroot] [git commit] package/pkg-python: fix headers install Message-ID: <20220307213817.E2C8482941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37cc5aecf57493e037769f444fdc4f7d8ac8782f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For an unknown reason, installation of headers is broken since commit 7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 which sets _PYTHON_PROJECT_BASE As _PYTHON_PROJECT_BASE value seems correct and fix its own build failures, use --install-headers to set install path for headers and avoid the following build failure with python-greenlet or python-pygame: python-greenlet: installs files in /home/peko/autobuild/instance-0/output-1/target//home/peko/autobuild/instance-0/output-1 python-pygame: installs files in /home/peko/autobuild/instance-1/output-1/target//home/peko/autobuild/instance-1/output-1 Fixes: - http://autobuild.buildroot.org/results/f5b52dee7e72f0a1f72b9f87723bc585743c7b31 - http://autobuild.buildroot.org/results/9eb2685d32756864000e1b38f8a183b57f6ea528 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index e81a1a3102..38455e40fb 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,10 +52,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(STAGING_DIR) @@ -84,12 +86,14 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ _python_exec_prefix=/usr PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ From arnout at mind.be Mon Mar 7 21:40:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:40:04 +0100 Subject: [Buildroot] [git commit] configs/microchip_sam9x60ek_mmc_dev_defconfig: add quotes around string Message-ID: <20220307213817.EBC8382DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59e62a8e0d556567fa97ea400a7c351f4fa22998 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but forgot to add quotes around it. Thus, kconfig removed the option entirely. While we're at it, move the option to a more appropriate place together with the rest of the ext2 options. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 00ccd784b5..06e03967c4 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" -BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" From arnout at mind.be Mon Mar 7 21:43:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:43:45 +0100 Subject: [Buildroot] [git commit] package/gdb: fix when gmp is installed on the host machine Message-ID: <20220307213818.0125883235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fa5d641ac4951087bb007e091a799101d294527 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with /usr/lib/ which can lead to libgmp from the wrong architecture with the result that the test fails. Even if a libgmp is found there it is now the one that should be used. This is the same macro used for expat and lzma for which there are already specific CONF_OPTS flags added here. Add the same flag for libgmp and move the handling down so that it is logically grouped with the other similar options. Note that there is no --with(out)-gmp flag to configure, as the dependency is mandatory, so only the --with-libgmp-prefix option is specified. Signed-off-by: John Keeping Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gdb/gdb.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 05de3c14d1..9bde2beea1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) HOST_GDB_DEPENDENCIES += host-gmp endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) -GDB_DEPENDENCIES += gmp -endif - # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, # so we disable it (additionally the option --disable-install-libbfd @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ --without-curses endif +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and +# we're building the full gdb for the target, we need gmp as a +# dependency. For now the default gdb version in Buildroot doesn't +# require gmp. +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_CONF_OPTS += \ + --with-libgmp-prefix=$(STAGING_DIR)/usr +GDB_DEPENDENCIES += gmp +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Mar 7 21:48:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:48:27 +0100 Subject: [Buildroot] [PATCH v2] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> References: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> Message-ID: <11add763-9e59-52de-65af-d9130a7bdbf7@mind.be> On 19/02/2022 22:22, Giulio Benetti wrote: > Sometimes new boards have not been tested with official docker so let's add > instructions to do it with utils/docker-run. > > Cc: Luca Ceresoli > Signed-off-by: Giulio Benetti Applied to master with Luca's improvement, thanks. Regards, Arnout > --- > V1->V2: > * use the available utils/docker-run > * improve explanation as suggested by Luca Ceresoli > --- > docs/manual/adding-board-support.txt | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt > index 33ed709535..074bab7a00 100644 > --- a/docs/manual/adding-board-support.txt > +++ b/docs/manual/adding-board-support.txt > @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory > +board//+. You can then store your patches > and configurations in these directories, and reference them from the main > Buildroot configuration. Refer to xref:customize[] for more details. > + > +Before submitting patches for new boards it is recommended to test it by > +building it using latest gitlab-CI docker container. To do this use > +utils/docker-run script and inside it hint: > +-------------------- > + $ make +_defconfig+ > + $ make > +-------------------- From arnout at mind.be Mon Mar 7 21:48:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:48:02 +0100 Subject: [Buildroot] [git commit] manual: board support: add instructions to test defconfig in the official docker Message-ID: <20220307214059.6A59982941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e1976a25d2a967759fddb747a074343678b42ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Sometimes new boards have not been tested with official docker so let's add instructions to do it with utils/docker-run. Cc: Luca Ceresoli Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-board-support.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index 33ed709535..cd90a5871f 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory +board//+. You can then store your patches and configurations in these directories, and reference them from the main Buildroot configuration. Refer to xref:customize[] for more details. + +Before submitting patches for new boards it is recommended to test it by +building it using latest gitlab-CI docker container. To do this use +utils/docker-run script and inside it issue these commands: +-------------------- + $ make +_defconfig+ + $ make +-------------------- From romain.naour at gmail.com Mon Mar 7 21:49:23 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 7 Mar 2022 22:49:23 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: <87zgm15yir.fsf@dell.be.48ers.dk> References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> Message-ID: Hello Peter, Le 07/03/2022 ? 20:54, Peter Korsgaard a ?crit?: >>>>>> "Romain" == Romain Naour writes: > > > To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both > > _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot > > already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first > > release tag 2009.02. > > > _TIME_BITS is not needed for musl libc since it already year2038 > > ready [2]. > > > The uclibc-ng libc only support time_t 32-bit (long int) so it will be > > affected by the year2038 issue [3]. > > > Fixes (in French, chapter Buildroot 2022 and GlibC): > > https://www.blaess.fr/christophe/2038 > > > Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc > > bleeding-edge 2021.11-1 toolchain. > > > Before: > > # date > > Tue Jan 19 03:14:07 UTC 2038 > > # date > > Thu Jan 1 00:00:00 UTC 1970 > > > After: > > # date > > Tue Jan 19 03:14:07 UTC 2038 > > # date > > Tue Jan 19 03:14:08 UTC 2038 > > # date > > Tue Jan 19 03:14:09 UTC 2038 > > Ahh, good catch. Maybe something to add a runtime test for? > > Committed, thanks. Sorry but I guess this patch needs more testing. > > > [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 > > [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 > > [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 > > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 > > > Signed-off-by: Romain Naour > > Cc: Christophe Blaess > > --- > > package/Makefile.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/package/Makefile.in b/package/Makefile.in > > index 508ea7c366..cde050ca82 100644 > > --- a/package/Makefile.in > > +++ b/package/Makefile.in > > @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) > > TARGET_HARDENED += -D_FORTIFY_SOURCE=2 > > endif > > > -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > > +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 I noticed that glibc 2.34 stop the build if _TIME_BITS is set without _FILE_OFFSET_BITS. What if something (build system) unset _FILE_OFFSET_BITS ? There is something weird with libzlib package. I suggest to apply for next first and backport it latter to the stable branch. Best regards, Romain > > TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) > > TARGET_CXXFLAGS = $(TARGET_CFLAGS) > > TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) > > -- > > > 2.35.1 > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From arnout at mind.be Mon Mar 7 22:04:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:04:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: disable external fmt In-Reply-To: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> References: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> Message-ID: <6d5f714c-da1b-1eae-5b73-51622e0f5121@mind.be> On 21/02/2022 23:38, Fabrice Fontaine wrote: > osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build > failure since bump of fmt to version 8.1.1 in commit > ec7fd50d08690a383fec40748ac9b78c3f764316: > > /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt > 1728 | formattable, > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/osm2pgsql/Config.in | 5 ++--- > package/osm2pgsql/osm2pgsql.mk | 5 +++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in > index 315f496d8e..e903e92c49 100644 > --- a/package/osm2pgsql/Config.in > +++ b/package/osm2pgsql/Config.in > @@ -1,17 +1,16 @@ > config BR2_PACKAGE_OSM2PGSQL > bool "osm2pgsql" > - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero > + depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium > depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem > - depends on BR2_USE_WCHAR # boost, fmt, libosmium > + depends on BR2_USE_WCHAR # boost, libosmium > depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future > select BR2_PACKAGE_BOOST > select BR2_PACKAGE_BOOST_SYSTEM > select BR2_PACKAGE_BOOST_FILESYSTEM > select BR2_PACKAGE_BZIP2 > select BR2_PACKAGE_EXPAT > - select BR2_PACKAGE_FMT > select BR2_PACKAGE_LIBOSMIUM > select BR2_PACKAGE_PROTOZERO > select BR2_PACKAGE_ZLIB > diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk > index b00976d28b..d389fff590 100644 > --- a/package/osm2pgsql/osm2pgsql.mk > +++ b/package/osm2pgsql/osm2pgsql.mk > @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ > OSM2PGSQL_LICENSE_FILES = COPYING > OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO > > -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib > +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib > > +# fmt > 8.0 is not yet supported > OSM2PGSQL_CONF_OPTS = \ > -DBUILD_TESTS=OFF \ > -DBUILD_COVERAGE=OFF \ > - -DEXTERNAL_FMT=ON \ > + -DEXTERNAL_FMT=OFF \ > -DEXTERNAL_LIBOSMIUM=ON \ > -DEXTERNAL_PROTOZERO=ON > From arnout at mind.be Mon Mar 7 22:05:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:05:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-treq: fix dependencies In-Reply-To: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> References: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> Message-ID: <4ab837ef-09f1-d7e7-49cb-bb6ac1f6107c@mind.be> On 22/02/2022 00:06, Fabrice Fontaine wrote: > python-treq needs TLS support in twisted so select > BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on > service_identity and pyOpenSSL since version 17.3.0 and > https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 > > Finally, python-idna was never a direct dependency of python-treq > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/python-treq/Config.in | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index f781b37305..7c02a35638 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -1,16 +1,13 @@ > config BR2_PACKAGE_PYTHON_TREQ > bool "python-treq" > - # python-pyopenssl -> python-cryptography > + # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > - # python-idna, python-pyopenssl -> python-cryptography > select BR2_PACKAGE_PYTHON_ATTRS # runtime > - select BR2_PACKAGE_PYTHON_IDNA # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > treq is an HTTP library inspired by requests but written on > top of Twisted's Agents. It provides a simple, higher level From arnout at mind.be Mon Mar 7 22:05:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:05:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/glib-networking: security bump to version 2.70.1 In-Reply-To: <20220222120034.1748652-1-aperez@igalia.com> References: <20220222120034.1748652-1-aperez@igalia.com> Message-ID: <7b607f83-e892-fb78-5dac-69b22b1ae4e2@mind.be> On 22/02/2022 13:00, Adrian Perez de Castro wrote: > This is a minor release which fixes a couple of crashes and an incorrect > case of TLS certificate velidation when built with the OpenSSL backend. > Release notes: > > https://gitlab.gnome.org/GNOME/glib-networking/-/blob/b0d45b17f745088256c9ad1ae9a7e2467dec6286/NEWS > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Arnout > --- > package/glib-networking/glib-networking.hash | 4 ++-- > package/glib-networking/glib-networking.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash > index 6a53b436b0..347ef6777c 100644 > --- a/package/glib-networking/glib-networking.hash > +++ b/package/glib-networking/glib-networking.hash > @@ -1,3 +1,3 @@ > -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum > -sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz > +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum > +sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk > index 53280700bc..f74e520d31 100644 > --- a/package/glib-networking/glib-networking.mk > +++ b/package/glib-networking/glib-networking.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > GLIB_NETWORKING_VERSION_MAJOR = 2.70 > -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 > +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 > GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) > GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz > GLIB_NETWORKING_INSTALL_STAGING = YES From arnout at mind.be Mon Mar 7 22:05:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:05:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycli: drop package In-Reply-To: <20220222174957.3086493-1-fontaine.fabrice@gmail.com> References: <20220222174957.3086493-1-fontaine.fabrice@gmail.com> Message-ID: <9ad2fb6e-ad1d-8a71-251a-d57efc28157d@mind.be> On 22/02/2022 18:49, Fabrice Fontaine wrote: > Even with the two upstream patches added in commit > b2e6e376a2d7551ccf146855ec4e99a65c35bd16, python-pycli still raises the > following build failure since bump of python3 to version 3.10.1 in > commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple > Exception types without parentheses" exception > (https://docs.python.org/3/whatsnew/3.10.html): > > error: File "/usr/lib/python3.10/site-packages/cli/test.py", line 142 > except raises, e: > ^^^^^^^^^ > SyntaxError: multiple exception types must be parenthesized > > So drop the package as the last release was made 10 years ago. > > Fixes: > - http://autobuild.buildroot.org/results/6112e1830ce608abcea4a26b659c10e5ff09a66a > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > Config.in.legacy | 7 ++++ > DEVELOPERS | 1 - > package/Config.in | 1 - > ...aise-exceptions-in-wrapped-functions.patch | 26 ------------ > ...pt-statement-changed-slightly-in-2-6.patch | 41 ------------------- > package/python-pycli/Config.in | 7 ---- > package/python-pycli/python-pycli.hash | 5 --- > package/python-pycli/python-pycli.mk | 14 ------- > 8 files changed, 7 insertions(+), 95 deletions(-) > delete mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > delete mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > delete mode 100644 package/python-pycli/Config.in > delete mode 100644 package/python-pycli/python-pycli.hash > delete mode 100644 package/python-pycli/python-pycli.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index aefb0ba6ea..99459c7ad3 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_PYTHON_PYCLI > + bool "python-pycli removed" > + select BR2_LEGACY > + help > + Package was removed because it is not compatible with python > + 3.10 and is not maintained anymore (no release since 2012). > + > config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL > bool "bpftool was moved" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index 3e7c753836..6208df974d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1065,7 +1065,6 @@ N: Geoff Levand > F: package/flannel/ > > N: Geoffrey Ragot > -F: package/python-pycli/ > F: package/python-pyyaml/ > > N: Gerome Burlats > diff --git a/package/Config.in b/package/Config.in > index 3213c4a9b4..ed7d9555b2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1144,7 +1144,6 @@ menu "External python modules" > source "package/python-pybind/Config.in" > source "package/python-pycairo/Config.in" > source "package/python-pycares/Config.in" > - source "package/python-pycli/Config.in" > source "package/python-pycparser/Config.in" > source "package/python-pycryptodomex/Config.in" > source "package/python-pycups/Config.in" > diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > deleted file mode 100644 > index 7ac9d7af9f..0000000000 > --- a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 > -From: mmbutter > -Date: Tue, 9 Jun 2020 11:50:41 -0500 > -Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. > - > -[Retrieved from: > -https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] > -Signed-off-by: Fabrice Fontaine > ---- > - lib/cli/app.py | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/lib/cli/app.py b/lib/cli/app.py > -index 7b6db52..f487ab4 100644 > ---- a/lib/cli/app.py > -+++ b/lib/cli/app.py > -@@ -240,6 +240,9 @@ def run(self): > - try: > - returned = self.main(*args) > - except Exception, e: > -+ elif isinstance(e, self.reraise): > -+ # raising the last exception preserves traceback > -+ raise > - returned = e > - > - return self.post_run(returned) > diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > deleted file mode 100644 > index 75869d6d23..0000000000 > --- a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 > -From: mmbutter > -Date: Thu, 11 Jun 2020 15:50:03 -0500 > -Subject: [PATCH] except statement changed slightly in 2.6. This could cause > - problems in newer versions. Updated to the new format. > - > -[Retrieved from: > -https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] > -Signed-off-by: Fabrice Fontaine > ---- > - lib/cli/app.py | 10 +++++----- > - 1 file changed, 5 insertions(+), 5 deletions(-) > - > -diff --git a/lib/cli/app.py b/lib/cli/app.py > -index f487ab4..45256b8 100644 > ---- a/lib/cli/app.py > -+++ b/lib/cli/app.py > -@@ -239,10 +239,10 @@ def run(self): > - args = () > - try: > - returned = self.main(*args) > -- except Exception, e: > -- elif isinstance(e, self.reraise): > -- # raising the last exception preserves traceback > -- raise > -+ except self.reraise: > -+ # raising the last exception preserves traceback > -+ raise > -+ except Exception as e: > - returned = e > - > - return self.post_run(returned) > -@@ -420,7 +420,7 @@ def pre_run(self): > - """ > - try: > - ns = self.argparser.parse_args() > -- except SystemExit, e: > -+ except SystemExit as e: > - if self.exit_after_main: > - raise > - else: > diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in > deleted file mode 100644 > index e1ce3b99a6..0000000000 > --- a/package/python-pycli/Config.in > +++ /dev/null > @@ -1,7 +0,0 @@ > -config BR2_PACKAGE_PYTHON_PYCLI > - bool "python-pycli" > - help > - The cli package is a framework for making simple, correct > - command line applications in Python. > - > - https://pythonhosted.org/pyCLI/ > diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash > deleted file mode 100644 > index f0890e83a9..0000000000 > --- a/package/python-pycli/python-pycli.hash > +++ /dev/null > @@ -1,5 +0,0 @@ > -# md5 from https://pypi.python.org/pypi/pycli/json > -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz > -# Locally computed > -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz > -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py > diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk > deleted file mode 100644 > index 7aff1c6200..0000000000 > --- a/package/python-pycli/python-pycli.mk > +++ /dev/null > @@ -1,14 +0,0 @@ > -################################################################################ > -# > -# python-pycli > -# > -################################################################################ > - > -PYTHON_PYCLI_VERSION = 2.0.3 > -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz > -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 > -PYTHON_PYCLI_LICENSE = ISC-like > -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py > -PYTHON_PYCLI_SETUP_TYPE = setuptools > - > -$(eval $(python-package)) From arnout at mind.be Mon Mar 7 22:06:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:06:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/sord: fix build without threads In-Reply-To: <20220222203746.3139075-1-fontaine.fabrice@gmail.com> References: <20220222203746.3139075-1-fontaine.fabrice@gmail.com> Message-ID: On 22/02/2022 21:37, Fabrice Fontaine wrote: > Fix the following build failure without threads raised since the > addition of the package in commit > 0d4c8ce8a2f26989e0e2d95b977d60e450c090a9: > > /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread > > Fixes: > - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-wscript-add-no-threads-option.patch | 59 +++++++++++++++++++ > package/sord/sord.mk | 4 ++ > 2 files changed, 63 insertions(+) > create mode 100644 package/sord/0001-wscript-add-no-threads-option.patch > > diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch > new file mode 100644 > index 0000000000..750ea8f4ad > --- /dev/null > +++ b/package/sord/0001-wscript-add-no-threads-option.patch > @@ -0,0 +1,59 @@ > +From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 22 Feb 2022 21:22:31 +0100 > +Subject: [PATCH] wscript: add -no-threads option > + > +Add -no-threads options to avoid the following build failure on embedded > +toolchains without threads support: > + > +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread > + > +Fixes: > + - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/drobilla/sord/pull/3] > +--- > + wscript | 5 ++++- > + 1 file changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/wscript b/wscript > +index fd8578e..d71d78c 100644 > +--- a/wscript > ++++ b/wscript > +@@ -35,6 +35,7 @@ def options(ctx): > + {'no-utils': 'do not build command line utilities', > + 'static': 'build static library', > + 'no-shared': 'do not build shared library', > ++ 'no-threads': 'disable threads', > + 'static-progs': 'build programs as static binaries'}) > + > + opt.add_option('--dump', type='string', default='', dest='dump', > +@@ -55,6 +56,7 @@ def configure(conf): > + > + conf.env.BUILD_UTILS = not Options.options.no_utils > + conf.env.BUILD_SHARED = not Options.options.no_shared > ++ conf.env.ENABLE_THREADS = not Options.options.no_threads > + conf.env.STATIC_PROGS = Options.options.static_progs > + conf.env.BUILD_STATIC = (Options.options.static or > + Options.options.static_progs) > +@@ -124,7 +126,7 @@ def configure(conf): > + conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') > + conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) > + > +- if conf.env.HAVE_PCRE: > ++ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: > + if conf.check(cflags=['-pthread'], mandatory=False): > + conf.env.PTHREAD_CFLAGS = ['-pthread'] > + if conf.env.CC_NAME != 'clang': > +@@ -160,6 +162,7 @@ def configure(conf): > + conf, > + {'Static library': bool(conf.env.BUILD_STATIC), > + 'Shared library': bool(conf.env.BUILD_SHARED), > ++ 'Threads': bool(conf.env.ENABLE_THREADS), > + 'Utilities': bool(conf.env.BUILD_UTILS), > + 'Unit tests': bool(conf.env.BUILD_TESTS), > + 'Debug dumping': dump}) > +-- > +2.34.1 > + > diff --git a/package/sord/sord.mk b/package/sord/sord.mk > index f805805e9d..c06ef9c55c 100644 > --- a/package/sord/sord.mk > +++ b/package/sord/sord.mk > @@ -22,4 +22,8 @@ ifeq ($(BR2_STATIC_LIBS),y) > SORD_CONF_OPTS += --static --no-shared --static-progs > endif > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > +SORD_CONF_OPTS += --no-threads > +endif > + > $(eval $(waf-package)) From arnout at mind.be Mon Mar 7 22:08:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:08:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 In-Reply-To: References: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> <20220306213212.GH228549@scaer> Message-ID: <776aff8d-84bc-4611-8ead-cdb1bb752234@mind.be> On 06/03/2022 22:43, Fabrice Fontaine wrote: > Yann, > > Le dim. 6 mars 2022 ? 22:32, Yann E. MORIN a ?crit : >> >> Fabrice, All, >> >> On 2022-02-22 21:40 +0100, Fabrice Fontaine spake thusly: >>> 2.6.0 is an maintenance and security release. >>> >>> https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 >> >> You claim 'security bump' in the title, but the announcement does not >> seem to identify any actual security fix, as compared to 2.5.0 which did >> explicitly list security fixes: >> https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 >> >> So, I don;t think this is material for master, is it? > > I don't know, indeed the announcement doesn't identify security fixes > but the first sentence is "2.6.0 is an maintenance and security > release." > At least, a crash with wayland is fixed with: > https://github.com/FreeRDP/FreeRDP/issues/7426 > > So feel free to apply it to next or master. It's indeed maintenance branch, not main development, so good for master. I've removed the "security" part though. Applied to master, thanks. Regards, Arnout > >> >> Regards, >> Yann E. MORIN. >> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> package/freerdp/freerdp.hash | 4 ++-- >>> package/freerdp/freerdp.mk | 2 +- >>> 2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash >>> index e31b8d5b96..780061bdbb 100644 >>> --- a/package/freerdp/freerdp.hash >>> +++ b/package/freerdp/freerdp.hash >>> @@ -1,5 +1,5 @@ >>> -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 >>> -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz >>> +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 >>> +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz >>> >>> # Locally calculated >>> sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE >>> diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk >>> index c536f6cb1c..edbfb6801a 100644 >>> --- a/package/freerdp/freerdp.mk >>> +++ b/package/freerdp/freerdp.mk >>> @@ -4,7 +4,7 @@ >>> # >>> ################################################################################ >>> >>> -FREERDP_VERSION = 2.5.0 >>> +FREERDP_VERSION = 2.6.0 >>> FREERDP_SITE = https://pub.freerdp.com/releases >>> FREERDP_DEPENDENCIES = libglib2 openssl zlib >>> FREERDP_LICENSE = Apache-2.0 >>> -- >>> 2.34.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -- >> .-----------------.--------------------.------------------.--------------------. >> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | >> '------------------------------^-------^------------------^--------------------' > > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Mon Mar 7 22:09:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:09:02 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5webkit: needs OpenSSL In-Reply-To: <20220222210024.6013-1-abrodkin@synopsys.com> References: <20220222210024.6013-1-abrodkin@synopsys.com> Message-ID: <9dd7ff0e-ad7b-6407-e569-dc12a8f55e6d@mind.be> On 22/02/2022 22:00, Alexey Brodkin via buildroot wrote: > W/o OpenSSL QT5Webkit fails to build that way: > -------------------------------->8----------------------------- > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared > 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && > | ^~~~~~~~~~ > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared > 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); > | ^~~~~~~~~~ > -------------------------------->8----------------------------- > > Signed-off-by: Alexey Brodkin > Cc: Fabrice Fontaine > Cc: James Hilliard > Cc: Peter Seiderer > Cc: Yann E. MORIN Applied to master, thanks. Regards, Arnout > --- > > Changes v1 -> v2: > > * Added "openssl" to QT5WEBKIT_DEPENDENCIES, thanks Yann for > spotting this one. > > Note that I interntionally added "openssl" not following > alphabetic order because: > > 1. Existing dependencies are already a bit shufffled > 2. I wanted to keep this diff as small as possible, w/o > re-shuffling multiple lines. If really needed we may do > reordering in a separate patch. > > --- > package/qt5/qt5webkit/Config.in | 1 + > package/qt5/qt5webkit/qt5webkit.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index ed87efca95..26c3897d1d 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_JPEG > select BR2_PACKAGE_LEVELDB > select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > select BR2_PACKAGE_QT5BASE_WIDGETS > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 2e96acc00f..c9b354e725 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -10,7 +10,7 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > QT5WEBKIT_DEPENDENCIES = \ > host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ > gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ > - qt5sensors qt5webchannel sqlite webp woff2 > + openssl qt5sensors qt5webchannel sqlite webp woff2 > QT5WEBKIT_INSTALL_STAGING = YES > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 From arnout at mind.be Mon Mar 7 22:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:09:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory In-Reply-To: <20220222213202.642708-1-ju.o@free.fr> References: <20220222213202.642708-1-ju.o@free.fr> Message-ID: On 22/02/2022 22:32, Julien Olivain wrote: > When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd > (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start > with a permission error. See output of command: > > journalctl --unit=mysqld > > Which shows: > > systemd[1]: Starting MySQL database server... > install[102]: install: can't create directory '/var/log/mysql': Permission denied > systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE > > Since the service file includes the "User=mysql" directive, the > "ExecStartPre=" is executed as this user, which does not have > permission to create a directory in "/var/log". > > This commit fixes this issue by adding the "!" prefix, which will > execute the command with full privileges. See the systemd.service manual > page entry for "ExecStart=", table "Special executable prefixes": > https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= > or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 > > Moreover, the "mysql_install_db" invocation does not need this special > prefix, as the "/var/lib/mysql" directory on target is already owned > by the "mysql" user. The "chown" command is also useless and is > removed in this commit. > > Reported-by: Gilles Talis > Signed-off-by: Julien Olivain Applied to master, thanks. Excellent commit message BTW. Regards, Arnout > --- > package/mariadb/mysqld.service | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service > index d9ea74ebc3..537430e9a2 100644 > --- a/package/mariadb/mysqld.service > +++ b/package/mariadb/mysqld.service > @@ -2,8 +2,8 @@ > Description=MySQL database server > > [Service] > -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' > -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql > +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' > +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql > ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log > Restart=always > User=mysql From arnout at mind.be Mon Mar 7 21:53:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:53:39 +0100 Subject: [Buildroot] [git commit] package/python-treq: fix dependencies Message-ID: <20220307220126.D663282DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5b4496c425576e4e444b65474d397aeb4a7cd42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-treq needs TLS support in twisted so select BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on service_identity and pyOpenSSL since version 17.3.0 and https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 Finally, python-idna was never a direct dependency of python-treq Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-treq/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index f781b37305..7c02a35638 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,16 +1,13 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - # python-pyopenssl -> python-cryptography + # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - # python-idna, python-pyopenssl -> python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help treq is an HTTP library inspired by requests but written on top of Twisted's Agents. It provides a simple, higher level From arnout at mind.be Mon Mar 7 21:52:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:52:33 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: disable external fmt Message-ID: <20220307220126.CB48E82941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4811802acbd16488adc32a7e340067700cec85c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build failure since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt 1728 | formattable, | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/osm2pgsql/Config.in | 5 ++--- package/osm2pgsql/osm2pgsql.mk | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 315f496d8e..e903e92c49 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,17 +1,16 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero + depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem - depends on BR2_USE_WCHAR # boost, fmt, libosmium + depends on BR2_USE_WCHAR # boost, libosmium depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBOSMIUM select BR2_PACKAGE_PROTOZERO select BR2_PACKAGE_ZLIB diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index b00976d28b..d389fff590 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib +# fmt > 8.0 is not yet supported OSM2PGSQL_CONF_OPTS = \ -DBUILD_TESTS=OFF \ -DBUILD_COVERAGE=OFF \ - -DEXTERNAL_FMT=ON \ + -DEXTERNAL_FMT=OFF \ -DEXTERNAL_LIBOSMIUM=ON \ -DEXTERNAL_PROTOZERO=ON From arnout at mind.be Mon Mar 7 21:55:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:55:57 +0100 Subject: [Buildroot] [git commit] package/glib-networking: security bump to version 2.70.1 Message-ID: <20220307220126.E072183235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fc9d586a3acd091653da3a62f471041d329d6bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor release which fixes a couple of crashes and an incorrect case of TLS certificate velidation when built with the OpenSSL backend. Release notes: https://gitlab.gnome.org/GNOME/glib-networking/-/blob/b0d45b17f745088256c9ad1ae9a7e2467dec6286/NEWS Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/glib-networking/glib-networking.hash | 4 ++-- package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 6a53b436b0..347ef6777c 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum -sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum +sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 53280700bc..f74e520d31 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -5,7 +5,7 @@ ################################################################################ GLIB_NETWORKING_VERSION_MAJOR = 2.70 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES From arnout at mind.be Mon Mar 7 22:06:49 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:06:49 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.6.0 Message-ID: <20220307220127.0FF1582941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1ff6a67739b29b79c81ee6bc14bd8c94a0a85c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 2.6.0 is an maintenance and security release. https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index e31b8d5b96..780061bdbb 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 5f6ae56d1d..c8978db6ce 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.5.0 +FREERDP_VERSION = 2.6.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From arnout at mind.be Mon Mar 7 22:07:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:07:41 +0100 Subject: [Buildroot] [git commit] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220307220127.258D482DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd03d4f057bdbd343f78360bd732df1b47d774a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain Tested-By: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql From arnout at mind.be Mon Mar 7 21:58:21 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:58:21 +0100 Subject: [Buildroot] [git commit] package/sord: fix build without threads Message-ID: <20220307220127.05E2782DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44306369e9821ee5c9a12114ecd4296b0e374ad4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without threads raised since the addition of the package in commit 0d4c8ce8a2f26989e0e2d95b977d60e450c090a9: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../sord/0001-wscript-add-no-threads-option.patch | 59 ++++++++++++++++++++++ package/sord/sord.mk | 4 ++ 2 files changed, 63 insertions(+) diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch new file mode 100644 index 0000000000..750ea8f4ad --- /dev/null +++ b/package/sord/0001-wscript-add-no-threads-option.patch @@ -0,0 +1,59 @@ +From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Feb 2022 21:22:31 +0100 +Subject: [PATCH] wscript: add -no-threads option + +Add -no-threads options to avoid the following build failure on embedded +toolchains without threads support: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread + +Fixes: + - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/drobilla/sord/pull/3] +--- + wscript | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index fd8578e..d71d78c 100644 +--- a/wscript ++++ b/wscript +@@ -35,6 +35,7 @@ def options(ctx): + {'no-utils': 'do not build command line utilities', + 'static': 'build static library', + 'no-shared': 'do not build shared library', ++ 'no-threads': 'disable threads', + 'static-progs': 'build programs as static binaries'}) + + opt.add_option('--dump', type='string', default='', dest='dump', +@@ -55,6 +56,7 @@ def configure(conf): + + conf.env.BUILD_UTILS = not Options.options.no_utils + conf.env.BUILD_SHARED = not Options.options.no_shared ++ conf.env.ENABLE_THREADS = not Options.options.no_threads + conf.env.STATIC_PROGS = Options.options.static_progs + conf.env.BUILD_STATIC = (Options.options.static or + Options.options.static_progs) +@@ -124,7 +126,7 @@ def configure(conf): + conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') + conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) + +- if conf.env.HAVE_PCRE: ++ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: + if conf.check(cflags=['-pthread'], mandatory=False): + conf.env.PTHREAD_CFLAGS = ['-pthread'] + if conf.env.CC_NAME != 'clang': +@@ -160,6 +162,7 @@ def configure(conf): + conf, + {'Static library': bool(conf.env.BUILD_STATIC), + 'Shared library': bool(conf.env.BUILD_SHARED), ++ 'Threads': bool(conf.env.ENABLE_THREADS), + 'Utilities': bool(conf.env.BUILD_UTILS), + 'Unit tests': bool(conf.env.BUILD_TESTS), + 'Debug dumping': dump}) +-- +2.34.1 + diff --git a/package/sord/sord.mk b/package/sord/sord.mk index f805805e9d..c06ef9c55c 100644 --- a/package/sord/sord.mk +++ b/package/sord/sord.mk @@ -22,4 +22,8 @@ ifeq ($(BR2_STATIC_LIBS),y) SORD_CONF_OPTS += --static --no-shared --static-progs endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +SORD_CONF_OPTS += --no-threads +endif + $(eval $(waf-package)) From arnout at mind.be Mon Mar 7 22:07:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:07:41 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: needs OpenSSL Message-ID: <20220307220127.19CE182941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f5be21db989acbb41b0f432d0f72bc7cc458b24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master W/o OpenSSL QT5Webkit fails to build that way: -------------------------------->8----------------------------- .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ???static bool WebCore::ResourceRequest::alpnIsSupported()???: .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ???QSslSocket??? has not been declared 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && | ^~~~~~~~~~ .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ???QSslSocket??? has not been declared 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); | ^~~~~~~~~~ -------------------------------->8----------------------------- Signed-off-by: Alexey Brodkin Cc: Fabrice Fontaine Cc: James Hilliard Cc: Peter Seiderer Cc: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index ed87efca95..26c3897d1d 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 9012a588d4..6912359674 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,7 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ - qt5sensors qt5webchannel sqlite webp woff2 + openssl qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 From arnout at mind.be Mon Mar 7 21:57:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:57:18 +0100 Subject: [Buildroot] [git commit] package/python-pycli: drop package Message-ID: <20220307220126.F000182941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e9565f831da2377622c79bfd6e5be37f7baaa7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Even with the two upstream patches added in commit b2e6e376a2d7551ccf146855ec4e99a65c35bd16, python-pycli still raises the following build failure since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html): error: File "/usr/lib/python3.10/site-packages/cli/test.py", line 142 except raises, e: ^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized So drop the package as the last release was made 10 years ago. Fixes: - http://autobuild.buildroot.org/results/6112e1830ce608abcea4a26b659c10e5ff09a66a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 7 ++++ DEVELOPERS | 1 - package/Config.in | 1 - ...-re-raise-exceptions-in-wrapped-functions.patch | 26 -------------- ...-except-statement-changed-slightly-in-2-6.patch | 41 ---------------------- package/python-pycli/Config.in | 7 ---- package/python-pycli/python-pycli.hash | 5 --- package/python-pycli/python-pycli.mk | 14 -------- 8 files changed, 7 insertions(+), 95 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b90b9dbcbc..3b066bbf72 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -158,6 +158,13 @@ config BR2_PACKAGE_WESTON_FBDEV help fbdev compositor was deprecated in weston 10.0.0. +config BR2_PACKAGE_PYTHON_PYCLI + bool "python-pycli removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with python + 3.10 and is not maintained anymore (no release since 2012). + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index b7a7c8771c..b5183711b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1061,7 +1061,6 @@ N: Geoff Levand F: package/flannel/ N: Geoffrey Ragot -F: package/python-pycli/ F: package/python-pyyaml/ N: Gerome Burlats diff --git a/package/Config.in b/package/Config.in index 8d2d550a64..517e66cce7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1144,7 +1144,6 @@ menu "External python modules" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" - source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch deleted file mode 100644 index 7ac9d7af9f..0000000000 --- a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Tue, 9 Jun 2020 11:50:41 -0500 -Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. - -[Retrieved from: -https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index 7b6db52..f487ab4 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -240,6 +240,9 @@ def run(self): - try: - returned = self.main(*args) - except Exception, e: -+ elif isinstance(e, self.reraise): -+ # raising the last exception preserves traceback -+ raise - returned = e - - return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch deleted file mode 100644 index 75869d6d23..0000000000 --- a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Thu, 11 Jun 2020 15:50:03 -0500 -Subject: [PATCH] except statement changed slightly in 2.6. This could cause - problems in newer versions. Updated to the new format. - -[Retrieved from: -https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index f487ab4..45256b8 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -239,10 +239,10 @@ def run(self): - args = () - try: - returned = self.main(*args) -- except Exception, e: -- elif isinstance(e, self.reraise): -- # raising the last exception preserves traceback -- raise -+ except self.reraise: -+ # raising the last exception preserves traceback -+ raise -+ except Exception as e: - returned = e - - return self.post_run(returned) -@@ -420,7 +420,7 @@ def pre_run(self): - """ - try: - ns = self.argparser.parse_args() -- except SystemExit, e: -+ except SystemExit as e: - if self.exit_after_main: - raise - else: diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash deleted file mode 100644 index f0890e83a9..0000000000 --- a/package/python-pycli/python-pycli.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pycli/json -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -# Locally computed -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk deleted file mode 100644 index 7aff1c6200..0000000000 --- a/package/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = 2.0.3 -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) From arnout at mind.be Mon Mar 7 22:25:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:25:38 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/ghostscript: disable tesseract without threads In-Reply-To: <20220223202648.3398307-1-fontaine.fabrice@gmail.com> References: <20220223202648.3398307-1-fontaine.fabrice@gmail.com> Message-ID: <9622b23e-22d8-c3c2-7255-d49feb46f552@mind.be> On 23/02/2022 21:26, Fabrice Fontaine wrote: > ghostscript embeds a local copy of tesseract-ocr which is enabled by > default since version 9.53.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef > > Since version 9.55.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, > ghostscript expects that tesseract is disabled if threads are not > available resulting in the following build failure since commit > 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: > > configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build > > So disable tesseract if threads are not available. It should be noted > that there is no way to tell ghostscript to use a system provided > tesseract-ocr package. > > Fixes: > - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > Changes v2 -> v3 (after review of Arnout Vandecappelle): > - Only disable tesseract without threads > > Changes v1 -> v2: > - Unconditionally disable tesseract > > package/ghostscript/ghostscript.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > index 24a0c489a8..02cb35fcfc 100644 > --- a/package/ghostscript/ghostscript.mk > +++ b/package/ghostscript/ghostscript.mk > @@ -83,4 +83,8 @@ else > GHOSTSCRIPT_CONF_OPTS += --without-x > endif > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > +GHOSTSCRIPT_CONF_OPTS += --without-tesseract > +endif > + > $(eval $(autotools-package)) From arnout at mind.be Mon Mar 7 22:27:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:27:00 +0100 Subject: [Buildroot] [PATCH 1/1] utils/checkpackagelib/lib_mk.py: check CONF_OPTS In-Reply-To: <20220223203631.3398950-1-fontaine.fabrice@gmail.com> References: <20220223203631.3398950-1-fontaine.fabrice@gmail.com> Message-ID: On 23/02/2022 21:36, Fabrice Fontaine wrote: > As already done for {FOO}_DEPENDENCIES in commit > 4910a175b3f1f4b55ff257a75945d8ffb14a4ceb, check that {FOO}_CONF_OPTS are > never overridden in a conditional > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. upmpdcli.mk failed this check, so I also pushed a fix. ?Regards, ?Arnout > --- > utils/checkpackagelib/lib_mk.py | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py > index 153754b6f1..b50a19ac62 100644 > --- a/utils/checkpackagelib/lib_mk.py > +++ b/utils/checkpackagelib/lib_mk.py > @@ -90,6 +90,7 @@ class OverriddenVariable(_CheckFunction): > r"_SOURCE\s*=\s*", > r"_VERSION\s*=\s*"]))) > FORBIDDEN_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ > + r"_CONF_OPTS\s*=\s*", > r"_DEPENDENCIES\s*=\s*"]))) > > def before(self): From arnout at mind.be Mon Mar 7 22:27:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:27:28 +0100 Subject: [Buildroot] [PATCH 1/2] linux: bump CIP kernel to version 5.10.100-cip2 In-Reply-To: <20220224113735.4088631-1-angelo@amarulasolutions.com> References: <20220224113735.4088631-1-angelo@amarulasolutions.com> Message-ID: On 24/02/2022 12:37, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci ?Both applied to master, thanks. ?Regards, ?Arnout > --- > linux/Config.in | 4 ++-- > linux/linux.hash | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in > index 13d99bd09d..c454a89fba 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION > bool "Latest version (5.15)" > > config BR2_LINUX_KERNEL_LATEST_CIP_VERSION > - bool "Latest CIP SLTS version (5.10.83-cip1)" > + bool "Latest CIP SLTS version (5.10.100-cip2)" > help > CIP launched in the spring of 2016 to address the needs of > organizations in industries such as power generation and > @@ -126,7 +126,7 @@ endif > config BR2_LINUX_KERNEL_VERSION > string > default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION > - default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION > + default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION > default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION > default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ > if BR2_LINUX_KERNEL_CUSTOM_VERSION > diff --git a/linux/linux.hash b/linux/linux.hash > index d0813e5db4..8b689f122b 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -9,7 +9,7 @@ sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux- > sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz > sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz > # Locally computed > -sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz > +sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz > sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz > > # Licenses hashes From arnout at mind.be Mon Mar 7 22:15:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:15:46 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/lib_mk.py: check CONF_OPTS Message-ID: <20220307221917.114A882DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dc48e8b9d832889edbeeed28c2dcf0a7bf01718 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As already done for {FOO}_DEPENDENCIES in commit 4910a175b3f1f4b55ff257a75945d8ffb14a4ceb, check that {FOO}_CONF_OPTS are never overridden in a conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 153754b6f1..b50a19ac62 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -90,6 +90,7 @@ class OverriddenVariable(_CheckFunction): r"_SOURCE\s*=\s*", r"_VERSION\s*=\s*"]))) FORBIDDEN_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ + r"_CONF_OPTS\s*=\s*", r"_DEPENDENCIES\s*=\s*"]))) def before(self): From arnout at mind.be Mon Mar 7 22:15:14 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:15:14 +0100 Subject: [Buildroot] [git commit] package/ghostscript: disable tesseract without threads Message-ID: <20220307221917.0892581375@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4adbfaf2e6153ad0e811b4debcf945ff5788c76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ghostscript embeds a local copy of tesseract-ocr which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build So disable tesseract if threads are not available. It should be noted that there is no way to tell ghostscript to use a system provided tesseract-ocr package. Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ghostscript/ghostscript.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..02cb35fcfc 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -83,4 +83,8 @@ else GHOSTSCRIPT_CONF_OPTS += --without-x endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +GHOSTSCRIPT_CONF_OPTS += --without-tesseract +endif + $(eval $(autotools-package)) From arnout at mind.be Mon Mar 7 22:22:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:22:20 +0100 Subject: [Buildroot] [git commit] linux: bump CIP RT kernel to version 5.10.100-cip2-rt2 Message-ID: <20220307221917.2E22082DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c44600c104f04d2d191f6e0e6320b4d5ff8b967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 68355f1c48..36744c5337 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.83-cip1-rt1)" + bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 4dcd515d9a..758fdbf856 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz -sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz +sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From arnout at mind.be Mon Mar 7 22:21:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:21:56 +0100 Subject: [Buildroot] [git commit] linux: bump CIP kernel to version 5.10.100-cip2 Message-ID: <20220307221917.2424D81375@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af2278c42a862654a18d5692fba96efaf4cb3979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index df5261e5ff..68355f1c48 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.83-cip1)" + bool "Latest CIP SLTS version (5.10.100-cip2)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 01325348ef..4dcd515d9a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz +sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz # Licenses hashes From arnout at mind.be Mon Mar 7 22:17:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:17:23 +0100 Subject: [Buildroot] [git commit] package/upmpdcli: append to _CONF_OPTS Message-ID: <20220307221917.1AC5083235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f64e13a6a6e861ae8a03dc8e93fe079f09c443aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master check-package now gives a warning about this. It's not a problem at the moment, but it's a risk if an unconditional setting of _CONF_OPTS is done earlier in the file. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/upmpdcli/upmpdcli.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index d1c0aef912..2f001c51ee 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -12,7 +12,7 @@ UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp # Disable spotify plugin which requires dlfcn.h ifeq ($(BR2_STATIC_LIBS),y) -UPMPDCLI_CONF_OPTS = --disable-spotify +UPMPDCLI_CONF_OPTS += --disable-spotify endif # Upmpdcli only runs if user upmpdcli exists From arnout at mind.be Mon Mar 7 22:33:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:33:10 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> Message-ID: <813a014c-8aae-990e-cd76-f961a9be9bf7@mind.be> On 07/03/2022 22:49, Romain Naour wrote: > Hello Peter, > > Le 07/03/2022 ? 20:54, Peter Korsgaard a ?crit?: >>>>>>> "Romain" == Romain Naour writes: >> >> > To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both >> > _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot >> > already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first >> > release tag 2009.02. >> >> > _TIME_BITS is not needed for musl libc since it already year2038 >> > ready [2]. >> >> > The uclibc-ng libc only support time_t 32-bit (long int) so it will be >> > affected by the year2038 issue [3]. >> >> > Fixes (in French, chapter Buildroot 2022 and GlibC): >> > https://www.blaess.fr/christophe/2038 >> >> > Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc >> > bleeding-edge 2021.11-1 toolchain. >> >> > Before: >> > # date >> > Tue Jan 19 03:14:07 UTC 2038 >> > # date >> > Thu Jan 1 00:00:00 UTC 1970 >> >> > After: >> > # date >> > Tue Jan 19 03:14:07 UTC 2038 >> > # date >> > Tue Jan 19 03:14:08 UTC 2038 >> > # date >> > Tue Jan 19 03:14:09 UTC 2038 >> >> Ahh, good catch. Maybe something to add a runtime test for? >> >> Committed, thanks. > > Sorry but I guess this patch needs more testing. > >> >> > [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 >> > [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 >> > [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 >> > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 >> >> > Signed-off-by: Romain Naour >> > Cc: Christophe Blaess >> > --- >> > package/Makefile.in | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> >> > diff --git a/package/Makefile.in b/package/Makefile.in >> > index 508ea7c366..cde050ca82 100644 >> > --- a/package/Makefile.in >> > +++ b/package/Makefile.in >> > @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) >> > TARGET_HARDENED += -D_FORTIFY_SOURCE=2 >> > endif >> >> > -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 >> > +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > > I noticed that glibc 2.34 stop the build if _TIME_BITS is set without > _FILE_OFFSET_BITS. > What if something (build system) unset _FILE_OFFSET_BITS ? Then there's something wrong with that package and it needs to be fixed. > There is something weird with libzlib package. gzguts.h has this: #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 # endif # ifdef _FILE_OFFSET_BITS # undef _FILE_OFFSET_BITS # endif #endif Why, I have no idea... Regards, Arnout > > I suggest to apply for next first and backport it latter to the stable branch. > > Best regards, > Romain > > >> > TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) >> > TARGET_CXXFLAGS = $(TARGET_CFLAGS) >> > TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) >> > -- >> >> > 2.35.1 >> >> > _______________________________________________ >> > buildroot mailing list >> > buildroot at buildroot.org >> > https://lists.buildroot.org/mailman/listinfo/buildroot >> >> > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Mon Mar 7 22:33:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Mar 2022 23:33:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/oprofile: drop custom install rules Message-ID: <20220307223355.945328-1-fontaine.fabrice@gmail.com> Drop custom install rules which have added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine --- package/oprofile/oprofile.mk | 41 ------------------------------------ 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) -- 2.34.1 From arnout at mind.be Mon Mar 7 22:36:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:36:17 +0100 Subject: [Buildroot] cannot make the device_table In-Reply-To: References: Message-ID: <6aaa39df-836f-055e-6f40-a077f690b669@mind.be> On 06/03/2022 13:46, Jacques Samoun wrote: > Hello, > despite all my tries, i just cannot make the "device_table" feature work as > described in the manual. > Basically, i am trying to set 666 rights to /dev/tty + add a dialout group, so i > created the following file (device_table.txt" > > /dev/tty c 666 root dialout 5 0 - - - > > and have set the correct variable in menuconfig. I know for sure that the build > has handled this file ... but looking at the /dev/tty, it is clear that nothing > has happened, the permissions are still 600 and the dialout group has not been set. When you say "looking at /dev/tty", do you mean looking at the contents of the tarball (or rootfs), or do you mean what appears after boot? Unless you have a very specific configuration (i.e. device managemnt: Static using device table), /dev will be a devtmpfs and the kernel will override anything you have set in device_table. So in that case you need dynamic handling using udev or mdev. Regards, Arnout > > Am I missing something ? > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Mon Mar 7 22:36:32 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 22:36:32 +0000 Subject: [Buildroot] [Bug 14641] oprofile can not find the events files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 --- Comment #1 from Fabrice Fontaine --- Hi, Thanks for your bug report. Can you confirm that the following patch fixes your issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220307223355.945328-1-fontaine.fabrice at gmail.com/ ? Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Mon Mar 7 22:39:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Mar 2022 23:39:12 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: fix build failure due to previous wrong commit In-Reply-To: <67313303-db84-93cd-d96b-56db0c73976b@mind.be> References: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> <67313303-db84-93cd-d96b-56db0c73976b@mind.be> Message-ID: <5226fc1a-8e39-26ea-8ef8-ad435bc317f8@benettiengineering.com> On 07/03/22 22:46, Arnout Vandecappelle wrote: > > > On 18/02/2022 12:09, Giulio Benetti wrote: >> Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but >> the option was listed in the wrong place. Options must be set in the order > > Order doesn't matter in kconfig. The problem was the lack of quotes. Oh, maybe I was told only because of style some time ago. I didn't see the quotes.. probably I was/am cooked. > Updated the commit message and applied to master, thanks. Thank you! -- Giulio Benetti Benetti Engineering sas > Regards, > Arnout > >> they are specified by Config.in files. So let's move >> BR2_TARGET_ROOTFS_EXT2_SIZE="120M" right after BR2_TARGET_ROOTFS_EXT2_4=y >> as it should be. >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 >> >> Signed-off-by: Giulio Benetti >> --- >> configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig >> index 00ccd784b5..06e03967c4 100644 >> --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig >> +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig >> @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" >> -BR2_TARGET_ROOTFS_EXT2_SIZE=120M >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >> BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" >> @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y >> BR2_PACKAGE_VIM=y >> BR2_TARGET_ROOTFS_EXT2=y >> BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> BR2_TARGET_AT91BOOTSTRAP3=y >> BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y >> BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From christian at paral.in Mon Mar 7 22:42:26 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 14:42:26 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build Message-ID: <20220307224226.1375696-1-christian@paral.in> Tested on Pi4 Model B (aarch64). Note: rpi-userland and upstream rpi os now support arm64. Signed-off-by: Christian Stewart --- package/rpi-userland/Config.in | 4 ++-- package/rpi-userland/rpi-userland.mk | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 342faf26e3..81f3588822 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_RPI_USERLAND bool "rpi-userland" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO endif comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..8a05bf2b51 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,10 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_aarch64),y) +RPI_USERLAND_CONF_OPTS += -DARM64=ON +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON -- 2.35.1 From ps.report at gmx.net Mon Mar 7 22:54:17 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 7 Mar 2022 23:54:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: <20220307224226.1375696-1-christian@paral.in> References: <20220307224226.1375696-1-christian@paral.in> Message-ID: <20220307235417.279e7751@gmx.net> Hello Christian, On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: > Tested on Pi4 Model B (aarch64). > > Note: rpi-userland and upstream rpi os now support arm64. All issues/questions solved since discussion [1], [2] about missing libraries/features? As far as I know rpi os graphic support is based on mesa3d v3d/vc4 instead of rpi-userland libraries? Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587538.html [2] http://lists.busybox.net/pipermail/buildroot/2021-October/626080.html > > Signed-off-by: Christian Stewart > --- > package/rpi-userland/Config.in | 4 ++-- > package/rpi-userland/rpi-userland.mk | 4 ++++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in > index 342faf26e3..81f3588822 100644 > --- a/package/rpi-userland/Config.in > +++ b/package/rpi-userland/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_RPI_USERLAND > bool "rpi-userland" > - depends on BR2_arm > + depends on BR2_arm || BR2_aarch64 > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO > endif > > comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" > - depends on BR2_arm > + depends on BR2_arm || BR2_aarch64 > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ > BR2_STATIC_LIBS > diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk > index 84050b6df3..8a05bf2b51 100644 > --- a/package/rpi-userland/rpi-userland.mk > +++ b/package/rpi-userland/rpi-userland.mk > @@ -13,6 +13,10 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr > > RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg > > +ifeq ($(BR2_aarch64),y) > +RPI_USERLAND_CONF_OPTS += -DARM64=ON > +endif > + > ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) > > RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From peter at korsgaard.com Mon Mar 7 23:00:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 00:00:00 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: <813a014c-8aae-990e-cd76-f961a9be9bf7@mind.be> (Arnout Vandecappelle's message of "Mon, 7 Mar 2022 23:33:10 +0100") References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> <813a014c-8aae-990e-cd76-f961a9be9bf7@mind.be> Message-ID: <871qzd4bdb.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: Hi, >> What if something (build system) unset _FILE_OFFSET_BITS ? > Then there's something wrong with that package and it needs to be fixed. >> There is something weird with libzlib package. > gzguts.h has this: > #ifdef _LARGEFILE64_SOURCE > # ifndef _LARGEFILE_SOURCE > # define _LARGEFILE_SOURCE 1 > # endif > # ifdef _FILE_OFFSET_BITS > # undef _FILE_OFFSET_BITS > # endif > #endif > Why, I have no idea... Me neither. It seems to have been added when the file was added to zlib 10 years ago, but given that there is no real public VCS for zlib it is hard to know why: https://github.com/madler/zlib/commit/d004b047838a7e803818b4973a2e39e0ff8c1fa2 We're not the only ones running into the issue: https://unix.stackexchange.com/questions/692377/relationship-between-flags-d-file-offset-bits-and-d-largefile64-source I agree that it simply looks like a bug in zlib, but maybe the best bet is indeed to revert for (the overdue) 2022.02 release? I hesitated when applying it given how late it is, but it indeed fixes a real bug. -- Bye, Peter Korsgaard From christian at paral.in Mon Mar 7 23:03:25 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 15:03:25 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: <20220307235417.279e7751@gmx.net> References: <20220307224226.1375696-1-christian@paral.in> <20220307235417.279e7751@gmx.net> Message-ID: Hi Peter, You're probably right about that: On Mon, Mar 7, 2022 at 2:54 PM Peter Seiderer wrote: > On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: > > > Tested on Pi4 Model B (aarch64). > > > > Note: rpi-userland and upstream rpi os now support arm64. > > All issues/questions solved since discussion [1], [2] about > missing libraries/features? > > As far as I know rpi os graphic support is based on mesa3d v3d/vc4 > instead of rpi-userland libraries? I use this package on arm64 for vcgencmd (videocore) and other commands, however I have not verified that graphics work correctly, and you're most likely correct, the arm64 stack probably is using mesa3d vc4. I boot the pi4 64 bit with: arm_64bit=1 dtoverlay=vc4-fkms-v3d So this is using vc4, as you've mentioned here. I suppose to fix this patch, it needs something like: ifeq ($(BR2_aarch64),y) RPI_USERLAND_CONF_OPTS += -DARM64=ON else RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg endif Is this correct? Thanks & best, Christian Stewart > Regards, > Peter > > [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587538.html > [2] http://lists.busybox.net/pipermail/buildroot/2021-October/626080.html PS: I've noticed that my e-mail / name is wrong again: Christian Stewart via buildroot is this on your end or mine? From charles at steinkuehler.net Mon Mar 7 23:52:33 2022 From: charles at steinkuehler.net (Charles Steinkuehler) Date: Mon, 7 Mar 2022 17:52:33 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: References: <20220307224226.1375696-1-christian@paral.in> <20220307235417.279e7751@gmx.net> Message-ID: <9e71b104-9955-4d41-e05a-02e0b1e40802@steinkuehler.net> On 3/7/2022 5:03 PM, Christian Stewart via buildroot wrote: > Hi Peter, > > You're probably right about that: > > On Mon, Mar 7, 2022 at 2:54 PM Peter Seiderer wrote: >> On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: >> >>> Tested on Pi4 Model B (aarch64). >>> >>> Note: rpi-userland and upstream rpi os now support arm64. >> >> All issues/questions solved since discussion [1], [2] about >> missing libraries/features? >> >> As far as I know rpi os graphic support is based on mesa3d v3d/vc4 >> instead of rpi-userland libraries? > > I use this package on arm64 for vcgencmd (videocore) and other commands, > > however I have not verified that graphics work correctly, and you're > most likely correct, > > the arm64 stack probably is using mesa3d vc4. I boot the pi4 64 bit with: > > arm_64bit=1 > dtoverlay=vc4-fkms-v3d I am using the RPi 4 / CM4 and accelerated graphics are working using the open source stack (vc4-kms-v3d) as tested with the kmscube app and Buildroot 2022.02-rc3. -- Charles Steinkuehler charles at steinkuehler.net From mmayer at broadcom.com Tue Mar 8 00:58:37 2022 From: mmayer at broadcom.com (Markus Mayer) Date: Mon, 7 Mar 2022 16:58:37 -0800 Subject: [Buildroot] [PATCH 1/1] linux: limit YYLTYPE kernel modification In-Reply-To: <20220305091849.GB228549@scaer> References: <20220305000052.491721-1-mmayer@broadcom.com> <20220305002209.493816-1-mmayer@broadcom.com> <20220305091849.GB228549@scaer> Message-ID: On Sat, 5 Mar 2022 at 01:18, Yann E. MORIN wrote: > > Markus, All, > > On 2022-03-04 16:22 -0800, Markus Mayer spake thusly: > > Commit 9b41b54be07711c10ad13ce157be272ed1cf402e addresses a build issue > > regarding re-defined YACC symbols. Unfortunately, this can break the > > build for older toolchains. > > > > To prevent unintentional breakage, make the source code modification > > conditional on BR2_TOOLCHAIN_GCC_AT_LEAST_10. Also inform the user about > > the modification when it is performed, so it becomes more obvious what > > is happening in case of unforseen problems. [...] > > diff --git a/linux/linux.mk b/linux/linux.mk > > index 940dc2849f..382a3f679e 100644 > > --- a/linux/linux.mk > > +++ b/linux/linux.mk > > @@ -293,12 +293,15 @@ endef > > > > LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES > > > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) > > That is wrong, because this is built with the _host_ compiler, not the > target compiler, and BR2_TOOLCHAIN_GCC_AT_LEAST_XX is about the target > compiler. Very good point. I convoluted host and target compilers. The issue was seen on a Ubuntu 20 build host, which means it was using GCC 9.3.0 as the host compiler. > So, if we wanted to make that conditional, that would have to be > conditional on BR2_HOST_GCC_AT_LEAST_10 (we only have up to gcc-9 for > the host for now, so we'd need to add it for gcc-10 and 11; hint: search > for BR2_HOST_GCC_AT_LEAST_9, HOST_GCC_VERSION, HOSTCC_VERSION, and > HOSTCC_MAX_VERSION). > > Furthermore, that is still wrong in your case: if you switch to a > distribution that has gcc 10 (so, as host compler!), then this fixup > will be applied again, and your build will break again, because your > kernel is (probably) missing the following commits (of the 29 that > touch scripts/dtc/ between 4.1 and e33a814e772c): Yes. Unfortunately, this is true. Using GCC 10, the build stumbles over yylloc again. I installed gcc-10 and gave it another spin: [...] /usr/bin/gcc-10 -O2 -I/local/users/mmayer/buildroot/output/arm64/host/include -DNDEBUG -L/local/users/mmayer/buildroot/output/arm64/host/lib -Wl,-rpath,/local/users/mmayer/buildroot/output/arm64/host/lib -Wp,-MD,scripts/dtc/.dtc-lexer.lex.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 -Iscripts/dtc -Iscripts/dtc/libfdt -c -o scripts/dtc/dtc-lexer.lex.o scripts/dtc/dtc-lexer.lex.c dtc-lexer.lex.c: In function ?yylex?: dtc-lexer.l:46:18: error: ?yylloc? undeclared (first use in this function); did you mean ?yyalloc?? dtc-lexer.lex.c:845:2: note: in expansion of macro ?YY_USER_ACTION? dtc-lexer.lex.c:939:1: note: in expansion of macro ?YY_RULE_SETUP? dtc-lexer.l:46:18: note: each undeclared identifier is reported only once for each function it appears in dtc-lexer.lex.c:845:2: note: in expansion of macro ?YY_USER_ACTION? dtc-lexer.lex.c:939:1: note: in expansion of macro ?YY_RULE_SETUP? make[4]: *** [scripts/Makefile.host:108: scripts/dtc/dtc-lexer.lex.o] Error 1 make[3]: *** [scripts/Makefile.build:476: scripts/dtc] Error 2 make[2]: *** [Makefile:555: scripts] Error 2 make[1]: *** [package/pkg-generic.mk:292: /local/users/mmayer/buildroot/output/arm64/build/linux-stb-4.1/.stamp_built] Error 2 make: *** [Makefile:27: _all] Error 2 > $ git slog -G'YYLTYPE yylloc;' v4.1..e33a814e772cdc36436c8c188d8c42d019fda639 -- scripts/dtc/ > e33a814e772cd scripts/dtc: Remove redundant YYLOC global declaration > e039139be8c25 scripts/dtc: generate lexer and parser during build instead of shipping > 4760597116e34 scripts/dtc: Update to upstream version 9d3649bd3be245c9 Correct. We don't have those. However, it might be possible for us to pull some of them in. Not sure yet. I'd have to take a closer look. > However, you still have a point: this is breaking older kernels that do > not have a recent-enough bundled dtc, whether they be built with a host > gcc 10+ or not... Agreed. We might be able to overcome the issue by looking at the aforementioned kernel patches, but others might still run into it. > Maybe we need to find a better heuristic to detect the case when we need > to apply the fix, but then I am afraid this is going to be a nightmare > of so many corner cases with vendor-specific franken-kernels. > > I am not sure where to go from here, though... Let me mull this one over for a bit, as well. I am guessing you'll have thought of most approaches already, but one never knows what one might stumble upon. > > # Older versions break on gcc 10+ because of redefined symbols > > define LINUX_DROP_YYLLOC > > + @echo "Removing 'YYLTYPE yylloc;' from kernel sources..." > > There are so many fixes and tweaks we do without informing the user. If > we were to, the build would be even more verbose than it currently is. > Finding a reference to yylloc in the build log would just mean grepping > for it, so you would achieve about the same by running: > > $ make V=1 > > as that would print the fixup line. True and I see your point regarding super-verbose output, however, the problem I was facing here was that I didn't *know* to run "make V=1" on buildroot as a whole -- and that I would have to do so *before* it patched the kernel. It won't go through that stage again if you just reconfigure or rebuild Linux. I was thinking that the Linux build system itself was somehow messing with the files. So, I was looking in the completely wrong place for a while. I am not saying a message not relying on "V=1" in the buildroot build log would have actually helped me find this issue much more quickly, but it could have served as a pointer to look at the Buildroot patch stage more closely and not the kernel build system. And that definitely wouldn't have hurt. Regards, -Markus From bugzilla at busybox.net Tue Mar 8 08:18:24 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 08:18:24 +0000 Subject: [Buildroot] [Bug 14641] oprofile can not find the events files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 --- Comment #2 from Sergey --- Hi Fabrice, Built and tested right now, it works. I think yours patch is easy solution. All events files take 2.8M. For some applications it could be a wasted space, but it is working solution, if someone wanna save the flash space (for example me), he can write own OPROFILE_INSTALL_TARGET_CMDS Thanks, Best Regards, Sergey -- You are receiving this mail because: You are on the CC list for the bug. From mail at dbrgn.ch Tue Mar 8 08:57:53 2022 From: mail at dbrgn.ch (Danilo) Date: Tue, 08 Mar 2022 09:57:53 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL Message-ID: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> Hello I'm trying to set up an Nginx module package (nginx-rtmp-module) in a Buildroot project that uses BR2_EXTERNAL. I added the new external package, that works. However, Nginx modules need to be compiled along with Nginx, which means that I need to patch the Buildroot nginx.mk file, right? What I need to inject into the makefile, is the following: NGINX_DEPENDENCIES += nginx-rtmp-module NGINX_CONF_OPTS += --add-module=$(NGINX_RTMP_MODULE_DIR) Is there a mechanism to do this from outside the Buildroot source? It seems that BR2_GLOBAL_PATCH_DIR only works for packet sources, but not for Buildroot makefiles, correct? I tried adding the assignments above into the package makefile (nginx-rtmp-module.mk), but that doesn't seem to work. Any help would be appreciated! Danilo From dopsi at dopsi.ch Tue Mar 8 10:19:21 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Tue, 08 Mar 2022 11:19:21 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> Message-ID: Hi, On Tue, 2022-03-08 at 09:57 +0100, Danilo wrote: > [ snip ] > > What I need to inject into the makefile, is the following: > > NGINX_DEPENDENCIES += nginx-rtmp-module > NGINX_CONF_OPTS += --add-module=$(NGINX_RTMP_MODULE_DIR) > > Is there a mechanism to do this from outside the Buildroot source? It > seems > that BR2_GLOBAL_PATCH_DIR only works for packet sources, but not for > Buildroot > makefiles, correct? > > I tried adding the assignments above into the package makefile > (nginx-rtmp-module.mk), but that doesn't seem to work. I hit a similar issue last month (see [1]): I needed to add a dependency (host-stm32wrapper4dbg) to the arm-trusted-firmware from an external tree but I failed (a temporary workaround for me is to manually trigger the build of the host-stm32wrapper4dbg dependency then build the whole system). I did expect that adding the dependency as you did would work but it failed: they show up when running `make arm- trusted-firmware-show-depends` but not in `make arm-trusted- firmware-show-build-order`. Does the same happen for you? I confirmed that adding a post-build hook from an external makefile works fully, only the dependency has issues. I did start to investigate the issue, but it is currently low on my priority list since I have an easy workaround for it. I suspect it is somewhere in the package/pkg-generic.mk file, but I'm not entirely sure where the issue is. As far as I know, there is no way to patch the buildroot source, only downloaded sources can be patched in the build process. [1]: https://lists.buildroot.org/pipermail/buildroot/2022-February/637237.html Best regards, Simon Doppler From peter at korsgaard.com Tue Mar 8 11:49:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 12:49:05 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: (Johannes Agricola's message of "Tue, 08 Mar 2022 11:37:13 +0000") References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> Message-ID: <87v8wo3bri.fsf@dell.be.48ers.dk> >>>>> "Johannes" == Johannes Agricola writes: > Good Day! > This seems to break the build of gcc-10.3 w/ glibc > 2.34-110. `libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp` > contains: >> #if SANITIZER_LINUX || SANITIZER_MAC >> // Tests in this file assume that off_t-dependent data structures match the >> // libc ABI. For example, struct dirent here is what readdir() function (as >> // exported from libc) returns, and not the user-facing "dirent", which >> // depends on _FILE_OFFSET_BITS setting. >> // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. >> #ifdef _FILE_OFFSET_BITS >> #undef _FILE_OFFSET_BITS >> #endif Yes, we'll revert it for now and get it sorted out for 2022.05 instead. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 11:49:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 12:49:49 +0100 Subject: [Buildroot] [git commit] Revert "package/Makefile.in: Use 64-bit time_t with glibc toolchains for > year 2038 support" Message-ID: <20220308114603.EE65382578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd170f0cbad729dba4193b2b20e3de0a7010d485 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 6e33e5908086a511294296f317f6e6f86fa84b1d. This unfortunately breaks a number of packages, as glibc errors out if 64bit time_t is used without 64bit file offsets, and some packages undefine _FILE_OFFSET_BITS leading to build breakage: # if ! defined (_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64 # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" .. So revert it for 2022.02. Signed-off-by: Peter Korsgaard --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index cde050ca82..508ea7c366 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) From rsassen at comecer.com Tue Mar 8 12:39:51 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Tue, 8 Mar 2022 12:39:51 +0000 Subject: [Buildroot] [PATCH 0/1] package/rpi-firmware: fix missing files in overlays Message-ID: First of all, this is my first patch I submit for buildroot, or for any git project for that matter, so please forgive me if it is not in the expected format. This patch fixes some files not being copied from the rpi-firmware boot/overlays directory. I suspect it could also be backported to older still supported branches, but from the documentation I'm not quite sure how to specify this in the patch submission, since the package has been bumped to newer versions in the mean time. Also, git stripped the leading TAB character from the changed line in the diff. I'm hesitant to manually edit this, since I'm not sure if this is intended behavior. Rutger Sassen (1): package/rpi-firmware: fix missing files in overlays package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From rsassen at comecer.com Tue Mar 8 12:40:14 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Tue, 8 Mar 2022 12:40:14 +0000 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: Not all files in boot/overlays are copied to the image, which may result in overlays not being loaded at all, or a wrong overlay being loaded. When using os_prefix and/or overlay_prefix in the raspberry pi config.txt, it checks for the existence of README in the overlays directory. If it is missing, overlays will not be loaded. The overlay_map.dtb file contains rules for overlays that require special handling depending on the specific type of raspberry pi hardware. When this file is missing, the wrong overlay may be loaded. Fixed by copying all files from boot/overlays, instead of only *.dtbo Signed-off-by: Rutger Sassen --- package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..4b9a442bb6 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -45,7 +45,7 @@ endif ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ +$(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) endef -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Mar 8 12:46:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 13:46:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/oprofile: drop custom install rules In-Reply-To: <20220307223355.945328-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Mar 2022 23:33:55 +0100") References: <20220307223355.945328-1-fontaine.fabrice@gmail.com> Message-ID: <87r17c393p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop custom install rules which have added since commit > 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a > broken installation. Especially, they are trying to "guess" what must > be installed based on BR2_ARCH but oprofile has its own logic. For > example, goldmont microarchitecture files must be installed in i386 > directory even if this architecture is 64 bits: > https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a > This will result in the following runtime failure: > oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks > Unable to find info for event cpu_clk_unhalted > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14641 > Signed-off-by: Fabrice Fontaine This might install a bit "too much", but Ok - Better than too less. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 12:44:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 13:44:38 +0100 Subject: [Buildroot] [git commit] package/oprofile: drop custom install rules Message-ID: <20220308123934.F1FE482AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5259807318699646a7bb9cbc24fb137983bc5270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop custom install rules which were added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) From bugzilla at busybox.net Tue Mar 8 12:50:33 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 12:50:33 +0000 Subject: [Buildroot] [Bug 14641] oprofile can not find the events files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Peter Korsgaard --- Fixed in git: https://git.buildroot.org/buildroot/commit/?id=5259807318699646a7bb9cbc24fb137983bc5270 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 8 15:54:14 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 15:54:14 +0000 Subject: [Buildroot] [Bug 14646] New: OpenSSH 8.9p1 error under mipsel Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14646 Bug ID: 14646 Summary: OpenSSH 8.9p1 error under mipsel Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: lancethepants at gmail.com CC: buildroot at uclibc.org Target Milestone: --- 8-March-2022 from git master mips32 softfloat gcc-11.2 kernel 5.16 mipsel throws the following compiler error while compiling openssh 8.9p1. make[2]: Entering directory '/home/tomato/tomatoware/src/openssh/openssh/openbsd-compat' mipsel-linux-cc -O2 -pipe -mips32 -mtune=mips32 -pipe -Wno-error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleading-indentation -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fPIC -I. -I.. -I. -I./.. -I/home/tomato/tomatoware/mmc/include -I/home/tomato/tomatoware/mmc/include -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DHAVE_CONFIG_H -c arc4random.c during RTL pass: final In file included from arc4random.c:52: chacha_private.h: In function ?chacha_encrypt_bytes.constprop?: chacha_private.h:222:1: internal compiler error: in mips_output_move, at config/mips/mips.c:5321 222 | } | ^ 0x12c020e diagnostic_impl(rich_location*, diagnostic_metadata const*, int, char const*, __va_list_tag (*) [1], diagnostic_t) ???:0 0x12c0e26 internal_error(char const*, ...) ???:0 0x5a1fc1 fancy_abort(char const*, int, char const*) ???:0 0xdcc6e9 mips_output_move(rtx_def*, rtx_def*) ???:0 0x7e705f final_scan_insn_1(rtx_insn*, _IO_FILE*, int, int, int*) [clone .isra.84] ???:0 0x7e745b final_scan_insn(rtx_insn*, _IO_FILE*, int, int, int*) ???:0 0x7e6e91 final_scan_insn_1(rtx_insn*, _IO_FILE*, int, int, int*) [clone .isra.84] ???:0 0x7e745b final_scan_insn(rtx_insn*, _IO_FILE*, int, int, int*) ???:0 0x7e771c final_1(rtx_insn*, _IO_FILE*, int, int) ???:0 0x7e7ee3 (anonymous namespace)::pass_final::execute(function*) ???:0 Please submit a full bug report, with preprocessed source if appropriate. Please include the complete backtrace with any bug report. See for instructions. {standard input}: Assembler messages: {standard input}: Warning: missing .end at end of assembly make[2]: *** [Makefile:104: arc4random.o] Error 1 make[2]: Leaving directory '/home/tomato/tomatoware/src/openssh/openssh/openbsd-compat' make[1]: *** [Makefile:204: openbsd-compat/libopenbsd-compat.a] Error 2 make[1]: Leaving directory '/home/tomato/tomatoware/src/openssh/openssh' make: *** [Makefile:5: tomatoware] Error 2 tomato at e2a84530afa9:~/tomatoware$ -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 8 15:54:28 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 15:54:28 +0000 Subject: [Buildroot] [Bug 14646] OpenSSH 8.9p1 compiler error under mipsel In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14646 Lance Fredrickson changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|OpenSSH 8.9p1 error under |OpenSSH 8.9p1 compiler |mipsel |error under mipsel -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Tue Mar 8 16:40:34 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 8 Mar 2022 17:40:34 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-hdhomerun: bump version to 19.1.0-Matrix Message-ID: <20220308164034.85212-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 4c866b59d8..f177eabd53 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a5e5135b176d9aeba35e16fb6ce48ce7323c53960457597e25c2962b126cca2 kodi-pvr-hdhomerun-19.0.2-Matrix.tar.gz +sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 5c6829cee3..a4a448c51e 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 19.0.2-Matrix +KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md -- 2.30.2 From yann.morin at orange.com Tue Mar 8 16:53:10 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Mar 2022 17:53:10 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: default to rawname to install binaries Message-ID: <19532_1646758392_622789F8_19532_102_1_b2db850ee51822a3272be0f6984d2e53d73e790c.1646758134.git.yann.morin@orange.com> From: "Yann E. MORIN" The default currently is to rely on the package name to decide what to build and install if not specified by tje caller. This works nice for target packages, where a 'foo' package will by default build and install a 'foo' executable. However, for host packages, that will build and install a 'host-foo' exzcutable, which is not really, even really not, what would be expected. We fix that by using the package raw name, i.e. the package name with the host- prefix yanked away. It is very improbable that there already have many host-golang packages in the wild (in br2-external trees), but if there are, they would forcibly define those variables to a sane value. This change is not incompatible, as the values provided by packages take precendence; it's just that those packages now carry superfluous, if innocuous, variable assignments. Signed-off-by: Yann E. MORIN --- package/pkg-golang.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 0cb2ed73cc..0b3dc3d32f 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -59,10 +59,10 @@ $(2)_BUILD_TARGETS ?= . # been specified, we assume that the binaries to be produced are named # after each build target building them (below in _BUILD_CMDS). ifeq ($$($(2)_BUILD_TARGETS),.) -$(2)_BIN_NAME ?= $(1) +$(2)_BIN_NAME ?= $$($(2)_RAWNAME) endif -$(2)_INSTALL_BINS ?= $(1) +$(2)_INSTALL_BINS ?= $$($(2)_RAWNAME) # Source files in Go usually use an import path resolved around # domain/vendor/software. We infer domain/vendor/software from the upstream URL -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From fontaine.fabrice at gmail.com Tue Mar 8 17:47:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 18:47:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix armv7 and sparc builds Message-ID: <20220308174737.1413882-1-fontaine.fabrice@gmail.com> Fix the following build failure on armv7 and sparc raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: In file included from perf_memcpy32_s.c:7: perf_private.h: In function 'rdtsc': perf_private.h:72:3: error: 'asm' undeclared (first use in this function) 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); | ^~~ Fixes: - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 Signed-off-by: Fabrice Fontaine --- ...01-fix-armv7-asm-inline-error-GH-115.patch | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch diff --git a/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch new file mode 100644 index 0000000000..3cb37b96f5 --- /dev/null +++ b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch @@ -0,0 +1,156 @@ +From 9c739800a8915d5f2a73c840190920e95ffa1c5c Mon Sep 17 00:00:00 2001 +From: Reini Urban +Date: Fri, 18 Feb 2022 09:46:45 +0100 +Subject: [PATCH] fix armv7 asm inline error GH #115 + +some armv7 buildroot variants fail on asm. +we already probe for that, so use it. +Fixes GH #115 + +[Retrieved from: +https://github.com/rurban/safeclib/commit/9c739800a8915d5f2a73c840190920e95ffa1c5c] +Signed-off-by: Fabrice Fontaine +--- + tests/perf_private.h | 49 +++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/tests/perf_private.h b/tests/perf_private.h +index 3296cb3d..843674d3 100644 +--- a/tests/perf_private.h ++++ b/tests/perf_private.h +@@ -1,9 +1,9 @@ + /*------------------------------------------------------------------ + * perf_private.h - Internal benchmarking tools + * +- * 2020 Reini Urban ++ * 2020,2022 Reini Urban + * +- * Copyright (c) 2017, 2020 Reini Urban ++ * Copyright (c) 2017, 2020, 2022 Reini Urban + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person +@@ -55,13 +55,16 @@ static inline uint64_t timer_start(); + static inline uint64_t timer_end(); + + static inline clock_t rdtsc() { +-#ifdef __x86_64__ ++#ifndef ASM_INLINE ++#define NO_CYCLE_COUNTER ++ return clock(); ++#elif defined __x86_64__ + uint64_t a, d; +- __asm__ volatile("rdtsc" : "=a"(a), "=d"(d)); ++ ASM_INLINE volatile("rdtsc" : "=a"(a), "=d"(d)); + return (clock_t)(a | (d << 32)); + #elif defined(__i386__) + clock_t x; +- __asm__ volatile("rdtsc" : "=A"(x)); ++ ASM_INLINE volatile("rdtsc" : "=A"(x)); + return x; + #elif defined(__ARM_ARCH) && (__ARM_ARCH >= 7) && (SIZEOF_SIZE_T == 4) + // V7 is the earliest arch that has a standard cyclecount (some say 6) +@@ -69,11 +72,11 @@ static inline clock_t rdtsc() { + uint32_t pmuseren; + uint32_t pmcntenset; + // Read the user mode perf monitor counter access permissions. +- asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); + if (pmcntenset & 0x80000000ul) { // Is it counting? +- asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); + // The counter is set up to count every 64th cycle + return (int64_t)(pmccntr) * 64; // Should optimize to << 6 + } +@@ -83,22 +86,22 @@ static inline clock_t rdtsc() { + uint64_t pmccntr; + uint64_t pmuseren = 1UL; + // Read the user mode perf monitor counter access permissions. +- //asm volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); ++ //ASM_INLINE volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); ++ ASM_INLINE volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); + return (uint64_t)(pmccntr) * 64; // Should optimize to << 6 + } + return (uint64_t)rdtsc(); + #elif defined(__powerpc64__) || defined(__ppc64__) + uint64_t tb; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "mfspr %0, 268" + : "=r" (tb)); + return tb; + #elif defined(__powerpc__) || defined(__ppc__) + // This returns a time-base, which is not always precisely a cycle-count. + uint32_t tbu, tbl, tmp; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "0:\n" + "mftbu %0\n" + "mftbl %1\n" +@@ -109,12 +112,12 @@ static inline clock_t rdtsc() { + return (((uint64_t) tbu << 32) | tbl); + #elif defined(__sparc__) + uint64_t tick; +- asm(".byte 0x83, 0x41, 0x00, 0x00"); +- asm("mov %%g1, %0" : "=r" (tick)); ++ ASM_INLINE(".byte 0x83, 0x41, 0x00, 0x00"); ++ ASM_INLINE("mov %%g1, %0" : "=r" (tick)); + return tick; + #elif defined(__ia64__) + uint64_t itc; +- asm("mov %0 = ar.itc" : "=r" (itc)); ++ ASM_INLINE("mov %0 = ar.itc" : "=r" (itc)); + return itc; + #else + #define NO_CYCLE_COUNTER +@@ -126,9 +129,11 @@ static inline clock_t rdtsc() { + // 3.2.1 The Improved Benchmarking Method + static inline uint64_t timer_start() + { +-#if defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -137,7 +142,7 @@ static inline uint64_t timer_start() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -151,9 +156,11 @@ static inline uint64_t timer_start() + + static inline uint64_t timer_end() + { +-#if defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" +@@ -162,7 +169,7 @@ static inline uint64_t timer_end() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 17:48:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 18:48:32 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/oprofile: add s390x support Message-ID: <20220308174832.1414005-1-fontaine.fabrice@gmail.com> s390x is supported since at least 2003 (see ChangeLog-2003) Signed-off-by: Fabrice Fontaine --- package/oprofile/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in index cce2cfdab8..eca43d7ac3 100644 --- a/package/oprofile/Config.in +++ b/package/oprofile/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on BR2_arceb || BR2_arcle || BR2_arm || BR2_armeb || \ BR2_aarch64 || BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_s390x || BR2_sh || \ BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 18:00:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 19:00:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 Message-ID: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> This is a patch release for version 2 & 2.4, fixing a regression introduced in 2.4.1. https://github.com/cisco/libsrtp/releases/tag/v2.4.2 Signed-off-by: Fabrice Fontaine --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 3de0130f4c..8e51e68ac2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 885f05a33c..f2ba600dd6 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.1 +LIBSRTP_VERSION = 2.4.2 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 18:01:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 19:01:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.6.1 Message-ID: <20220308180152.1558214-1-fontaine.fabrice@gmail.com> https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 Signed-off-by: Fabrice Fontaine --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 780061bdbb..28e733aa2f 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 -sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.1.tar.gz.sha256 +sha256 e4b3b93d102bc03164f592d26d7a06d6de648bf78b1e3dcbd8d62941431c1f28 freerdp-2.6.1.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c8978db6ce..a1791b27f0 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.6.0 +FREERDP_VERSION = 2.6.1 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 18:28:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 19:28:45 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libaacs: bump to version 0.11.1 Message-ID: <20220308182845.1832681-1-fontaine.fabrice@gmail.com> Drop patch (not needed since https://code.videolan.org/videolan/libaacs/-/commit/a2ef3313bae4550f54ba842fa342d5b9b5f97145) https://code.videolan.org/videolan/libaacs/-/blob/0.11.1/ChangeLog Signed-off-by: Fabrice Fontaine --- ...0001-read_file.h-include-sys-types.h.patch | 36 ------------------- package/libaacs/libaacs.hash | 4 +-- package/libaacs/libaacs.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/libaacs/0001-read_file.h-include-sys-types.h.patch diff --git a/package/libaacs/0001-read_file.h-include-sys-types.h.patch b/package/libaacs/0001-read_file.h-include-sys-types.h.patch deleted file mode 100644 index 9bb1e04539..0000000000 --- a/package/libaacs/0001-read_file.h-include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1fb08a352afada589f0b93af7a07c6fcd6da9bb8 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 21 Sep 2020 20:19:38 +0200 -Subject: [PATCH] read_file.h: include sys/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-8.3.0: - -In file included from src/devtools/uk_dump.c:28: -src/devtools/read_file.h:24:44: error: unknown type name ?off_t? - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) - -Upstream status: pending - -Signed-off-by: Bernd Kuhls ---- - src/devtools/read_file.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devtools/read_file.h b/src/devtools/read_file.h -index 953b2ef..a5d185c 100644 ---- a/src/devtools/read_file.h -+++ b/src/devtools/read_file.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) --- -2.27.0 - diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 62e389f2f9..d4977727b0 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 -sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.1/libaacs-0.11.1.tar.bz2.sha512 +sha512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42 libaacs-0.11.1.tar.bz2 # Hash for license file: sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 3e0df18010..d4e90be26c 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.11.0 +LIBAACS_VERSION = 0.11.1 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ -- 2.34.1 From zajec5 at gmail.com Tue Mar 8 18:35:27 2022 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Tue, 8 Mar 2022 19:35:27 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package Message-ID: <20220308183527.17639-1-zajec5@gmail.com> From: Rafa? Mi?ecki This new package provides "lzma_alone" host binary based on the original LZMA SDK. It provides few extra options when compared to the LZMA Utils / XZ Utils project "lzma" binary (already packaged as the "lzma"). This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows Debian's solution. Please note that Debian also uses LZMA SDK for the base "lzma" tool which may be considered for Buildroot too - as an independent change. Similar packaging is also used by Ubuntu & Arch. lzma_alone is a requirement for preparing firmware images for some Broadcom based home routers with a picky CFE bootloader. It has limited LZMA support and building compatible images requires specifying dictionary size and lc/lp/pb LZMA values manually. Version 9.22 is used as it's the last release using .tar.bz2 format. The same version is used by Debian. Signed-off-by: Rafa? Mi?ecki --- Hi, this is V2 of my following old attempt: [PATCH] package/lzma-alone: new package https://patchwork.ozlabs.org/project/buildroot/patch/20201026213433.4309-1-zajec5 at gmail.com/ It doesn't seem like I'm going to get V1 properly reviewed / commented so let me try with V2 with changes I think were expected. --- package/Config.in.host | 1 + package/lzma-alone/Config.in.host | 18 ++++++++++++++++++ package/lzma-alone/lzma-alone.hash | 1 + package/lzma-alone/lzma-alone.mk | 22 ++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 package/lzma-alone/Config.in.host create mode 100644 package/lzma-alone/lzma-alone.hash create mode 100644 package/lzma-alone/lzma-alone.mk diff --git a/package/Config.in.host b/package/Config.in.host index e5fbb07fc2..cd1c34b5a3 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -50,6 +50,7 @@ menu "Host utilities" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/lzma-alone/Config.in.host" source "package/mender-artifact/Config.in.host" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" diff --git a/package/lzma-alone/Config.in.host b/package/lzma-alone/Config.in.host new file mode 100644 index 0000000000..053b869635 --- /dev/null +++ b/package/lzma-alone/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_LZMA_ALONE + bool "host lzma-alone" + help + LZMA has two well-known command-line tools: + 1. lzma from LZMA SDK + 2. lzma from XZ Utils (previously LZMA Utils) + + This package provides the former one which: + 1. Gives more control over compression parameters + 2. Gets named lzma_alone to allow coexistence + + This tool may be used to prepare firmwares for bootloaders + with limited LZMA support. + E.g. Broadcom's CFE bootloader for MIPS BCM47xx devices is + known to fail to boot images using LZMA compression with + dictionary. + + https://www.7-zip.org/sdk.html diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash new file mode 100644 index 0000000000..39759c4e3b --- /dev/null +++ b/package/lzma-alone/lzma-alone.hash @@ -0,0 +1 @@ +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk new file mode 100644 index 0000000000..6258bb4a95 --- /dev/null +++ b/package/lzma-alone/lzma-alone.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# lzma-alone +# +################################################################################ + +LZMA_ALONE_VERSION = 9.22 +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK +LZMA_ALONE_SOURCE = lzma922.tar.bz2 +LZMA_ALONE_STRIP_COMPONENTS = 0 +LZMA_ALONE_LICENSE = LGPL-2.1-or-later, BSD-3-Clause + +define HOST_LZMA_ALONE_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/C/Util/Lzma -f makefile.gcc + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc +endef + +define HOST_LZMA_ALONE_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/CPP/7zip/Bundles/LzmaCon/lzma $(HOST_DIR)/bin/lzma_alone +endef + +$(eval $(host-generic-package)) -- 2.34.1 From peter at korsgaard.com Tue Mar 8 20:13:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:13:14 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: default to rawname to install binaries In-Reply-To: <19532_1646758392_622789F8_19532_102_1_b2db850ee51822a3272be0f6984d2e53d73e790c.1646758134.git.yann.morin@orange.com> (yann morin's message of "Tue, 8 Mar 2022 17:53:10 +0100") References: <19532_1646758392_622789F8_19532_102_1_b2db850ee51822a3272be0f6984d2e53d73e790c.1646758134.git.yann.morin@orange.com> Message-ID: <87mti02of9.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > The default currently is to rely on the package name to decide what to > build and install if not specified by tje caller. This works nice for > target packages, where a 'foo' package will by default build and > install a 'foo' executable. > However, for host packages, that will build and install a 'host-foo' > exzcutable, which is not really, even really not, what would be > expected. > We fix that by using the package raw name, i.e. the package name with > the host- prefix yanked away. > It is very improbable that there already have many host-golang packages > in the wild (in br2-external trees), but if there are, they would > forcibly define those variables to a sane value. This change is not > incompatible, as the values provided by packages take precendence; it's > just that those packages now carry superfluous, if innocuous, variable > assignments. > Signed-off-by: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:15:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:15:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 In-Reply-To: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:00:56 +0100") References: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> Message-ID: <87ilso2oc3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This is a patch release for version 2 & 2.4, fixing a regression > introduced in 2.4.1. > https://github.com/cisco/libsrtp/releases/tag/v2.4.2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:15:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:15:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.6.1 In-Reply-To: <20220308180152.1558214-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:01:52 +0100") References: <20220308180152.1558214-1-fontaine.fabrice@gmail.com> Message-ID: <87ee3c2obd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:11:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:11:50 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: default to rawname to install binaries Message-ID: <20220308200742.B598F837E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8539378771f7201bf29f207b3d4d6c9e943f3952 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The default currently is to rely on the package name to decide what to build and install if not specified by the caller. This works nice for target packages, where a 'foo' package will by default build and install a 'foo' executable. However, for host packages, that will build and install a 'host-foo' exzcutable, which is not really, even really not, what would be expected. We fix that by using the package raw name, i.e. the package name with the host- prefix yanked away. It is very improbable that there already are many host-golang packages in the wild (in br2-external trees), but if there are, they would forcibly define those variables to a sane value. This change is not incompatible, as the values provided by packages take precedence; it's just that those packages now carry superfluous, if innocuous, variable assignments. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 0cb2ed73cc..0b3dc3d32f 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -59,10 +59,10 @@ $(2)_BUILD_TARGETS ?= . # been specified, we assume that the binaries to be produced are named # after each build target building them (below in _BUILD_CMDS). ifeq ($$($(2)_BUILD_TARGETS),.) -$(2)_BIN_NAME ?= $(1) +$(2)_BIN_NAME ?= $$($(2)_RAWNAME) endif -$(2)_INSTALL_BINS ?= $(1) +$(2)_INSTALL_BINS ?= $$($(2)_RAWNAME) # Source files in Go usually use an import path resolved around # domain/vendor/software. We infer domain/vendor/software from the upstream URL From peter at korsgaard.com Tue Mar 8 20:14:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:14:29 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.6.1 Message-ID: <20220308200742.C5A708380C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=888d4aa36768b4d6932d39d25935cf6636a2af83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 780061bdbb..28e733aa2f 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 -sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.1.tar.gz.sha256 +sha256 e4b3b93d102bc03164f592d26d7a06d6de648bf78b1e3dcbd8d62941431c1f28 freerdp-2.6.1.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c8978db6ce..a1791b27f0 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.6.0 +FREERDP_VERSION = 2.6.1 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Mar 8 20:14:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:14:17 +0100 Subject: [Buildroot] [git commit] package/libsrtp: bump to version 2.4.2 Message-ID: <20220308200742.BDA87837ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=232868ffd3ef76f060711adf5ea1e5001e21ef9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a patch release for version 2 & 2.4, fixing a regression introduced in 2.4.1. https://github.com/cisco/libsrtp/releases/tag/v2.4.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 3de0130f4c..8e51e68ac2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 885f05a33c..f2ba600dd6 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.1 +LIBSRTP_VERSION = 2.4.2 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause From ps.report at gmx.net Tue Mar 8 20:26:41 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Mar 2022 21:26:41 +0100 Subject: [Buildroot] [PATCH 0/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220308212641.15b03b75@gmx.net> Hello Rutger, On Tue, 8 Mar 2022 12:39:51 +0000, "Sassen, Rutger" wrote: > First of all, this is my first patch I submit for buildroot, or for > any git project for that matter, so please forgive me if it is not in > the expected format. No problem, every patch (or hint about bugs/missing features) welcome... > > This patch fixes some files not being copied from the rpi-firmware > boot/overlays directory. I suspect it could also be backported to older > still supported branches, but from the documentation I'm not quite sure > how to specify this in the patch submission, since the package has been > bumped to newer versions in the mean time. Should be no problem as the mentioned overlay_map.dtb file should be already available in the older rpi-firmware releases (since April 2020)... > > Also, git stripped the leading TAB character from the changed line in > the diff. I'm hesitant to manually edit this, since I'm not sure if this > is intended behavior. This should not happen, are you sure the tab is committed? > > Rutger Sassen (1): > package/rpi-firmware: fix missing files in overlays > > package/rpi-firmware/rpi-firmware.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -- > 2.20.1 > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone > the message or any information contained in the message and I ask that you please notify me by return email and delete this > communication immediately. Thank you. According to the email footer I could not look further at your provided patch ;-) Please try to re-send without it.... More comments in replay to your patch... Regards, Peter From ps.report at gmx.net Tue Mar 8 20:41:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Mar 2022 21:41:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220308214133.5b494e1c@gmx.net> Hello Rutger, On Tue, 8 Mar 2022 12:40:14 +0000, "Sassen, Rutger" wrote: > Not all files in boot/overlays are copied to the image, which may result > in overlays not being loaded at all, or a wrong overlay being loaded. > > When using os_prefix and/or overlay_prefix in the raspberry pi > config.txt, it checks for the existence of README in the overlays > directory. If it is missing, overlays will not be loaded. Any prove for this behavior (could not find anything about it in the docs)? > > The overlay_map.dtb file contains rules for overlays that require > special handling depending on the specific type of raspberry pi > hardware. When this file is missing, the wrong overlay may be loaded. Only if you use this feature, see [1], [2] (building multiple rpi targeting sdcard) instead of determining the right overlay (exactly targeting one rpi flavour sdcard, as the buildroot rpi example config files do)... > > Fixed by copying all files from boot/overlays, instead of only *.dtbo > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/rpi-firmware.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..4b9a442bb6 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -45,7 +45,7 @@ endif > > ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) > define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > - $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ > +$(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*), \ > $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) > ) > endef Would prefer to only/explicitly add the overlay_map.dtb file: $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo) $(@D)/boot/overlays/overlay_map.dtb, \ or $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo $(@D)/boot/overlays/*.dtb), \ or as it is a (maybe unwanted target feature) add a new buildroot rpi-firmware configure option for adding the overlay_map.dtb file... Regards, Peter [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc [2] https://github.com/raspberrypi/documentation/commit/67f5d3b4ff8b2e52239a5415c4b0272a85a910fc Please avoid your footer message... > -- > 2.20.1 > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone > the message or any information contained in the message and I ask that you please notify me by return email and delete this > communication immediately. Thank you. From peter at korsgaard.com Tue Mar 8 20:43:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:43:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix armv7 and sparc builds In-Reply-To: <20220308174737.1413882-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 18:47:37 +0100") References: <20220308174737.1413882-1-fontaine.fabrice@gmail.com> Message-ID: <87a6e02n0w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure on armv7 and sparc raised since bump to > version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and > https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: > In file included from perf_memcpy32_s.c:7: > perf_private.h: In function 'rdtsc': > perf_private.h:72:3: error: 'asm' undeclared (first use in this function) > 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); > | ^~~ > Fixes: > - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:42:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:42:03 +0100 Subject: [Buildroot] [git commit] package/safeclib: fix armv7 and sparc builds Message-ID: <20220308203520.899D983831@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d8c29e7ac8ff2558656340bb88a7d044279d302 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on armv7 and sparc raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: In file included from perf_memcpy32_s.c:7: perf_private.h: In function 'rdtsc': perf_private.h:72:3: error: 'asm' undeclared (first use in this function) 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); | ^~~ Fixes: - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-fix-armv7-asm-inline-error-GH-115.patch | 156 +++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch new file mode 100644 index 0000000000..3cb37b96f5 --- /dev/null +++ b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch @@ -0,0 +1,156 @@ +From 9c739800a8915d5f2a73c840190920e95ffa1c5c Mon Sep 17 00:00:00 2001 +From: Reini Urban +Date: Fri, 18 Feb 2022 09:46:45 +0100 +Subject: [PATCH] fix armv7 asm inline error GH #115 + +some armv7 buildroot variants fail on asm. +we already probe for that, so use it. +Fixes GH #115 + +[Retrieved from: +https://github.com/rurban/safeclib/commit/9c739800a8915d5f2a73c840190920e95ffa1c5c] +Signed-off-by: Fabrice Fontaine +--- + tests/perf_private.h | 49 +++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/tests/perf_private.h b/tests/perf_private.h +index 3296cb3d..843674d3 100644 +--- a/tests/perf_private.h ++++ b/tests/perf_private.h +@@ -1,9 +1,9 @@ + /*------------------------------------------------------------------ + * perf_private.h - Internal benchmarking tools + * +- * 2020 Reini Urban ++ * 2020,2022 Reini Urban + * +- * Copyright (c) 2017, 2020 Reini Urban ++ * Copyright (c) 2017, 2020, 2022 Reini Urban + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person +@@ -55,13 +55,16 @@ static inline uint64_t timer_start(); + static inline uint64_t timer_end(); + + static inline clock_t rdtsc() { +-#ifdef __x86_64__ ++#ifndef ASM_INLINE ++#define NO_CYCLE_COUNTER ++ return clock(); ++#elif defined __x86_64__ + uint64_t a, d; +- __asm__ volatile("rdtsc" : "=a"(a), "=d"(d)); ++ ASM_INLINE volatile("rdtsc" : "=a"(a), "=d"(d)); + return (clock_t)(a | (d << 32)); + #elif defined(__i386__) + clock_t x; +- __asm__ volatile("rdtsc" : "=A"(x)); ++ ASM_INLINE volatile("rdtsc" : "=A"(x)); + return x; + #elif defined(__ARM_ARCH) && (__ARM_ARCH >= 7) && (SIZEOF_SIZE_T == 4) + // V7 is the earliest arch that has a standard cyclecount (some say 6) +@@ -69,11 +72,11 @@ static inline clock_t rdtsc() { + uint32_t pmuseren; + uint32_t pmcntenset; + // Read the user mode perf monitor counter access permissions. +- asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); + if (pmcntenset & 0x80000000ul) { // Is it counting? +- asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); + // The counter is set up to count every 64th cycle + return (int64_t)(pmccntr) * 64; // Should optimize to << 6 + } +@@ -83,22 +86,22 @@ static inline clock_t rdtsc() { + uint64_t pmccntr; + uint64_t pmuseren = 1UL; + // Read the user mode perf monitor counter access permissions. +- //asm volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); ++ //ASM_INLINE volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); ++ ASM_INLINE volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); + return (uint64_t)(pmccntr) * 64; // Should optimize to << 6 + } + return (uint64_t)rdtsc(); + #elif defined(__powerpc64__) || defined(__ppc64__) + uint64_t tb; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "mfspr %0, 268" + : "=r" (tb)); + return tb; + #elif defined(__powerpc__) || defined(__ppc__) + // This returns a time-base, which is not always precisely a cycle-count. + uint32_t tbu, tbl, tmp; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "0:\n" + "mftbu %0\n" + "mftbl %1\n" +@@ -109,12 +112,12 @@ static inline clock_t rdtsc() { + return (((uint64_t) tbu << 32) | tbl); + #elif defined(__sparc__) + uint64_t tick; +- asm(".byte 0x83, 0x41, 0x00, 0x00"); +- asm("mov %%g1, %0" : "=r" (tick)); ++ ASM_INLINE(".byte 0x83, 0x41, 0x00, 0x00"); ++ ASM_INLINE("mov %%g1, %0" : "=r" (tick)); + return tick; + #elif defined(__ia64__) + uint64_t itc; +- asm("mov %0 = ar.itc" : "=r" (itc)); ++ ASM_INLINE("mov %0 = ar.itc" : "=r" (itc)); + return itc; + #else + #define NO_CYCLE_COUNTER +@@ -126,9 +129,11 @@ static inline clock_t rdtsc() { + // 3.2.1 The Improved Benchmarking Method + static inline uint64_t timer_start() + { +-#if defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -137,7 +142,7 @@ static inline uint64_t timer_start() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -151,9 +156,11 @@ static inline uint64_t timer_start() + + static inline uint64_t timer_end() + { +-#if defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" +@@ -162,7 +169,7 @@ static inline uint64_t timer_end() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" From ps.report at gmx.net Tue Mar 8 20:59:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Mar 2022 21:59:47 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: References: <20220307224226.1375696-1-christian@paral.in> <20220307235417.279e7751@gmx.net> Message-ID: <20220308215947.665d0fac@gmx.net> Hello Christian, On Mon, 7 Mar 2022 15:03:25 -0800, Christian Stewart via buildroot wrote: > Hi Peter, > > You're probably right about that: > > On Mon, Mar 7, 2022 at 2:54 PM Peter Seiderer wrote: > > On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: > > > > > Tested on Pi4 Model B (aarch64). > > > > > > Note: rpi-userland and upstream rpi os now support arm64. > > > > All issues/questions solved since discussion [1], [2] about > > missing libraries/features? > > > > As far as I know rpi os graphic support is based on mesa3d v3d/vc4 > > instead of rpi-userland libraries? > > I use this package on arm64 for vcgencmd (videocore) and other commands, > > however I have not verified that graphics work correctly, and you're > most likely correct, > > the arm64 stack probably is using mesa3d vc4. I boot the pi4 64 bit with: > > arm_64bit=1 > dtoverlay=vc4-fkms-v3d > > So this is using vc4, as you've mentioned here. > > I suppose to fix this patch, it needs something like: > > ifeq ($(BR2_aarch64),y) > RPI_USERLAND_CONF_OPTS += -DARM64=ON > else > RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg > endif > > Is this correct? Did not (yet/lately) check if really all the above libs are disabled with the ARM64 feature, but at least a starting point for the aarch64 use case.... But needs a corresponding aarch64 handling in package/rpi-userland/Config.in too (select BR2_PACKAGE_HAS_LIBEGL, select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_LIBOPENVG, select BR2_PACKAGE_HAS_LIBOPENMAX, ...) and maybe the help text needs to be adjusted... > > Thanks & best, > Christian Stewart > > > Regards, > > Peter > > > > [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587538.html > > [2] http://lists.busybox.net/pipermail/buildroot/2021-October/626080.html > > PS: I've noticed that my e-mail / name is wrong again: > > Christian Stewart via buildroot > > is this on your end or mine? Maybe both, I got your original email with From: Christian Stewart via buildroot CC: Christian Stewart , ... Reply-To: Christian Stewart My email client (Claws Mail) seems to ignore the Reply-To field leading to To: Christian Stewart via buildroot CC: Christian Stewart CC: ... But the copy from the mailing list I receive is missing the CC: Christian Stewart but keeps the other CC recipients... Regards, Peter > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Tue Mar 8 21:12:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 22:12:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/boinc: disable fcgi Message-ID: <20220308211205.3682-1-fontaine.fabrice@gmail.com> libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot -- 2.34.1 From peter at korsgaard.com Tue Mar 8 22:08:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 23:08:11 +0100 Subject: [Buildroot] [git commit] Update for 2022.02 Message-ID: <20220308220031.EAA1883874@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08967921c4a91eb7d966c31f755a0720914e8bff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 21 +++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 68 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 8e8ecd1a72..59ae8f15ce 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,36 @@ +2022.02, released March 8th, 2022 + + Various fixes. + + Fixes to cargo and golang packaging infrastructure. + + Defconfigs: OrangePi RK3399: Fix genimage format + + Updated/fixed packages: azure-iot-sdk-c, bpftool, cog, + directfb, directfb-examples, dnsmasq, docker-engine, expat, + freerdp, frr, gdb, ghostscript, glib-networking, go, haproxy, + hostapd, kf5-extra-cmake-modules, kf5-kcoreaddons, + kf5-modemmanager-qt, kf5-networkmanager-qt, libcamera-apps, + libgee, libglfw, librstp, libtorrent, libvirt, libxslt, linux, + mariadb, oprofile, osm2pgsql, pulseview, python-cryptography, + python-gnupg, python-treq, qt5base, qt5webkit, rauc, re2, + rygel, safeclib, sconeserver, seatd, sord, upmpdcli, + util-linux, weston, wpa_supplicant, xdriver_xf86-video-mach64, + xdriver_xf86-video-nouveau, xdriver_xf86-video-qxl, + xscreensaver, zabbix + + New packages: gdk-pixbuf-xlib + + Removed packages: python-pycli + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14611: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_.. + #14631: host-go-bootstrap: go not being built for package in .. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2022.02-rc3, released February 28th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index 4f693d40a9..71f8096b71 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-rc3 +export BR2_VERSION := 2022.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646083800 +BR2_VERSION_EPOCH = 1646777000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 891221e155..18a9254cbf 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
Download
-

Latest long term support release: 2021.02.10

+

Latest stable / long term support release: 2022.02

- +
- +
-

buildroot-2021.02.10.tar.gz

-

PGP signature

+

buildroot-2022.02.tar.gz

+

PGP signature

- +
- +
-

buildroot-2021.02.10.tar.bz2

-

PGP signature

+

buildroot-2022.02.tar.xz

+

PGP signature

- + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
diff --git a/docs/website/news.html b/docs/website/news.html index 88885a058f..de80a5f23d 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2022.02 released

    +

    8 March 2022

    +
    +
    +

    The stable 2022.02 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2022.02 release.

    + +

    Notice that this is a long term support release which will be + supported with security and other important fixes until March 2023.

    +
    +
    +
    • +
  • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 37981d7932..a5a0e3f41a 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.2' +RELEASE='2022.02' ### Change here for more memory/cores ### VM_MEMORY=2048 From fontaine.fabrice at gmail.com Tue Mar 8 22:08:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 23:08:12 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/riemann-c-client: bump to version 1.10.5 Message-ID: <20220308220812.35726-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/algernon/riemann-c-client/releases/tag/riemann-c-client-1.10.5 Signed-off-by: Fabrice Fontaine --- package/riemann-c-client/riemann-c-client.hash | 4 ++-- package/riemann-c-client/riemann-c-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/riemann-c-client/riemann-c-client.hash b/package/riemann-c-client/riemann-c-client.hash index 6d4d634d75..43d4cd45c4 100644 --- a/package/riemann-c-client/riemann-c-client.hash +++ b/package/riemann-c-client/riemann-c-client.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 334874f0b9a507a8abbc7138df719cba4f28f12c02c39d5e55090b8edb86f9d2 riemann-c-client-1.10.4.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE +sha256 568416d854d1c1e5eac743c9f56db6fa0d6a8144daa74a799d0556bb6b50e679 riemann-c-client-1.10.5.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 6fbb3caf5c..f942d560c8 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -RIEMANN_C_CLIENT_VERSION = 1.10.4 +RIEMANN_C_CLIENT_VERSION = 1.10.5 RIEMANN_C_CLIENT_SITE = \ $(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)) RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+ -- 2.34.1 From mail at dbrgn.ch Tue Mar 8 22:58:47 2022 From: mail at dbrgn.ch (Danilo) Date: Tue, 08 Mar 2022 23:58:47 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> Message-ID: <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> Hi Simon > I did expect that adding the dependency as you did would work but it > failed: they show up when running `make arm- > trusted-firmware-show-depends` but not in `make arm-trusted- > firmware-show-build-order`. Does the same happen for you? Yes, same issue for me. "make nginx-show-depends" includes "nginx-rtmp-module", but "make nginx-show-build-order" does not. Manually building the module before building nginx does work, but it would be nice if there were a clean fix. Danilo From fontaine.fabrice at gmail.com Tue Mar 8 23:17:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 00:17:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix dnssec static build Message-ID: <20220308231733.176991-1-fontaine.fabrice@gmail.com> Drop -DHAVE_DNSSEC_STATIC which has been added by commit e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises the following static build failure because dnsmasq will wrongly append "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' Strangely enough, this is the first time this build failure is raised by the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 Fixes: - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e Signed-off-by: Fabrice Fontaine --- package/dnsmasq/dnsmasq.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4..230e4a8116 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -26,9 +26,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Mar 9 07:43:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 09 Mar 2022 07:43:30 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-08 Message-ID: <20220309074335.AF1FB4089C@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-03-08 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 16 | 4 | 0 | 20 | 2021.11.x | 4 | 0 | 0 | 4 | master | 34 | 12 | 0 | 46 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 1 dnsmasq-2.86 | 1 efl-1.26.1 | 1 file-5.41 | 1 frr-8.1 | 1 gstd-0.13.0 | 1 host-libselinux-3.3 | 1 librtlsdr-ed0317e6a58c09887... | 1 safeclib-3.7.1 | 1 target-finalize | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/32ba5bde054ceee823af0a27e2cb849031c226cb | x86_64 | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/99b419ddb5a3be561d39e715833510a59519213e | powerpc | efl-1.26.1 | NOK | http://autobuild.buildroot.net/results/0a462c2de955d145a43aae657adf1ecc5ffba4f9 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/2c8f26162e5c0e8202b58930930c08cf529bdb0f | ORPH arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/43fd833d5d6562b54988641cf8ad37e327d4fc8c | arm | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/cd485ea788be73a3dc52aa89f6c8993928f9734c | ORPH xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/08c6207fd5f86e4cf786408d36bdda2797b60dd9 | x86_64 | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/ba76e152edad04134708f3d00ce78a194a18327c | sparc64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/024103bf9b624f25026cc9c9f60cdc3087379410 | arc | target-finalize | NOK | http://autobuild.buildroot.net/results/b7092e72d59aa1b55b494f7718cab3e8287d117e | arm | unknown | NOK | http://autobuild.buildroot.net/results/5b00e08bd10723985eb666d87544ea2ee6ff980a | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f7f8969613ee6f2710cbf3d02fed1c3f22b7b029 | Classification of failures by reason for 2021.02.x -------------------------------------------------- gstreamer1-mm-1.10.0 | 1 ndisc6-1.0.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/fc67af8a06c3a6d583be2a4211439d9fc3556846 | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/3d6e0a40b64ddf37429cf2b6870e0002a9d53810 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/b5bd8c5dc46eb98a7958fc88e02bb9ae122fb6a6 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/78b0bd1d3f5eab2c2b41d156c42b7da11e178424 | -- http://autobuild.buildroot.net From bugzilla at busybox.net Wed Mar 9 09:58:14 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 09:58:14 +0000 Subject: [Buildroot] [Bug 14651] New: OpenSSH 8.9p1 compiler error under ARM Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 Bug ID: 14651 Summary: OpenSSH 8.9p1 compiler error under ARM Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: major Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: mf at go-sys.de CC: buildroot at uclibc.org Target Milestone: --- 9-March-2022 from git master ARM little endian gcc-11.2 kernel aspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64 compiling error openssh 8.9.p1 -fzero-call-used-regs is not supported on this target ssherr.c: In Funktion ?ssh_err?: ssherr.c:151:1: nicht implementiert: ?-fzero-call-used-regs? wird auf diesem Ziel nicht unterst?tzt 151 | } | ^ -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 9 10:05:51 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:05:51 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 Frank Rogall changed: What |Removed |Added ---------------------------------------------------------------------------- Version|2021.11.1 |2022.02 Severity|major |blocker --- Comment #6 from Frank Rogall --- This Bug is still in 2022.02 LD_LIBRARY_PATH=/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/lib.host:/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../tools/v8_gypfiles; mkdir -p /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/obj/gen/generate-bytecode-output-root/builtins-generated; python ../../deps/v8/tools/run.py "/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/v8-qemu-wrapper" "/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator" "/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/obj/gen/generate-bytecode-output-root/builtins-generated/bytecodes-builtins-list.h" /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator) /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator) /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator) make[3]: *** [tools/v8_gypfiles/generate_bytecode_builtins_list.target.mk:13: /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/obj/gen/generate-bytecode-output-root/builtins-generated/bytecodes-builtins-list.h] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 9 10:19:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:19:59 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 --- Comment #7 from Jens Maus --- (In reply to Frank Rogall from comment #6) I could verify that this issue still exists in 2022.02. However, my mentioned workaround (cf. https://bugs.busybox.net/show_bug.cgi?id=14366#c4) still works. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 9 10:22:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:22:59 +0000 Subject: [Buildroot] [Bug 14656] New: Adding dependencies from an external tree does not work Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14656 Bug ID: 14656 Summary: Adding dependencies from an external tree does not work Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dopsi at dopsi.ch CC: buildroot at uclibc.org Target Milestone: --- When a dependency is added by a Makefile in an external tree to a package present in the Buildroot tree, the dependency does not get built before the package. Detailled description: When having the following in an external tree: FOO_DEPENDENCIES += bar FOO_FINAL_ALL_DEPENDENCIES gets updated and will contain bar (as shown by running make foo-show-depends) but this will not be reflected in the build order (as shown in make foo-show-build-order). In the package/pkg-generic.mk file [1] there is a call to patsubst that will compute the prerequisites for foo-show-build-order. When printing the output of pathsubst with echo $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES)) the value is properly written out and will contain bar. However, the prerequisite is not present when printing them out with echo $$^ [1] https://git.buildroot.org/buildroot/tree/package/pkg-generic.mk#n996 Links: - first mailing list post: https://lists.buildroot.org/pipermail/buildroot/2022-February/637237.html - second mailing list post: https://lists.buildroot.org/pipermail/buildroot/2022-March/638117.html - minimal example: https://gitlab.com/dopsi/mve-br2-external-dep -- You are receiving this mail because: You are on the CC list for the bug. From rsassen at comecer.com Wed Mar 9 10:24:56 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 9 Mar 2022 10:24:56 +0000 Subject: [Buildroot] [PATCH 0/1] package/rpi-firmware: fix missing files in overlays Message-ID: Hi Peter, > > Also, git stripped the leading TAB character from the changed line in > > the diff. I'm hesitant to manually edit this, since I'm not sure if > > this is intended behavior. > > This should not happen, are you sure the tab is committed? I think it must have been a mistake on my side. I cannot reproduce it. I will fix it in a next revision for the patch. > > This email communication is CONFIDENTIAL. If you are not the intended > > recipient, you may not use, copy or disclose to anyone the message or > > any information contained in the message and I ask that you please notify > me by return email and delete this communication immediately. Thank you. > > According to the email footer I could not look further at your provided patch > ;-) > > Please try to re-send without it.... Unfortunately I have no control over this. It is added automatically by our company email gateway. I have submitted a support ticket for it, but I won't hold my breath... Thanks for the suggestions, Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 9 10:25:19 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:25:19 +0000 Subject: [Buildroot] [Bug 14656] Adding dependencies from an external tree does not work In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14656 --- Comment #1 from Simon Doppler --- Workaround: It is possible to build bar first and then building the entire system. -- You are receiving this mail because: You are on the CC list for the bug. From rsassen at comecer.com Wed Mar 9 10:25:24 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 9 Mar 2022 10:25:24 +0000 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: Hi Peter, > > Not all files in boot/overlays are copied to the image, which may result > > in overlays not being loaded at all, or a wrong overlay being loaded. > > > > When using os_prefix and/or overlay_prefix in the raspberry pi > > config.txt, it checks for the existence of README in the overlays > > directory. If it is missing, overlays will not be loaded. > Any prove for this behavior (could not find anything about it in > the docs)? Yes, it is documented in the raspberry pi docs for config.txt [3], 2nd paragraph: I've also tested it myself and can confirm that e.g. when using os_prefix=custom/ , and /custom/overlays/README does not exist, that overlays will be loaded from the root /overlays instead, or when /overlays does not exist, no overlays will be loaded at all. > > The overlay_map.dtb file contains rules for overlays that require > > special handling depending on the specific type of raspberry pi > > hardware. When this file is missing, the wrong overlay may be loaded. > > Only if you use this feature, see [1], [2] (building multiple rpi targeting sdcard) > instead of determining the right overlay (exactly targeting one rpi flavour sdcard, > as the buildroot rpi example config files do)... That is correct. You have to be careful however when e.g. switching to a new rpi target. When no overlay map is present, you'll have to manually change config.txt to use the correct overlays for your platform instead of relying on the overlay map. > Would prefer to only/explicitly add the overlay_map.dtb file: > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo) $(@D)/boot/overlays/overlay_map.dtb, \ > > or > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo $(@D)/boot/overlays/*.dtb), \ > > or as it is a (maybe unwanted target feature) add a new buildroot rpi-firmware > configure option for adding the overlay_map.dtb file... I had also considered adding only the README and overlay_map.dtb. But I figured if the raspberry pi firmware adds extra files, they would probably be important. Not copying them might introduce unexpected behavior. When not copying all files, each time when bumping rpi-firmware to a new version one should check if files were added, and if they are worth copying. I could add a configure option to also copy overlay_map.dtb and README like you suggested (probably two separate options then; default on?). E.g. BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_README How about instead adding a configure option for specifying a list of files to be copied instead of all files? That way you could also specify exactly which dtbo files should be copied, instead of copying all of them. Currently there are a lot of overlays copied that we don't use for our system configuration. And if in the future new files are added to the rpi-firmware overlays, we don't have to introduce yet another configure option for it. E.g. BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_FILES Thanks for the feedback, regards, Rutger [3] https://www.raspberrypi.com/documentation/computers/config_txt.html#os_prefix This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Wed Mar 9 11:20:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 12:20:02 +0100 Subject: [Buildroot] Buildroot 2022.02 released Message-ID: <87y21j1ifx.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02.tar.gz or http://buildroot.net/downloads/buildroot-2022.02.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Please give it a spin and report any problems to the mailing list or bug tracker. Again a very active development cycle with almost 2000 changes and contributions from 148 unique contributors! Of noteworthy new features/changes we have: - Toolchain: - glibc: Optional support for compatibility shims for running on older kernels than what glibc has been built against - uClibc: Use uClibc-ng 1.0.40 - External toolchains: Update Bootlin toolchains to 2021.11-1 version - Python 2.7 and python 2.x specific packages removed as python 2.x is EOL since April 2020. Likewise a number of python3 specific host packages has been renamed (host-python-foo instead of host-python3-foo) now host-python is always python 3.x. - Cargo (Rust) package infrastructure added. Vendoring support added to golang package infrastructure. - New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2, QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike Riscv64, Xilinx zcu102 - New packages: ace, alchemy, alfred, bat, bento4, bmx7, bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper, davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi, gdk-pixbuf-xlib gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools, libcamera-apps, libest, libexecinfo, libfutils, libglvnd, libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv, lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver, moby-buildkit, modsecurity2, networkd-dispatcher, pahole, php-apcu, php-lua, php-pam, python-argon2-cffi-bindings, python-cssselect2, python-distro, python-fonttools, python-gnupg, python-installer, python-memory-profiler, python-mpd2, python-pep517, python-pydyf, python-pypa-build, python-pyphen, python-tinycss2, python-tomli, python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware, riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp, sentry-cli, serd, simple-mail, sord, sratom, sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog, vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02 Upgrading from 2021.02.x: In addition to these changes, for people upgrading from 2021.02.x the most noteworthy changes since that release are: - FORTIFY_SOURCE, PIC/PIE, RELRO and SSP security hardening options are now enabled by default. - The minimal host cmake version has been bumped to 3.16 - support/download: Fix tarball generation (from git/svn repos) including symlinks pointing to ./. Fix svn download for <1.9 clients or repos using CVS-style keywords. - Infrastructure: Expose CONFIG_DIR to post-build/post-image scripts, so they can call the Buildroot Makefile in the correct directory for both in-tree / out-of-tree builds. - support/scripts/gen-missing-cpe: A script to query the list of CPE IDs for the packages enabled in the current configuration and: - for CPE IDs that do not have any matching entry in the CPE database, it emits a warning - for CPE IDs that do have a matching entry, but not with the same version, it generates a snippet of XML that can be used to propose an updated version to NIST. - support/scripts/cve.py: Use the (significantly) faster yajl2 ijson backend for older (< 2.5) ijson versions rather than the slow python default, speeding up pkg-stats by ~2x. - CPE meta data has been added for a large number of packages - Toolchain: Add support for gcc 11.x, gcc 10.x is now the default, removed gcc 8.x support except for PowerPC SPE. Support for gdb 11.x added, gdb 10.x now the default. Add support for binutils 2.37, binutils 2.36.x is now the default, binutils 2.34 removed. Glibc updated to 2.34 - Bootloaders/firmware: support for building the EDK II UEFI firmware, support for building AT91Bootstrap 4.x. - New BR2_ENABLE_RUNTIME_DEBUG option, that controls whether packages should be compiled with runtime debugging information (which is different than debugging symbols). - Many features of the bluez5_utils package have been made optional, and default to disabled. Users of bluez5_utils are encouraged to review their configuration. - Many packages (over 70) updated to enable the appropriate SELinux refpolicy module when SELinux support is enabled. - Many packages updated to select the appropriate OpenSSL features after many OpenSSL ciphers/features have been made optional. - Filesystems: - new OCI filesystem type, to build container images compatible with the Open Container Initiative standard - support for hybrid ISO9660 images added, which work on legacy and EFI BIOS machines Future: This release will be become our new long term support releases, which means it will be supported with security and other important fixes until 2023.02 is out. The previous 2021.02.x LTS release will see atleast one more update before it becomes EOL in April, so start migration to 2022.02 soon. The next release will be 2022.05. Expect the first release candidate in early May and the final release at the end of the month. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 12:56:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 13:56:12 +0100 Subject: [Buildroot] [git commit] Kickoff 2022.05 cycle Message-ID: <20220309124906.1EAE88386E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=722dffca13a8f129a8fb2938a02def5f454991fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 71f8096b71..6756945819 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02 +export BR2_VERSION := 2022.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1646777000 From peter at korsgaard.com Wed Mar 9 12:55:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 13:55:32 +0100 Subject: [Buildroot] [git commit] docs/website/news.html: add 2022.02 announcement link Message-ID: <20220309124906.150C683903@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=501263241ce6b38f3c45e737c7928a1ae1c66927 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index de80a5f23d..3b7234b307 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

    The stable 2022.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2022.02 release.

    From Alexey.Brodkin at synopsys.com Wed Mar 9 13:28:35 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 9 Mar 2022 16:28:35 +0300 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC Message-ID: <20220309132835.7251-1-abrodkin@synopsys.com> This patch adds support of ARC architecture in Qt's JS core and Webkit. The change itself is quite straight-forward: 1. Enable JS core for ARC 2. Make sure so-called "large memory model" is used, i.e. relocations with long jumps are being generated for global symbols, as otherwise insanely huge libqt5webkit.so fails to link because some symbols might be more than 32 MiB away from each other. 3. Make the original WebKit build system aware of yet another CPU architecture with explicitly disabled JIT in JS core for ARC. Obviously, this one depends on [1]. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer --- package/qt5/Config.in | 2 +- package/qt5/qt5base/qt5base.mk | 13 +++ .../0005-Add-support-for-ARC-processors.patch | 93 +++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch diff --git a/package/qt5/Config.in b/package/qt5/Config.in index f2b1ff4a19..cbb2e06a21 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE bool default y # Javascript engine is only available on certain architectures - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..b25e0f44b6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -201,6 +201,19 @@ endif QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) +ifeq ($(BR2_arc),y) +# In case of -Os (which is default in BR) gcc will use millicode implementation +# from libgcc. That along with performance degradation may lead to issues during +# linkage stage. In case of QtWebkit exactly that happens - millicode functions +# get put way too far from caller functions and so linker fails. +# To solve that problem we explicitly disable millicode call generation for Qt. +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) +# it's good to firce compiler to not assume short or even medium-length calls +# could be used. I.e. always use long jump instaructions. +# Otherwise there's a high risk of hitting link-time failures. +QT5BASE_CFLAGS += -mno-millicode -mlong-calls +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch new file mode 100644 index 0000000000..92f023eab6 --- /dev/null +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch @@ -0,0 +1,93 @@ +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 21 Feb 2022 18:28:00 +0300 +Subject: [PATCH] Add support for ARC processors + +Signed-off-by: Alexey Brodkin +--- + CMakeLists.txt | 4 +++- + Source/JavaScriptCore/CMakeLists.txt | 3 ++- + Source/WTF/wtf/Platform.h | 8 ++++++++ + Source/WTF/wtf/dtoa/utils.h | 2 +- + Source/cmake/OptionsQt.cmake | 4 ++++ + 5 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31a2ea1fd..f0dfbda5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) + else () + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) + endif () +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") ++ set(WTF_CPU_ARC 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 937b3ed00..205dde288 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) + endif () + +-if (WTF_CPU_ARM) ++if (WTF_CPU_ARC) ++elseif (WTF_CPU_ARM) + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5717f3ea1..b327ed693 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -349,6 +349,14 @@ + + #endif /* ARM */ + ++/* CPU(ARC) - ARC */ ++#if defined(__arc__) ++#define WTF_CPU_ARC 1 ++#if defined(__BIG_ENDIAN__) ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++#endif ++ + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 889642cee..8f1e9933e 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +index ec6081de0..e1a5efc1e 100644 +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) + endif () + ++if (WTF_CPU_ARC) ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) ++endif () ++ + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) +-- +2.25.1 + -- 2.25.1 From arnout at mind.be Wed Mar 9 13:30:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:24 -0000 Subject: [Buildroot] [git commit] package/libxkbcommon: bump version to 1.4.0 Message-ID: <20220309132156.0ADB883916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=948050c0f9096953555ed7f84835c5297a415a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) From arnout at mind.be Wed Mar 9 13:30:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:24 -0000 Subject: [Buildroot] [git commit] package/python-setuptools: bump to version 60.8.2 Message-ID: <20220309132156.4917283917@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=795c473cfdedc71b6dcf5b691cec729d2845da0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Mar 9 13:30:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:25 -0000 Subject: [Buildroot] [git commit] package/xmrig: bump version to 6.16.4 Message-ID: <20220309132156.3CBF583916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b969c8c8cd30a97a47f7197c114e37c9d12d80b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 9 13:30:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:25 -0000 Subject: [Buildroot] [git commit] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Message-ID: <20220309132156.320BD83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80f480381b3b307079c761f14508458782772111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From peter at korsgaard.com Wed Mar 9 13:23:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 14:23:07 +0100 Subject: [Buildroot] [git commit] Merge branch 'next' Message-ID: <20220309132156.ED25D83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0064df6bd29492b3472542b0d52dd5d1ca983dc Patch is too large, so refusing to show it Patch is too large, so refusing to show it From arnout at mind.be Wed Mar 9 13:30:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:25 -0000 Subject: [Buildroot] [git commit] package/liquid-dsp: bump version to 1.4.0 Message-ID: <20220309132155.F12CA83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f7f8f381394207bfb029ec395f5ced5695a0a2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Wed Mar 9 13:30:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:26 -0000 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Message-ID: <20220309132156.546AB83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aca97d6e51a006187bcd3319cb7ff1a92380c66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 871cf2f495..c8573fafad 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.5 +MESA3D_HEADERS_VERSION = 21.3.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e36d798e21..d64b833100 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.5 +MESA3D_VERSION = 21.3.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Wed Mar 9 13:30:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:26 -0000 Subject: [Buildroot] [git commit] package/unbound: bump version to 1.15.0 Message-ID: <20220309132156.6B5AE83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad0f7a096ce29b3626e4ac41e5dbea0ff3e7ae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From arnout at mind.be Wed Mar 9 13:30:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:27 -0000 Subject: [Buildroot] [git commit] boot/barebox: bump version to 2022.01.0 Message-ID: <20220309132156.613B483916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a2beaf778d3649ab395c2a931a3935f69191585 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bartosz Bilas Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From arnout at mind.be Wed Mar 9 13:30:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:28 -0000 Subject: [Buildroot] [git commit] package/mutt: bump to version 2.2.0 Message-ID: <20220309132156.8FDA183915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1ca33e81230eaa5fe41c4945075c62821128a8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif From arnout at mind.be Wed Mar 9 13:30:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:29 -0000 Subject: [Buildroot] [git commit] package/opentracing-cpp: bump to version 1.6.0 Message-ID: <20220309132156.84EE083915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5a8485963dc0112c0201e712d599d31f0081035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 9 13:30:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:30 -0000 Subject: [Buildroot] [git commit] package/pkg-python.mk: refactor build/install opts Message-ID: <20220309132156.9D7BF83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3810c131761922ae8c046840c78430c4125f16e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python package infrastructure defines a number of helper variables that are used to construct the build and install commands. However, there are still a few parts (setup.py and its argument) that are set explicitly in _BUILD_CMDS and _INSTALL_CMDS. This creates problems if we want to add another setup type that does not use setup.py. Therefore, move the setup.py part into the helper variables as well. Since this means that the variable becomes a full command rather than just options, rename them to _BUILD_CMD and _INSTALL_CMD. While we're at it, also clean up the whitespace in the definition of these variables. They were aligned on = at some point, but that alignment was already broken. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 02df061a19..61f0dd6ec2 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -130,27 +130,27 @@ endif # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") @@ -186,8 +186,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif @@ -200,8 +200,9 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) endef endif @@ -213,8 +214,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -227,8 +228,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif From arnout at mind.be Wed Mar 9 13:30:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:31 -0000 Subject: [Buildroot] [git commit] package/ola: reintroduce package at version 0.10.8 Message-ID: <20220309132156.792E983916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ff948444c3978d63f483344a3d92d994c64312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Wed Mar 9 13:30:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:33 -0000 Subject: [Buildroot] [git commit] package/python-flit-core: new package/infrastructure Message-ID: <20220309132156.AA74283916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29a12eb86aee706082f344a25d2e563984b9aa1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This adds pep517(needed for flit-core to build itself) and flit python package types. We need to add an installer script and pass it appropriate options for installing pep517 wheels generated by python-pypa-build during the build stage. Unfortunately it seems pep517 does not support builds without using the wheel format. We also need to add a patch fixing the version parser in flit-core. Signed-off-by: James Hilliard [Arnout: - fix indentation in pkg-python.mk (tabs, not spaces); - use the new _CMD variables instead of duplicating the entire _CMDS definitions; - no need to filter dependencies (they're not self-referencing); - _NEEDS_HOST_PYTHON no longer exists; - host-python-pypa-build gets added to DEPENDENCIES automatically. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 59 +++++++++++++++- ...t-version-parser-for-multiple-assignments.patch | 80 ++++++++++++++++++++++ package/python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 13 ++++ support/scripts/pyinstaller.py | 69 +++++++++++++++++++ 5 files changed, 223 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 61f0dd6ec2..0c5577362f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -103,6 +103,47 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PATH=$(BR_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ + PYTHONPATH="$(PYTHON3_PATH)" \ + PYTHONNOUSERSITE=1 \ + _python_sysroot=$(STAGING_DIR) \ + _python_prefix=/usr \ + _python_exec_prefix=/usr + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/usr/bin \ + --data=$(HOST_DIR)/usr + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -152,8 +193,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +ifeq ($(4),target) +$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for @@ -172,6 +224,11 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += host-python-flit-core +endif endif # SETUP_TYPE # Python interpreter to use for building the package. diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch new file mode 100644 index 0000000000..5a94e1dcab --- /dev/null +++ b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch @@ -0,0 +1,80 @@ +From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 27 Nov 2021 02:36:15 -0700 +Subject: [PATCH] Fix ast version parser for multiple assignments + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/takluyver/flit/pull/474] +--- + flit_core/common.py | 21 +++++++++++-------- + .../tests/samples/moduleunimportabledouble.py | 8 +++++++ + flit_core/tests/test_common.py | 5 +++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py + +diff --git a/flit_core/common.py b/flit_core/common.py +index f1f378f..86bcf4b 100644 +--- a/flit_core/common.py ++++ b/flit_core/common.py +@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): + for child in node.body: + # Only use the version from the given module if it's a simple + # string assignment to __version__ +- is_version_str = ( +- isinstance(child, ast.Assign) +- and len(child.targets) == 1 +- and isinstance(child.targets[0], ast.Name) +- and child.targets[0].id == "__version__" +- and isinstance(child.value, ast.Str) +- ) +- if is_version_str: +- version = child.value.s ++ if isinstance(child, ast.Assign): ++ for target in child.targets: ++ is_version_str = ( ++ isinstance(target, ast.Name) ++ and target.id == "__version__" ++ and isinstance(child.value, ast.Str) ++ ) ++ if is_version_str: ++ version = child.value.s ++ break ++ else: ++ continue + break + else: + version = None +diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py +new file mode 100644 +index 0000000..42d51f3 +--- /dev/null ++++ b/flit_core/tests/samples/moduleunimportabledouble.py +@@ -0,0 +1,8 @@ ++ ++""" ++A sample unimportable module with double assignment ++""" ++ ++raise ImportError() ++ ++VERSION = __version__ = "0.1" +diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py +index 02cfab7..42e230b 100644 +--- a/flit_core/tests/test_common.py ++++ b/flit_core/tests/test_common.py +@@ -70,6 +70,11 @@ class ModuleTests(TestCase): + 'version': '0.1'} + ) + ++ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) ++ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', ++ 'version': '0.1'} ++ ) ++ + info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) + self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', + 'version': '1.2.3'} +-- +2.33.1 + diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash new file mode 100644 index 0000000000..bd47fd4f6b --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz +sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 0000000000..8971223d1f --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 + +$(eval $(host-python-package)) diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py new file mode 100755 index 0000000000..6dd9242327 --- /dev/null +++ b/support/scripts/pyinstaller.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import argparse +import glob + +from installer import install +from installer.destinations import SchemeDictionaryDestination +from installer.sources import WheelFile + + +def main(): + """Entry point for CLI.""" + ap = argparse.ArgumentParser("python pyinstaller.py") + ap.add_argument("wheel_file", help="Path to a .whl file to install") + + ap.add_argument( + "--interpreter", required=True, help="Interpreter path to be used in scripts" + ) + ap.add_argument( + "--script-kind", + required=True, + choices=["posix", "win-ia32", "win-amd64", "win-arm", "win-arm64"], + help="Kind of launcher to create for each script", + ) + + dest_args = ap.add_argument_group("Destination directories") + dest_args.add_argument( + "--purelib", + required=True, + help="Directory for platform-independent Python modules", + ) + dest_args.add_argument( + "--platlib", + help="Directory for platform-dependent Python modules (same as purelib " + "if not specified)", + ) + dest_args.add_argument( + "--headers", required=True, help="Directory for C header files" + ) + dest_args.add_argument( + "--scripts", required=True, help="Directory for executable scripts" + ) + dest_args.add_argument( + "--data", required=True, help="Directory for external data files" + ) + args = ap.parse_args() + + destination = SchemeDictionaryDestination( + { + "purelib": args.purelib, + "platlib": args.platlib if args.platlib is not None else args.purelib, + "headers": args.headers, + "scripts": args.scripts, + "data": args.data, + }, + interpreter=args.interpreter, + script_kind=args.script_kind, + ) + + with WheelFile.open(glob.glob(args.wheel_file)[0]) as source: + install( + source=source, + destination=destination, + additional_metadata={}, + ) + + +if __name__ == "__main__": + main() From arnout at mind.be Wed Mar 9 13:30:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:33 -0000 Subject: [Buildroot] [git commit] package/python-tinycss2: bump to version 1.1.1 Message-ID: <20220309132156.B4D8283917@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc60c732a19548cfbd3543d3521324ef5faaa116 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-tinycss2/Config.in | 2 ++ package/python-tinycss2/python-tinycss2.hash | 4 ++-- package/python-tinycss2/python-tinycss2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index a34717e002..4d6dcca663 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -3,3 +3,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb3754752..e8e1d93f83 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 60272f58f8d5834b2e09ffbc9bd5de53 tinycss2-1.1.1.tar.gz +sha256 b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf tinycss2-1.1.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b97766..e4fc5dc9c5 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.1.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/1e/5a/576828164b5486f319c4323915b915a8af3fa4a654bbb6f8fc8e87b5cb17 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Mar 9 13:30:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 09 Mar 2022 13:30:34 -0000 Subject: [Buildroot] [git commit] package/cryptsetup: openssl is the default crypto backend Message-ID: <20220309132156.BFA3A83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ce909afa98223bbd6bb1b2c65dec6cc8982ad31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bad31cec8a 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -20,15 +20,15 @@ CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif From arnout at mind.be Wed Mar 9 13:30:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:35 -0000 Subject: [Buildroot] [git commit] package/poke: bump to version 2.1 Message-ID: <20220309132156.1799D83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc614345f1b8389df46b8f2d64cb3ae5a209b6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...c-HELP2MAN-replace-by-true-when-cross-com.patch | 6 ++--- ...-getrandom.c-fix-build-with-uclibc-1.0.35.patch | 28 +++++++++++----------- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index c169516153..85a76e068e 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From b35dadae6371c3727cac46ae5bd348b66aa411fc Mon Sep 17 00:00:00 2001 +From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -17,10 +17,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2c6f1aef..9c4c9be2 100644 +index a1943b57..c633f719 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index 757dc3f760..bd20b5d2c6 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -15,7 +15,7 @@ In file included from ./sys/random.h:40, /tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 7 | #include +++ |+#include - 8 | + 8 | This patch is not upstreamable as it is only a workaround for uclibc < 1.0.35, upstream uclibc has been patched with @@ -26,15 +26,15 @@ Fixes: Signed-off-by: Fabrice Fontaine --- - jitter/gnulib-local/getrandom.c | 1 + - gl/getrandom.c | 1 + gl-libpoke/getrandom.c | 1 + + gl/getrandom.c | 1 + + jitter/gnulib-local/getrandom.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/jitter/gnulib-local/getrandom.c -+++ b/jitter/gnulib-local/getrandom.c +diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c +index e146873..3948d8d 100644 +--- a/gl-libpoke/getrandom.c ++++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ #include @@ -44,7 +44,7 @@ index 41212fb32..0ad3f9648 100644 #include diff --git a/gl/getrandom.c b/gl/getrandom.c -index 41212fb32..0ad3f9648 100644 +index e146873..3948d8d 100644 --- a/gl/getrandom.c +++ b/gl/getrandom.c @@ -19,6 +19,7 @@ @@ -55,10 +55,10 @@ index 41212fb32..0ad3f9648 100644 #include #include -diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/gl-libpoke/getrandom.c -+++ b/gl-libpoke/getrandom.c +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index e146873..3948d8d 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c @@ -19,6 +19,7 @@ #include @@ -68,5 +68,5 @@ index 41212fb32..0ad3f9648 100644 #include -- -2.30.2 +2.31.1 diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 1367262f54..c30713b91c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24 poke-1.4.tar.gz +sha256 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) From arnout at mind.be Wed Mar 9 13:30:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:36 -0000 Subject: [Buildroot] [git commit] package/rng-tools: bump to version 6.15 Message-ID: <20220309132156.2415F83917@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91cc129d72cf972c906829b1085c96797e41efd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-detect-non-posix-extensions-for-pthreads.patch | 43 ------------------- ...se-of-either-pthread-affinity-set-methods.patch | 49 ---------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) diff --git a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:43:01 -0400 -Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads - -Theres a desire to build rngd with musl, which doesn't have all the gnu -extensions (but it has some). So test for those. Note, this requires -the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0fe06fc..de7dca3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD - AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS([rng-tools-config.h]) - AC_CONFIG_MACRO_DIRS([m4]) -+AC_USE_SYSTEM_EXTENSIONS - - dnl Parse options - -@@ -100,6 +101,12 @@ AS_IF( - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) - -+AC_CHECK_DECL(pthread_attr_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], -+ [ AC_CHECK_DECL(pthread_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include ]]) -+ ], [[#include ]]) -+ - AS_IF( - [ test "x$with_nistbeacon" != "xno"], - [ diff --git a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:48:10 -0400 -Subject: [PATCH] Allow for use of either pthread affinity set methods - -musl has support for pthread_setaffinity_np, but not -pthread_attr_setaffinity_np. so check for hte existence of either -function in configure, and use the appropriate one. - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893] -Signed-off-by: Fabrice Fontaine ---- - rngd_jitter.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index ea29436..5c7e09e 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, - for(i=i-1;i>=0;i--) { - CPU_SET(i,cpus); - } -- pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); - -+ /* -+ * Note that only one of: -+ * HAVE_PTHREAD_ATTR_SETAFFINITY -+ * and -+ * HAVE_PTHREAD_SETAFFINITY -+ * Will ever be set, as per the configure.ac logic -+ */ -+#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY -+ pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); -+#endif - ret = -pthread_create(&thread_ctx->notime_thread_id, - &thread_ctx->notime_pthread_attr, - start_routine, arg); - -+#ifdef HAVE_PTHREAD_SETAFFINITY -+ pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); -+#endif -+ - CPU_FREE(cpus); - return ret; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING From nolange79 at gmail.com Wed Mar 9 13:52:23 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 9 Mar 2022 14:52:23 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: support mismatched merged usr In-Reply-To: <2086ffec-82b8-ec71-41f0-55253c3cd8eb@mind.be> References: <20220215124619.563502-1-nolange79@gmail.com> <2086ffec-82b8-ec71-41f0-55253c3cd8eb@mind.be> Message-ID: Am Sa., 5. M?rz 2022 um 16:09 Uhr schrieb Arnout Vandecappelle : > > > > On 15/02/2022 13:46, Norbert Lange wrote: > > Look at the case where the source toolchain has non-merged usr, > > yet the target will have merged usr. > > > > sysroot/lib/ld-musl-x86_64.so.1 -> ../usr/lib/libc.so > > sysroot/usr/lib/libc.so > > Where do you get an external toolchain with such a weird layout? Normally libc > is in sysroot/lib and ld-musl*.so.1 is a symlink to either /lib/libc.so or > ../lib/libc.so. > > > Regards, > Arnout > the toolchain is built with crosstool-ng > > > > What happens is that buildroot copies the ld-*so* symlink > > into usr/lib, at which point it becomes broken. > > > > We now detect these broken symlinks, then try to find the target > > binary in the library directories and fix the link. > > > > Fix the case where the lib directory is a symlink, and no ld-*so* > > is installed by adding -H to find. > > > > Also use `cp -t` instead of some rarely used xargs tricks. > > > > Signed-off-by: Norbert Lange > > --- > > toolchain/helpers.mk | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > > index ef8e9a5f64..aaf2aecd80 100644 > > --- a/toolchain/helpers.mk > > +++ b/toolchain/helpers.mk > > @@ -135,8 +135,17 @@ copy_toolchain_sysroot = \ > > $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ > > done ; \ > > fi ; \ > > - if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > > - find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ > > + for i in $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -xtype l); do \ > > + LINKTARGET=`readlink $$i`; \ > > + rm $$i; \ > > + NEWLINKTARGET=$$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/lib $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/lib -name "`basename $${LINKTARGET}`" -print -quit); \ > > + if [ -n "$${NEWLINKTARGET}" -a -e "$${NEWLINKTARGET}" ]; then \ > > + ln -sr $${NEWLINKTARGET} $$i; \ > > + echo "Symlinking $$i -> `readlink $$i`" ; \ > > + fi; \ > > + done; \ > > + if [[ ! $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > > + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 cp -t $(STAGING_DIR)/lib/; \ > > fi ; \ > > if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ > > if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ From foss+buildroot at 0leil.net Wed Mar 9 14:29:13 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Wed, 9 Mar 2022 15:29:13 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 Message-ID: <20220309142913.2102898-1-foss+buildroot@0leil.net> From: Quentin Schulz This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. The patch fails to apply because of a conflict in copyright year so it needed some additional handling after downloading. The patch file was added by running the following command: wget https://download.qt.io/archive/qt/5.15/CVE-2022-25255-qprocess5-15.diff -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch [1] https://nvd.nist.gov/vuln/detail/CVE-2022-25255 Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 2 + 2 files changed, 58 insertions(+) create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch new file mode 100644 index 0000000000..dfab92a9ef --- /dev/null +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch @@ -0,0 +1,56 @@ +--- a/src/corelib/io/qprocess_unix.cpp ++++ b/src/corelib/io/qprocess_unix.cpp +@@ -1,7 +1,7 @@ + /**************************************************************************** + ** + ** Copyright (C) 2016 The Qt Company Ltd. +-** Copyright (C) 2016 Intel Corporation. ++** Copyright (C) 2022 Intel Corporation. + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtCore module of the Qt Toolkit. +@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess() + // Add the program name to the argument list. + argv[0] = nullptr; + if (!program.contains(QLatin1Char('/'))) { ++ // findExecutable() returns its argument if it's an absolute path, ++ // otherwise it searches $PATH; returns empty if not found (we handle ++ // that case much later) + const QString &exeFilePath = QStandardPaths::findExecutable(program); +- if (!exeFilePath.isEmpty()) { +- const QByteArray &tmp = QFile::encodeName(exeFilePath); +- argv[0] = ::strdup(tmp.constData()); +- } +- } +- if (!argv[0]) ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); ++ argv[0] = ::strdup(tmp.constData()); ++ } else { + argv[0] = ::strdup(encodedProgramName.constData()); ++ } + + // Add every argument to the list + for (int i = 0; i < arguments.count(); ++i) +@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid) + envp = _q_dupEnvironment(environment.d.constData()->vars, &envc); + } + +- QByteArray tmp; + if (!program.contains(QLatin1Char('/'))) { ++ // findExecutable() returns its argument if it's an absolute path, ++ // otherwise it searches $PATH; returns empty if not found (we handle ++ // that case much later) + const QString &exeFilePath = QStandardPaths::findExecutable(program); +- if (!exeFilePath.isEmpty()) +- tmp = QFile::encodeName(exeFilePath); ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); ++ argv[0] = ::strdup(tmp.constData()); ++ } else { ++ argv[0] = ::strdup(QFile::encodeName(program)); + } +- if (tmp.isEmpty()) +- tmp = QFile::encodeName(program); +- argv[0] = tmp.data(); + + if (envp) + qt_safe_execve(argv[0], argv, envp); diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..ac0781c430 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -15,6 +15,8 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# 0008-CVE-2022-25255-qprocess5-15.diff.patch +QT5BASE_IGNORE_CVES += CVE-2022-25255 # A few comments: # * -no-pch to workaround the issue described at -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:35:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:35:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads Message-ID: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine --- ...cks-define-lock-functions-as-a-macro.patch | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:37:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:37:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/pppd: fix CPE ID Message-ID: <20220309173710.527496-1-fontaine.fabrice@gmail.com> samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce..d9d6244f10 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:58:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:58:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola! drop autoreconf Message-ID: <20220309175826.538666-1-fontaine.fabrice@gmail.com> OLA_AUTORECONF has been set since re-introduction of package in commit 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no patches are touching Makefile.am or ola.m4 anymore Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..1874350784 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:59:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:59:31 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/ola: drop autoreconf Message-ID: <20220309175931.538771-1-fontaine.fabrice@gmail.com> OLA_AUTORECONF has been set since re-introduction of package in commit 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no patches are touching Makefile.am or ola.m4 anymore Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo in title package/ola/ola.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..1874350784 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola -- 2.34.1 From bugzilla at busybox.net Wed Mar 9 18:18:35 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 18:18:35 +0000 Subject: [Buildroot] [Bug 14661] New: Fakeroot script relies on bash-isms, does not work with dash Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 Bug ID: 14661 Summary: Fakeroot script relies on bash-isms, does not work with dash Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: gsmecher at threespeedlogic.com CC: buildroot at uclibc.org Target Milestone: --- On a Debian (bookworm) release, I get the following error message when building up the release tarball: >>> Generating filesystem image rootfs.tar mkdir -p /home/gsmecher/winterland/buildroot-mkids/output/images rm -rf /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar mkdir -p /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar rsync -auH --exclude=/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM /home/gsmecher/winterland/buildroot-mkids/output/target/ /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target echo '#!/bin/sh' > /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "set -e" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "chown -h -R 0:0 /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot PATH="/home/gsmecher/winterland/buildroot-mkids/output/host/bin:/home/gsmecher/winterland/buildroot-mkids/output/host/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" /home/gsmecher/winterland/buildroot-mkids/support/scripts/mkusers /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/full_users_table.txt /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "/home/gsmecher/winterland/buildroot-mkids/output/host/bin/makedevs -d /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/full_devices_table.txt /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "rm -rf /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/run/* /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/run/.[^.]* /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/tmp/* /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/tmp/.[^.]*" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot printf ' \n' >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot printf ' \n' >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot printf ' (cd /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target; find -print0 | LC_ALL=C sort -z | tar --pax-option=exthdr.name=%%d/PaxHeaders/%%f,atime:=0,ctime:=0 -cf /home/gsmecher/winterland/buildroot-mkids/output/images/rootfs.tar --null --xattrs-include='\''*'\'' --no-recursion -T - --numeric-owner)\n' >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot chmod a+x /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot PATH="/home/gsmecher/winterland/buildroot-mkids/output/host/bin:/home/gsmecher/winterland/buildroot-mkids/output/host/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" FAKEROOTDONTTRYCHOWN=1 /home/gsmecher/winterland/buildroot-mkids/output/host/bin/fakeroot -- /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot rootdir=/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target table='/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/full_devices_table.txt' rm: refusing to remove '.' or '..' directory: skipping '/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/tmp/..' make: *** [fs/tar/tar.mk:37: /home/gsmecher/winterland/buildroot-mkids/output/images/rootfs.tar] Error 1 My /bin/sh is symlinked to /bin/dash: $ ls -ls /bin/sh 0 lrwxrwxrwx 1 root root 4 Mar 7 16:32 /bin/sh -> dash When I change fs/common.mk to produce a shebang line using /bin/bash instead, the build completes as expected. This is most likely a bash-ism in the fakeroot script - it is conceivably also possibly a dash limitation. In any case, the most plausible fixes are either - for me to insist on /bin/bash for /bin/sh, which fixes the problem here and does not require buildroot alterations, or - for buildroot to use /bin/bash instead of /bin/sh, which fixes the problem for anyone else who bumps into it. I am happy with either but thought a bug report was polite. thanks, Graeme -- You are receiving this mail because: You are on the CC list for the bug. From dopsi at dopsi.ch Wed Mar 9 10:30:14 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Wed, 09 Mar 2022 11:30:14 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> Message-ID: <3677050fbcbf7d7e31d8c6c12924f648d0e37d2a.camel@dopsi.ch> Hi Danilo, > > I did expect that adding the dependency as you did would work but > > it > > failed: they show up when running `make arm- > > trusted-firmware-show-depends` but not in `make arm-trusted- > > firmware-show-build-order`. Does the same happen for you? > > Yes, same issue for me. "make nginx-show-depends" includes "nginx- > rtmp-module", > but "make nginx-show-build-order" does not. > > Manually building the module before building nginx does work, but it > would be > nice if there were a clean fix. I submitted a bug report [1], with some extra info I found by digging around today. I will continue to dig around in the coming weeks but it will still not be high on my priorities. Simon From bugzilla at busybox.net Wed Mar 9 19:12:40 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 19:12:40 +0000 Subject: [Buildroot] [Bug 14661] Fakeroot script relies on bash-isms, does not work with dash In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 clayton.shotwell at rockwellcollins.com changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2022.02 -- You are receiving this mail because: You are on the CC list for the bug. From ps.report at gmx.net Wed Mar 9 19:39:44 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 9 Mar 2022 20:39:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220309203944.17591179@gmx.net> Hello Rutger, On Wed, 9 Mar 2022 10:25:24 +0000, "Sassen, Rutger" wrote: > Hi Peter, > > > > Not all files in boot/overlays are copied to the image, which may result > > > in overlays not being loaded at all, or a wrong overlay being loaded. > > > > > > When using os_prefix and/or overlay_prefix in the raspberry pi > > > config.txt, it checks for the existence of README in the overlays > > > directory. If it is missing, overlays will not be loaded. > > > Any prove for this behavior (could not find anything about it in > > the docs)? > > Yes, it is documented in the raspberry pi docs for config.txt [3], 2nd paragraph: > Thanks for the link, but as I read it (and I am pretty sure the given overlays are loaded from the default location without the README file) the README file is only needed in case os_prefix is is (overlays stored in a non default location)? > I've also tested it myself and can confirm that e.g. when using os_prefix=custom/ , and /custom/overlays/README does not exist, that overlays will be loaded from the root /overlays instead, or when /overlays does not exist, no overlays will be loaded at all. > Seems to validate the above..., a README file in the default boot partition overlays directory is not needed (the default buildroot/rpi-firmware/genimage-configs location)..., and the special cases (os_prefix use cases) are not supported by buildroot out-of-the-box, so I would omit the README case... > > > > The overlay_map.dtb file contains rules for overlays that require > > > special handling depending on the specific type of raspberry pi > > > hardware. When this file is missing, the wrong overlay may be loaded. > > > > Only if you use this feature, see [1], [2] (building multiple rpi targeting sdcard) > > instead of determining the right overlay (exactly targeting one rpi flavour sdcard, > > as the buildroot rpi example config files do)... > > That is correct. You have to be careful however when e.g. switching to a new rpi target. When no overlay map is present, you'll have to manually change config.txt to use the correct overlays for your platform instead of relying on the overlay map. As the buildroot default configs are per raspberry pi model this is no use-case/problem...., but optional support for multiple targeting sdcards is welcome ;-) > > > Would prefer to only/explicitly add the overlay_map.dtb file: > > > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo) $(@D)/boot/overlays/overlay_map.dtb, \ > > > > or > > > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo $(@D)/boot/overlays/*.dtb), \ > > > > or as it is a (maybe unwanted target feature) add a new buildroot rpi-firmware > > configure option for adding the overlay_map.dtb file... > > I had also considered adding only the README and overlay_map.dtb. But I figured if the raspberry pi firmware adds extra files, they would probably be important. Not copying them might introduce unexpected behavior. When not copying all files, each time when bumping rpi-firmware to a new version one should check if files were added, and if they are worth copying. > > I could add a configure option to also copy overlay_map.dtb and README like you suggested (probably two separate options then; default on?). E.g. > > BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP Yes (default off)..., as it is a easy/simple option to enable one implementation of basic multi-target sd-cards (the other option would be the use of 'Model Filters' ([4]) in config.txt). > BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_README Omit (see above)... > > How about instead adding a configure option for specifying a list of files to be copied instead of all files? That way you could also specify exactly which dtbo files should be copied, instead of copying all of them. Currently there are a lot of overlays copied that we don't use for our system configuration. And if in the future new files are added to the rpi-firmware overlays, we don't have to introduce yet another configure option for it. E.g. > > BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_FILES Matter of taste (as with many options available in buildroot)...., I believe the _FILES option is overkill/too-complex for 1.1M overlays files (and will not fix/enable all possibles use-cases, see os_prefix above..., very special cases needs special hand-crafted solutions/scripts/genimage-configs, etc.)... Regards, Peter [4] https://www.raspberrypi.com/documentation/computers/config_txt.html#model-filters > > Thanks for the feedback, regards, > > Rutger > > [3] https://www.raspberrypi.com/documentation/computers/config_txt.html#os_prefix > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. From yann.morin.1998 at free.fr Wed Mar 9 20:10:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:10:30 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: <3677050fbcbf7d7e31d8c6c12924f648d0e37d2a.camel@dopsi.ch> References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> <3677050fbcbf7d7e31d8c6c12924f648d0e37d2a.camel@dopsi.ch> Message-ID: <20220309201030.GA23050@scaer> Simon, Danillo, All, On 2022-03-09 11:30 +0100, Simon Doppler spake thusly: > > > I did expect that adding the dependency as you did would work but > > > it > > > failed: they show up when running `make arm- > > > trusted-firmware-show-depends` but not in `make arm-trusted- > > > firmware-show-build-order`. Does the same happen for you? > > > > Yes, same issue for me. "make nginx-show-depends" includes "nginx- > > rtmp-module", > > but "make nginx-show-build-order" does not. > > > > Manually building the module before building nginx does work, but it > > would be > > nice if there were a clean fix. > > I submitted a bug report [1], with some extra info I found by digging > around today. > > I will continue to dig around in the coming weeks but it will still not > be high on my priorities. The value of FOO_DEPENDENCIES are used to generate Makefile-level dependencies, and that is done at the time a package infra is called. I.e. when your foo.mk has: FOO_DPEENDENCIES = bar $(eval $(generic-pakcage)) This is turned into Makefile code like: foo: bar Which means that, modifying FOO_DEPENDENCIES later on will have no impact in the actual dependency chain. br2-external trees are meant to add new packages, and it is not possible to modify existing packages. In the current state, you have no way but to modify nginx.mk in the Buildroot tree. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Wed Mar 9 20:14:16 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 20:14:16 +0000 Subject: [Buildroot] [Bug 14656] Adding dependencies from an external tree does not work In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14656 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |yann.morin.1998 at free.fr Resolution|--- |WONTFIX --- Comment #2 from Yann E. MORIN --- Simon, All, As I explained on the list [0], it is not possible to use a br2-external tree to modify the dependencies of a package. [0] https://lore.kernel.org/buildroot/20220309201030.GA23050 at scaer/T/#m4bacf3a6047b2da82554d088f2afd805bef5a312 There is for now no way to achieve what you need without directly modifying the original package's .mk file. (note: there have been a few ideas floated around in the past, but they are far from trivial to apply, if at all.) Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Wed Mar 9 20:25:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:25:53 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 In-Reply-To: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 28 Feb 2022 13:02:43 +0100") References: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> Message-ID: <87tuc627qm.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:26:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:26:29 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/jpeg-turbo: bump to version 2.1.3 In-Reply-To: <20220304193210.4025746-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 20:32:10 +0100") References: <20220304193210.4025746-1-fontaine.fabrice@gmail.com> Message-ID: <87pmmu27pm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update hash of license file (date updated with > https://github.com/libjpeg-turbo/libjpeg-turbo/commit/172972394a51352d0b67c30f20041e69a98d78b7) > https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:25:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:25:39 +0100 Subject: [Buildroot] [git commit] package/at: bump version to 3.2.5 Message-ID: <20220309201939.4163F83946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1f3dacf4568dc1b995ca89ed04b44d2cf2416a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at/at.hash b/package/at/at.hash index d4ad9aa436..be3e82f9f0 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz +sha256 bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8 at_3.2.5.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index 26c44f5287..ed38def337 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.4 +AT_VERSION = 3.2.5 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex From peter at korsgaard.com Wed Mar 9 20:26:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:26:41 +0100 Subject: [Buildroot] [git commit] package/faketime: bump to version 0.9.10 Message-ID: <20220309201939.54A078394B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b335ba17be6139a1fa2f6e58c3d87f89d98c0ed8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/wolfcw/libfaketime/releases/tag/v0.9.10 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/faketime/faketime.hash | 2 +- package/faketime/faketime.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index 0628ff9ae6..a7d8d62dba 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 729ad33b9c750a50d9c68e97b90499680a74afd1568d859c574c0fe56fe7947f faketime-0.9.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 355477ba3b..6fc684f852 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.9 +FAKETIME_VERSION = 0.9.10 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 9 20:26:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:26:11 +0100 Subject: [Buildroot] [git commit] package/jpeg-turbo: bump to version 2.1.3 Message-ID: <20220309201939.4BF5783949@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f73e257cdf859c67ed2c3769f9ef15dc8f9b4878 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of license file (date updated with https://github.com/libjpeg-turbo/libjpeg-turbo/commit/172972394a51352d0b67c30f20041e69a98d78b7) https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jpeg-turbo/jpeg-turbo.hash | 10 +++++----- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index de82199659..a892fd3eaa 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/ -sha1 65c51c543b1fbba6db9ff5bee474ccb0b52a929f libjpeg-turbo-2.1.2.tar.gz -md5 e181bd78884dd5392a869209bfa41d4a libjpeg-turbo-2.1.2.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.3/ +sha1 6dec48193bb27e1c07abae8230031ce9ecb1cfec libjpeg-turbo-2.1.3.tar.gz +md5 85244dedeaf06f636a9e7ddea6d236d8 libjpeg-turbo-2.1.3.tar.gz # Locally computed -sha256 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 libjpeg-turbo-2.1.2.tar.gz -sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 LICENSE.md +sha256 467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0 libjpeg-turbo-2.1.3.tar.gz +sha256 ee1eaf194d5924b6360af8a6ba6a4e1554037091f7505943300cdeec65f1aebb LICENSE.md sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index ddae019839..475eb5fa84 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.1.2 +JPEG_TURBO_VERSION = 2.1.3 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) From peter at korsgaard.com Wed Mar 9 20:29:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:29:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack2: bump to version 1.9.20 In-Reply-To: (Jan Havran's message of "Mon, 7 Mar 2022 10:35:00 +0100") References: Message-ID: <87lexi27la.fsf@dell.be.48ers.dk> >>>>> "Jan" == Jan Havran writes: > - Fix URL for 'JACK DBus packaging' GitHub Wiki page. > https://github.com/jackaudio/jack2/releases/tag/v1.9.18 > https://github.com/jackaudio/jack2/releases/tag/v1.9.19 > https://github.com/jackaudio/jack2/releases/tag/v1.9.20 > Signed-off-by: Jan Havran Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:29:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:29:27 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-hdhomerun: bump version to 19.1.0-Matrix In-Reply-To: <20220308164034.85212-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 8 Mar 2022 17:40:34 +0100") References: <20220308164034.85212-1-bernd.kuhls@t-online.de> Message-ID: <87h78627ko.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:29:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:29:46 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/oprofile: add s390x support In-Reply-To: <20220308174832.1414005-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 18:48:32 +0100") References: <20220308174832.1414005-1-fontaine.fabrice@gmail.com> Message-ID: <87cziu27k5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > s390x is supported since at least 2003 (see ChangeLog-2003) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:30:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:30:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libaacs: bump to version 0.11.1 In-Reply-To: <20220308182845.1832681-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:28:45 +0100") References: <20220308182845.1832681-1-fontaine.fabrice@gmail.com> Message-ID: <878rti27jb.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (not needed since > https://code.videolan.org/videolan/libaacs/-/commit/a2ef3313bae4550f54ba842fa342d5b9b5f97145) > https://code.videolan.org/videolan/libaacs/-/blob/0.11.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:28:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:28:45 +0100 Subject: [Buildroot] [git commit] package/jack2: bump to version 1.9.20 Message-ID: <20220309202204.C676F83976@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26ca7fec041836c31f29c5566365fe40eb552bca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix URL for 'JACK DBus packaging' GitHub Wiki page. https://github.com/jackaudio/jack2/releases/tag/v1.9.18 https://github.com/jackaudio/jack2/releases/tag/v1.9.19 https://github.com/jackaudio/jack2/releases/tag/v1.9.20 Signed-off-by: Jan Havran Signed-off-by: Peter Korsgaard --- package/jack2/Config.in | 4 ++-- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d5..8abdda6376 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca5..6361473cf7 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..2e55169984 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.20 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 9 20:29:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:29:43 +0100 Subject: [Buildroot] [git commit] package/oprofile: add s390x support Message-ID: <20220309202204.E2A0983979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f3de83940ed4ff2bc2a5fec0cd2add93ebf635 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x is supported since at least 2003 (see ChangeLog-2003) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/oprofile/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in index cce2cfdab8..eca43d7ac3 100644 --- a/package/oprofile/Config.in +++ b/package/oprofile/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on BR2_arceb || BR2_arcle || BR2_arm || BR2_armeb || \ BR2_aarch64 || BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_s390x || BR2_sh || \ BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 From peter at korsgaard.com Wed Mar 9 20:29:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:29:59 +0100 Subject: [Buildroot] [git commit] package/libaacs: bump to version 0.11.1 Message-ID: <20220309202205.0298483976@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57eb983832a848dd406bf6c6403d01394bc5fc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed since https://code.videolan.org/videolan/libaacs/-/commit/a2ef3313bae4550f54ba842fa342d5b9b5f97145) https://code.videolan.org/videolan/libaacs/-/blob/0.11.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-read_file.h-include-sys-types.h.patch | 36 ---------------------- package/libaacs/libaacs.hash | 4 +-- package/libaacs/libaacs.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/package/libaacs/0001-read_file.h-include-sys-types.h.patch b/package/libaacs/0001-read_file.h-include-sys-types.h.patch deleted file mode 100644 index 9bb1e04539..0000000000 --- a/package/libaacs/0001-read_file.h-include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1fb08a352afada589f0b93af7a07c6fcd6da9bb8 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 21 Sep 2020 20:19:38 +0200 -Subject: [PATCH] read_file.h: include sys/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-8.3.0: - -In file included from src/devtools/uk_dump.c:28: -src/devtools/read_file.h:24:44: error: unknown type name ???off_t??? - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) - -Upstream status: pending - -Signed-off-by: Bernd Kuhls ---- - src/devtools/read_file.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devtools/read_file.h b/src/devtools/read_file.h -index 953b2ef..a5d185c 100644 ---- a/src/devtools/read_file.h -+++ b/src/devtools/read_file.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) --- -2.27.0 - diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 62e389f2f9..d4977727b0 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 -sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.1/libaacs-0.11.1.tar.bz2.sha512 +sha512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42 libaacs-0.11.1.tar.bz2 # Hash for license file: sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 3e0df18010..d4e90be26c 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.11.0 +LIBAACS_VERSION = 0.11.1 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Mar 9 20:29:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:29:23 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-hdhomerun: bump version to 19.1.0-Matrix Message-ID: <20220309202204.D631383978@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97f3c1fee2165cc0c1c17cb9c0ef03027ef40f82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 4c866b59d8..f177eabd53 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a5e5135b176d9aeba35e16fb6ce48ce7323c53960457597e25c2962b126cca2 kodi-pvr-hdhomerun-19.0.2-Matrix.tar.gz +sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 5c6829cee3..a4a448c51e 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 19.0.2-Matrix +KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Wed Mar 9 20:34:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:34:08 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/riemann-c-client: bump to version 1.10.5 In-Reply-To: <20220308220812.35726-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 23:08:12 +0100") References: <20220308220812.35726-1-fontaine.fabrice@gmail.com> Message-ID: <874k4627cv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/algernon/riemann-c-client/releases/tag/riemann-c-client-1.10.5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Mar 9 20:45:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:45:56 +0100 Subject: [Buildroot] [PATCH 1/1] fix links to Technologic Systems web resources In-Reply-To: <20220307211455.9630-1-kris@embeddedTS.com> References: <20220307211455.9630-1-kris@embeddedTS.com> Message-ID: <20220309204556.GB23050@scaer> Kris, All, On 2022-03-07 13:14 -0800, Kris Bahnsen via buildroot spake thusly: > Technologic Systems has rebranded as embeddedTS with the current > domain eventually going offline. Update web/doc URLs to correct > resource locations. > > Signed-off-by: Kris Bahnsen Applied to master, thanks. Regards, Yann E. MORIN. > --- > RESEND: > - Was not subscribed to Buildroot list with this email > > board/technologic/ts4900/readme.txt | 4 ++-- > board/technologic/ts5500/readme.txt | 4 ++-- > board/technologic/ts7680/readme.txt | 4 ++-- > configs/ts7680_defconfig | 2 +- > package/ts4900-fpga/Config.in | 2 +- > package/ts4900-fpga/ts4900-fpga.hash | 2 +- > package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- > 7 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt > index 679454fdeb..121e639749 100644 > --- a/board/technologic/ts4900/readme.txt > +++ b/board/technologic/ts4900/readme.txt > @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at > 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express > Bus, high speed USB host and device (OTG), and microSD card. > More details on the board here: > - http://wiki.embeddedarm.com/wiki/TS-4900 > + https://docs.embeddedTS.com/TS-4900 > > The TS-4900 is not currently supported by mainline Linux, so a > Technologic Systems Linux is used based on Linux 4.1. > @@ -48,5 +48,5 @@ connector etc. > The bootloader comes pre-flashed on the board on an SPI flash. Since > updating the bootloader is risky and not trivial, it is not included > in the Buildroot defconfig. Refer to > -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which > +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which > U-Boot config to use and how to flash it. > diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt > index 1e73ab3ea1..1fe384faae 100644 > --- a/board/technologic/ts5500/readme.txt > +++ b/board/technologic/ts5500/readme.txt > @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the > Technologic Systems TS-5x00 serie of x86-based Single Board Computers. > > TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more > -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD > +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD > > The kernel configuration works for any AMD Elan520-based SBCs, but the support > is enhanced for the TS-5500 and TS-5400 models (on-board devices registration > @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by > choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS > Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') > flag on partition 1. For details about the CMOS setup, please see: > -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens > +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens > > Connect a terminal program to the rs232 connector marked "COM2" > with baudrate set to 115200, insert the Compact Flash card into the socket, > diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt > index 43d5d135e8..3f703330bf 100644 > --- a/board/technologic/ts7680/readme.txt > +++ b/board/technologic/ts7680/readme.txt > @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S > running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, > Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, > relays and ADC/DAC. More details on the board here: > -https://wiki.embeddedarm.com/wiki/TS-7680 > +https://docs.embeddedTS.com/TS-7680 > > The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. > > @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. > The bootloader comes pre-flashed on the board on an SPI flash. Since > updating the bootloader is risky and not trivial, it is not included > in the Buildroot defconfig. Refer to > -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on > +https://docs.embeddedts.com/TS-7680#U-Boot for details on > which U-Boot config to use and how to flash it. > diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig > index 7eb57ab1c5..e4f5c1aabd 100644 > --- a/configs/ts7680_defconfig > +++ b/configs/ts7680_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" > diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in > index 7aa94e26f2..9f704fbc8c 100644 > --- a/package/ts4900-fpga/Config.in > +++ b/package/ts4900-fpga/Config.in > @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA > It is loaded by U-Boot during the boot sequence, the default > U-boot script expects to find it in the /boot folder. > > - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog > + https://docs.embeddedts.com/TS-4900#FPGA_Changelog > diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash > index 2147aeb3c2..ed2941079a 100644 > --- a/package/ts4900-fpga/ts4900-fpga.hash > +++ b/package/ts4900-fpga/ts4900-fpga.hash > @@ -1,4 +1,4 @@ > -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 > +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 > md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin > > # Locally calculated > diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk > index 7bb62a3984..a3e42c0812 100644 > --- a/package/ts4900-fpga/ts4900-fpga.mk > +++ b/package/ts4900-fpga/ts4900-fpga.mk > @@ -6,9 +6,9 @@ > > TS4900_FPGA_VERSION = 20150930 > TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin > -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga > +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga > # No license file provided, Yocto recipe from the vendor claims MIT. > -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 > +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 > > define TS4900_FPGA_EXTRACT_CMDS > cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) > -- > 2.11.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 9 20:47:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:47:48 +0100 Subject: [Buildroot] [git commit] package/ola: drop autoreconf Message-ID: <20220309203930.D366A839C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66d348ae18c6e73d6ff9d935a241e55a65948be6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master OLA_AUTORECONF has been set since re-introduction of package in commit 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no patches are touching Makefile.am or ola.m4 anymore Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ola/ola.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..1874350784 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola From yann.morin.1998 at free.fr Wed Mar 9 20:47:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:47:48 +0100 Subject: [Buildroot] [git commit] package/pppd: fix CPE ID Message-ID: <20220309203930.C8DFF83972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9051a6322187129ba65249b5ee2228e045a4fa8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce..d9d6244f10 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y From yann.morin.1998 at free.fr Wed Mar 9 20:47:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:47:48 +0100 Subject: [Buildroot] [git commit] fix links to Technologic Systems web resources Message-ID: <20220309203930.C06FA839AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b058e15f5334dac93f42b92ea31525afdc2c27c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From yann.morin.1998 at free.fr Wed Mar 9 20:48:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:48:34 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/ola: drop autoreconf In-Reply-To: <20220309175931.538771-1-fontaine.fabrice@gmail.com> References: <20220309175931.538771-1-fontaine.fabrice@gmail.com> Message-ID: <20220309204834.GC23050@scaer> Fabrice, All, On 2022-03-09 18:59 +0100, Fabrice Fontaine spake thusly: > OLA_AUTORECONF has been set since re-introduction of package in commit > 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no > patches are touching Makefile.am or ola.m4 anymore > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - Fix typo in title > > package/ola/ola.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 5090076175..1874350784 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE > OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) > OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE > OLA_INSTALL_STAGING = YES > -OLA_AUTORECONF = YES > > # util-linux provides uuid lib > OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 9 20:49:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:49:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pppd: fix CPE ID In-Reply-To: <20220309173710.527496-1-fontaine.fabrice@gmail.com> References: <20220309173710.527496-1-fontaine.fabrice@gmail.com> Message-ID: <20220309204905.GD23050@scaer> Fabrice, All, On 2022-03-09 18:37 +0100, Fabrice Fontaine spake thusly: > samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has > been deprecated in February 2020: > > > > > cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the > correct CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pppd/pppd.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk > index 19b6f3ccce..d9d6244f10 100644 > --- a/package/pppd/pppd.mk > +++ b/package/pppd/pppd.mk > @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ > PPPD_LICENSE_FILES = \ > pppd/tdb.c pppd/plugins/pppoatm/COPYING \ > pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c > -PPPD_CPE_ID_VENDOR = samba > -PPPD_CPE_ID_PRODUCT = ppp > +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project > +PPPD_CPE_ID_PRODUCT = point-to-point_protocol > PPPD_SELINUX_MODULES = ppp > > PPPD_MAKE_OPTS = HAVE_INET6=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Mar 9 21:04:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 22:04:26 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/xdotool: bump to version 3.20211022.1 In-Reply-To: <20220302214404.2476680-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 22:44:04 +0100") References: <20220302214404.2476680-1-fontaine.fabrice@gmail.com> Message-ID: <87zglyzvl1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Retrieve official tarball > - Update indentation in hash file (two spaces) > https://github.com/jordansissel/xdotool/blob/v3.20211022.1/CHANGELIST > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 21:04:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 22:04:35 +0100 Subject: [Buildroot] [git commit] package/xdotool: bump to version 3.20211022.1 Message-ID: <20220309205614.281CF83A43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e8714f54fab704be63a8b7dc1d82afaf1e785a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Retrieve official tarball - Update indentation in hash file (two spaces) https://github.com/jordansissel/xdotool/blob/v3.20211022.1/CHANGELIST Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xdotool/xdotool.hash | 4 ++-- package/xdotool/xdotool.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/xdotool/xdotool.hash b/package/xdotool/xdotool.hash index b0d5a7582a..549e807ccc 100644 --- a/package/xdotool/xdotool.hash +++ b/package/xdotool/xdotool.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a xdotool-3.20160805.1.tar.gz -sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT +sha256 96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada xdotool-3.20211022.1.tar.gz +sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT diff --git a/package/xdotool/xdotool.mk b/package/xdotool/xdotool.mk index 5c5603bd62..c430a49d06 100644 --- a/package/xdotool/xdotool.mk +++ b/package/xdotool/xdotool.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDOTOOL_VERSION = 3.20160805.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,v$(XDOTOOL_VERSION)) +XDOTOOL_VERSION = 3.20211022.1 +XDOTOOL_SITE = https://github.com/jordansissel/xdotool/releases/download/v$(XDOTOOL_VERSION) XDOTOOL_LICENSE = BSD-3-Clause XDOTOOL_LICENSE_FILES = COPYRIGHT XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 From peter at korsgaard.com Wed Mar 9 21:04:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 22:04:35 +0100 Subject: [Buildroot] [git commit] package/riemann-c-client: bump to version 1.10.5 Message-ID: <20220309205614.1DFE083A34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59ab0dff71c0da0dfa58369d81c41e9d2f3e470f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/algernon/riemann-c-client/releases/tag/riemann-c-client-1.10.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/riemann-c-client/riemann-c-client.hash | 4 ++-- package/riemann-c-client/riemann-c-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/riemann-c-client/riemann-c-client.hash b/package/riemann-c-client/riemann-c-client.hash index 6d4d634d75..43d4cd45c4 100644 --- a/package/riemann-c-client/riemann-c-client.hash +++ b/package/riemann-c-client/riemann-c-client.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 334874f0b9a507a8abbc7138df719cba4f28f12c02c39d5e55090b8edb86f9d2 riemann-c-client-1.10.4.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE +sha256 568416d854d1c1e5eac743c9f56db6fa0d6a8144daa74a799d0556bb6b50e679 riemann-c-client-1.10.5.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 6fbb3caf5c..f942d560c8 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -RIEMANN_C_CLIENT_VERSION = 1.10.4 +RIEMANN_C_CLIENT_VERSION = 1.10.5 RIEMANN_C_CLIENT_SITE = \ $(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)) RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+ From fontaine.fabrice at gmail.com Wed Mar 9 21:09:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:09:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: bump to version 6.03 Message-ID: <20220309210953.540376-1-fontaine.fabrice@gmail.com> xlib_libXft and xlib_libXi are now mandatory https://www.jwz.org/xscreensaver/changelog.html Signed-off-by: Fabrice Fontaine --- package/xscreensaver/Config.in | 2 ++ package/xscreensaver/xscreensaver.hash | 2 +- package/xscreensaver/xscreensaver.mk | 18 +++--------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 10b2b7012c..48eefdfa70 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXT help XScreenSaver is the standard screen saver collection shipped diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 26ecd8bbbf..27ef7d8f00 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 46dedc3211..0a91d22d14 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.45 +XSCREENSAVER_VERSION = 6.03 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ libgtk2 \ libxml2 \ xlib_libX11 \ + xlib_libXft \ + xlib_libXi \ xlib_libXt \ $(TARGET_NLS_DEPENDENCIES) \ host-intltool @@ -51,20 +53,6 @@ else XSCREENSAVER_CONF_OPTS += --with-systemd=no endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XSCREENSAVER_CONF_OPTS += --with-xft=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXft -else -XSCREENSAVER_CONF_OPTS += --with-xft=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXi -else -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes XSCREENSAVER_DEPENDENCIES += xlib_libXinerama -- 2.34.1 From yann.morin.1998 at free.fr Wed Mar 9 21:25:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 22:25:37 +0100 Subject: [Buildroot] [git commit] package/gnutls: fix build without threads Message-ID: <20220309211728.20D8683A4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f4f57b62b371252425bde4440cedcac45fcaebd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From yann.morin.1998 at free.fr Wed Mar 9 21:26:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 22:26:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads In-Reply-To: <20220309173503.527227-1-fontaine.fabrice@gmail.com> References: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Message-ID: <20220309212618.GE23050@scaer> Fabrice, All, On 2022-03-09 18:35 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure without threads raised since bump to > version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: > > kx.c: In function '_gnutls_nss_keylog_write': > kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? > 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { > | ^~~~~~~~~~~~ > | keylog_once > > Fixes: > - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...cks-define-lock-functions-as-a-macro.patch | 179 ++++++++++++++++++ > 1 file changed, 179 insertions(+) > create mode 100644 package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch > > diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch > new file mode 100644 > index 0000000000..52965c051d > --- /dev/null > +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch > @@ -0,0 +1,179 @@ > +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 > +From: Daiki Ueno > +Date: Wed, 9 Mar 2022 08:07:58 +0100 > +Subject: [PATCH] locks: define lock functions as a macro > + > +When threads are not supported, glthread_* functions are defined as > +no-op and thus dereferencing lock variables in inline functions will > +cause compilation error. This change fixes it by redefining our lock > +functions as a macro so it will also be compiled out. > + > +Reported by Fabrice Fontaine in: > +https://gitlab.com/gnutls/gnutls/-/issues/1330 > + > +Signed-off-by: Daiki Ueno > + > +[Retrieved from: > +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/locks.c | 54 ----------------------------------------------- > + lib/locks.h | 28 ++++++++++++++++++------ > + lib/pkcs11.c | 2 +- > + lib/priority.c | 2 +- > + lib/verify-tofu.c | 2 +- > + 5 files changed, 25 insertions(+), 63 deletions(-) > + > +diff --git a/lib/locks.c b/lib/locks.c > +index d61504e077..8888ed6b12 100644 > +--- a/lib/locks.c > ++++ b/lib/locks.c > +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, > + gnutls_mutex_lock = lock; > + gnutls_mutex_unlock = unlock; > + } > +- > +-int > +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) > +-{ > +- if (unlikely(glthread_lock_lock(lock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) > +-{ > +- if (unlikely(glthread_lock_unlock(lock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) > +-{ > +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) > +-{ > +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) > +-{ > +- if (unlikely(glthread_rwlock_unlock(rwlock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) > +-{ > +- if (unlikely(glthread_once(once, init_func))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +diff --git a/lib/locks.h b/lib/locks.h > +index a1ff0fa9d7..907adfc134 100644 > +--- a/lib/locks.h > ++++ b/lib/locks.h > +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; > + */ > + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) > + typedef gl_lock_t *gnutls_static_mutex_t; > +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); > +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); > ++ > ++#define gnutls_static_mutex_lock(LOCK) \ > ++ (unlikely(glthread_lock_lock(LOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > ++ > ++#define gnutls_static_mutex_unlock(LOCK) \ > ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > + > + /* Unlike static mutexes, static rwlocks can be locked/unlocked with > + * the functions defined below, because there is no way to replace > +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); > + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) > + typedef gl_rwlock_t *gnutls_rwlock_t; > + > +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); > +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); > +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); > ++#define gnutls_rwlock_rdlock(RWLOCK) \ > ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > ++ > ++#define gnutls_rwlock_wrlock(RWLOCK) \ > ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > ++ > ++#define gnutls_rwlock_unlock(RWLOCK) \ > ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > + > + #define GNUTLS_ONCE(once) gl_once_define(static, once) > + typedef gl_once_t *gnutls_once_t; > + > +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); > ++#define gnutls_once(ONCE, INIT_FUNC) \ > ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > + > + #endif /* GNUTLS_LIB_LOCKS_H */ > +diff --git a/lib/pkcs11.c b/lib/pkcs11.c > +index 8dda0f07c9..ba8ac0c375 100644 > +--- a/lib/pkcs11.c > ++++ b/lib/pkcs11.c > +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ > + ret = sret; > + > + cleanup: > +- gnutls_static_mutex_unlock(&pkcs11_mutex); > ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); > + > + return ret; > + } > +diff --git a/lib/priority.c b/lib/priority.c > +index d17a923318..55ae185c1f 100644 > +--- a/lib/priority.c > ++++ b/lib/priority.c > +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) > + } > + > + out: > +- gnutls_rwlock_unlock(&system_wide_config_rwlock); > ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); > + return ret; > + } > + > +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c > +index 40b7acdc8a..97f47385e6 100644 > +--- a/lib/verify-tofu.c > ++++ b/lib/verify-tofu.c > +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, > + if (fp != NULL) > + fclose(fp); > + > +- gnutls_static_mutex_unlock(&file_mutex); > ++ (void)gnutls_static_mutex_unlock(&file_mutex); > + gnutls_free(b64key.data); > + > + return ret; > +-- > +GitLab > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Wed Mar 9 21:34:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:34:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220309213459.677932-1-fontaine.fabrice@gmail.com> cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 8df8aedeb3..54a4031056 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 21:41:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:41:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 Message-ID: <20220309214156.776849-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/gerbera/gerbera/releases/tag/v1.10.0 Signed-off-by: Fabrice Fontaine --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------------- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md -- 2.34.1 From bugzilla at busybox.net Wed Mar 9 21:44:20 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 21:44:20 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #1 from Peter Seiderer --- (In reply to mf from comment #0) - from build/openssh-8.9p1/ChangeLog: 2692 commit 39f2111b1d5f00206446257377dcce58cc72369f 2693 Author: Darren Tucker 2694 Date: Wed Sep 29 10:53:55 2021 +1000 2695 2696 Add new compiler hardening flags. 2697 2698 Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of 2699 compiler hardening flags that configure checks for. These are support ed 2700 by clang and gcc, and make ROP gadgets less useful and mitigate 2701 stack-based infoleaks respectively. ok djm@ - from openssh-8.9p1/configure.ac: 195 OSSH_CHECK_CFLAG_COMPILE([-fzero-call-used-regs=all]) - from build/openssh-8.9p1/config.log: 716 configure:6832: checking if .../host/bin/arm-buildroot-linux-gnueabihf-gcc supports compile flag -fzero-call-used-regs=all 717 configure:6865: .../hos t/bin/arm-buildroot-linux-gnueabihf-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFIL E64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pipe -Wno- error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsi gn-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleadi ng-indentation -fno-strict-aliasing -ftrapv -Werror -fzero-call-used-regs= all -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conft est.c >&5 718 arm-buildroot-linux-gnueabihf-gcc.br_real: error: unrecognized command-lin e option '-fzero-call-used-regs=all' [...] 766 configure:6878: result: no So 'zero-call-used-regs' not supported (gcc-10.3, raspberrypi0w_defconfig) is detected correctly here... Same test with gcc-11.2, from build/openssh-8.9p1/config.log: configure:6832: checking if .../host/bin/arm-buildroot-linux-gnueabihf-gcc supports compile flag -fzero-call-used-regs=all configure:6865: .../host/bin/arm-buildroot-linux-gnueabihf-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pipe -Wno-error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleading-indentation -fno-strict-aliasing -ftrapv -Werror -fzero-call-used-regs=all -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 configure:6865: $? = 0 configure:6873: result: yes Which compiler do you use? For which target do you compile? Can you provide a failing .config/defconfig file? -- You are receiving this mail because: You are on the CC list for the bug. From yannick.brosseau at gmail.com Wed Mar 9 21:55:31 2022 From: yannick.brosseau at gmail.com (Yannick Brosseau) Date: Wed, 9 Mar 2022 16:55:31 -0500 Subject: [Buildroot] [PATCH] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220309215531.638593-1-yannick.brosseau@gmail.com> In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 9 21:56:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:56:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: bump to version 2022-03-08 Message-ID: <20220309215639.786189-1-fontaine.fabrice@gmail.com> - Switch site: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 - Update first and second patches - Drop third and fourth patches (already in version) - This bump will fix the following build failure with powerpc and gcc 11 thanks to https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian Fixes: - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be Signed-off-by: Fabrice Fontaine --- ...emove-Werror-to-avoid-build-failures.patch | 17 +++--- ...vm-unit-tests-test-for-rdseed-rdrand.patch | 24 ++++---- ...3-Makefile-fix-stack-protector-tests.patch | 36 ----------- ...issue-with-the-linker-from-Fedora-32.patch | 61 ------------------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- 6 files changed, 27 insertions(+), 119 deletions(-) delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch index cbfa3a87e6..d07b9b6912 100644 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures Signed-off-by: Thomas Petazzoni [Matthew: Refactoring of Thomas Petazzoni's original.] Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 1 - 1 file changed, 1 deletion(-) @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- +- 2.14.2 diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch index 1a1a90ce99..80549fd32a 100644 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch @@ -13,6 +13,8 @@ Upstream: https://marc.info/?l=kvm&m=151580743523259&w=2 Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 2 +- configure | 18 ++++++++++++++++++ @@ -27,11 +29,11 @@ index d9ad42b..799e9b5 100644 cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer +-COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common ++COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common $(EXTRA_CFLAGS) + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized + COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + diff --git a/configure b/configure index dd9d361..21c0219 100755 --- a/configure @@ -63,7 +65,7 @@ index dd9d361..21c0219 100755 @@ -181,6 +198,7 @@ ARCH_NAME=$arch_name PROCESSOR=$processor CC=$cross_prefix$cc - CXX=$cross_prefix$cxx + CFLAGS=$cflags +EXTRA_CFLAGS=$extra_cflags LD=$cross_prefix$ld OBJCOPY=$cross_prefix$objcopy @@ -84,12 +86,12 @@ index 4a3e94b..2cbe3eb 100644 extern void insn_hlt(); extern void insn_invlpg(); @@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); + extern void insn_str(void); + extern void insn_cpuid(void); + extern void insn_invd(void); +#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); + extern void insn_rdrand(void); + extern void insn_rdseed(void); +#endif u32 cur_insn; diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c6..0000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm at vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7..0000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth at redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2..42c3b4a241 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb9..d610442e03 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,9 +4,9 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:00:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:00:16 +0100 Subject: [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6 Message-ID: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Update hash of Copyright.txt (year updated and Qt Company Ltd. added: https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50 https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716) Signed-off-by: Fabrice Fontaine --- package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 97e83a274c..da514a6d6b 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz # Locally calculated -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index b1b214982e..4177b119ab 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.16 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 3.18 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:00:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:00:17 +0100 Subject: [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 In-Reply-To: <20220309220018.786891-1-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Message-ID: <20220309220018.786891-2-fontaine.fabrice@gmail.com> gerbera requires cmake 3.18 since version 1.10.0 and https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559 Signed-off-by: Fabrice Fontaine --- support/dependencies/check-host-cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index dfc252e919..5760e4ded1 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,9 @@ -# Set this to either 3.16 or higher, depending on the highest minimum +# Set this to either 3.18 or higher, depending on the highest minimum # version required by any of the packages bundled in Buildroot. If a # package is bumped or a new one added, and it requires a higher # version, our cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.16 +BR2_CMAKE_VERSION_MIN = 3.18 BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:00:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:00:18 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 In-Reply-To: <20220309220018.786891-1-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Message-ID: <20220309220018.786891-3-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/gerbera/gerbera/releases/tag/v1.10.0 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add cmake patches to the serie package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------------- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:02:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:02:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: bump to version LTS_01_2022_Ref01 Message-ID: <20220309220219.787315-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_01_2022_Ref01 Signed-off-by: Fabrice Fontaine --- ...c-fix-mismatching-function-prototype.patch | 35 ------------------- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch deleted file mode 100644 index 0c262e6c46..0000000000 --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 -From: Francesco Giancane <30423178+fgiancane8 at users.noreply.github.com> -Date: Fri, 2 Jul 2021 20:47:38 +0200 -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) - -The reported function raises a warning when compilers assert the flag -`-Warray-parameter=`, signaling that an array-type argument was promoted -to a pointer-type argument. - -While in practice in most C implementations this is correct, fixing the -warning (and, in this case, indicating the maximum size for the array) -would represent a best-practice for finding out-of-bound accesses or -identifying wrongly-sized arrays passed in the function. - -Signed-off-by: Francesco Giancane -[Retrieved from: -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] -Signed-off-by: Fabrice Fontaine ---- - src/hmac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hmac.c b/src/hmac.c -index 53f2411f8..160af9d2f 100644 ---- a/c-utility/src/hmac.c -+++ b/c-utility/src/hmac.c -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, - * sha Error Code. - * - */ --int hmacResult(HMACContext *ctx, uint8_t *digest) -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) - { - if (!ctx) return shaNull; - diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index 72fa99c44d..5dbb530954 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz +sha256 082e41f7cdf06fec036b8cfa1793f03e81ba527b55ea13c66be0e4cf9f20ff7b azure-iot-sdk-c-LTS_01_2022_Ref01-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e6de8c851b..874646c445 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 +AZURE_IOT_SDK_C_VERSION = LTS_01_2022_Ref01 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:03:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:03:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/nbd: bump to version 3.24 Message-ID: <20220309220320.787799-1-fontaine.fabrice@gmail.com> https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -- 2.34.1 From yann.morin.1998 at free.fr Wed Mar 9 22:06:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 23:06:08 +0100 Subject: [Buildroot] [git commit] package/lzma-alone: new package Message-ID: <20220309215932.52B9583A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4accbb4655d3816fd230f9820e6aac4ee9b1d8fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This new package provides "lzma_alone" host binary based on the original LZMA SDK. It provides few extra options when compared to the LZMA Utils / XZ Utils project "lzma" binary (already packaged as the "lzma"). This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows Debian's solution. Please note that Debian also uses LZMA SDK for the base "lzma" tool which may be considered for Buildroot too - as an independent change. Similar packaging is also used by Ubuntu & Arch. lzma_alone is a requirement for preparing firmware images for some Broadcom based home routers with a picky CFE bootloader. It has limited LZMA support and building compatible images requires specifying dictionary size and lc/lp/pb LZMA values manually. Version 9.22 is used as it's the last release using .tar.bz2 format. The same version is used by Debian. Signed-off-by: Rafa?? Mi??ecki [yann.morin.1998 at free.fr: - add the upstream sha1, add comments - fix license - add license file and its sha256 - fix coding styles ] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/lzma-alone/Config.in.host | 18 ++++++++++++++++++ package/lzma-alone/lzma-alone.hash | 5 +++++ package/lzma-alone/lzma-alone.mk | 27 +++++++++++++++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index e5fbb07fc2..cd1c34b5a3 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -50,6 +50,7 @@ menu "Host utilities" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/lzma-alone/Config.in.host" source "package/mender-artifact/Config.in.host" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" diff --git a/package/lzma-alone/Config.in.host b/package/lzma-alone/Config.in.host new file mode 100644 index 0000000000..053b869635 --- /dev/null +++ b/package/lzma-alone/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_LZMA_ALONE + bool "host lzma-alone" + help + LZMA has two well-known command-line tools: + 1. lzma from LZMA SDK + 2. lzma from XZ Utils (previously LZMA Utils) + + This package provides the former one which: + 1. Gives more control over compression parameters + 2. Gets named lzma_alone to allow coexistence + + This tool may be used to prepare firmwares for bootloaders + with limited LZMA support. + E.g. Broadcom's CFE bootloader for MIPS BCM47xx devices is + known to fail to boot images using LZMA compression with + dictionary. + + https://www.7-zip.org/sdk.html diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash new file mode 100644 index 0000000000..33901d1620 --- /dev/null +++ b/package/lzma-alone/lzma-alone.hash @@ -0,0 +1,5 @@ +# From https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/ +sha1 fbe4d6c02202d65fae75c2db0e3cdc542ca41e6d lzma922.tar.bz2 +# Locally computed +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 +sha256 65cd2f7b76266889cbdcec55ab8ce6e845beabb5f450d58287439b25666e3b6a lzma.txt diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk new file mode 100644 index 0000000000..2ed6c2c772 --- /dev/null +++ b/package/lzma-alone/lzma-alone.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# lzma-alone +# +################################################################################ + +LZMA_ALONE_VERSION = 9.22 +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK +LZMA_ALONE_SOURCE = lzma922.tar.bz2 +LZMA_ALONE_STRIP_COMPONENTS = 0 +LZMA_ALONE_LICENSE = Public Domain +LZMA_ALONE_LICENSE_FILES = lzma.txt + +define HOST_LZMA_ALONE_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/C/Util/Lzma -f makefile.gcc + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc +endef + +define HOST_LZMA_ALONE_INSTALL_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/CPP/7zip/Bundles/LzmaCon/lzma \ + $(HOST_DIR)/bin/lzma_alone +endef + +$(eval $(host-generic-package)) From yann.morin.1998 at free.fr Wed Mar 9 22:08:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 23:08:00 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package In-Reply-To: <20220308183527.17639-1-zajec5@gmail.com> References: <20220308183527.17639-1-zajec5@gmail.com> Message-ID: <20220309220800.GF23050@scaer> Rafa?, All, On 2022-03-08 19:35 +0100, Rafa? Mi?ecki spake thusly: > From: Rafa? Mi?ecki > > This new package provides "lzma_alone" host binary based on the original > LZMA SDK. It provides few extra options when compared to the LZMA Utils > / XZ Utils project "lzma" binary (already packaged as the "lzma"). > > This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows > Debian's solution. Please note that Debian also uses LZMA SDK for the > base "lzma" tool which may be considered for Buildroot too - as an > independent change. Similar packaging is also used by Ubuntu & Arch. > > lzma_alone is a requirement for preparing firmware images for some > Broadcom based home routers with a picky CFE bootloader. It has limited > LZMA support and building compatible images requires specifying > dictionary size and lc/lp/pb LZMA values manually. > > Version 9.22 is used as it's the last release using .tar.bz2 format. We could introduce a host variant of p7zip, so that we could automatically add that to FOO_EXTRACT_DEPENDENCIES if the host does not already have 7za (or 7zr), like we do for lzip archives for example. > The > same version is used by Debian. > > Signed-off-by: Rafa? Mi?ecki > --- [--SNIP--] > diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash > new file mode 100644 > index 0000000000..39759c4e3b > --- /dev/null > +++ b/package/lzma-alone/lzma-alone.hash > @@ -0,0 +1 @@ > +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 Fields must be separated by two spaces; fixed. I also added the sha1 that is provided int he SF page, and approipriate comments. > diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk > new file mode 100644 > index 0000000000..6258bb4a95 > --- /dev/null > +++ b/package/lzma-alone/lzma-alone.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# lzma-alone > +# > +################################################################################ > + > +LZMA_ALONE_VERSION = 9.22 > +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK > +LZMA_ALONE_SOURCE = lzma922.tar.bz2 > +LZMA_ALONE_STRIP_COMPONENTS = 0 > +LZMA_ALONE_LICENSE = LGPL-2.1-or-later, BSD-3-Clause The license stated in lzma.txt (at the root of the source tree) states the "LZMA SDK is written and placed in the public domain by Igor Pavlov." The 'GPL' term only appears in that file, and BSD appears nowhere. Also, the usual words in the BSD or GPL licenses do not appear in the source at all: 'redistribution', 'provided', 'disclaimer'. WikiPedia seems to agree that it is Public Domain since 2008 and version 4.62: https://en.wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Markov_chain_algorithm#7-Zip_reference_implementation Fixed. > +define HOST_LZMA_ALONE_BUILD_CMDS > + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/C/Util/Lzma -f makefile.gcc > + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc Lines too long, I've split them. > +endef > + > +define HOST_LZMA_ALONE_INSTALL_CMDS > + $(INSTALL) -D -m 0755 $(@D)/CPP/7zip/Bundles/LzmaCon/lzma $(HOST_DIR)/bin/lzma_alone Ditto. Applied to master, thanks. Could you see at using a more recent version, with the p7zip host variant I suggested above, please? Regards, Yann E. MORIN. > +endef > + > +$(eval $(host-generic-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Mar 9 22:37:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 23:37:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tree: bump to version 2.0.2 In-Reply-To: <20220302215131.2479736-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 22:51:31 +0100") References: <20220302215131.2479736-1-fontaine.fabrice@gmail.com> Message-ID: <87v8wmzrab.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > http://mama.indstate.edu/users/ice/tree/changes.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 22:37:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 23:37:40 +0100 Subject: [Buildroot] [PATCH] package/pdbg: bump version to v3.5 In-Reply-To: <20220307052858.1245393-1-joel@jms.id.au> (Joel Stanley's message of "Mon, 7 Mar 2022 15:58:57 +1030") References: <20220307052858.1245393-1-joel@jms.id.au> Message-ID: <87r17azr9n.fsf@dell.be.48ers.dk> >>>>> "Joel" == Joel Stanley writes: > Signed-off-by: Joel Stanley Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 22:39:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 23:39:50 +0100 Subject: [Buildroot] [git commit] package/pdbg: bump version to v3.5 Message-ID: <20220309223137.41A2783A8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5030d7f4ea5004b24025eb93d421ddadb0f8ee06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Joel Stanley Signed-off-by: Peter Korsgaard --- package/pdbg/pdbg.hash | 4 ++-- package/pdbg/pdbg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index df7ba314bf..f859930dd6 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5b721fd5551591cd5626ccf72c8d9096d902de4da10324097a37b4763815f0d7 pdbg-3.4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +sha256 7bdbab4e14b8cf50dbf6242955e46e58882c37b1a52671d9e6f3073885629dfa pdbg-3.5.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 5a5cfbc62d..871bf953f2 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 3.4 +PDBG_VERSION = 3.5 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 9 22:36:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 23:36:44 +0100 Subject: [Buildroot] [git commit] package/tree: bump to version 2.0.2 Message-ID: <20220309223137.39C6683A8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11a3989dbf7ac2535fac04b24ab3d959da3686b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) http://mama.indstate.edu/users/ice/tree/changes.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tree/tree.hash | 4 ++-- package/tree/tree.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 6bffaa5ec0..298153c89c 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 tree-1.8.0.tgz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf tree-2.0.2.tgz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index b6c63c0244..7c111b47d2 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 1.8.0 +TREE_VERSION = 2.0.2 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://mama.indstate.edu/users/ice/tree/src TREE_LICENSE = GPL-2.0+ From clayton.shotwell at rockwellcollins.com Wed Mar 9 23:07:45 2022 From: clayton.shotwell at rockwellcollins.com (clayton.shotwell at rockwellcollins.com) Date: Wed, 9 Mar 2022 17:07:45 -0600 Subject: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash Message-ID: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> From: Clayton Shotwell The addition of the removal of the /run and /tmp contents using a non-POSIX pattern causes the file system creation to fail on systems where /bin/sh does not default to bash. Switching the fakeroot script to a bash shell addresses the problem. Fixes: https://bugs.buildroot.org/show_bug.cgi?id=14661 Signed-off-by: Clayton Shotwell --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..09edf41c21 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -172,7 +172,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(BASE_TARGET_DIR)/ \ $$(TARGET_DIR) - echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) + echo '#!/bin/bash' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) -- 2.29.0 From David.Laight at ACULAB.COM Thu Mar 10 07:40:50 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 07:40:50 +0000 Subject: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash In-Reply-To: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> References: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> Message-ID: <28b7bbc57970469eae07f1e439fdf1cd@AcuMS.aculab.com> From: clayton.shotwell > Sent: 09 March 2022 23:08 > > The addition of the removal of the /run and /tmp contents using a > non-POSIX pattern causes the file system creation to fail on systems > where /bin/sh does not default to bash. Switching the fakeroot script > to a bash shell addresses the problem. I'm not sure you can rely on /bin/bash existing. Better to fix the script to not need bashisms. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From clement.leger at bootlin.com Thu Mar 10 08:07:44 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:44 +0100 Subject: [Buildroot] [PATCH 2/3] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310080745.16903-3-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..f8426f9ab2 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE version below 3.16 used python-pycryptodomex package + in python scripts. Newer version uses python-cryptography. + Select this option if optee-os needs python-cryptography to + be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..57f9a17bb6 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,12 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 08:07:43 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:43 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-cryptography: enable host package In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310080745.16903-2-clement.leger@bootlin.com> Enable host package and add needed dependencies. Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..4ff61c7f86 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 08:07:42 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:42 +0100 Subject: [Buildroot] [PATCH 0/3] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220310080745.16903-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Cl?ment L?ger (3): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 3 +-- boot/optee-os/optee-os.mk | 7 ++++++- package/python-cryptography/python-cryptography.mk | 7 +++++++ 4 files changed, 25 insertions(+), 5 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 08:07:45 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:45 +0100 Subject: [Buildroot] [PATCH 3/3] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310080745.16903-4-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index f8426f9ab2..6fe2ae95ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography. @@ -58,7 +59,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b3276d702a 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,3 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz # Locally computed +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From kamel.bouhara at bootlin.com Thu Mar 10 08:51:46 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 09:51:46 +0100 Subject: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant In-Reply-To: <20220226113538.6def80d0@windsurf> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-5-kamel.bouhara@bootlin.com> <20220226113538.6def80d0@windsurf> Message-ID: On Sat, Feb 26, 2022 at 11:35:38AM +0100, Thomas Petazzoni wrote: > On Fri, 25 Feb 2022 12:34:00 +0100 > Kamel Bouhara via buildroot wrote: > > > Add host variant of libodb-boost required by host-odb package. > > This is a bit short, and I think just like PATCH 3/4, it needs a more > extensive explanation that the ODB compiler needs the libodb-boost > headers at compile time, and therefore installed in $(HOST_DIR). > Ack. > > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > > index bac5f1e78f..7f2ad1fe72 100644 > > --- a/package/libodb-boost/libodb-boost.mk > > +++ b/package/libodb-boost/libodb-boost.mk > > @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE > > LIBODB_BOOST_INSTALL_STAGING = YES > > LIBODB_BOOST_LICENSE = GPL-2.0 > > LIBODB_BOOST_LICENSE_FILES = LICENSE > > -LIBODB_BOOST_DEPENDENCIES = boost libodb > > +LIBODB_BOOST_DEPENDENCIES = boost libodb \ > > + host-boost \ > > + host-libodb > > This seems wrong. Why is libodb-boost depending on host-libodb-boost. > At least, this makes the dependencies added in your PATCH 2/4 a bit > irrelevant. > Actually, that is the host variant that is depending on it. Your following comments are completely right. Thanks ! > I guess what you need to do instead is: > > HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb > > And rely on the logic in odb.mk to pull in host-libodb-boost when > BR2_PACKAGE_LIBODB_BOOST=y. > > Could you fix your patch series, and send a new iteration? > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com -- Kamel Bouhara, Bootlin Embedded Linux and kernel engineering https://bootlin.com From bugzilla at busybox.net Thu Mar 10 09:19:21 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Mar 2022 09:19:21 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #2 from mf at go-sys.de --- Created attachment 9236 --> https://bugs.busybox.net/attachment.cgi?id=9236&action=edit Buildroot config file Sample buildroot config file. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Thu Mar 10 09:22:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Mar 2022 09:22:04 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #3 from mf at go-sys.de --- Created attachment 9241 --> https://bugs.busybox.net/attachment.cgi?id=9241&action=edit openssh-8.9p1 config.log -- You are receiving this mail because: You are on the CC list for the bug. From kamel.bouhara at bootlin.com Thu Mar 10 09:55:58 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:55:58 +0100 Subject: [Buildroot] [PATCH v2 0/4] Add odb host variant and fix gcc-11 build Message-ID: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Hello, Here is a short patch series that fix odb build issue with gcc-11 and add a host variant of the libodb package required by the host-odb compiler. The host-libodb-boost variant is only required when boost package is enabled. Changes v1 -> v2: - Fix patch order issue. - Add a more extensive commit description for the libodb-boost. - Use HOST_*_DEPENDENCIES when appropriate. - Use BR2_PACKAGE_LIBODB_BOOST in odb.mk to check for optional dependencies. Kamel Bouhara (1): package/libodb-boost: add host variant Thomas Petazzoni (3): package/odb: backport more upstream commits to fix build with gcc 11.x package/libodb: add host variant package/odb: add dependency on host-libodb package/libodb-boost/libodb-boost.mk | 2 + package/libodb/libodb.mk | 2 + .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ package/odb/odb.mk | 8 ++- 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:55:59 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:55:59 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-2-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara --- Note: the above autobuilder issue has stopped appearing after September 29, 2021, which initially sounded odd. However, on October 3, we started rejecting build results from Xogium's autobuilder (for other reasons), and all those issues were coming from Xogium's autobuilder. And this is pretty logical: Xogium's autobuilder was known to be running a very recent Arch Linux, and therefore was the only autobuild machine running gcc 11.x as the host compiler. --- .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:56:00 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:56:00 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/libodb: add host variant In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-3-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:56:01 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:56:01 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-4-kamel.bouhara@bootlin.com> Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara --- package/libodb-boost/libodb-boost.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..39c9f91030 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,8 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:56:02 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:56:02 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/odb: add dependency on host-libodb In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-5-kamel.bouhara@bootlin.com> From: Thomas Petazzoni host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts -- 2.25.1 From mat at parad0x.org Thu Mar 10 10:18:26 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 11:18:26 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns Message-ID: <20220310101826.GA2353@parad0x.org> Different shells can have different behaviours when it comes to globbing patterns. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that results in this new behaviour: Using bash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.[^.]* Using dash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.. The current FAKEROOT script uses this shell glob pattern which now fails on recent Debian testing systems: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' It seems safer to use `find | xargs rm` here instead of relying on shell globbing patterns. Signed-off-by: Mathieu Mirmont --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..37eafac4f7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) -- 2.34.1 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From David.Laight at ACULAB.COM Thu Mar 10 10:45:41 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 10:45:41 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> References: <20220310101826.GA2353@parad0x.org> Message-ID: <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> From: Mathieu Mirmont > Sent: 10 March 2022 10:18 > > Different shells can have different behaviours when it comes to > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > to a different fnmatch/glob implementation that results in this new > behaviour: > > Using bash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.[^.]* > > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. That is just broken. Does the [^x] pattern work at all? Raise a bug on 'Debian testing' hopefully they'll fix it before it actually gets released anywhere. For this script I'd just ignore errors from rm. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From bonet at grenoble.cnrs.fr Thu Mar 10 11:22:16 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Thu, 10 Mar 2022 12:22:16 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> References: <20220310101826.GA2353@parad0x.org> Message-ID: <455a9499-b6a6-adbd-1e20-0b4f1ceb66f7@grenoble.cnrs.fr> Mathieu Mirmont wrote: > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. There is an error in this glob pattern. Fixing it would be simpler than invoking find/xargs. Within a regexp, character classes are complemented with "^": [^.] means "any character other that a dot". Within a glob pattern, character classes are complemented with "!", and the same class would be written [!.] C.f. glob(7). Regards, Edgar. From David.Laight at ACULAB.COM Thu Mar 10 11:31:21 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 11:31:21 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <455a9499-b6a6-adbd-1e20-0b4f1ceb66f7@grenoble.cnrs.fr> References: <20220310101826.GA2353@parad0x.org> <455a9499-b6a6-adbd-1e20-0b4f1ceb66f7@grenoble.cnrs.fr> Message-ID: From: Of Edgar Bonet > Sent: 10 March 2022 11:22 > > Mathieu Mirmont wrote: > > Using dash: > > $ mkdir /tmp/foo > > $ echo /tmp/foo/.[^.]* > > /tmp/foo/.. > > There is an error in this glob pattern. Fixing it would be simpler than > invoking find/xargs. > > Within a regexp, character classes are complemented with "^": [^.] means > "any character other that a dot". Within a glob pattern, character > classes are complemented with "!", and the same class would be written > [!.] I should know that :-) David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From mat at parad0x.org Thu Mar 10 11:33:11 2022 From: mat at parad0x.org (Mat) Date: Thu, 10 Mar 2022 12:33:11 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> Message-ID: <20220310113310.GA9122@parad0x.org> On Thu, Mar 10, 2022 at 10:45:41AM +0000, David Laight wrote: > From: Mathieu Mirmont > > Sent: 10 March 2022 10:18 > > > > Different shells can have different behaviours when it comes to > > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > > to a different fnmatch/glob implementation that results in this new > > behaviour: > > > > Using bash: > > $ mkdir /tmp/foo > > $ echo /tmp/foo/.[^.]* > > /tmp/foo/.[^.]* > > > > Using dash: > > $ mkdir /tmp/foo > > $ echo /tmp/foo/.[^.]* > > /tmp/foo/.. > > That is just broken. > Does the [^x] pattern work at all? > > Raise a bug on 'Debian testing' hopefully they'll > fix it before it actually gets released anywhere. The new behaviour of dash is very strange indeed, but also according to POSIX the wildcard pattern [^x] is undefined so we should not rely on it. -- Mat -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From fperrad at gmail.com Thu Mar 10 11:40:47 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:40:47 +0100 Subject: [Buildroot] [PATCH] package/libgcrypt: bump to version 1.10.0 Message-ID: <20220310114047.919725-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- .../0001-configure.ac-add-an-option-to-disable-tests.patch | 2 +- package/libgcrypt/libgcrypt.hash | 6 ++---- package/libgcrypt/libgcrypt.mk | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index 4ef02fba6..e32f93863 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 23562d0ed..2ea4d74c2 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,5 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 +sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index e5fdfcfc8..c6c88f607 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.9.4 +LIBGCRYPT_VERSION = 1.10.0 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:41:22 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:41:22 +0100 Subject: [Buildroot] [PATCH] package/libglib2: bump to version 2.70.4 Message-ID: <20220310114122.919781-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- ...03-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- ...son.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f9522893..b5603c92f 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', + version : '2.70.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2339,7 +2324,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982..e21239301 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd3..db77a7320 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08..f0f0cb55a 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8b..18f5b329c 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:41:41 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:41:41 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.33 Message-ID: <20220310114141.919836-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb51..23ce1f42b 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade..cd0a75eb2 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:41:53 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:41:53 +0100 Subject: [Buildroot] [PATCH] package/moarvm: bump to version 2022.02 Message-ID: <20220310114153.919891-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 01e3ee4ae..58e3ce8ac 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz +sha256 4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 MoarVM-2022.02.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 99e26c73c..db336bfe4 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2021.10 +MOARVM_VERSION = 2022.02 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:42:01 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:42:01 +0100 Subject: [Buildroot] [PATCH] package/nano: bump to version 6.2 Message-ID: <20220310114201.919946-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 80529437d..69ebc27b7 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v6/nano-6.0.tar.xz.asc +# https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz +sha256 2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 nano-6.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 30db3249e..e3ecbab56 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:42:11 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:42:11 +0100 Subject: [Buildroot] [PATCH] package/pango: bump to version 1.50.5 Message-ID: <20220310114211.920001-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c..319d9778c 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228..69ec5bb49 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:42:20 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:42:20 +0100 Subject: [Buildroot] [PATCH] package/webp: bump to version 1.2.2 Message-ID: <20220310114220.920056-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index cf7b1dc9d..a95086e81 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz +sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index f23e1c92e..670a7b801 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.1 +WEBP_VERSION = 1.2.2 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause -- 2.32.0 From David.Laight at ACULAB.COM Thu Mar 10 11:52:08 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 11:52:08 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310113310.GA9122@parad0x.org> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> Message-ID: <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> From: Mat > Sent: 10 March 2022 11:33 > > On Thu, Mar 10, 2022 at 10:45:41AM +0000, David Laight wrote: > > From: Mathieu Mirmont > > > Sent: 10 March 2022 10:18 > > > > > > Different shells can have different behaviours when it comes to > > > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > > > to a different fnmatch/glob implementation that results in this new > > > behaviour: > > > > > > Using bash: > > > $ mkdir /tmp/foo > > > $ echo /tmp/foo/.[^.]* > > > /tmp/foo/.[^.]* > > > > > > Using dash: > > > $ mkdir /tmp/foo > > > $ echo /tmp/foo/.[^.]* > > > /tmp/foo/.. > > > > That is just broken. > > Does the [^x] pattern work at all? > > > > Raise a bug on 'Debian testing' hopefully they'll > > fix it before it actually gets released anywhere. > > The new behaviour of dash is very strange indeed, but also according > to POSIX the wildcard pattern [^x] is undefined so we should not rely > on it. Well [^x] originally meant '^' or 'x' (the same as [x^] but then shells started treating [^x] the same as [!x]. So I guess POSIX has allowed such shells to be conformant by making [^x] undefined. I'm not sure how many shells treat [^x] the same as [!x] but enough do that people (including me) have forgotten the difference. ash from a recent buildroot treats [^x] as [!x} but a cygwin ash I've got doesn't. A quick search failed to find dash. ISTR dash is badly broken in other places, try: $ x=aaab234; echo ${x##${x%%b*}} b234 It is worth checking whether Debian have changed the behaviour of dash or whether they've just changed the default root shell to dash. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From mat at parad0x.org Thu Mar 10 12:02:56 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 13:02:56 +0100 Subject: [Buildroot] [PATCH v2] fs/common.mk: fix the globing pattern In-Reply-To: <20220310101826.GA2353@parad0x.org> Message-ID: <20220310120256.GA11974@parad0x.org> The FAKEROOT script uses [^x] wildcard patterns which, while supported by many shells and interpreted like a regex, are undefined according to POSIX. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that does not support [^x]. Instead it treats [^x] as either "^" or "x", and as a result buildroot fails to build on this distro: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' The correct form should be [!x] rather than [^x]. Signed-off-by: Mathieu Mirmont --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..64a94d9ad8 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) -- 2.35.1 Changes v1 -> v2: - Fix the regex rather than use find|xargs (suggested by Edgar Bonet & David Laight) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From mat at parad0x.org Thu Mar 10 12:11:05 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 13:11:05 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> Message-ID: <20220310121105.GB11974@parad0x.org> On Thu, Mar 10, 2022 at 11:52:08AM +0000, David Laight wrote: > It is worth checking whether Debian have changed the behaviour of dash > or whether they've just changed the default root shell to dash. They've switched to the internal fnmatch implementation of dash [1] in this commit [1]. Before that they were using fnmatch(3) from the glibc. [1] https://salsa.debian.org/debian/dash/-/commit/d7b1269eeeb5749ccc577f6e01dfccc2916b0130 -- Mathieu Mirmont -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From zajec5 at gmail.com Thu Mar 10 12:12:29 2022 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Thu, 10 Mar 2022 13:12:29 +0100 Subject: [Buildroot] [PATCH V2] board/broadcom: add support for Northstar platform devices Message-ID: <20220310121229.18284-1-zajec5@gmail.com> From: Rafa? Mi?ecki Broadcom Northstar family of SoCs is most commonly used for home routers. It's an ARM platform with Cortex-A9 CPU(s). All known Northstar devices come with CFE bootloader which almost always expects a TRX firmware format (with exception for D-Link). Some vendors (like Luxul and Netgear) wrap TRX in their own containers. This board code provides: 1. Minimal kernel with support for on-SoC blocks It enables Linux drivers for SoC, watchdog, Ethernet, switch, USB, PCIe, LEDs). 2. Post image script building firmware images In uses Buildroot packages tools (lzma_alone, otrx, lxlfw) to build bootloader-compatible images that can be flashed. Signed-off-by: Rafa? Mi?ecki --- Previous attempt: [PATCH] board/broadcom: add support for Northstar platform devices https://patchwork.ozlabs.org/project/buildroot/patch/20210810131236.18022-1-zajec5 at gmail.com/ V2: Update DEVELOPERS Reduce kernel config Add readme.txt Use UBI with ubifs for rootfs (instead of initramfs) --- DEVELOPERS | 2 + board/broadcom/ns/linux.config | 70 +++++++++++++++++++++++++++++++++ board/broadcom/ns/post-image.sh | 40 +++++++++++++++++++ board/broadcom/ns/readme.txt | 38 ++++++++++++++++++ configs/broadcom_ns_defconfig | 14 +++++++ 5 files changed, 164 insertions(+) create mode 100644 board/broadcom/ns/linux.config create mode 100755 board/broadcom/ns/post-image.sh create mode 100644 board/broadcom/ns/readme.txt create mode 100644 configs/broadcom_ns_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 3bc9819382..4d17194af3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2382,6 +2382,8 @@ F: board/avnet/s6lx9_microboard/ F: configs/s6lx9_microboard_defconfig N: Rafa? Mi?ecki +F: board/broadcom/ns/ +F: configs/broadcom_ns_defconfig F: package/firmware-utils/ N: Rahul Bedarkar diff --git a/board/broadcom/ns/linux.config b/board/broadcom/ns/linux.config new file mode 100644 index 0000000000..47e6990032 --- /dev/null +++ b/board/broadcom/ns/linux.config @@ -0,0 +1,70 @@ +CONFIG_EMBEDDED=y +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_5301X=y +CONFIG_ARCH_BCM_53573=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_HIGHMEM=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_CMDLINE="ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs" +CONFIG_CMDLINE_FORCE=y +# CONFIG_SUSPEND is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=y +CONFIG_VLAN_8021Q=y +CONFIG_PCI=y +CONFIG_BCM47XX_NVRAM=y +CONFIG_BCM47XX_SPROM=y +CONFIG_MTD=y +CONFIG_MTD_BCM47XX_PARTS=y +CONFIG_MTD_PARSER_TRX=y +CONFIG_MTD_BCM47XXSFLASH=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_BRCMNAND=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_NETDEVICES=y +CONFIG_VXLAN=y +CONFIG_VETH=y +CONFIG_B53=y +CONFIG_BGMAC_BCMA=y +CONFIG_BROADCOM_PHY=y +CONFIG_MDIO_BUS_MUX_MMIOREG=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SPI=y +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_BCM47XX_WDT=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +CONFIG_USB=y +CONFIG_USB_LEDS_TRIGGER_USBPORT=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_PCI is not set +CONFIG_USB_HCD_BCMA=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_PHY_BCM_NS_USB2=y +CONFIG_PHY_BCM_NS_USB3=y +CONFIG_UBIFS_FS=y +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_UNCOMPRESS=y +CONFIG_EARLY_PRINTK=y diff --git a/board/broadcom/ns/post-image.sh b/board/broadcom/ns/post-image.sh new file mode 100755 index 0000000000..b6150fc539 --- /dev/null +++ b/board/broadcom/ns/post-image.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +# $1: images directory path +# $2: device dts filename +# $3: board id +build_lxl() { + local images="$1" + local device="$2" + local board="$3" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma + $HOST_DIR/bin/lxlfw create $images/$device.lxl -i $images/$device.trx -b "$board" +} + +# $1: images directory path +# $2: device dts filename +build_trx() { + local images="$1" + local device="$2" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma +} + +devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" +for device in $devices; do + case "$device" in + "bcm4708-smartrg-sr400ac") + build_trx "$1" "$device" + ;; + "bcm47094-luxul-xwr-3150-v1") + build_lxl "$1" "$device" "XWR-3150" + ;; + esac +done diff --git a/board/broadcom/ns/readme.txt b/board/broadcom/ns/readme.txt new file mode 100644 index 0000000000..18c9b03c13 --- /dev/null +++ b/board/broadcom/ns/readme.txt @@ -0,0 +1,38 @@ +Broadcom Northstar + +Intro +===== + +This readme covers Northstar family of Broadcom SoCs. It includes: + - BCM4708 (2 x 800 MHz) + - BCM47081 (1 x 800 MHz) + - BCM4709 (2 x 1 GHz) + - BCM47094 (2 x 1 GHz) (AKA BCM4709C0) + +Northstar platform is used in some home routers by multiple vendors. There are +over 100 market devices based on it and they can all be supported with 1 kernel. + +There is no point in having separated board for each model. This board code is +meant for all supported Northstar devices. + +All Northstar devices come with CFE bootloader by default. It's basically closed +source as sources are available for some old releases only. There is no U-Boot (or +any other) drop-in replacement or second stage loader with Northstar support. + +CFE supports flashing firmware images over TFTP and HTTP (depending on vendor / +device setup). + +How to build it +=============== + + $ make broadcom_ns_defconfig + + $ make + +How to flash over HTTP +====================== + +Power on device and press (and hold) CTRL+C in serial console terminal. When CFE +gets into prompt mode it'll automatically start built-in HTTP server. Navigate +to http://192.168.1.1/ (unless IP was changed - verify with "ifconfig") and +upload new firmware using a web browser. diff --git a/configs/broadcom_ns_defconfig b/configs/broadcom_ns_defconfig new file mode 100644 index 0000000000..bba7011aac --- /dev/null +++ b/configs/broadcom_ns_defconfig @@ -0,0 +1,14 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/broadcom/ns/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/ns/linux.config" +BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm4708-smartrg-sr400ac bcm47094-luxul-xwr-3150-v1" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_PACKAGE_HOST_FIRMWARE_UTILS=y +BR2_PACKAGE_HOST_LZMA_ALONE=y -- 2.34.1 From nicolas.carrier at orolia.com Thu Mar 10 12:41:06 2022 From: nicolas.carrier at orolia.com (Nicolas Carrier) Date: Thu, 10 Mar 2022 13:41:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: fix compilation with linaro 7.3 / 7.5 toolchains Message-ID: <20220310124106.2916278-1-nicolas.carrier@orolia.com> An unitialized field in a structure, causes the following error: platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar initializer for type ?gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}? This commit applies a patch to qt5webkit to fix the compilation issue. Signed-off-by: Nicolas Carrier --- ...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch diff --git a/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch new file mode 100644 index 0000000000..dc2dcdafb7 --- /dev/null +++ b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch @@ -0,0 +1,17 @@ +AudioFileReaderGStreamer.cpp: fix error: braces around scalar initializer + +Compilation error, with linaro toolchains Linaro ARM 2018.05 and Linaro ARM +2019.12. + +Signed-off-by: Nicolas Carrier + +--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2022-03-09 16:44:12.597494891 +0100 ++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2020-03-04 18:16:37.000000000 +0100 +@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterle + [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { + return static_cast(userData)->handleSample(sink); + }, ++ nullptr, // new_event + { nullptr } + }; + gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0); -- 2.30.2 From nicolas.carrier at orolia.com Thu Mar 10 12:42:40 2022 From: nicolas.carrier at orolia.com (Nicolas Carrier) Date: Thu, 10 Mar 2022 13:42:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: fix compilation with linaro 7.3 / 7.5 toolchains In-Reply-To: <20220310124106.2916278-1-nicolas.carrier@orolia.com> References: <20220310124106.2916278-1-nicolas.carrier@orolia.com> Message-ID: <8794da8eac039997d08572a1508077ff878cce7c.camel@orolia.com> I forgot to add, that I had this bug when testing the latest LTS version 2022.02, so if accepted, it could be applied to it too, it would be great :) On Thu, 2022-03-10 at 13:41 +0100, Nicolas Carrier wrote: > An unitialized field in a structure, causes the following error: > ??? platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar > initializer for type ?gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}? > > This commit applies a patch to qt5webkit to fix the compilation issue. > > Signed-off-by: Nicolas Carrier > --- > ?...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++ > ?1 file changed, 17 insertions(+) > ?create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > > diff --git a/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > new file mode 100644 > index 0000000000..dc2dcdafb7 > --- /dev/null > +++ b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > @@ -0,0 +1,17 @@ > +AudioFileReaderGStreamer.cpp: fix error: braces around scalar initializer > + > +Compilation error, with linaro toolchains Linaro ARM 2018.05 and Linaro ARM > +2019.12. > + > +Signed-off-by: Nicolas Carrier > + > +--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp?????2022-03-09 > 16:44:12.597494891 +0100 > ++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp?????2020-03-04 > 18:16:37.000000000 +0100 > +@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterle > +???????? [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { > +???????????? return static_cast(userData)->handleSample(sink); > +???????? }, > ++??????? nullptr, // new_event > +???????? { nullptr } > +???? }; > +???? gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0); From clement.leger at bootlin.com Thu Mar 10 13:28:36 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Thu, 10 Mar 2022 14:28:36 +0100 Subject: [Buildroot] [PATCH 0/3] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310142836.2c8e1787@fixe.home> Le Thu, 10 Mar 2022 09:07:42 +0100, Cl?ment L?ger a ?crit : > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. > > Cl?ment L?ger (3): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > > boot/optee-os/Config.in | 13 +++++++++++-- > boot/optee-os/optee-os.hash | 3 +-- > boot/optee-os/optee-os.mk | 7 ++++++- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 4 files changed, 25 insertions(+), 5 deletions(-) > Actually, all optee packages needs to be updated to 3.16.0. Please ignore this version. I'll send a V2 updating other packages. Thanks, -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From David.Laight at ACULAB.COM Thu Mar 10 13:47:24 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 13:47:24 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310121105.GB11974@parad0x.org> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> <20220310121105.GB11974@parad0x.org> Message-ID: <2c3fb2b6d5c54261a4e0a8538ec6ea3c@AcuMS.aculab.com> From: Mathieu Mirmont > Sent: 10 March 2022 12:11 > > On Thu, Mar 10, 2022 at 11:52:08AM +0000, David Laight wrote: > > It is worth checking whether Debian have changed the behaviour of dash > > or whether they've just changed the default root shell to dash. > > They've switched to the internal fnmatch implementation of dash [1] in > this commit [1]. Before that they were using fnmatch(3) from the > glibc. > > [1] https://salsa.debian.org/debian/dash/-/commit/d7b1269eeeb5749ccc577f6e01dfccc2916b0130 Hmmm: External implementations change in subtle ways, leading to hard to diagnose bugs. It?s better to rely on the built-in implementation instead. As does randomly changing the implementation! Anyone signed up to the debian lists to comment? David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From john at metanate.com Thu Mar 10 14:03:50 2022 From: john at metanate.com (John Keeping) Date: Thu, 10 Mar 2022 14:03:50 +0000 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit Message-ID: <20220310140350.1955655-1-john@metanate.com> sshd is broken on 32-bit systems because ppoll_time64 is used by the application although it is not allowed by the seccomp filter. Apply the upstream patch to fix this. Signed-off-by: John Keeping --- ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch new file mode 100644 index 0000000000..34b309bd9a --- /dev/null +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch @@ -0,0 +1,31 @@ +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Sat, 26 Feb 2022 14:06:14 +1100 +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. + +Should fix sandbox violations on (some? at least i386 and armhf) 32bit +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at +debian.org via bz#3396. + +Signed-off-by: John Keeping +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif +-- +2.35.1 + -- 2.35.1 From zajec5 at gmail.com Thu Mar 10 14:12:53 2022 From: zajec5 at gmail.com (=?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?=) Date: Thu, 10 Mar 2022 15:12:53 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package In-Reply-To: <20220309220800.GF23050@scaer> References: <20220308183527.17639-1-zajec5@gmail.com> <20220309220800.GF23050@scaer> Message-ID: <95291ce8-0b8d-9bfc-8a5c-db6d640d2255@gmail.com> On 9.03.2022 23:08, Yann E. MORIN wrote: > On 2022-03-08 19:35 +0100, Rafa? Mi?ecki spake thusly: >> From: Rafa? Mi?ecki >> >> This new package provides "lzma_alone" host binary based on the original >> LZMA SDK. It provides few extra options when compared to the LZMA Utils >> / XZ Utils project "lzma" binary (already packaged as the "lzma"). >> >> This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows >> Debian's solution. Please note that Debian also uses LZMA SDK for the >> base "lzma" tool which may be considered for Buildroot too - as an >> independent change. Similar packaging is also used by Ubuntu & Arch. >> >> lzma_alone is a requirement for preparing firmware images for some >> Broadcom based home routers with a picky CFE bootloader. It has limited >> LZMA support and building compatible images requires specifying >> dictionary size and lc/lp/pb LZMA values manually. >> >> Version 9.22 is used as it's the last release using .tar.bz2 format. > > We could introduce a host variant of p7zip, so that we could > automatically add that to FOO_EXTRACT_DEPENDENCIES if the host does not > already have 7za (or 7zr), like we do for lzip archives for example. I can see 7z format support is no less messy than LZMA tools. It seems that 7-Zip project didn't provide command-line tool initially and that resulted in developing p7zip. It seems it has changed though. So we have two projects: 1. p7zip * Provides "7z" and "7za" * Last updated in 2016 * Suffers from security issues * Requires patching (11 Debian patches, 2 for CVEs) 2. 7-Zip * Provides "7zr" (documented as "7za") * Last updated in 2021 * Messy source * Doesn't even compile on some systems: ../../../C/Util/7z/7zMain.c:363:5: error: initializer element is not constant (const UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - kFileTimeStartYear)); ^ Which one of above we should try to package? > Applied to master, thanks. Huge thanks for your help. From theo.lebrun at bootlin.com Thu Mar 10 15:20:46 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 10 Mar 2022 16:20:46 +0100 Subject: [Buildroot] [PATCH 1/3] package/ragel: new package Message-ID: <20220310152048.633340-1-theo.lebrun@bootlin.com> This is an host-only package that does preprocessing to .rl files to turn them into .c or .cpp files. Initially added to support package/roc. See https://www.colm.net/open-source/ragel/ for the project's home page: Ragel compiles executable finite state machines from regular languages. Ragel targets C, C++ and ASM. Ragel state machines can not only recognize byte sequences as regular expression machines do, but can also execute code at arbitrary points in the recognition of a regular language. Code embedding is done using inline operators that do not disrupt the regular language syntax. Signed-off-by: Th?o Lebrun --- package/ragel/ragel.hash | 3 +++ package/ragel/ragel.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/ragel/ragel.hash create mode 100644 package/ragel/ragel.mk diff --git a/package/ragel/ragel.hash b/package/ragel/ragel.hash new file mode 100644 index 0000000000..332f587432 --- /dev/null +++ b/package/ragel/ragel.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f ragel-6.10.tar.gz +sha256 05a87975accb539399d0c8a4f4402ac27a6762fb1e4f31d04d455a8bee3e3693 COPYING diff --git a/package/ragel/ragel.mk b/package/ragel/ragel.mk new file mode 100644 index 0000000000..476aff5da4 --- /dev/null +++ b/package/ragel/ragel.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# ragel +# +################################################################################ + +RAGEL_VERSION = 6.10 +RAGEL_SITE = https://www.colm.net/files/ragel/ +RAGEL_LICENSE = GPL-2.0 +RAGEL_LICENSE_FILES = COPYING +RAGEL_CONF_OPTS = \ + --disable-silent-rules \ + --disable-manual \ + --disable-dependency-tracking +RAGEL_DEPENDENCIES = +HOST_RAGEL_DEPENDENCIES = + +$(eval $(host-autotools-package)) -- 2.35.1 From theo.lebrun at bootlin.com Thu Mar 10 15:20:48 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 10 Mar 2022 16:20:48 +0100 Subject: [Buildroot] [PATCH 3/3] package/pipewire: add optional roc In-Reply-To: <20220310152048.633340-1-theo.lebrun@bootlin.com> References: <20220310152048.633340-1-theo.lebrun@bootlin.com> Message-ID: <20220310152048.633340-3-theo.lebrun@bootlin.com> Roc is a toolkit for real-time audio streaming over the network, that can be used as a PipeWire module. Successful if libpipewire-module-roc-{sink,source}.so get built. Signed-off-by: Th?o Lebrun --- package/pipewire/pipewire.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..de27bce10c 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -189,6 +189,13 @@ else PIPEWIRE_CONF_OPTS += -Draop=disabled endif +ifeq ($(BR2_PACKAGE_ROC),y) +PIPEWIRE_CONF_OPTS += -Droc=enabled +PIPEWIRE_DEPENDENCIES += roc +else +PIPEWIRE_CONF_OPTS += -Droc=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef -- 2.35.1 From theo.lebrun at bootlin.com Thu Mar 10 15:20:47 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 10 Mar 2022 16:20:47 +0100 Subject: [Buildroot] [PATCH 2/3] package/roc: new package In-Reply-To: <20220310152048.633340-1-theo.lebrun@bootlin.com> References: <20220310152048.633340-1-theo.lebrun@bootlin.com> Message-ID: <20220310152048.633340-2-theo.lebrun@bootlin.com> Roc is a toolkit for real-time audio streaming over the network. https://roc-streaming.org/ Goal: optional dependency to PipeWire. Requires host-ragel to build. Signed-off-by: Th?o Lebrun --- package/Config.in | 1 + ...uild-that-used-removed-functionality.patch | 28 +++++++ package/roc/Config.in | 28 +++++++ package/roc/roc.hash | 3 + package/roc/roc.mk | 75 +++++++++++++++++++ 5 files changed, 135 insertions(+) create mode 100644 package/roc/0001-fix-build-that-used-removed-functionality.patch create mode 100644 package/roc/Config.in create mode 100644 package/roc/roc.hash create mode 100644 package/roc/roc.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..7ed075ae19 100644 --- a/package/Config.in +++ b/package/Config.in @@ -48,6 +48,7 @@ menu "Audio and video applications" source "package/on2-8170-libs/Config.in" source "package/opus-tools/Config.in" source "package/pulseaudio/Config.in" + source "package/roc/Config.in" source "package/sox/Config.in" source "package/squeezelite/Config.in" source "package/tovid/Config.in" diff --git a/package/roc/0001-fix-build-that-used-removed-functionality.patch b/package/roc/0001-fix-build-that-used-removed-functionality.patch new file mode 100644 index 0000000000..50147905c8 --- /dev/null +++ b/package/roc/0001-fix-build-that-used-removed-functionality.patch @@ -0,0 +1,28 @@ +build: fix build that used removed functionality + +The SConstruct file used the "SourceCode()" method that was removed in +SCons 4.0.0, after being deprecated in 2.0.0. + +This was fixed upstream but is not in the latest release yet. +https://github.com/roc-streaming/roc-toolkit/commit/abdfbb94df98fe88be4dd92ca587500126558411 + +Signed-off-by: Th?o Lebrun +--- + SConstruct | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index c724854..91fd469 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[ + # performance tuning + env.Decider('MD5-timestamp') + env.SetOption('implicit_cache', 1) +-env.SourceCode('.', None) + + # provide absolute path to force single sconsign file + # per-directory sconsign files seems to be buggy with generated sources +-- +2.35.1 + diff --git a/package/roc/Config.in b/package/roc/Config.in new file mode 100644 index 0000000000..3fd74cab3f --- /dev/null +++ b/package/roc/Config.in @@ -0,0 +1,28 @@ +comment "ROC needs a toolchain w/ shared libraries, C++, NPTL" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + +config BR2_PACKAGE_ROC + bool "roc" + # depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_1 + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_USE_MMU # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON3_SSL + select BR2_PACKAGE_LIBUV + help + Roc is a toolkit for real-time audio streaming over the + network. + + https://roc-streaming.org/ + +if BR2_PACKAGE_ROC +config BR2_PACKAGE_ROC_TOOLS + bool "build roc-{conv,recv,send} tools" + default y +endif diff --git a/package/roc/roc.hash b/package/roc/roc.hash new file mode 100644 index 0000000000..92bd8ce022 --- /dev/null +++ b/package/roc/roc.hash @@ -0,0 +1,3 @@ +# Computed locally: +sha256 b5f6eda94e5f989226bc6e61dcd0e307e711f00e3b27da49b552133862117353 roc-v0.1.5.tar.gz +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d LICENSE diff --git a/package/roc/roc.mk b/package/roc/roc.mk new file mode 100644 index 0000000000..90d226ffbd --- /dev/null +++ b/package/roc/roc.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# roc +# +################################################################################ + +ROC_VERSION = v0.1.5 +ROC_SITE = $(call github,roc-streaming,roc-toolkit,$(ROC_VERSION)) +ROC_LICENSE = MPL-2.0 +ROC_LICENSE_FILES = LICENSE +ROC_INSTALL_STAGING = YES +ROC_DEPENDENCIES = \ + host-gengetopt \ + host-pkgconf \ + host-ragel \ + host-scons \ + libuv + +ROC_SCONS_OPTS = \ + --disable-tests \ + --disable-examples \ + --disable-doc \ + --disable-libunwind \ + --build-3rdparty=openfec +# We are not building OpenFEC ourselves as they are using a forked version. See +# the following note in the documentation: +# https://github.com/roc-streaming/roc-toolkit/blob/c89687330bfce6f4dce79826f7a235b581f2b49d/docs/sphinx/building/dependencies.rst + +# The shared library is enabled by default. --enable-lib does not exist. +ifneq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +ROC_SCONS_OPTS += --disable-lib +endif + +ifeq ($(BR2_PACKAGE_ROC_TOOLS),y) + +# Tools are enabled by default. --enable-tools does not exist. + +# SoX and Pulseaudio support is only used for tools or examples, which is why +# their support is inside the TOOLS condition. + +ifeq ($(BR2_PACKAGE_SOX),y) +ROC_DEPENDENCIES += sox +else +ROC_SCONS_OPTS += --disable-sox +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +ROC_DEPENDENCIES += pulseaudio +else +ROC_SCONS_OPTS += --disable-pulseaudio +endif + +else +ROC_SCONS_OPTS += --disable-tools +endif + +define ROC_BUILD_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(SCONS) $(ROC_SCONS_OPTS)) +endef + +define ROC_INSTALL_STAGING_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(SCONS) $(ROC_SCONS_OPTS) --prefix="$(STAGING_DIR)/usr" install) +endef + +define ROC_INSTALL_TARGET_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(SCONS) $(ROC_SCONS_OPTS) --prefix="$(TARGET_DIR)/usr" install) +endef + +$(eval $(generic-package)) -- 2.35.1 From mat at parad0x.org Thu Mar 10 15:42:09 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 16:42:09 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <2c3fb2b6d5c54261a4e0a8538ec6ea3c@AcuMS.aculab.com> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> <20220310121105.GB11974@parad0x.org> <2c3fb2b6d5c54261a4e0a8538ec6ea3c@AcuMS.aculab.com> Message-ID: <20220310154209.GA32108@parad0x.org> On Thu, Mar 10, 2022 at 01:47:24PM +0000, David Laight wrote: > From: Mathieu Mirmont > > Sent: 10 March 2022 12:11 > > > > On Thu, Mar 10, 2022 at 11:52:08AM +0000, David Laight wrote: > > > It is worth checking whether Debian have changed the behaviour of dash > > > or whether they've just changed the default root shell to dash. > > > > They've switched to the internal fnmatch implementation of dash [1] in > > this commit [1]. Before that they were using fnmatch(3) from the > > glibc. > > > > [1] https://salsa.debian.org/debian/dash/-/commit/d7b1269eeeb5749ccc577f6e01dfccc2916b0130 > > Hmmm: > > External implementations change in subtle ways, leading to hard to > diagnose bugs. It?s better to rely on the built-in implementation > instead. > > As does randomly changing the implementation! True, however [^x] is not part of POSIX so it can't be expected to work with /bin/sh. -- Mathieu Mirmont -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From Clayton.Shotwell at collins.com Thu Mar 10 15:06:28 2022 From: Clayton.Shotwell at collins.com (Shotwell, Clayton L Collins) Date: Thu, 10 Mar 2022 15:06:28 +0000 Subject: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash In-Reply-To: <28b7bbc57970469eae07f1e439fdf1cd@AcuMS.aculab.com> References: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> <28b7bbc57970469eae07f1e439fdf1cd@AcuMS.aculab.com> Message-ID: David, > -----Original Message----- > From: David Laight > Sent: Thursday, March 10, 2022 1:41 AM > To: Shotwell, Clayton L Collins ; buildroot at buildroot.org > Cc: Shotwell, Clayton L Collins ; Weber, Matthew L Collins > Subject: [External] RE: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash > > From: clayton.shotwell > > Sent: 09 March 2022 23:08 > > > > The addition of the removal of the /run and /tmp contents using a > > non-POSIX pattern causes the file system creation to fail on systems > > where /bin/sh does not default to bash. Switching the fakeroot script > > to a bash shell addresses the problem. > > I'm not sure you can rely on /bin/bash existing. > > Better to fix the script to not need bashisms. Bash is a required tool of Buildroot (according to the manual anyway) but I agree fixing the bashism would be the better option. I see others have already pushed a fix so I will mark this patch as Rejected. https://patchwork.ozlabs.org/project/buildroot/patch/20220310120256.GA11974 at parad0x.org/ Thanks, Clayton From etienne.carriere at linaro.org Thu Mar 10 16:00:26 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Thu, 10 Mar 2022 17:00:26 +0100 Subject: [Buildroot] [PATCH 0/3] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220310142836.2c8e1787@fixe.home> References: <20220310080745.16903-1-clement.leger@bootlin.com> <20220310142836.2c8e1787@fixe.home> Message-ID: Hello Cl?ment, Thanks for upgrading optee. Regards, Etienne On Thu, 10 Mar 2022 at 14:30, Cl?ment L?ger wrote: > > Le Thu, 10 Mar 2022 09:07:42 +0100, > Cl?ment L?ger a ?crit : > > > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > > of python-pycryptodomex to build. This series adds support to build > > host-python-cryptography and uses it in optee-os package to build the > > 3.16.0 version. > > > > Cl?ment L?ger (3): > > package/python-cryptography: enable host package > > boot/optee-os: add support to build with python-cryptography > > boot/optee-os: bump to version 3.16.0 > > > > boot/optee-os/Config.in | 13 +++++++++++-- > > boot/optee-os/optee-os.hash | 3 +-- > > boot/optee-os/optee-os.mk | 7 ++++++- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 4 files changed, 25 insertions(+), 5 deletions(-) > > > > Actually, all optee packages needs to be updated to 3.16.0. Please > ignore this version. I'll send a V2 updating other packages. > > Thanks, > > -- > Cl?ment L?ger, > Embedded Linux and Kernel engineer at Bootlin > https://bootlin.com From hrsourabh011 at gmail.com Thu Mar 10 16:43:27 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 10 Mar 2022 17:43:27 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: Hello All, I am trying to connect my Raspberry Pi CM4 to Wifi automatically after start-up. I am using Buildroot based Linux distribution. I have worked with Yocto before and it provides systemd-networkd and wpa_supplicant feature to connect to wifi on boot. I am lloking something similar in Buildroot but couldn't find any notes online. So far, I think I have enabled the necessary config/driver using "make menuconfig" : [image: wpa_supplicant.png] [image: firmware.png] But now, how can I set-up wpa_supplicant.conf? Any link to notes or suggestion would be helpful. Can anyone please let me know how to proceed further with it? Your help will be much appreciated. Thanks in advance. P.S: I am using Buildroot 2022.02 release and also using systemd feature and let me know if any info is missing here. Regards, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: firmware.png Type: image/png Size: 11900 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: wpa_supplicant.png Type: image/png Size: 11434 bytes Desc: not available URL: From clement.leger at bootlin.com Thu Mar 10 16:57:29 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:29 +0100 Subject: [Buildroot] [PATCH v2 1/7] package/python-cryptography: enable host package In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-2-clement.leger@bootlin.com> Enable host package and add needed dependencies. Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..4ff61c7f86 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:31 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:31 +0100 Subject: [Buildroot] [PATCH v2 3/7] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-4-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index f8426f9ab2..6fe2ae95ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography. @@ -58,7 +59,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..d05309e0db 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ # From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:32 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:32 +0100 Subject: [Buildroot] [PATCH v2 4/7] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-5-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:33 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:33 +0100 Subject: [Buildroot] [PATCH v2 5/7] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-6-clement.leger@bootlin.com> From: Etienne Carriere Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:30 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:30 +0100 Subject: [Buildroot] [PATCH v2 2/7] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-3-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..f8426f9ab2 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE version below 3.16 used python-pycryptodomex package + in python scripts. Newer version uses python-cryptography. + Select this option if optee-os needs python-cryptography to + be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..57f9a17bb6 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,12 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:35 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:35 +0100 Subject: [Buildroot] [PATCH v2 7/7] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-8-clement.leger@bootlin.com> From: Etienne Carriere Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:34 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:34 +0100 Subject: [Buildroot] [PATCH v2 6/7] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-7-clement.leger@bootlin.com> From: Etienne Carriere Bump OP-TEE Client package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:28 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:28 +0100 Subject: [Buildroot] [PATCH v2 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220310165735.1102802-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which neess to be aligned with optee-os version. ---- Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (4): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 Etienne Carriere (3): package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 2 +- boot/optee-os/optee-os.mk | 7 ++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 37 insertions(+), 16 deletions(-) -- 2.34.1 From havran.jan at email.cz Thu Mar 10 18:03:32 2022 From: havran.jan at email.cz (Jan Havran) Date: Thu, 10 Mar 2022 19:03:32 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: Hi Sourabh, after enabling RPi firmware you must load the Wifi driver - since you are using systemd, it should by handled by udev on start I think. So you probably just need to configure /etc/network/interfaces to start wpa_supplicant on wlan0 with /etc/wpa_supplicant.conf file, where you can put your credentials. Or at least that is what I have done, but I am not using systemd. I did something similar some time ago, you can check it here: https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 (note that to make "my" credentials public in that commit was an intention). P.S.: if you want to have any modifications to be part of your image with filesystem, you can do it by using rootfs overlays for example: https://buildroot.org/downloads/manual/manual.html#rootfs-custom Regards, Jan Havran V?Thu, Mar 10, 2022 at 05:43:27PM +0100,?Sourabh Hegde napsal(a): > Hello All, > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > start-up. I am using Buildroot based Linux distribution. I have worked with > Yocto before and it provides systemd-networkd and wpa_supplicant feature to > connect to wifi on boot. I am lloking something similar in Buildroot but > couldn't find any notes online. > > So far, I think I have enabled the necessary config/driver using "make > menuconfig" : > [image: wpa_supplicant.png] > [image: firmware.png] > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > suggestion would be helpful. > > Can anyone please let me know how to proceed further with it? > > Your help will be much appreciated. > > Thanks in advance. > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > and let me know if any info is missing here. > > Regards, > > Sourabh > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kris at embeddedTS.com Thu Mar 10 18:59:21 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 10 Mar 2022 10:59:21 -0800 Subject: [Buildroot] [PATCH 1/1] package/ts4900-fpga: bump version to 20170510 Message-ID: <20220310185921.8852-1-kris@embeddedTS.com> Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte transmits. Signed-off-by: Kris Bahnsen --- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 9ffff643af..1d3c62bfd1 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index a3e42c0812..73e7a28e31 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,7 +4,7 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -- 2.11.0 From peter at korsgaard.com Thu Mar 10 19:38:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:38:26 +0100 Subject: [Buildroot] [PATCH 2/2] package/expat: security bump to version 2.4.5 In-Reply-To: <20220219122831.2961097-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 19 Feb 2022 13:28:31 +0100") References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> <20220219122831.2961097-2-fontaine.fabrice@gmail.com> Message-ID: <87mthxzjgt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security fixes: > #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 > sequences (e.g. from start tag names) to the XML > processing application on top of Expat can cause > arbitrary damage (e.g. code execution) depending > on how invalid UTF-8 is handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #561 CVE-2022-25236 -- Passing (one or more) namespace separator > characters in "xmlns[:prefix]" attribute values > made Expat send malformed tag names to the XML > processor on top of Expat which can cause > arbitrary damage (e.g. code execution) depending > on such unexpectable cases are handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing > that could be triggered by e.g. a 2 megabytes > file with a large number of opening braces. > Expected impact is denial of service or potentially > arbitrary code execution. > #560 CVE-2022-25314 -- Fix integer overflow in function copyString; > only affects the encoding name parameter at parser creation > time which is often hardcoded (rather than user input), > takes a value in the gigabytes to trigger, and a 64-bit > machine. Expected impact is denial of service. > #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; > needs input in the gigabytes and a 64-bit machine. > Expected impact is denial of service or potentially > arbitrary code execution. > https://blog.hartwork.org/posts/expat-2-4-5-released/ > https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Thu Mar 10 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <20220309142913.2102898-1-foss+buildroot@0leil.net> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> Message-ID: Hi Quentin, On 09/03/2022 15:29, Quentin Schulz wrote: > From: Quentin Schulz > > This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. > > The patch fails to apply because of a conflict in copyright year so it > needed some additional handling after downloading. > > The patch file was added by running the following command: > wget https://download.qt.io/archive/qt/5.15/CVE-2022-25255-qprocess5-15.diff -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch > > [1] https://nvd.nist.gov/vuln/detail/CVE-2022-25255 > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz > --- > ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ > package/qt5/qt5base/qt5base.mk | 2 + > 2 files changed, 58 insertions(+) > create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > new file mode 100644 > index 0000000000..dfab92a9ef > --- /dev/null > +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch Please make the patch something that approaches git-formatted. At the very least, the patch itself must have a description of what it does (i.e. a commit message) and a Signed-off-by from you. Ideally, though, you look for the appropriate commit in the upstream repository [1] and use that instead of a random diff. In that case, add something like this at the end of the description part: [Quentin: backport from upstream commit ab6915f0efb12cfe48d1f126f4a828212f853ce5 in 6.2 branch] Signed-off-by: ... Regards, Arnout [1] https://invent.kde.org/qt/qt/qtbase/-/commit/ab6915f0efb12cfe48d1f126f4a828212f853ce5.patch > @@ -0,0 +1,56 @@ > +--- a/src/corelib/io/qprocess_unix.cpp > ++++ b/src/corelib/io/qprocess_unix.cpp > +@@ -1,7 +1,7 @@ > + /**************************************************************************** > + ** > + ** Copyright (C) 2016 The Qt Company Ltd. > +-** Copyright (C) 2016 Intel Corporation. > ++** Copyright (C) 2022 Intel Corporation. > + ** Contact: https://www.qt.io/licensing/ > + ** > + ** This file is part of the QtCore module of the Qt Toolkit. > +@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess() > + // Add the program name to the argument list. > + argv[0] = nullptr; > + if (!program.contains(QLatin1Char('/'))) { > ++ // findExecutable() returns its argument if it's an absolute path, > ++ // otherwise it searches $PATH; returns empty if not found (we handle > ++ // that case much later) > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > +- if (!exeFilePath.isEmpty()) { > +- const QByteArray &tmp = QFile::encodeName(exeFilePath); > +- argv[0] = ::strdup(tmp.constData()); > +- } > +- } > +- if (!argv[0]) > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > ++ argv[0] = ::strdup(tmp.constData()); > ++ } else { > + argv[0] = ::strdup(encodedProgramName.constData()); > ++ } > + > + // Add every argument to the list > + for (int i = 0; i < arguments.count(); ++i) > +@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid) > + envp = _q_dupEnvironment(environment.d.constData()->vars, &envc); > + } > + > +- QByteArray tmp; > + if (!program.contains(QLatin1Char('/'))) { > ++ // findExecutable() returns its argument if it's an absolute path, > ++ // otherwise it searches $PATH; returns empty if not found (we handle > ++ // that case much later) > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > +- if (!exeFilePath.isEmpty()) > +- tmp = QFile::encodeName(exeFilePath); > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > ++ argv[0] = ::strdup(tmp.constData()); > ++ } else { > ++ argv[0] = ::strdup(QFile::encodeName(program)); > + } > +- if (tmp.isEmpty()) > +- tmp = QFile::encodeName(program); > +- argv[0] = tmp.data(); > + > + if (envp) > + qt_safe_execve(argv[0], argv, envp); > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef38d03253..ac0781c430 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -15,6 +15,8 @@ QT5BASE_SYNC_QT_HEADERS = YES > # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > +# 0008-CVE-2022-25255-qprocess5-15.diff.patch > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > > # A few comments: > # * -no-pch to workaround the issue described at From huth at tuxfamily.org Thu Mar 10 20:15:32 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Thu, 10 Mar 2022 21:15:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: bump to version 2022-03-08 In-Reply-To: <20220309215639.786189-1-fontaine.fabrice@gmail.com> References: <20220309215639.786189-1-fontaine.fabrice@gmail.com> Message-ID: <20220310211532.51f8d789@tuxfamily.org> Am Wed, 9 Mar 2022 22:56:39 +0100 schrieb Fabrice Fontaine : > - Switch site: > https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 > - Update first and second patches > - Drop third and fourth patches (already in version) > - This bump will fix the following build failure with powerpc and gcc 11 > thanks to > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 > > /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian > > Fixes: > - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be > > Signed-off-by: Fabrice Fontaine > --- > ...emove-Werror-to-avoid-build-failures.patch | 17 +++--- > ...vm-unit-tests-test-for-rdseed-rdrand.patch | 24 ++++---- > ...3-Makefile-fix-stack-protector-tests.patch | 36 ----------- > ...issue-with-the-linker-from-Fedora-32.patch | 61 ------------------- > package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- > package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- > 6 files changed, 27 insertions(+), 119 deletions(-) > delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > > diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > index cbfa3a87e6..d07b9b6912 100644 > --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures > Signed-off-by: Thomas Petazzoni > [Matthew: Refactoring of Thomas Petazzoni's original.] > Signed-off-by: Matthew Weber > +[Fabrice: updated for 2022-03-08] > +Signed-off-by: Fabrice Fontaine > --- > Makefile | 1 - > 1 file changed, 1 deletion(-) > @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile > index 7231334..d9ad42b 100644 > --- a/Makefile > +++ b/Makefile > -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > - COMMON_CFLAGS += -g $(autodepend-flags) > - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized > - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter > --COMMON_CFLAGS += -Werror > +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > + > + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common > + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized > +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces > ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces > + > frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") > - fnostack_protector := $(call cc-option, -fno-stack-protector, "") > --- > +- > 2.14.2 > > diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > index 1a1a90ce99..80549fd32a 100644 > --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > +++ b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > @@ -13,6 +13,8 @@ Upstream: > https://marc.info/?l=kvm&m=151580743523259&w=2 If I've get that old patch description right, this patch 0002 was only there for supporting old binutils versions < 2.23 ... but buildroot does not support those versions anymore, so I think you could simply drop the 0002 patch completely instead? Apart from that, your patch looks fine to me. Thomas From ps.report at gmx.net Thu Mar 10 20:21:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Mar 2022 21:21:26 +0100 Subject: [Buildroot] [PATCH v1] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220310202126.8379-1-ps.report@gmx.net> - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ?reserve?: bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer --- ...n-of-fzero-call-used-regs-all-suppor.patch | 38 +++++++++++++++++++ package/openssh/openssh.mk | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch diff --git a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ -- 2.35.1 From bugzilla at busybox.net Thu Mar 10 20:23:52 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Mar 2022 20:23:52 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #4 from Peter Seiderer --- Suggested buildroot patch [1] should fix the problem, thanks for reporting the problem and providing the config file! [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220310202126.8379-1-ps.report at gmx.net/ -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Thu Mar 10 20:29:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 21:29:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.0.16 In-Reply-To: <20220218190233.473109-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 18 Feb 2022 20:02:33 +0100") References: <20220218190233.473109-1-bernd.kuhls@t-online.de> Message-ID: <87ilslzh3b.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 > Fixes CVE-2021-21708. > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 7.4.28 which contains the same fix. -- Bye, Peter Korsgaard From arnout at mind.be Thu Mar 10 20:29:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:29:48 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package In-Reply-To: <95291ce8-0b8d-9bfc-8a5c-db6d640d2255@gmail.com> References: <20220308183527.17639-1-zajec5@gmail.com> <20220309220800.GF23050@scaer> <95291ce8-0b8d-9bfc-8a5c-db6d640d2255@gmail.com> Message-ID: <2a7d0213-14a4-e930-aabf-0d79ecd2b075@mind.be> On 10/03/2022 15:12, Rafa? Mi?ecki wrote: > On 9.03.2022 23:08, Yann E. MORIN wrote: >> On 2022-03-08 19:35 +0100, Rafa? Mi?ecki spake thusly: >>> From: Rafa? Mi?ecki >>> >>> This new package provides "lzma_alone" host binary based on the original >>> LZMA SDK. It provides few extra options when compared to the LZMA Utils >>> / XZ Utils project "lzma" binary (already packaged as the "lzma"). >>> >>> This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows >>> Debian's solution. Please note that Debian also uses LZMA SDK for the >>> base "lzma" tool which may be considered for Buildroot too - as an >>> independent change. Similar packaging is also used by Ubuntu & Arch. >>> >>> lzma_alone is a requirement for preparing firmware images for some >>> Broadcom based home routers with a picky CFE bootloader. It has limited >>> LZMA support and building compatible images requires specifying >>> dictionary size and lc/lp/pb LZMA values manually. >>> >>> Version 9.22 is used as it's the last release using .tar.bz2 format. >> >> We could introduce a host variant of p7zip, so that we could >> automatically add that to FOO_EXTRACT_DEPENDENCIES if the host does not >> already have 7za (or 7zr), like we do for lzip archives for example. > > I can see 7z format support is no less messy than LZMA tools. > > It seems that 7-Zip project didn't provide command-line tool initially > and that resulted in developing p7zip. It seems it has changed though. > > So we have two projects: > > 1. p7zip > * Provides "7z" and "7za" > * Last updated in 2016 > * Suffers from security issues > * Requires patching (11 Debian patches, 2 for CVEs) Last commit in the fork that we use in package/p7zip [1] is from December '21, so not that bad I think. Regards, Arnout [1] https://github.com/jinfeihan57/p7zip > > 2. 7-Zip > * Provides "7zr" (documented as "7za") > * Last updated in 2021 > * Messy source > * Doesn't even compile on some systems: > ../../../C/Util/7z/7zMain.c:363:5: error: initializer element is not constant > ???? (const UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - > kFileTimeStartYear)); > ???? ^ > > Which one of above we should try to package? > > >> Applied to master, thanks. > > Huge thanks for your help. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Thu Mar 10 20:38:40 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Mar 2022 21:38:40 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220310140350.1955655-1-john@metanate.com> References: <20220310140350.1955655-1-john@metanate.com> Message-ID: <20220310213840.32655ec7@gmx.net> Hello John, thanks for the patch, some minor nitpicks... Better patch subject would be: package/openssh: add upstream patch to add seccomp ppoll_time64 support On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: > sshd is broken on 32-bit systems because ppoll_time64 is used by the > application although it is not allowed by the seccomp filter. > > Apply the upstream patch to fix this. Better: -add upstream patch ([1] to add seccomp ppoll_time64 support [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch > > Signed-off-by: John Keeping > --- > ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ > 1 file changed, 31 insertions(+) > create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > > diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > new file mode 100644 > index 0000000000..34b309bd9a > --- /dev/null > +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > @@ -0,0 +1,31 @@ > +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 > +From: Darren Tucker > +Date: Sat, 26 Feb 2022 14:06:14 +1100 > +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. > + > +Should fix sandbox violations on (some? at least i386 and armhf) 32bit > +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at > +debian.org via bz#3396. > + Missing: [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] > +Signed-off-by: John Keeping > +--- > + sandbox-seccomp-filter.c | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c > +index 2e065ba3..4ce80cb2 100644 > +--- a/sandbox-seccomp-filter.c > ++++ b/sandbox-seccomp-filter.c > +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { > + #ifdef __NR_ppoll > + SC_ALLOW(__NR_ppoll), > + #endif > ++#ifdef __NR_ppoll_time64 > ++ SC_ALLOW(__NR_ppoll_time64), > ++#endif > + #ifdef __NR_poll > + SC_ALLOW(__NR_poll), > + #endif > +-- > +2.35.1 > + With this fixed you can add my Reviewed-by: Peter Seiderer Regards, Peter From arnout at mind.be Thu Mar 10 20:43:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:43:28 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_pc_defconfig: switch to extlinux In-Reply-To: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> References: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> Message-ID: <90f76172-fd06-bd9f-f88c-dff188ef4a7d@mind.be> On 18/02/2022 04:51, Sergey Kuzminov wrote: > Changes: > * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch SD image from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > > Signed-off-by: Sergey Kuzminov Applied to master, thanks. Regards, Arnout > --- > V1->V2: > * improved commit log > --- > board/orangepi/orangepi-pc/boot.cmd | 8 ------ > board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- > configs/orangepi_pc_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd > deleted file mode 100644 > index 9da625c803..0000000000 > --- a/board/orangepi/orangepi-pc/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg > deleted file mode 100644 > index 14e326cc56..0000000000 > --- a/board/orangepi/orangepi-pc/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc.dtb", > - "boot.scr" > - } > - } > - > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig > index 44ea9b95c4..fd0f64e0e6 100644 > --- a/configs/orangepi_pc_defconfig > +++ b/configs/orangepi_pc_defconfig > @@ -5,8 +5,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" > BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" > BR2_SYSTEM_DHCP="eth0" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" > @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Thu Mar 10 20:44:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:44:38 +0100 Subject: [Buildroot] [PATCH v2 0/6] orangepi/linksprite: convert more allwinner boards to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <777b2ce3-bf0a-3b3e-896a-00bc9525b65a@mind.be> On 25/02/2022 08:26, Sergey Matyukevich wrote: > Hi all, > > Recently extlinux infrastructure has been added for orangepi boards by > Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig: > switch to extlinux"). This patch series converts to extlinux some of the > boards that I have at my disposal: > - orangepi-zero-plus2 > - orangepi-pc-plus > - orangepi-one > - linksprite-pcduino > > All these changes have been build- and boot- tested. Also I added > orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye > on its build failures. > > Regards, > Sergey Series applied to master, thanks. Regards, Arnout > > v1 -> v2 > - add linksprite-pcduino changes > - update commit messages according to Giulio Benetti comments > > > Sergey Matyukevich (6): > board/orangepi/orangepi-zero-plus2: switch to extlinux > board/orangepi/orangepi-pc-plus: switch to extlinux > board/orangepi/orangepi-one: switch to extlinux > board/linksprite/pcduino: switch to extlinux > configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions > DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 > > DEVELOPERS | 2 + > board/linksprite/pcduino/boot.cmd | 8 ---- > board/linksprite/pcduino/genimage.cfg | 43 ------------------- > board/linksprite/pcduino/post-build.sh | 11 ----- > board/linksprite/pcduino/post-image.sh | 16 ------- > board/orangepi/orangepi-one/boot.cmd | 8 ---- > board/orangepi/orangepi-one/genimage.cfg | 37 ---------------- > board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- > board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ------------------- > board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- > .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------ > configs/linksprite_pcduino_defconfig | 18 ++++---- > configs/orangepi_one_defconfig | 9 ++-- > configs/orangepi_pc_plus_defconfig | 9 ++-- > configs/orangepi_zero_plus2_defconfig | 14 +++--- > 15 files changed, 24 insertions(+), 249 deletions(-) > delete mode 100644 board/linksprite/pcduino/boot.cmd > delete mode 100644 board/linksprite/pcduino/genimage.cfg > delete mode 100755 board/linksprite/pcduino/post-build.sh > delete mode 100755 board/linksprite/pcduino/post-image.sh > delete mode 100644 board/orangepi/orangepi-one/boot.cmd > delete mode 100644 board/orangepi/orangepi-one/genimage.cfg > delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg > delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg > From arnout at mind.be Thu Mar 10 20:45:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:45:06 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-treq: bump to version 22.2.0 In-Reply-To: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> References: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> Message-ID: On 22/02/2022 00:08, Fabrice Fontaine wrote: > - hyperlink is a dependency since version 20.4.0 and > https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed > - six is not a dependency since version 21.5.0 and > https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-treq/Config.in | 2 +- > package/python-treq/python-treq.hash | 4 ++-- > package/python-treq/python-treq.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index 7c02a35638..5d76a5cdd6 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ > # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > select BR2_PACKAGE_PYTHON_ATTRS # runtime > + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash > index 288279cbd8..aecf71aad8 100644 > --- a/package/python-treq/python-treq.hash > +++ b/package/python-treq/python-treq.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/treq/json > -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz > -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz > +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz > +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz > # Locally computed sha256 checksums > sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE > diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk > index 320f57b6f2..57dc50ee74 100644 > --- a/package/python-treq/python-treq.mk > +++ b/package/python-treq/python-treq.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TREQ_VERSION = 20.3.0 > +PYTHON_TREQ_VERSION = 22.2.0 > PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz > -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 > +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 > PYTHON_TREQ_LICENSE = MIT > PYTHON_TREQ_LICENSE_FILES = LICENSE > PYTHON_TREQ_SETUP_TYPE = setuptools From arnout at mind.be Thu Mar 10 20:45:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:45:25 +0100 Subject: [Buildroot] [PATCH v5] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220222153741.15815-1-mdurrant@arcturusnetworks.com> References: <20220222153741.15815-1-mdurrant@arcturusnetworks.com> Message-ID: <06ac030e-ecab-f78b-5137-08d1237337d8@mind.be> On 22/02/2022 16:37, Michael Durrant wrote: > - Bump Linux to version 5.4.137 > - Bump U-Boot to add new targets, version remains the same > - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was > only used by PFE and now PFE is loaded directly by the kernel > - Use Image.gz instead of Image to have a compressed kernel > - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and > post-image.sh use different name. This fixes the bug that didn't > allow the creation of the part0-000000.itb file. > > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > V2->V3: > - Moved SoB to top of patch > - The use of Image.gz replace Image to force use of compression. > - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used > in original readme. > - Removing extra newline > - The NXP Packet Forward Engine (PFE) firmware loader was the only > file used in the overlay. As the PFE is now loaded directly by > the kernel the BR2_ROOTFS_OVERLAY script has been removed. > V3->V4: > - Improved commit log by listing all the changed as suggested by Giulio. > - Updated header version comment in defconfig to reflect 5.4 series. > V4->V5: > - Adding Reviewed-by & Tested-by by Giulio. > - Wrapping commit log. > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - > board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 10 +++++----- > 4 files changed, 7 insertions(+), 22 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..372df59c61 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,4 @@ > #!/bin/sh > > mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..b486ecebc7 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -24,13 +24,13 @@ After building, you should obtain this tree: > > output/images/ > +-- arc-ucls1012a.dtb > - +-- Image > + +-- Image.gz > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > + +-- br2-ucls1012a.its > > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..124cc3ff94 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,22 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +# Linux headers same as kernel, a 5.4 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools From arnout at mind.be Thu Mar 10 20:34:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:34:29 +0100 Subject: [Buildroot] [git commit] configs/orangepi_pc_defconfig: switch to extlinux Message-ID: <20220310203713.DCCAE83B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=866ffbe0e63aff5788f29007b8fabc3fa49cd5ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changes: * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. * Exclude FAT partition, it is no longer needed for U-Boot. * Switch SD image from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-pc/boot.cmd | 8 ------- board/orangepi/orangepi-pc/genimage.cfg | 37 --------------------------------- configs/orangepi_pc_defconfig | 9 +++----- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..fd0f64e0e6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Thu Mar 10 20:35:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:35:20 +0100 Subject: [Buildroot] [git commit] package/python-treq: bump to version 22.2.0 Message-ID: <20220310203713.E644A83A8A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=933447c27c41ebcdb5eb9fa2a374456699ae33f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - hyperlink is a dependency since version 20.4.0 and https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed - six is not a dependency since version 21.5.0 and https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-treq/Config.in | 2 +- package/python-treq/python-treq.hash | 4 ++-- package/python-treq/python-treq.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 7c02a35638..5d76a5cdd6 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index 288279cbd8..aecf71aad8 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 320f57b6f2..57dc50ee74 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 20.3.0 +PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools From arnout at mind.be Thu Mar 10 20:39:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:54 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 Message-ID: <20220310203714.343B283B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4616a195ea396e2113dcbb5dad373306036c1a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergey Matyukevich Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3bc9819382..6f213e054f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2546,10 +2546,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ From arnout at mind.be Thu Mar 10 20:39:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:40 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-one: switch to extlinux Message-ID: <20220310203714.17E7783B7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbca462131f7d8e40dcef47d12c57d741dc21648 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-one/boot.cmd | 8 ------- board/orangepi/orangepi-one/genimage.cfg | 37 -------------------------------- configs/orangepi_one_defconfig | 9 +++----- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..ba128424a0 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From arnout at mind.be Thu Mar 10 20:39:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:50 +0100 Subject: [Buildroot] [git commit] configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions Message-ID: <20220310203714.2A31B83B78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3c6c1d9793db45000dfd9cf5df6ff7404ccf097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump Linux kernel to 5.16.1 and U-Boot to 2022.01. Select option BR2_TARGET_UBOOT_NEEDS_OPENSSL since U-Boot requires openssl. Drop redundant U-Boot options. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/linksprite_pcduino_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 05b25aede4..806c4f0697 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -40,13 +40,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" -BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" From arnout at mind.be Thu Mar 10 20:39:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:07 +0100 Subject: [Buildroot] [git commit] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220310203713.F0E8B83B7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b72db519e69491e3c37074e2c526310f12d0faa9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- .../aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..124cc3ff94 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools From arnout at mind.be Thu Mar 10 20:39:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:37 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-pc-plus: switch to extlinux Message-ID: <20220310203714.0EFC683B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8497e2a3ce8632ef57d0af5c7a482ba6978e6e9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ------ board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ---------------------------- configs/orangepi_pc_plus_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 57 deletions(-) diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y From arnout at mind.be Thu Mar 10 20:39:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:45 +0100 Subject: [Buildroot] [git commit] board/linksprite/pcduino: switch to extlinux Message-ID: <20220310203714.20CAA83B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bfc4002ed598189a92db1eb7797928e136a9883 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/linksprite/pcduino/boot.cmd | 8 ------- board/linksprite/pcduino/genimage.cfg | 43 ---------------------------------- board/linksprite/pcduino/post-build.sh | 11 --------- board/linksprite/pcduino/post-image.sh | 16 ------------- configs/linksprite_pcduino_defconfig | 9 ++++--- 5 files changed, 4 insertions(+), 83 deletions(-) diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd deleted file mode 100644 index 0db8363599..0000000000 --- a/board/linksprite/pcduino/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg deleted file mode 100644 index db33322118..0000000000 --- a/board/linksprite/pcduino/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# -# Minimal SD card image for the pcDuino -# - -image boot.vfat { - vfat { - files = { - "zImage", - "sun4i-a10-pcduino.dtb", - "boot.scr" - } - } - - size = 16M -} - -# -# Note: u-boot environment is stored between u-boot and boot partitions -# - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 1M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh deleted file mode 100755 index e1e1877671..0000000000 --- a/board/linksprite/pcduino/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for pcDuino taken from OrangePi post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh deleted file mode 100755 index c82b189f9c..0000000000 --- a/board/linksprite/pcduino/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index b58f970493..05b25aede4 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -11,8 +11,9 @@ BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # SD image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -29,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -49,10 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Target packages: wireless support for pcduino-lite-wifi BR2_PACKAGE_IW=y From arnout at mind.be Thu Mar 10 20:39:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:25 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-zero-plus2: switch to extlinux Message-ID: <20220310203714.0669483B78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce73d0a1d2b5abec972cd2bf9a5945b0853eb035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. To help extlinux to find DTB without U-Boot environment changes, do not strip arm64 board specific directory from DTB name when installing it in /boot directory. For this purpose use BR2_KERNEL_DTB_KEEP_DIRNAME config option. Finally, tidy up configuration file adding section names. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 ---- board/orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------------- configs/orangepi_zero_plus2_defconfig | 14 +++++---- 3 files changed, 8 insertions(+), 53 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..ef171c3ad3 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From arnout at mind.be Thu Mar 10 20:57:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:57:36 +0100 Subject: [Buildroot] [PATCH v5 0/3] Add andes ae350 support In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <2df4d52d-03db-3af9-8ef9-808236638379@mind.be> On 25/02/2022 10:25, Yu Chien Peter Lin wrote: > This patchset > - renames andes/ae3xx and its defconfig to ae300 for nds32 architecture. > - adds ae350 platform support and andes_ae350_45_defconfig. > > Yu Chien Peter Lin (3): > board/andes: rearrange andes folder structure > board/andes/ae350: add support for Andes AE350 > DEVELOPERS: add Yu-Chien Lin to board/andes Series applied to master, thanks. Regards, Arnout > > DEVELOPERS | 5 +- > .../ae3xx.fragment => ae300/ae300.fragment} | 0 > ...0001-nds32-Fix-boot-messages-garbled.patch | 0 > ...ve-redundant-YYLOC-global-declaratio.patch | 0 > board/andes/{ => ae300}/readme.txt | 10 +- > board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ > board/andes/ae350/genimage_sdcard.cfg | 26 ++ > ...isable-PIC-explicitly-for-assembling.patch | 29 ++ > ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 ++ > ...001-Fix-mmc-no-partition-table-error.patch | 27 ++ > ...2-Prevent-fw_dynamic-from-relocation.patch | 27 ++ > ...0003-Fix-u-boot-proper-booting-issue.patch | 26 ++ > ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 ++ > board/andes/ae350/post-build.sh | 3 + > board/andes/ae350/readme.txt | 65 +++++ > .../boot/extlinux/extlinux.conf | 4 + > board/andes/ae350/uboot.config.fragment | 5 + > ..._ae3xx_defconfig => andes_ae300_defconfig} | 4 +- > configs/andes_ae350_45_defconfig | 43 +++ > .../toolchain-external-andes-nds32/Config.in | 2 +- > 20 files changed, 590 insertions(+), 10 deletions(-) > rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) > rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > rename board/andes/{ => ae300}/readme.txt (71%) > create mode 100755 board/andes/ae350/ae350.dts > create mode 100644 board/andes/ae350/genimage_sdcard.cfg > create mode 100644 board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch > create mode 100644 board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch > create mode 100644 board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch > create mode 100644 board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch > create mode 100644 board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch > create mode 100644 board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch > create mode 100755 board/andes/ae350/post-build.sh > create mode 100644 board/andes/ae350/readme.txt > create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > create mode 100644 board/andes/ae350/uboot.config.fragment > rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) > create mode 100644 configs/andes_ae350_45_defconfig > From arnout at mind.be Thu Mar 10 20:57:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:57:55 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/balena-engine: bump to version 20.10.12 In-Reply-To: <20220226102418.943851-1-tianyuanhao3@163.com> References: <20220226102418.943851-1-tianyuanhao3@163.com> Message-ID: On 26/02/2022 11:24, TIAN Yuanhao wrote: > Also: > - drop unused dependencies > - drop invalid tags > - drop the autogen step > - simplify kconfigs just to run hello-world > > https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md > > Signed-off-by: TIAN Yuanhao Applied to master, thanks. Regards, Arnout > --- > package/balena-engine/Config.in | 1 - > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 42 +++++------------------- > 3 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in > index f48f361dc2..02f694515e 100644 > --- a/package/balena-engine/Config.in > +++ b/package/balena-engine/Config.in > @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE > depends on BR2_USE_MMU # util-linux > select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime > select BR2_PACKAGE_IPTABLES # runtime > - select BR2_PACKAGE_SQLITE # runtime > select BR2_PACKAGE_UTIL_LINUX # runtime > select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime > select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 3f632ef381..ef590881f5 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz > +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index b3eb2ca75b..0afcea3d7e 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,34 +4,33 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 19.03.14 > +BALENA_ENGINE_VERSION = 20.10.12 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 > BALENA_ENGINE_LICENSE_FILES = LICENSE > > -BALENA_ENGINE_DEPENDENCIES = host-pkgconf > BALENA_ENGINE_GOMOD = github.com/docker/docker > > BALENA_ENGINE_LDFLAGS = \ > - -X github.com/docker/cli/cli/version.Version=N/A \ > - -X github.com/docker/cli/cli/version.GitCommit= \ > - -X github.com/docker/cli/cli/version.BuildTime= \ > + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ > + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ > -X github.com/containerd/containerd/version.Version=N/A \ > + -X github.com/docker/cli/cli/version.BuildTime= \ > + -X github.com/docker/cli/cli/version.GitCommit= \ > + -X github.com/docker/cli/cli/version.Version=N/A \ > -X github.com/opencontainers/runc.version=N/A > > BALENA_ENGINE_TAGS = \ > cgo \ > - exclude_graphdriver_zfs \ > - autogen \ > - no_buildkit \ > no_btrfs \ > no_cri \ > no_devmapper \ > no_zfs \ > exclude_disk_quota \ > exclude_graphdriver_btrfs \ > - exclude_graphdriver_devicemapper > + exclude_graphdriver_devicemapper \ > + exclude_graphdriver_zfs > > BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine > > @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd > BALENA_ENGINE_TAGS += journald > endif > > -define BALENA_ENGINE_RUN_AUTOGEN > - cd $(@D) && \ > - VERSION=$(BALENA_ENGINE_VERSION) \ > - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ > - $(TARGET_MAKE_ENV) \ > - $(SHELL) hack/make/.go-autogen > -endef > - > -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN > - > define BALENA_ENGINE_INSTALL_INIT_SYSTEMD > $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ > $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service > @@ -64,35 +53,20 @@ endef > define BALENA_ENGINE_LINUX_CONFIG_FIXUPS > $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) > $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) > $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) > $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) > - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) > - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) > $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) > - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) > - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) > $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) > - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) > - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) > - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) > $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) > - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) > endef > > define BALENA_ENGINE_INSTALL_SYMLINK From arnout at mind.be Thu Mar 10 20:52:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:52:46 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: replace Nylon chen with Yu Chien Peter Lin for Andes Message-ID: <20220310204935.8759883BF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff6d4778c270d612e5338a9a5f93f84f7cf3e4f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 26bcb508e5..70d71186ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2147,10 +2147,11 @@ N: Norbert Lange F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen +N: Yu Chien Peter Lin F: arch/Config.in.nds32 F: board/andes F: configs/andes_ae300_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel From arnout at mind.be Thu Mar 10 20:47:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:47:55 +0100 Subject: [Buildroot] [git commit] board/andes: rearrange andes folder structure Message-ID: <20220310204935.727D383BF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48bdd8374174494b5a1ae658edb32780e9f86052 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to add ae350 RISC-V platform, rename ae3xx to ae300 for NDS32 architecture. AE300 (NDS32): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ AE350 (RISC-V): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 +- board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +++++----- configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- .../toolchain-external-andes-nds32/Config.in | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6f213e054f..26bcb508e5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2150,7 +2150,7 @@ F: package/tcf-agent/ N: Nylon Chen F: arch/Config.in.nds32 F: board/andes -F: configs/andes_ae3xx_defconfig +F: configs/andes_ae300_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment similarity index 100% rename from board/andes/ae3xx/ae3xx.fragment rename to board/andes/ae300/ae300.fragment diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch similarity index 100% rename from board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch rename to board/andes/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt similarity index 71% rename from board/andes/readme.txt rename to board/andes/ae300/readme.txt index 0f95c65549..51c05c9235 100644 --- a/board/andes/readme.txt +++ b/board/andes/ae300/readme.txt @@ -1,10 +1,10 @@ Intro ===== -Andestech(nds32) AE3XX Platform +Andestech(nds32) AE300 Platform -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. +The AE300 prototype demonstrates the AE300 example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE300. How to build it =============== @@ -12,10 +12,10 @@ How to build it Configure Buildroot ------------------- -The andes_ae3xx_defconfig configuration is a sample configuration with +The andes_ae300_defconfig configuration is a sample configuration with all that is required to bring the FPGA Development Board: - $ make andes_ae3xx_defconfig + $ make andes_ae300_defconfig Build everything ---------------- diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig similarity index 69% rename from configs/andes_ae3xx_defconfig rename to configs/andes_ae300_defconfig index 52634caa50..ffcb4d7d38 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae300_defconfig @@ -1,10 +1,10 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in index 9c937b8c44..ecd50cc805 100644 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 help nds32 toolchain for the nds32 architecture. It uses GCC 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform + code that runs on ae300 platform From arnout at mind.be Thu Mar 10 20:48:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:48:16 +0100 Subject: [Buildroot] [git commit] board/andes/ae350: add support for Andes AE350 Message-ID: <20220310204935.7D48083BF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc22c3ce40d8be4a6fbb1bcf0f16bd1777b562ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch provides defconfig and basic support for Andes 45 series RISC-V architecture on AE350 platform. http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/andes/ae350/ae350.dts | 274 +++++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...001-Disable-PIC-explicitly-for-assembling.patch | 29 +++ .../0002-Enable-cache-for-opensbi-jump-mode.patch | 25 ++ .../0001-Fix-mmc-no-partition-table-error.patch | 27 ++ .../0002-Prevent-fw_dynamic-from-relocation.patch | 27 ++ .../0003-Fix-u-boot-proper-booting-issue.patch | 26 ++ .../0004-Enable-printing-OpenSBI-boot-logo.patch | 25 ++ board/andes/ae350/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 ++++ 13 files changed, 579 insertions(+) diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts new file mode 100755 index 0000000000..5e5d70ab25 --- /dev/null +++ b/board/andes/ae350/ae350.dts @@ -0,0 +1,274 @@ +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,ae350"; + model = "andestech,ax45"; + aliases { + uart0 = &serial0; + spi0 = &spi; + }; + + chosen { + bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + timebase-frequency = <60000000>; + CPU0: cpu at 0 { + device_type = "cpu"; + reg = <0>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU0_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU1: cpu at 1 { + device_type = "cpu"; + reg = <1>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU1_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU2: cpu at 2 { + device_type = "cpu"; + reg = <2>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU2_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU3: cpu at 3 { + device_type = "cpu"; + reg = <3>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU3_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + }; + L2: l2-cache at e0500000 { + compatible = "cache"; + cache-level = <2>; + cache-size = <0x80000>; + reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; + andes,inst-prefetch = <3>; + andes,data-prefetch = <3>; + // The value format is + andes,tag-ram-ctl = <0 0>; + andes,data-ram-ctl = <0 0>; + }; + memory at 0 { + reg = <0x00000000 0x00000000 0x00000000 0x80000000>; + device_type = "memory"; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,riscv-ae350-soc", "simple-bus"; + ranges; + plic0: interrupt-controller at e4000000 { + compatible = "riscv,plic0"; + reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; + interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <71>; + }; + plic1: interrupt-controller at e6400000 { + compatible = "riscv,plic1"; + reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; + interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <4>; + }; + plmt0: plmt0 at e6000000 { + compatible = "riscv,plmt0"; + reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; + interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; + }; + spiclk: virt_100mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + timer0: timer at f0400000 { + compatible = "andestech,atcpit100"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + }; + pwm: pwm at f0400000 { + compatible = "andestech,atcpit100-pwm"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + pwm-cells = <2>; + }; + wdt: wdt at f0500000 { + compatible = "andestech,atcwdt200"; + reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <15000000>; + }; + serial0: serial at f0300000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; + interrupts = <9 4>; + interrupt-parent = <&plic0>; + clock-frequency = <19660800>; + reg-shift = <2>; + reg-offset = <32>; + no-loopback-test = <1>; + }; + rtc0: rtc at f0600000 { + compatible = "andestech,atcrtc100"; + reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; + interrupts = <1 4 2 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + gpio: gpio at f0700000 { + compatible = "andestech,atcgpio100"; + reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; + interrupts = <7 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + mac0: mac at e0100000 { + compatible = "andestech,atmac100"; + reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; + interrupts = <19 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + smu: smu at f0100000 { + compatible = "andestech,atcsmu"; + reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; + }; + mmc0: mmc at f0e00000 { + compatible = "andestech,atfsdc010"; + reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; + interrupts = <18 4>; + interrupt-parent = <&plic0>; + clock-freq-min-max = <400000 100000000>; + max-frequency = <100000000>; + fifo-depth = <16>; + cap-sd-highspeed; + dma-coherent; + }; + dma0: dma at f0c00000 { + compatible = "andestech,atcdmac300"; + reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; + interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; + interrupt-parent = <&plic0>; + dma-channels = <8>; + }; + lcd0: lcd at e0200000 { + compatible = "andestech,atflcdc100"; + reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; + interrupts = <20 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + pmu: pmu { + compatible = "riscv,andes-pmu"; + device_type = "pmu"; + }; + spi: spi at f0b00000 { + compatible = "andestech,atcspi200"; + reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; + interrupts = <4 4>; + interrupt-parent = <&plic0>; + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + clocks = <&spiclk>; + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0x00000000>; + spi-max-frequency = <50000000>; + spi-cpol; + spi-cpha; + }; + }; + }; +}; diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch new file mode 100644 index 0000000000..aeafed4c9f --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch @@ -0,0 +1,29 @@ +From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 29 Dec 2021 16:04:54 +0800 +Subject: [PATCH] Disable PIC explicitly for assembling + +This patch is necessary if the fw_dynamic load address +is not equal to link address. +However, they are equal currently, since we include an u-boot +patch for preventing fw_dynamic relocation. + +Signed-off-by: Yu Chien Peter Lin +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index d6f097d..441518d 100644 +--- a/Makefile ++++ b/Makefile +@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) + ASFLAGS += $(firmware-asflags-y) ++ASFLAGS += -fno-pic + + ARFLAGS = rcs + +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch new file mode 100644 index 0000000000..ae48a760c8 --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch @@ -0,0 +1,25 @@ +From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 30 Dec 2021 08:47:34 +0800 +Subject: [PATCH] Enable cache for opensbi jump mode + +Signed-off-by: Yu Chien Peter Lin +--- + firmware/fw_base.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/firmware/fw_base.S b/firmware/fw_base.S +index ab33e11..155d230 100644 +--- a/firmware/fw_base.S ++++ b/firmware/fw_base.S +@@ -46,6 +46,8 @@ + .globl _start + .globl _start_warm + _start: ++ li t0, 0x80003 ++ csrw 0x7ca, t0 + /* Find preferred boot HART id */ + MOV_3R s0, a0, s1, a1, s2, a2 + call fw_boot_hart +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch new file mode 100644 index 0000000000..7aff3cebf6 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch @@ -0,0 +1,27 @@ +From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:00:59 +0800 +Subject: [PATCH] Fix mmc no partition table error + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf..3b1e0aa0 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) + return ret; + #endif + +- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ +- dev_read_bool(dev, "cap-sd-highspeed")) +- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; +- + ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, + priv->minmax[1] , priv->minmax[0]); + chip->mmc = &plat->mmc; +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch new file mode 100644 index 0000000000..c6e1896f1c --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch @@ -0,0 +1,27 @@ +From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:02:26 +0800 +Subject: [PATCH] Prevent fw_dynamic from relocation + +This patch prevents OpenSBI relocation, load fw_dynamic to link address + +Signed-off-by: Yu Chien Peter Lin +--- + board/AndesTech/ax25-ae350/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig +index e50f505a..385c4c11 100644 +--- a/board/AndesTech/ax25-ae350/Kconfig ++++ b/board/AndesTech/ax25-ae350/Kconfig +@@ -25,7 +25,7 @@ config SPL_TEXT_BASE + default 0x800000 + + config SPL_OPENSBI_LOAD_ADDR +- default 0x01000000 ++ default 0x0 + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch new file mode 100644 index 0000000000..20598fdba4 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch @@ -0,0 +1,26 @@ +From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 18:17:39 +0800 +Subject: [PATCH] Fix u-boot proper booting issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/cpu/start.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S +index 76850ec9..2ccda4f5 100644 +--- a/arch/riscv/cpu/start.S ++++ b/arch/riscv/cpu/start.S +@@ -139,7 +139,9 @@ call_harts_early_init: + * accesses gd). + */ + mv gp, s0 ++#if !CONFIG_IS_ENABLED(RISCV_SMODE) + bnez tp, secondary_hart_loop ++#endif + #endif + + jal board_init_f_init_reserve +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch new file mode 100644 index 0000000000..efd78ab26d --- /dev/null +++ b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch @@ -0,0 +1,25 @@ +From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 6 Jan 2022 13:50:07 +0800 +Subject: [PATCH] Enable printing OpenSBI boot logo + +Signed-off-by: Yu Chien Peter Lin +--- + include/opensbi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/opensbi.h b/include/opensbi.h +index d812cc8c..91fb8fd9 100644 +--- a/include/opensbi.h ++++ b/include/opensbi.h +@@ -20,7 +20,7 @@ + + enum sbi_scratch_options { + /** Disable prints during boot */ +- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), ++ SBI_SCRATCH_NO_BOOT_PRINTS = 0, + }; + + /** Representation dynamic info passed by previous booting stage */ +-- +2.25.1 diff --git a/board/andes/ae350/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make andes_ae350_45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4992d712a5 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,5 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_OF_BOARD is not set +CONFIG_OF_SEPARATE=y diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig new file mode 100644 index 0000000000..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Thu Mar 10 20:53:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:53:43 +0100 Subject: [Buildroot] [git commit] package/balena-engine: bump to version 20.10.12 Message-ID: <20220310204935.91DB083BF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=046739df7ef1e704889a24a7e0886865dd32e0b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also: - drop unused dependencies - drop invalid tags - drop the autogen step - simplify kconfigs just to run hello-world https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/balena-engine/Config.in | 1 - package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 42 ++++++-------------------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2..02f694515e 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381..ef590881f5 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b..0afcea3d7e 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,34 +4,33 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.12 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +53,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK From ps.report at gmx.net Thu Mar 10 20:59:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Mar 2022 21:59:14 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: References: <20220309142913.2102898-1-foss+buildroot@0leil.net> Message-ID: <20220310215914.3d26c317@gmx.net> Hello *, On Thu, 10 Mar 2022 21:10:36 +0100, Arnout Vandecappelle wrote: > Hi Quentin, > > On 09/03/2022 15:29, Quentin Schulz wrote: > > From: Quentin Schulz > > > > This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. > > > > The patch fails to apply because of a conflict in copyright year so it > > needed some additional handling after downloading. > > > > The patch file was added by running the following command: > > wget https://download.qt.io/archive/qt/5.15/CVE-2022-25255-qprocess5-15.diff -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch > > > > [1] https://nvd.nist.gov/vuln/detail/CVE-2022-25255 > > > > Cc: Quentin Schulz > > Signed-off-by: Quentin Schulz > > --- > > ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ > > package/qt5/qt5base/qt5base.mk | 2 + > > 2 files changed, 58 insertions(+) > > create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > > > diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > new file mode 100644 > > index 0000000000..dfab92a9ef > > --- /dev/null > > +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > Please make the patch something that approaches git-formatted. At the very > least, the patch itself must have a description of what it does (i.e. a commit > message) and a Signed-off-by from you. Ideally, though, you look for the > appropriate commit in the upstream repository [1] and use that instead of a > random diff. In that case, add something like this at the end of the description > part: > > [Quentin: backport from upstream commit ab6915f0efb12cfe48d1f126f4a828212f853ce5 > in 6.2 branch] > Signed-off-by: ... > ..or wait until [2] is merged and bump the qt5base version/kde-git-revision (but then only applicable for 2022.02.x/master and not for the older buildroot branches)... Regards Peter [2] https://invent.kde.org/qt/qt/qtbase/-/merge_requests/115 > > Regards, > Arnout > > [1] > https://invent.kde.org/qt/qt/qtbase/-/commit/ab6915f0efb12cfe48d1f126f4a828212f853ce5.patch > > > > @@ -0,0 +1,56 @@ > > +--- a/src/corelib/io/qprocess_unix.cpp > > ++++ b/src/corelib/io/qprocess_unix.cpp > > +@@ -1,7 +1,7 @@ > > + /**************************************************************************** > > + ** > > + ** Copyright (C) 2016 The Qt Company Ltd. > > +-** Copyright (C) 2016 Intel Corporation. > > ++** Copyright (C) 2022 Intel Corporation. > > + ** Contact: https://www.qt.io/licensing/ > > + ** > > + ** This file is part of the QtCore module of the Qt Toolkit. > > +@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess() > > + // Add the program name to the argument list. > > + argv[0] = nullptr; > > + if (!program.contains(QLatin1Char('/'))) { > > ++ // findExecutable() returns its argument if it's an absolute path, > > ++ // otherwise it searches $PATH; returns empty if not found (we handle > > ++ // that case much later) > > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > > +- if (!exeFilePath.isEmpty()) { > > +- const QByteArray &tmp = QFile::encodeName(exeFilePath); > > +- argv[0] = ::strdup(tmp.constData()); > > +- } > > +- } > > +- if (!argv[0]) > > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > > ++ argv[0] = ::strdup(tmp.constData()); > > ++ } else { > > + argv[0] = ::strdup(encodedProgramName.constData()); > > ++ } > > + > > + // Add every argument to the list > > + for (int i = 0; i < arguments.count(); ++i) > > +@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid) > > + envp = _q_dupEnvironment(environment.d.constData()->vars, &envc); > > + } > > + > > +- QByteArray tmp; > > + if (!program.contains(QLatin1Char('/'))) { > > ++ // findExecutable() returns its argument if it's an absolute path, > > ++ // otherwise it searches $PATH; returns empty if not found (we handle > > ++ // that case much later) > > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > > +- if (!exeFilePath.isEmpty()) > > +- tmp = QFile::encodeName(exeFilePath); > > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > > ++ argv[0] = ::strdup(tmp.constData()); > > ++ } else { > > ++ argv[0] = ::strdup(QFile::encodeName(program)); > > + } > > +- if (tmp.isEmpty()) > > +- tmp = QFile::encodeName(program); > > +- argv[0] = tmp.data(); > > + > > + if (envp) > > + qt_safe_execve(argv[0], argv, envp); > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index ef38d03253..ac0781c430 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -15,6 +15,8 @@ QT5BASE_SYNC_QT_HEADERS = YES > > # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > > # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > > QT5BASE_IGNORE_CVES += CVE-2021-38593 > > +# 0008-CVE-2022-25255-qprocess5-15.diff.patch > > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > > > > # A few comments: > > # * -no-pch to workaround the issue described at > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Mar 10 21:03:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:03:23 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220310213840.32655ec7@gmx.net> References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> Message-ID: On 10/03/2022 21:38, Peter Seiderer wrote: > Hello John, > > thanks for the patch, some minor nitpicks... > > Better patch subject would be: > > package/openssh: add upstream patch to add seccomp ppoll_time64 support Applied to master with this changed. > > On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: > >> sshd is broken on 32-bit systems because ppoll_time64 is used by the >> application although it is not allowed by the seccomp filter. >> >> Apply the upstream patch to fix this. > > Better: > > -add upstream patch ([1] to add seccomp ppoll_time64 support Since the subject now already says that it adds seccomp ppoll_time64 support, this is redundant. Since I'm lazy :-), I didn't change this. > > [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch There's already a reference to the upstream commit in the patch itself, so this is not really needed. > >> >> Signed-off-by: John Keeping >> --- >> ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ >> 1 file changed, 31 insertions(+) >> create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >> >> diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >> new file mode 100644 >> index 0000000000..34b309bd9a >> --- /dev/null >> +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >> @@ -0,0 +1,31 @@ >> +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 >> +From: Darren Tucker >> +Date: Sat, 26 Feb 2022 14:06:14 +1100 >> +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. >> + >> +Should fix sandbox violations on (some? at least i386 and armhf) 32bit >> +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at >> +debian.org via bz#3396. >> + > > Missing: > > [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] Except for the signoff, the patch is literally the upstream patch, including the sha1 in the From line. So an upstream reference is not really needed. Still, it's useful so I overcame my laziness and added it. Regards, Arnout >> +Signed-off-by: John Keeping >> +--- >> + sandbox-seccomp-filter.c | 3 +++ >> + 1 file changed, 3 insertions(+) >> + >> +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c >> +index 2e065ba3..4ce80cb2 100644 >> +--- a/sandbox-seccomp-filter.c >> ++++ b/sandbox-seccomp-filter.c >> +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { >> + #ifdef __NR_ppoll >> + SC_ALLOW(__NR_ppoll), >> + #endif >> ++#ifdef __NR_ppoll_time64 >> ++ SC_ALLOW(__NR_ppoll_time64), >> ++#endif >> + #ifdef __NR_poll >> + SC_ALLOW(__NR_poll), >> + #endif >> +-- >> +2.35.1 >> + > > With this fixed you can add my > > Reviewed-by: Peter Seiderer > > Regards, > Peter > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Mar 10 21:02:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:02:58 +0100 Subject: [Buildroot] [git commit] package/openssh: add upstream patch to add seccomp ppoll_time64 support Message-ID: <20220310205500.005D183BFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10c1d887d6082d8806b38b86097c212c4c3ec8f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sshd is broken on 32-bit systems because ppoll_time64 is used by the application although it is not allowed by the seccomp filter. Apply the upstream patch to fix this. Signed-off-by: John Keeping Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...001-Allow-ppoll_time64-in-seccomp-sandbox.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch new file mode 100644 index 0000000000..16eb6eaba2 --- /dev/null +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch @@ -0,0 +1,32 @@ +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Sat, 26 Feb 2022 14:06:14 +1100 +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. + +Should fix sandbox violations on (some? at least i386 and armhf) 32bit +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at +debian.org via bz#3396. + +[Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] +Signed-off-by: John Keeping +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif +-- +2.35.1 + From arnout at mind.be Thu Mar 10 21:07:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:07:51 +0100 Subject: [Buildroot] [PATCH] package/mender: bump to version 3.2.1 In-Reply-To: <20220222105531.2498422-1-angelo@amarulasolutions.com> References: <20220222105531.2498422-1-angelo@amarulasolutions.com> Message-ID: On 22/02/2022 11:55, Angelo Compagnucci wrote: > Main LICENSE file hash is changed due to a copyright year update. > > Signed-off-by: Angelo Compagnucci Same comment as the earlier patch from Adam [1]: I'm sorry Adam, but that's not enough. When you say "update license hashes due to removals and additions" it sounds like there were clauses removed to or added to the license - which would mean the license has changed. Did you mean the following? Update license hashes due to year changes. Remove license files of vendored dependencies that are no longer used. Add license files for new vendored dependencies. Also, did you check if MENDER_LICENSE needs to be updated due to the added or removed vendored dependencies? Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/list/?series=284884 > --- > package/mender/mender.hash | 15 ++++++++------- > package/mender/mender.mk | 7 ++++--- > 2 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/package/mender/mender.hash b/package/mender/mender.hash > index 40d82f072f..3a7a675341 100644 > --- a/package/mender/mender.hash > +++ b/package/mender/mender.hash > @@ -1,12 +1,12 @@ > # Locally computed: > -sha256 716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763 3.1.0.tar.gz > +sha256 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.tar.gz > > # Vendor licenses > # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 > > # Apache-2.0 license. > -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE > -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE > +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE > +sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a vendor/github.com/mendersoftware/mender-artifact/LICENSE > sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE > sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE > @@ -14,26 +14,27 @@ sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor > # BSD 2 Clause license. > sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE > sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE > +sha256 2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d vendor/github.com/gorilla/websocket/LICENSE > # > # BSD 3 Clause license. > -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE > +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE > sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE > -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE > sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE > sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md > sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE > +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/term/LICENSE > # > # ISC license. > sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE > # > # MIT license. > sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE > +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE > sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE > sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE > sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE > sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE > sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE > -sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE > sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE > sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE > # > @@ -41,4 +42,4 @@ sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor > sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md > > # sha256 of all the vendor licenses combined > -sha256 4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24 LIC_FILES_CHKSUM.sha256 > +sha256 e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f LIC_FILES_CHKSUM.sha256 > diff --git a/package/mender/mender.mk b/package/mender/mender.mk > index ddf3e43be2..33b4611a5f 100644 > --- a/package/mender/mender.mk > +++ b/package/mender/mender.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MENDER_VERSION = 3.1.0 > +MENDER_VERSION = 3.2.1 > MENDER_SITE = https://github.com/mendersoftware/mender/archive > MENDER_SOURCE = $(MENDER_VERSION).tar.gz > MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 > @@ -20,20 +20,21 @@ MENDER_LICENSE_FILES = \ > vendor/github.com/mendersoftware/progressbar/LICENSE \ > vendor/github.com/pkg/errors/LICENSE \ > vendor/github.com/godbus/dbus/LICENSE \ > + vendor/github.com/gorilla/websocket/LICENSE \ > vendor/github.com/klauspost/compress/LICENSE \ > vendor/github.com/pmezard/go-difflib/LICENSE \ > - vendor/golang.org/x/crypto/LICENSE \ > vendor/golang.org/x/sys/LICENSE \ > vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ > vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ > + vendor/golang.org/x/term/LICENSE \ > vendor/github.com/davecgh/go-spew/LICENSE \ > vendor/github.com/klauspost/pgzip/LICENSE \ > + vendor/github.com/klauspost/cpuid/v2/LICENSE \ > vendor/github.com/sirupsen/logrus/LICENSE \ > vendor/github.com/stretchr/testify/LICENSE \ > vendor/github.com/ungerik/go-sysfs/LICENSE \ > vendor/github.com/urfave/cli/v2/LICENSE \ > vendor/github.com/stretchr/objx/LICENSE \ > - vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ > vendor/gopkg.in/yaml.v3/LICENSE \ > vendor/github.com/mattn/go-isatty/LICENSE \ > vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md From arnout at mind.be Thu Mar 10 21:22:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:22:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe In-Reply-To: <20220206212028.1786742-1-james.hilliard1@gmail.com> References: <20220206212028.1786742-1-james.hilliard1@gmail.com> Message-ID: <60819f52-11e9-40e0-b3ec-b399c1c7b1fa@mind.be> On 06/02/2022 22:20, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 396f5044ff..1b9ff43ab2 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 > +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index d8a0bf1d16..37ad9c652c 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d > +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > From arnout at mind.be Thu Mar 10 21:22:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:22:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5declarative: bump to version 1d49a5b678957adde7e2db23a485a3f48157bc8f In-Reply-To: <20220206212405.1787998-1-james.hilliard1@gmail.com> References: <20220206212405.1787998-1-james.hilliard1@gmail.com> Message-ID: On 06/02/2022 22:24, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > index adda7e03ba..e5b016fc20 100644 > --- a/package/qt5/qt5declarative/qt5declarative.hash > +++ b/package/qt5/qt5declarative/qt5declarative.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 > +sha256 afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index e63a78021a..54aa3be1cb 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 > +QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f > QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > QT5DECLARATIVE_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 10 21:22:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:22:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5wayland: bump to version ce2caf493a1343fbd9f8e4c85baf6a61c057f242 In-Reply-To: <20220206212824.1790375-1-james.hilliard1@gmail.com> References: <20220206212824.1790375-1-james.hilliard1@gmail.com> Message-ID: <403e117c-e579-f96e-764f-7f69d6fdf8fe@mind.be> On 06/02/2022 22:28, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > index 1a7400de67..2acdd1643c 100644 > --- a/package/qt5/qt5wayland/qt5wayland.hash > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 > +sha256 f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0 qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > index bcc4915022..61182f611c 100644 > --- a/package/qt5/qt5wayland/qt5wayland.mk > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 > +QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242 > QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > QT5WAYLAND_DEPENDENCIES = wayland From arnout at mind.be Thu Mar 10 21:23:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:23:03 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/gen-bootlin-toolchains: add s390x toolchain In-Reply-To: <20220208213514.7141-1-romain.naour@gmail.com> References: <20220208213514.7141-1-romain.naour@gmail.com> Message-ID: <7417e8c3-fb16-f276-33f3-65ee8b4f0b22@mind.be> On 08/02/2022 22:35, Romain Naour wrote: > s390x support has been added since toolchain-builder release > 2021.05 [1]. > > [1] https://github.com/bootlin/toolchains-builder/commit/4bbb52a6a30a340a30722bc170467aa6fa4adbe6 > > Signed-off-by: Romain Naour Both applied to master, thanks. Regards, Arnout > --- > support/scripts/gen-bootlin-toolchains | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains > index dc173fa949..f9dd9da9a8 100755 > --- a/support/scripts/gen-bootlin-toolchains > +++ b/support/scripts/gen-bootlin-toolchains > @@ -162,6 +162,10 @@ arches = { > 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], > 'prefix': 'riscv64', > }, > + 's390x-z13': { > + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], > + 'prefix': 's390x', > + }, > 'sh-sh4': { > 'conditions': ['BR2_sh', 'BR2_sh4'], > 'prefix': 'sh4', From arnout at mind.be Thu Mar 10 21:23:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:23:23 +0100 Subject: [Buildroot] [PATCH] package/erofs-utils: bump version to 1.4 In-Reply-To: <20220214152450.319583-1-hsiangkao@aol.com> References: <20220214152450.319583-1-hsiangkao.ref@aol.com> <20220214152450.319583-1-hsiangkao@aol.com> Message-ID: On 14/02/2022 16:24, Gao Xiang via buildroot wrote: > - new upstream version; > - add 0001-erofs-utils-dump-fix-de-nid-issues.patch [1]; > - add 0002-fsck-main.c-add-missing-include.patch [2]; > - add 0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch [3]; > - add 0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch [4]. > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 > [2] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=1ca453ee89894b1669ac78d7f216bda172783e8d > [3] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eb255afa101b52096bd3e5e48f990576190f03bd > [4] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 > > Signed-off-by: Gao Xiang Applied to master, thanks. Regards, Arnout [snip] From arnout at mind.be Thu Mar 10 21:23:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:23:55 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.48 In-Reply-To: <20220214211051.22421-1-ps.report@gmx.net> References: <20220214211051.22421-1-ps.report@gmx.net> Message-ID: <66a1b135-aeca-d245-f209-ce52a8e507c4@mind.be> On 14/02/2022 22:10, Peter Seiderer wrote: > - Changelog (since 0.47, from [1]): > > ver 0.48: > Fix issue with memory leaking from ICMPv6 RA. > > [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog > > Signed-off-by: Peter Seiderer Both applied to master, thanks. Regards, Arnout > --- > 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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz > +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 3ce64b6f2f..267b44e5f0 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.47 > +ELL_VERSION = 0.48 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 10 21:24:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:24:11 +0100 Subject: [Buildroot] [PATCH 1/2] syslog-ng: Bump version to 3.35.1 In-Reply-To: <20220214211927.3673441-1-judge.packham@gmail.com> References: <20220214211927.3673441-1-judge.packham@gmail.com> Message-ID: On 14/02/2022 22:19, Chris Packham wrote: > Signed-off-by: Chris Packham Applied to master, thanks. Regards, Arnout > --- > package/syslog-ng/syslog-ng.conf | 2 +- > package/syslog-ng/syslog-ng.hash | 2 +- > package/syslog-ng/syslog-ng.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf > index 55d01501cb..64ff980593 100644 > --- a/package/syslog-ng/syslog-ng.conf > +++ b/package/syslog-ng/syslog-ng.conf > @@ -1,4 +1,4 @@ > - at version: 3.34 > + at version: 3.35 > > source s_sys { > file("/proc/kmsg" program_override("kernel")); > diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash > index 99ed363eca..ab643627e8 100644 > --- a/package/syslog-ng/syslog-ng.hash > +++ b/package/syslog-ng/syslog-ng.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz > +sha256 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53 syslog-ng-3.35.1.tar.gz > sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING > sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt > diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk > index c05ec9785c..fc57a56820 100644 > --- a/package/syslog-ng/syslog-ng.mk > +++ b/package/syslog-ng/syslog-ng.mk > @@ -6,7 +6,7 @@ > > # When updating the version, please check at runtime if the version in > # syslog-ng.conf header needs to be updated > -SYSLOG_NG_VERSION = 3.34.1 > +SYSLOG_NG_VERSION = 3.35.1 > SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) > SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) > SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From arnout at mind.be Thu Mar 10 21:25:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:25:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/perl-gd: bump to version 2.76 In-Reply-To: <20220215070739.2199760-1-francois.perrad@gadz.org> References: <20220215070739.2199760-1-francois.perrad@gadz.org> Message-ID: On 15/02/2022 08:07, Francois Perrad wrote: > remove upstreamed patch > > Signed-off-by: Francois Perrad Both applied to master, thanks. Regards, Arnout > --- > ...-fix-cross-compilation-with-gdlib.pc.patch | 34 ------------------- > package/perl-gd/perl-gd.hash | 4 +-- > package/perl-gd/perl-gd.mk | 2 +- > 3 files changed, 3 insertions(+), 37 deletions(-) > delete mode 100644 package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch > > diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch > deleted file mode 100644 > index af053c560..000000000 > --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 24 Jan 2021 10:59:31 +0100 > -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc > - > -Cross-compilation will fail if gdlib.pc does not contain any cflags. > -Indeed, if cflags is empty, Makefile.PL will use the default value for > -INC (i.e. -I/usr/include -I/usr/include/gd) > - > -It should be noted that gdlib-config has been dropped from gd since > -version 2.3.0 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: probably not upstreamable] > ---- > - Makefile.PL | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile.PL b/Makefile.PL > -index 25f2f93..7da3651 100644 > ---- a/Makefile.PL > -+++ b/Makefile.PL > -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - > - END > - } > - > -- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; > -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; > - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; > - @LIBS = qw(-lgd) unless @LIBS; > - > --- > -2.29.2 > - > diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash > index 780b1d1e2..97f1da821 100644 > --- a/package/perl-gd/perl-gd.hash > +++ b/package/perl-gd/perl-gd.hash > @@ -1,6 +1,6 @@ > # retrieved by scancpan from http://cpan.metacpan.org/ > -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz > -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz > +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz > +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz > > # computed by scancpan > sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE > diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk > index b402dfff4..9787cc12f 100644 > --- a/package/perl-gd/perl-gd.mk > +++ b/package/perl-gd/perl-gd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PERL_GD_VERSION = 2.73 > +PERL_GD_VERSION = 2.76 > PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz > PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN > PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd From arnout at mind.be Thu Mar 10 21:26:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:26:12 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.2.1 In-Reply-To: <20220215214125.20412-1-ps.report@gmx.net> References: <20220215214125.20412-1-ps.report@gmx.net> Message-ID: <8f96b3e5-bb85-e3e3-6047-f98127c08e21@mind.be> On 15/02/2022 22:41, Peter Seiderer wrote: > For details see [1]. > > [1] https://github.com/assimp/assimp/releases/tag/v5.2.1 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/assimp/assimp.hash | 2 +- > package/assimp/assimp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash > index 50f0b3e6d6..a778b79132 100644 > --- a/package/assimp/assimp.hash > +++ b/package/assimp/assimp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz > +sha256 c9cbbc8589639cd8c13f65e94a90422a70454e8fa150cf899b6038ba86e9ecff assimp-5.2.1.tar.gz > sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE > diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk > index 766b2c9b5a..42440f0fa9 100644 > --- a/package/assimp/assimp.mk > +++ b/package/assimp/assimp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ASSIMP_VERSION = 5.1.6 > +ASSIMP_VERSION = 5.2.1 > ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) > ASSIMP_LICENSE = BSD-3-Clause > ASSIMP_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 10 21:26:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:26:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: bump to version 0.7.0 In-Reply-To: <20220215222422.1865613-1-james.hilliard1@gmail.com> References: <20220215222422.1865613-1-james.hilliard1@gmail.com> Message-ID: <4b15d59e-f5e9-f0f0-8047-0d4cbfb6b9c1@mind.be> On 15/02/2022 23:24, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/libbpf/libbpf.hash | 2 +- > package/libbpf/libbpf.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash > index 27e22be9e9..06adc09885 100644 > --- a/package/libbpf/libbpf.hash > +++ b/package/libbpf/libbpf.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz > +sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz > sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE > sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause > sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 6750b063c0..ff018f5c24 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBPF_VERSION = 0.6.1 > +LIBBPF_VERSION = 0.7.0 > LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) > LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause > LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Thu Mar 10 21:26:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:26:45 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libdrm: bump version to 2.4.110 In-Reply-To: <20220216180128.49268-1-bernd.kuhls@t-online.de> References: <20220216180128.49268-1-bernd.kuhls@t-online.de> Message-ID: <17e6ed80-9fe7-3b84-8d8b-2c7f68a2185d@mind.be> On 16/02/2022 19:01, Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libdrm/libdrm.hash | 6 +++--- > package/libdrm/libdrm.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash > index ca7332dd76..e0fac3a4d1 100644 > --- a/package/libdrm/libdrm.hash > +++ b/package/libdrm/libdrm.hash > @@ -1,6 +1,6 @@ > -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html > -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz > -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz > +# From https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html > +sha256 eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 libdrm-2.4.110.tar.xz > +sha512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3 libdrm-2.4.110.tar.xz > > # Hash for license file > sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build > diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk > index 9b614bf421..b64db06931 100644 > --- a/package/libdrm/libdrm.mk > +++ b/package/libdrm/libdrm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBDRM_VERSION = 2.4.109 > +LIBDRM_VERSION = 2.4.110 > LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz > LIBDRM_SITE = https://dri.freedesktop.org/libdrm > LIBDRM_LICENSE = MIT From peter at korsgaard.com Thu Mar 10 21:26:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:26:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/php: security bump version to 7.4.28 Message-ID: <20220310211823.9D2CF83C07@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51aa106ba3194ae49e119fb3c0bd91ddd81608fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog: https://www.php.net/ChangeLog-7.php#7.4.28 Fixes CVE-2021-21708. Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 76e4b4a8e5..33f56dc551 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e305b3aafdc85fa73a81c53d3ce30578bc94d1633ec376add193a1e85e0f0ef8 php-7.4.26.tar.xz +sha256 9cc3b6f6217b60582f78566b3814532c4b71d517876c25013ae51811e65d8fce php-7.4.28.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 2123cbc5e9..15f5540c5e 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.26 +PHP_VERSION = 7.4.28 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 19:37:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:37:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: security bump to version 2.4.5 Message-ID: <20220310211823.930EB83C06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73fd90816a23c925a33ad0c606df3e0992d873b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 21c07c0aaa7e43b8f676c564f173a510d345a77a) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 10e13206d0..cd2e8c7fb9 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 19:39:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:39:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/php: security bump version to 8.0.16 Message-ID: <20220310211836.01F9283C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfe590a9594b94debfcf2db0c5c6d887aeab9e7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 Fixes CVE-2021-21708. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 4c4d28922942deb0fc41d11d4057b7fedd25cab1) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index e78385cbe7..2753f9a0eb 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz +sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c9de8c2c76..5b29692d94 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.15 +PHP_VERSION = 8.0.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 19:37:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:37:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: security bump to version 2.4.5 Message-ID: <20220310211835.EC81C83C15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42ecaeb1ce83823552dbe73997f5e401f0a021df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 21c07c0aaa7e43b8f676c564f173a510d345a77a) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 10e13206d0..cd2e8c7fb9 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 10 21:09:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:17 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5declarative: bump to version 1d49a5b678957adde7e2db23a485a3f48157bc8f Message-ID: <20220310211843.9370883C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27be79eeeb8e6d60c5ae01499b6d4eb2e063e3ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03ba..e5b016fc20 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index e63a78021a..54aa3be1cb 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 10 21:09:14 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:14 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe Message-ID: <20220310211843.8874783C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d88189202e61653850fe1a6d9b4e4d90ebcb1cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff..1b9ff43ab2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..010df7ec75 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 From arnout at mind.be Thu Mar 10 21:09:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:33 +0100 Subject: [Buildroot] [git commit] package/ell: bump version to 0.48 Message-ID: <20220310211843.D028783C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c01a8397d9923c38b14a0d083ba1cf3ee3a3049a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Changelog (since 0.47, from [1]): ver 0.48: Fix issue with memory leaking from ICMPv6 RA. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f..267b44e5f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.48 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 10 21:09:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:19 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5wayland: bump to version ce2caf493a1343fbd9f8e4c85baf6a61c057f242 Message-ID: <20220310211843.9FC4E83C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec0fabf14527716c55f8d5496829667bfef8c6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 1a7400de67..2acdd1643c 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 +sha256 f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0 qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index bcc4915022..61182f611c 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland From arnout at mind.be Thu Mar 10 21:09:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:22 +0100 Subject: [Buildroot] [git commit] support/scripts/gen-bootlin-toolchains: add s390x toolchain Message-ID: <20220310211843.AC8FA83C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=249ce1c584815c42a52a3c4932a9546fd5b980a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x support has been added since toolchain-builder release 2021.05 [1]. [1] https://github.com/bootlin/toolchains-builder/commit/4bbb52a6a30a340a30722bc170467aa6fa4adbe6 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/gen-bootlin-toolchains | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index dc173fa949..f9dd9da9a8 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -162,6 +162,10 @@ arches = { 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], 'prefix': 'riscv64', }, + 's390x-z13': { + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], + 'prefix': 's390x', + }, 'sh-sh4': { 'conditions': ['BR2_sh', 'BR2_sh4'], 'prefix': 'sh4', From arnout at mind.be Thu Mar 10 21:25:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:25:55 +0100 Subject: [Buildroot] [git commit] package/micropython: Bump version to 1.18 Message-ID: <20220310211844.0103783C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4104e099fd10ca3fdd537ffa151146f86e6424f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LICENSE hash is update due to change in copyright year. Signed-off-by: Chris Packham Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/micropython/micropython.hash | 4 ++-- package/micropython/micropython.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index d5045e8f27..6beea78bc7 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c21dbf8144237b3dbe3847c9ad5264cd0f3104eb078c810b3986004cce8fcd70 micropython-1.17.tar.gz -sha256 59b1f0947a87c90d0d29dbe2c8deb3d1f8263bbbd2fb5ebcc79a649cff6dfcba LICENSE +sha256 d804a422872c6fe283c6e4fd392698472035b34b5a683ac26adbd5c7582267f9 micropython-1.18.tar.gz +sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 55c00ba08a..d8ba5ac0c0 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.17 +MICROPYTHON_VERSION = 1.18 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, From arnout at mind.be Thu Mar 10 21:09:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:26 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update with new s390x toolchain Message-ID: <20220310211843.BA1D183C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62451216135a86021278a24c8e8fc04c1a52f5b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../tests/toolchain/test_external_bootlin.py | 30 +++++++++++++ .../toolchain-external-bootlin/Config.in.options | 51 ++++++++++++++++++++++ .../toolchain-external-bootlin.hash | 4 ++ .../toolchain-external-bootlin.mk | 12 +++++ 4 files changed, 97 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index cf6174303e..94df9ac488 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2152,6 +2152,36 @@ class TestExternalToolchainBootlinRiscv64lp64dUclibcStable(TestExternalToolchain TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinS390xz13GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinS390xz13GlibcStable(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinShsh4GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_sh=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 4b4404620c..53034c4f5e 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -33,6 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_powerpc64le && BR2_powerpc_power8 default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_32 && BR2_RISCV_ABI_ILP32D default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64D + default y if BR2_s390x && BR2_s390x_z13 default y if BR2_sh && BR2_sh4 default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 @@ -3455,6 +3456,56 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE + bool "s390x-z13 glibc bleeding-edge 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the s390x-z13 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE + bool "s390x-z13 glibc stable 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the s390x-z13 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE bool "sh-sh4 glibc bleeding-edge 2021.11-1" depends on BR2_sh diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index 6542694033..1f2aa1386c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -278,6 +278,10 @@ sha256 42ca8024547e51e6126e3c9e711d80815aa4b2997900dfc8af4b9514105e8b78 riscv6 sha256 02dd9fe4a024f84c7f73b7155640066017c7d18dd90c4da6efe6f0e66d24f75c riscv64-lp64d--uclibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2021.11-1.sha256 sha256 01f061e1b3d106d25614ae5bd64df3a3588bc960caa3bbad14b50f718a558f41 riscv64-lp64d--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2021.11-1.sha256 +sha256 d8e657ba00929007e938c7fc398fb5aee8abeceea3ad1cd304c05e7f47d9ef30 s390x-z13--glibc--bleeding-edge-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2021.11-1.sha256 +sha256 04d8c28bc1af09a949cfe76991379fef4b0876448192625a22c028c7daf92e3f s390x-z13--glibc--stable-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2021.11-1.sha256 sha256 64c14617fb95b1eeb50564d1e0ccbf73fa73e5e58aea6b192549fc7127e4bd5c sh-sh4--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2021.11-1.sha256 diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index fb19ef2909..786967052f 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -840,6 +840,18 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EX TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 From arnout at mind.be Thu Mar 10 21:25:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:25:47 +0100 Subject: [Buildroot] [git commit] package/syslog-ng: Bump version to 3.35.1 Message-ID: <20220310211843.E8BC883C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dc5f4a4d9f965d3bc8f3b14f9371fcef19b193a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Chris Packham Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 55d01501cb..64ff980593 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ - at version: 3.34 + at version: 3.35 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 99ed363eca..ab643627e8 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz +sha256 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53 syslog-ng-3.35.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index c05ec9785c..fc57a56820 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.34.1 +SYSLOG_NG_VERSION = 3.35.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/libbpf: bump to version 0.7.0 Message-ID: <20220310211844.3858D83C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b1003855b02f6d9c77de634c9d0f636470e7388 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 27e22be9e9..06adc09885 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz +sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 06f3f3475a..d6914757d7 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.6.1 +LIBBPF_VERSION = 0.7.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Thu Mar 10 21:09:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:36 +0100 Subject: [Buildroot] [git commit] package/iwd: bump version to 1.24 Message-ID: <20220310211843.DC0A183C1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92e0fe71de85d0d7647aefbcab843e66f9bcca99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - remove 001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch (upstream applied [1]) - Changelog (since 1.21, from [2]): ver 1.24: Fix issue with handshake and missing rekeying support. Fix issue with BSS ranking and zero signal strength. Fix issue with setting OWE IE length correctly. ver 1.23: Fix issue with handling handshake offloading. Fix issue with at_console and D-Bus policy. ver 1.22: Fix issue with handling periodic scanning. Fix issue with handling scanning completion. Fix issue with handling scanning for OWE auto-connect. Add support for additional DPP features. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...licit-declaration-of-function-explicit_bz.patch | 41 ---------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch deleted file mode 100644 index 3e808deb88..0000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero - warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add missing src/missing.h include for explicit_bzero, fixes uclibc - compile/linking - -Fixes: - - src/dpp.c:166:2: warning: implicit declaration of function ???explicit_bzero??? [-Wimplicit-function-declaration] - 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); - | ^~~~~~~~~~~~~~ - -[backport from upstream] -Signed-off-by: Peter Seiderer -[yann.morin.1998 at free.fr: actual backport now upstreamn applied] -Signed-off-by: Yann E. MORIN ---- - src/dpp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dpp.c b/src/dpp.c -index 84e89f6c..8091ded1 100644 ---- a/src/dpp.c -+++ b/src/dpp.c -@@ -30,6 +30,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/dbus.h" - #include "src/netdev.h" - #include "src/module.h" --- -2.34.1 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 8e34d2983f..1a58ec88e8 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc..548b508edb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 1.24 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/assimp: bump version to 5.2.1 Message-ID: <20220310211844.2360F83C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=629fc34cb6b1f0ca8982b7f7e145afc7c110e27d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.2.1 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 50f0b3e6d6..a778b79132 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz +sha256 c9cbbc8589639cd8c13f65e94a90422a70454e8fa150cf899b6038ba86e9ecff assimp-5.2.1.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 766b2c9b5a..42440f0fa9 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.6 +ASSIMP_VERSION = 5.2.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/perl-gd: add webp support Message-ID: <20220310211844.18E5083C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b117664aca0e5b81236c0fc7ad5f0ccb4e0267a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl-gd/perl-gd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index 9787cc12fe..cd32c7fb8f 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -40,6 +40,12 @@ PERL_GD_OPTIONS += PNG PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_WEBP),y) +PERL_GD_DEPENDENCIES += webp +PERL_GD_OPTIONS += WEBP +PERL_GD_CONF_OPTS += -lib_webp_path=$(STAGING_DIR)/usr +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) PERL_GD_DEPENDENCIES += xlib_libXpm PERL_GD_OPTIONS += XPM From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/perl-gd: bump to version 2.76 Message-ID: <20220310211844.0C9D283C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c6d0b52698a032f181e97c6218c52abe4cabc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master remove upstreamed patch Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...le.PL-fix-cross-compilation-with-gdlib.pc.patch | 34 ---------------------- package/perl-gd/perl-gd.hash | 4 +-- package/perl-gd/perl-gd.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch deleted file mode 100644 index af053c5605..0000000000 --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 24 Jan 2021 10:59:31 +0100 -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc - -Cross-compilation will fail if gdlib.pc does not contain any cflags. -Indeed, if cflags is empty, Makefile.PL will use the default value for -INC (i.e. -I/usr/include -I/usr/include/gd) - -It should be noted that gdlib-config has been dropped from gd since -version 2.3.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable] ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 25f2f93..7da3651 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - - END - } - -- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; - @LIBS = qw(-lgd) unless @LIBS; - --- -2.29.2 - diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 780b1d1e27..97f1da821a 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index b402dfff49..9787cc12fe 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.73 +PERL_GD_VERSION = 2.76 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/libdrm: bump version to 2.4.110 Message-ID: <20220310211844.4491F83BFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dc0576b49bc67922b5c136b78ae4072726eeb71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index ca7332dd76..e0fac3a4d1 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html +sha256 eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 libdrm-2.4.110.tar.xz +sha512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3 libdrm-2.4.110.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 9b614bf421..b64db06931 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.109 +LIBDRM_VERSION = 2.4.110 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From arnout at mind.be Thu Mar 10 21:09:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:30 +0100 Subject: [Buildroot] [git commit] package/erofs-utils: bump version to 1.4 Message-ID: <20220310211843.C530583C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2e32e655802ad917eb240b8c2b7ac343ab55ec1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - new upstream version; - add 0001-erofs-utils-dump-fix-de-nid-issues.patch [1]; - add 0002-fsck-main.c-add-missing-include.patch [2]; - add 0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch [3]; - add 0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch [4]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 [2] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=1ca453ee89894b1669ac78d7f216bda172783e8d [3] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eb255afa101b52096bd3e5e48f990576190f03bd [4] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Signed-off-by: Gao Xiang Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-erofs-utils-dump-fix-de-nid-issues.patch | 134 +++++++++++++++++++++ ...-manpage-only-install-erofsfuse.1-with-th.patch | 32 ----- .../0002-fsck-main.c-add-missing-include.patch | 31 +++++ ...-lib-fix-blobdev-without-Eforce-chunk-ind.patch | 40 ++++++ ...utils-fix-Makefile-for-fsck.erofs-manpage.patch | 29 +++++ package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 2 +- 7 files changed, 236 insertions(+), 34 deletions(-) diff --git a/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch new file mode 100644 index 0000000000..493ce59177 --- /dev/null +++ b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch @@ -0,0 +1,134 @@ +From 17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:48:48 +0800 +Subject: [PATCH] erofs-utils: dump: fix de->nid issues + +As David Michael reported, " + In file included from main.c:11: + main.c: In function 'erofs_checkdirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:264:17: note: in expansion of macro 'erofs_err' + 264 | erofs_err("invalid file type %llu", de->nid); + | ^~~~~~~~~ + main.c: In function 'erofs_read_dirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:303:25: note: in expansion of macro 'erofs_err' + 303 | erofs_err("parse dir nid %llu error occurred\n", + | ^~~~~~~~~ + cc1: all warnings being treated as errors +" + +Also there are many de->nid lacking of endianness handling. +Should fix them together. + +Link: https://lore.kernel.org/r/20211121234848.12663-1-xiang at kernel.org +Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") +Cc: Wang Qi +Cc: Guo Xuenan +Reported-by: David Michael +Signed-off-by: Gao Xiang +--- + dump/main.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +diff --git a/dump/main.c b/dump/main.c +index b7560eca1080..f85903b059d2 100644 +--- a/dump/main.c ++++ b/dump/main.c +@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + { + int dname_len; + unsigned int nameoff = le16_to_cpu(de->nameoff); ++ erofs_nid_t nid = le64_to_cpu(de->nid); + + if (nameoff < sizeof(struct erofs_dirent) || + nameoff >= PAGE_SIZE) { + erofs_err("invalid de[0].nameoff %u @ nid %llu", +- nameoff, de->nid | 0ULL); ++ nameoff, nid | 0ULL); + return -EFSCORRUPTED; + } + +@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + /* a corrupted entry is found */ + if (nameoff + dname_len > maxsize || + dname_len > EROFS_NAME_LEN) { +- erofs_err("bogus dirent @ nid %llu", +- le64_to_cpu(de->nid) | 0ULL); ++ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + if (de->file_type >= EROFS_FT_MAX) { +- erofs_err("invalid file type %llu", de->nid); ++ erofs_err("invalid file type %llu", nid | 0ULL); + return -EFSCORRUPTED; + } + return dname_len; +@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, + { + int err; + erofs_off_t occupied_size = 0; +- struct erofs_inode inode = { .nid = de->nid }; ++ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; + + stats.files++; + stats.file_category_stat[de->file_type]++; +@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, + update_file_size_statatics(occupied_size, inode.i_size); + } + +- if ((de->file_type == EROFS_FT_DIR) +- && de->nid != nid && de->nid != parent_nid) { +- err = erofs_read_dir(de->nid, nid); ++ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && ++ inode.nid != parent_nid) { ++ err = erofs_read_dir(inode.nid, nid); + if (err) { + erofs_err("parse dir nid %llu error occurred\n", +- de->nid); ++ inode.nid | 0ULL); + return err; + } + } +@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) + int ret; + + /* skip "." and ".." dentry */ +- if (de->nid == nid || de->nid == parent_nid) { ++ if (le64_to_cpu(de->nid) == nid || ++ le64_to_cpu(de->nid) == parent_nid) { + de++; + continue; + } +@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, + if (len < 0) + return len; + +- if (de->nid == target) { ++ if (le64_to_cpu(de->nid) == target) { + memcpy(path + pos, dname, len); + path[pos + len] = '\0'; + return 0; + } + + if (de->file_type == EROFS_FT_DIR && +- de->nid != parent_nid && +- de->nid != nid) { ++ le64_to_cpu(de->nid) != parent_nid && ++ le64_to_cpu(de->nid) != nid) { + memcpy(path + pos, dname, len); +- err = erofs_get_pathname(de->nid, nid, +- target, path, pos + len); ++ err = erofs_get_pathname(le64_to_cpu(de->nid), ++ nid, target, path, pos + len); + if (!err) + return 0; + memset(path + pos, 0, len); +-- +2.30.2 + diff --git a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch b/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch deleted file mode 100644 index 0aa99d5324..0000000000 --- a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ab34000c672adca90388a8fcb1f70a7d391d35c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Thu, 3 Jun 2021 16:18:57 -0400 -Subject: [PATCH] erofs-utils: manpage: only install erofsfuse.1 with the - command - -Link: https://lore.kernel.org/r/87lf7q3dn2.fsf at gmail.com -Reviewed-by: Gao Xiang -Signed-off-by: David Michael -Signed-off-by: Gao Xiang ---- - man/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index ffcf6f81c255..0df947b6fbf7 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,9 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Makefile.am - --dist_man_MANS = mkfs.erofs.1 erofsfuse.1 -+dist_man_MANS = mkfs.erofs.1 - -+EXTRA_DIST = erofsfuse.1 -+if ENABLE_FUSE -+man_MANS = erofsfuse.1 -+endif --- -2.20.1 - diff --git a/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch new file mode 100644 index 0000000000..c4fe71c9e6 --- /dev/null +++ b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch @@ -0,0 +1,31 @@ +From 1ca453ee89894b1669ac78d7f216bda172783e8d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 6 Dec 2021 20:14:03 +0100 +Subject: [PATCH] fsck/main.c: add missing include + +Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR +definitions. + +Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex at linutronix.de +Reviewed-by: Gao Xiang +Signed-off-by: Alexander Kanavin +Signed-off-by: Gao Xiang +--- + fsck/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsck/main.c b/fsck/main.c +index aefa881f740a..ad48e35f587b 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include "erofs/print.h" + #include "erofs/io.h" + #include "erofs/decompress.h" +-- +2.30.2 + diff --git a/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch new file mode 100644 index 0000000000..88979eb28f --- /dev/null +++ b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch @@ -0,0 +1,40 @@ +From eb255afa101b52096bd3e5e48f990576190f03bd Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Thu, 23 Dec 2021 16:49:07 +0800 +Subject: [PATCH] erofs-utils: lib: fix --blobdev without -Eforce-chunk-indexes + +blockmap is used by default, chunk indexes should be switched +instead if --blobdev is specified. + +Link: https://lore.kernel.org/r/20211223084907.93020-1-hsiangkao at linux.alibaba.com +Fixes: 016bd812be1e ("erofs-utils: mkfs: enable block map chunk format") +Signed-off-by: Gao Xiang +--- + lib/blobchunk.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/blobchunk.c b/lib/blobchunk.c +index 5e9a88a30af3..a145be917b4a 100644 +--- a/lib/blobchunk.c ++++ b/lib/blobchunk.c +@@ -113,7 +113,7 @@ int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, + + if (multidev) { + idx.device_id = 1; +- inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; ++ DBG_BUGON(!(inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES)); + } else { + base_blkaddr = remapped_base; + } +@@ -171,6 +171,8 @@ int erofs_blob_write_chunked_file(struct erofs_inode *inode) + int fd, ret; + + inode->u.chunkformat |= inode->u.chunkbits - LOG_BLOCK_SIZE; ++ if (multidev) ++ inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; + + if (inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES) + unit = sizeof(struct erofs_inode_chunk_index); +-- +2.30.2 + diff --git a/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch new file mode 100644 index 0000000000..27832d1e32 --- /dev/null +++ b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch @@ -0,0 +1,29 @@ +From 534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:58:40 +0800 +Subject: [PATCH] erofs-utils: fix Makefile for fsck.erofs manpage + +Add the missing dependency for fsck.erofs manpage. + +Link: https://lore.kernel.org/r/20211121235840.17600-1-xiang at kernel.org +Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") +Signed-off-by: Gao Xiang +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 769b5578a175..4628b85df2ef 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0+ + +-dist_man_MANS = mkfs.erofs.1 dump.erofs.1 ++dist_man_MANS = mkfs.erofs.1 dump.erofs.1 fsck.erofs.1 + + EXTRA_DIST = erofsfuse.1 + if ENABLE_FUSE +-- +2.30.2 + diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 8bbb088568..aca5677d17 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 132635740039bbe76d743aea72378bfae30dbf034e123929f5d794198d4c0b12 erofs-utils-1.3.tar.gz +sha256 67702b1fc5da05719d95ddb7c107e334b04365f5161a9717479d2831fca85a98 erofs-utils-1.4.tar.gz sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index e35470b02e..03df2be366 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.3 +EROFS_UTILS_VERSION = 1.4 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 10 21:44:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:44:51 +0100 Subject: [Buildroot] [PATCH v1] package/wireless-regdb: bump version to 2022.02.18 In-Reply-To: <20220219102451.25602-1-ps.report@gmx.net> (Peter Seiderer's message of "Sat, 19 Feb 2022 11:24:51 +0100") References: <20220219102451.25602-1-ps.report@gmx.net> Message-ID: <87ee39zdm4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (since 2021.08.28, [1]): > e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US > 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz > 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) > acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz > ea83a82 wireless-regdb: add support for US S1G channels > 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain > 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz > e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" > 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) > e427ff2 wireless-regdb: Update regulatory rules for China (CN) > 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz > 4dac44b wireless-regdb: update regulatory database based on preceding changes > [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 21:44:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:44:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220310213635.5764983C36@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fad951aaef52b86f93aef93efff69ea651fac28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 324f0552526d169c24cd75e9dadf67641f2beef0) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From peter at korsgaard.com Thu Mar 10 21:44:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:44:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireless-regdb: drop spurious space Message-ID: <20220310213635.4A37983C33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8368a375e2680399bc4cd04bf70ae2fceb899d58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop spurious space added by commit 71dc107d41e5daf45e0955740b302367313aa23f Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 2210ab8385cfa4729ed117a7724c0d05478cf356) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 0db8c6f345..9e01283c01 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -12,7 +12,7 @@ WIRELESS_REGDB_LICENSE_FILES = LICENSE WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) -define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS +define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS $(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \ $(TARGET_DIR)/usr/lib/crda/regulatory.bin $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ From peter at korsgaard.com Thu Mar 10 21:43:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:43:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220310213651.E090A83C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15d2938c2440b6d87616c9231aba3e497da8497f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 324f0552526d169c24cd75e9dadf67641f2beef0) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From peter at korsgaard.com Thu Mar 10 21:47:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:47:09 +0100 Subject: [Buildroot] [PATCH] package/zsh: security bump to version 5.8.1 In-Reply-To: <871qzxbawi.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sun, 20 Feb 2022 20:22:53 +0100") References: <20220218133057.2426-1-peter@korsgaard.com> <871qzxbawi.fsf@dell.be.48ers.dk> Message-ID: <87a6dxzdia.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Korsgaard writes: >> Fixes the following security issue: >> - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code >> execution if they control a command output inside the prompt, as >> demonstrated by a %F argument. This occurs because of recursive >> PROMPT_SUBST expansion. >> The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. >> Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 21:46:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:46:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/zsh: security bump to version 5.8.1 Message-ID: <20220310213851.EDD2583C3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d357990204241bc832a8543ad1007a5789d8f62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard (cherry picked from commit ca6c2ee3da7be5e4af478e779b49248b89e6514d) Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses From peter at korsgaard.com Thu Mar 10 21:46:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:46:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/zsh: security bump to version 5.8.1 Message-ID: <20220310213902.E5ECE83C42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f45f6bae0db3df1ee3666df52dc711e609890d0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard (cherry picked from commit ca6c2ee3da7be5e4af478e779b49248b89e6514d) Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses From peter at korsgaard.com Thu Mar 10 21:50:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:50:17 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/gdk-pixbuf: enable relocatable option In-Reply-To: <20220220121637.200393-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 13:16:36 +0100") References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Message-ID: <875yolzdd2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Enable relocatable option to fix the following PPD build failure of > adwaita-icon-theme: > Can't load file: Unrecognized image file format > This failure is raised because the SVG library is not found by > gtk-encode-symbolic-svg. To find the SVG library, > gtk-encode-symbolic-svg depends on libgtk_pixbuf library which reads the > loaders.cache file using: > - a hardcoded path (which points to host-gdk-pixbuf per-package > directory) if relocatable is disabled. The loaders.cache in this > directory doesn't declare SVG support because it has not yet been > updated by host-librsvg > - or a dynamic path corresponding to the binary location if relocatable > is enabled. > So obviously, we need to set relocatable to true. > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Drop relocatable from target > - Enhance commit message Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 21:49:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:49:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gdk-pixbuf: fix run with per-package directory Message-ID: <20220310214214.61D6B83C48@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9884d674d1788124194e0dc8757830ad832af320 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are provided either by the gdk-pixbuf package itself, or be installed by third-party packages, like librsvg. At runtime, those plugins get loaded by helper function in the gdk-pixbuf library. The location where to find those modules is currently hard-coded at build time, to the location where gdb-pixbuf is installed.. This means that host-packages that install image-conversion utilities will try to look in the path where gdk-pixbuf was installed. With per-package directories, this fails to find any module that was installed bu a third-party package. For example, the module for loading an SVG provided by librsvg, so it is not present in the PPD of gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another format, like adwaita-icon-theme does) will fail with: Can't load file: Unrecognized image file format However, gdk-pixbuf can be configured so as to look for the modules relative to where the program is run from, rather than hard-coding the location at build time. This is exactly what we need in the PPD case Additionally, even without PPD, this would fail in a similar manner in the SDK, as that can be relocated too. So we unconditionally enable the relocatable option, but only for the host variant (there is no reason to enable it for the target, as it is not going to be relocated). Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword the already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 75361a9aba042799040591fb84192802b137fc3a) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) From peter at korsgaard.com Thu Mar 10 21:48:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:48:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdk-pixbuf: fix run with per-package directory Message-ID: <20220310214220.F0F4983C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9395a06b18b8472ac139232d9779d65fcd4a713 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are provided either by the gdk-pixbuf package itself, or be installed by third-party packages, like librsvg. At runtime, those plugins get loaded by helper function in the gdk-pixbuf library. The location where to find those modules is currently hard-coded at build time, to the location where gdb-pixbuf is installed.. This means that host-packages that install image-conversion utilities will try to look in the path where gdk-pixbuf was installed. With per-package directories, this fails to find any module that was installed bu a third-party package. For example, the module for loading an SVG provided by librsvg, so it is not present in the PPD of gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another format, like adwaita-icon-theme does) will fail with: Can't load file: Unrecognized image file format However, gdk-pixbuf can be configured so as to look for the modules relative to where the program is run from, rather than hard-coding the location at build time. This is exactly what we need in the PPD case Additionally, even without PPD, this would fail in a similar manner in the SDK, as that can be relocated too. So we unconditionally enable the relocatable option, but only for the host variant (there is no reason to enable it for the target, as it is not going to be relocated). Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword the already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 75361a9aba042799040591fb84192802b137fc3a) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) From fontaine.fabrice at gmail.com Thu Mar 10 22:19:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 10 Mar 2022 23:19:08 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/kvm-unit-tests: bump to version 2022-03-08 Message-ID: <20220310221908.30588-1-fontaine.fabrice@gmail.com> - Switch site: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 - Update first patch - Drop second patch (binutils < 2.23 is not supported by buildroot anymore) - Drop third and fourth patches (already in version) - This bump will fix the following build failure with powerpc and gcc 11 thanks to https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian Fixes: - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Huth): - Drop second patch ...emove-Werror-to-avoid-build-failures.patch | 17 +-- ...vm-unit-tests-test-for-rdseed-rdrand.patch | 110 ------------------ ...3-Makefile-fix-stack-protector-tests.patch | 36 ------ ...issue-with-the-linker-from-Fedora-32.patch | 61 ---------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- 6 files changed, 14 insertions(+), 218 deletions(-) delete mode 100644 package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch index cbfa3a87e6..d07b9b6912 100644 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures Signed-off-by: Thomas Petazzoni [Matthew: Refactoring of Thomas Petazzoni's original.] Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 1 - 1 file changed, 1 deletion(-) @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- +- 2.14.2 diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch deleted file mode 100644 index 1a1a90ce99..0000000000 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 12 Jan 2018 19:07:27 -0600 -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand - -The build fails when the host binutils isn't at least 2.23 -(2.22.x introduced RDSEED). - -Fixes: -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ - -Upstream: -https://marc.info/?l=kvm&m=151580743523259&w=2 - -Signed-off-by: Matthew Weber ---- - Makefile | 2 +- - configure | 18 ++++++++++++++++++ - x86/vmx_tests.c | 6 ++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d9ad42b..799e9b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer -diff --git a/configure b/configure -index dd9d361..21c0219 100755 ---- a/configure -+++ b/configure -@@ -171,6 +171,23 @@ mkdir -p lib - ln -sf "$asm" lib/asm - - -+cat > rd_test.c < -+int main() { -+ uint16_t seed=0; -+ unsigned char ok; -+ asm volatile ("rdseed %0; setc %1" -+ : "=r" (seed), "=qm" (ok)); -+ return ok; -+} -+EOF -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then -+ echo "Checking for rdseed/rdrand... Yes." -+else -+ echo "Checking for rdseed/rdrand... No." -+ extra_cflags="-DNO_RDSEEDRAND" -+fi -+ - # create the config - cat < config.mak - SRCDIR=$srcdir -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name - PROCESSOR=$processor - CC=$cross_prefix$cc - CXX=$cross_prefix$cxx -+EXTRA_CFLAGS=$extra_cflags - LD=$cross_prefix$ld - OBJCOPY=$cross_prefix$objcopy - OBJDUMP=$cross_prefix$objdump -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c -index 4a3e94b..2cbe3eb 100644 ---- a/x86/vmx_tests.c -+++ b/x86/vmx_tests.c -@@ -770,8 +770,10 @@ asm( - "insn_sldt: sldt %ax;ret\n\t" - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" - "insn_str: str %ax;ret\n\t" -+#ifndef NO_RDSEEDRAND - "insn_rdrand: rdrand %rax;ret\n\t" - "insn_rdseed: rdseed %rax;ret\n\t" -+#endif - ); - extern void insn_hlt(); - extern void insn_invlpg(); -@@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); -+#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); -+#endif - - u32 cur_insn; - u64 cr3; -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ -+#ifndef NO_RDSEEDRAND - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, -+#endif - // Instructions always trap - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, --- -1.9.1 - diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c6..0000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm at vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7..0000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth at redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2..42c3b4a241 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb9..d610442e03 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,9 +4,9 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -- 2.34.1 From peter at korsgaard.com Thu Mar 10 21:52:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:52:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220310222235.9F1BA83C59@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e12ce1a6b9a03eda75d888d236f664632585fd5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit af37e96f3d85a687503c85e7d2e37cfbd791dd18) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Mar 10 21:52:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:52:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220310222235.AB98883C4B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be2ef38faa9b0d843417bbc213917220a6e2dd3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit b43ba475cf3dbf2b3990144758d5b1d4b74862c0) Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 29536ecf9d..25145ee067 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. From peter at korsgaard.com Thu Mar 10 22:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:29:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: Needs python 3 Message-ID: <20220310222247.9188883C6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1db1922e460d4f5862be16ef2b3f0c84c3201ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x >From the twisted-21.2.0 release notes: Deprecations and Removals - Support for Python 2.7 has been removed. Twisted now supports only Python versions 3.5/3.6/3.7. https://github.com/twisted/twisted/releases/tag/twisted-21.2.0 Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + support/testing/tests/package/test_python_twisted.py | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 8a8717ff9c..5ad936f6c9 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TWISTED bool "python-twisted" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INCREMENTAL select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOMAT # runtime diff --git a/support/testing/tests/package/test_python_twisted.py b/support/testing/tests/package/test_python_twisted.py index a458ee45dd..e87312db13 100644 --- a/support/testing/tests/package/test_python_twisted.py +++ b/support/testing/tests/package/test_python_twisted.py @@ -21,15 +21,6 @@ class TestPythonTwisted(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Twisted(TestPythonTwisted): - __test__ = True - config = TestPythonTwisted.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TWISTED=y - """ - - class TestPythonPy3Twisted(TestPythonTwisted): __test__ = True config = TestPythonTwisted.config + \ From peter at korsgaard.com Thu Mar 10 22:02:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:02:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220310222247.85C7283C70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f32a2440eb6fa417ba28c0237cd3e2b37126633 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit b43ba475cf3dbf2b3990144758d5b1d4b74862c0) Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 4e24a3f71a..8a8717ff9c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. From peter at korsgaard.com Thu Mar 10 22:02:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:02:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220310222247.7A2AA83C6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0879a8e26c3455f9c06f83266e2374c271a329fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit af37e96f3d85a687503c85e7d2e37cfbd791dd18) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Mar 10 22:31:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:31:33 +0100 Subject: [Buildroot] [PATCH] package/python-twisted: add missing python typing extensions runtime dependency In-Reply-To: <20220221215702.8461-1-romain.naour@gmail.com> (Romain Naour's message of "Mon, 21 Feb 2022 22:57:02 +0100") References: <20220221215702.8461-1-romain.naour@gmail.com> Message-ID: <871qz9zbga.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > # python sample_python_txtorcon.py > Traceback (most recent call last): > File "/root/sample_python_txtorcon.py", line 1, in > import txtorcon # noqa > File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in > File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in > File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in > File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in > ModuleNotFoundError: No module named 'typing_extensions' > python typing_extensions is required since python-twisted 22.1.0 [1] > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 > [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 > Signed-off-by: Romain Naour Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 22:31:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:31:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <20220218105557.705926-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:55:57 +0100") References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> Message-ID: <87wnh1xwvj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21712: twisted is an event-driven networking engine written > in Python. In affected versions twisted exposes cookies and > authorization headers when following cross-origin redirects. This issue > is present in the `twited.web.RedirectAgent` and `twisted.web. > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > are no known workarounds. > Update hash of license file (author added and update in year: > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 22:35:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:35:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: bump to version 2.4.6 Message-ID: <20220310222720.C91AF83C72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19214951bb25f215e26d3065204f3faf7527c0d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 46390b3a7c47420b7523b8f18276f3ccd49940c7) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index cd2e8c7fb9..0d9f60931f 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 22:35:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:35:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: bump to version 2.4.6 Message-ID: <20220310222728.42F2683C75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2ecadb5fca1cd987b05dc5c566a888c3a64b6863 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 46390b3a7c47420b7523b8f18276f3ccd49940c7) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index cd2e8c7fb9..0d9f60931f 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 22:36:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:36:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.6 In-Reply-To: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 21:47:22 +0100") References: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> Message-ID: <87sfrpxwo7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release fixes a regression introduced by one of the security fixes > in 2.4.5. > https://blog.hartwork.org/posts/expat-2-4-6-released > https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From christian at paral.in Fri Mar 11 04:18:21 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:18:21 -0800 Subject: [Buildroot] [PATCH 1/1] package/moby-buildkit: bump to version 0.10.0 Message-ID: <20220311041821.3078930-1-christian@paral.in> https://github.com/moby/buildkit/releases/tag/v0.10.0 Signed-off-by: Christian Stewart --- package/moby-buildkit/moby-buildkit.hash | 4 ++-- package/moby-buildkit/moby-buildkit.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index 3015e479f6..e22e97cb3a 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef..d34ff96252 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_VERSION = 0.10.0 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE -- 2.35.1 From christian at paral.in Fri Mar 11 04:31:37 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:31:37 -0800 Subject: [Buildroot] [PATCH 1/1] package/balena-engine: bump to version 20.10.13 Message-ID: <20220311043137.3210407-1-christian@paral.in> https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md Signed-off-by: Christian Stewart --- package/balena-engine/Config.in | 1 - package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 42 +++++------------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2..02f694515e 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381..1054e22550 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 88254fe4a5bcb9801ba0094226de65696fc754eca8143f601c75ba2f95893d3b balena-engine-20.10.13.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b..402c586468 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,34 +4,33 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.13 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +53,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK -- 2.35.1 From christian at paral.in Fri Mar 11 04:32:25 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:32:25 -0800 Subject: [Buildroot] [PATCH 1/1] package/balena-engine: bump to version 20.10.13 In-Reply-To: <20220311043137.3210407-1-christian@paral.in> References: <20220311043137.3210407-1-christian@paral.in> Message-ID: All, My mistake, seems this patch somehow got rebased incorrectly. Will fix. On Thu, Mar 10, 2022 at 8:31 PM Christian Stewart wrote: > > https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md > > Signed-off-by: Christian Stewart > --- > package/balena-engine/Config.in | 1 - > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 42 +++++------------------- > 3 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in > index f48f361dc2..02f694515e 100644 > --- a/package/balena-engine/Config.in > +++ b/package/balena-engine/Config.in > @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE > depends on BR2_USE_MMU # util-linux > select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime > select BR2_PACKAGE_IPTABLES # runtime > - select BR2_PACKAGE_SQLITE # runtime > select BR2_PACKAGE_UTIL_LINUX # runtime > select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime > select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 3f632ef381..1054e22550 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed [SNIP] From christian at paral.in Fri Mar 11 04:41:17 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:41:17 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.13 Message-ID: <20220311044117.3213995-1-christian@paral.in> https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md Signed-off-by: Christian Stewart --- v2: - rebase: update commit against upstream/master Signed-off-by: Christian Stewart --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index ef590881f5..1054e22550 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz +sha256 88254fe4a5bcb9801ba0094226de65696fc754eca8143f601c75ba2f95893d3b balena-engine-20.10.13.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index 0afcea3d7e..402c586468 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.12 +BALENA_ENGINE_VERSION = 20.10.13 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 -- 2.35.1 From christian at paral.in Fri Mar 11 04:48:16 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:48:16 -0800 Subject: [Buildroot] [PATCH v3 1/1] package/nerdctl: new package Message-ID: <20220311044816.3222673-1-christian@paral.in> nerdctl is a CLI for containerd (package docker-containerd) which is drop-in compatible with the Docker Daemon CLI. This allows using the lighter weight containerd daemon directly, instead of via the additional docker daemon. It also implements rootless mode. https://github.com/containerd/nerdctl Signed-off-by: Christian Stewart --- v1: - pkg-golang does not support main.go at root of project - https://bugs.busybox.net/show_bug.cgi?id=13651 - override the build command instead v2: - bump to 0.8.0 - go now works fine with /. targets, remove command override - docker-containerd was renamed to containerd v3: - bump to version 0.17.1 from 0.8.0 - add correct build targets Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/nerdctl/Config.in | 24 ++++++++++++++++++++++++ package/nerdctl/nerdctl.hash | 3 +++ package/nerdctl/nerdctl.mk | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 package/nerdctl/Config.in create mode 100644 package/nerdctl/nerdctl.hash create mode 100644 package/nerdctl/nerdctl.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..8f68c464db 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2554,6 +2554,7 @@ menu "System tools" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" + source "package/nerdctl/Config.in" source "package/netifrc/Config.in" source "package/numactl/Config.in" source "package/nut/Config.in" diff --git a/package/nerdctl/Config.in b/package/nerdctl/Config.in new file mode 100644 index 0000000000..51a2919d9d --- /dev/null +++ b/package/nerdctl/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_NERDCTL + bool "nerdctl" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_CONTAINERD # containerd runtime dependency + select BR2_PACKAGE_RUNC # containerd runtime dependency + select BR2_PACKAGE_UTIL_LINUX # runtime dependency + select BR2_PACKAGE_UTIL_LINUX_BINARIES # containerd + select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT # containerd + select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT # containerd + select BR2_PACKAGE_UTIL_LINUX_MOUNT # containerd + help + Docker-compatible CLI for containerd, controlling runc. + + https://github.com/containerd/nerdctl + +comment "nerdctl needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash new file mode 100644 index 0000000000..a31b12b26d --- /dev/null +++ b/package/nerdctl/nerdctl.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 be41804ef139a3f92b774edc8439678e56b44033d7ab3fcf4389f0865c1fe069 nerdctl-0.17.1.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk new file mode 100644 index 0000000000..3f3c04aa11 --- /dev/null +++ b/package/nerdctl/nerdctl.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# nerdctl +# +################################################################################ + +NERDCTL_VERSION = 0.17.1 +NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) + +NERDCTL_LICENSE = Apache-2.0 +NERDCTL_LICENSE_FILES = LICENSE + +NERDCTL_GOMOD = github.com/containerd/nerdctl + +NERDCTL_LDFLAGS = \ + -X $(NERDCTL_GOMOD)/pkg/version.Version=$(NERDCTL_VERSION) + +NERDCTL_BUILD_TARGETS = cmd/nerdctl + +$(eval $(golang-package)) -- 2.35.1 From ps.report at gmx.net Fri Mar 11 06:50:42 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 07:50:42 +0100 Subject: [Buildroot] [PATCH v1] package/wget: bump version to 1.21.3 Message-ID: <20220311065042.8687-1-ps.report@gmx.net> - explicit set some default options (--without-metalink, --enable-opie, --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, --disable-assert) - add optional libpsl dependency - remove legacy --with-libidn option (see [1]), replace with new --enable-iri option in case libiconv and libidn2 are available - use explicit --with-libuuid option - add optional c-ares dependency For details see [2]. [1] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 [2] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html Signed-off-by: Peter Seiderer --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..026c6c375d 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -12,6 +12,22 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +WGET_CONF_OPTS = \ + --without-metalink \ + --enable-opie \ + --enable-digest \ + --enable-ntlm \ + --disable-debug \ + --disable-valgrind-tests \ + --disable-assert + +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls @@ -22,19 +38,18 @@ else WGET_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WGET_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn -WGET_DEPENDENCIES += libidn2 +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri +WGET_DEPENDENCIES += libiconv libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) @@ -44,6 +59,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 -- 2.35.1 From ps.report at gmx.net Fri Mar 11 06:55:11 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 07:55:11 +0100 Subject: [Buildroot] [PATCH v2] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220311065511.14015-1-ps.report@gmx.net> - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ?reserve?: bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - rebased and renumbered patch from 0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch to 0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch --- ...n-of-fzero-call-used-regs-all-suppor.patch | 38 +++++++++++++++++++ package/openssh/openssh.mk | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ -- 2.35.1 From ps.report at gmx.net Fri Mar 11 06:59:28 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 07:59:28 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.38 Message-ID: <20220311065928.14849-1-ps.report@gmx.net> For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html Signed-off-by: Peter Seiderer --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486f..a162bfdc95 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231..c875814bc7 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ -- 2.35.1 From mohd.faiz.rohani at gmail.com Fri Mar 11 07:10:46 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Fri, 11 Mar 2022 15:10:46 +0800 Subject: [Buildroot] User and Group Utility in Buildroot Message-ID: Hi Guys I need help here. I could not find the correct utils for the Linux user and group management (useradd groupadd etc. etc.) in the Buildroot packages. Can anyone show me which utils I need to select in order to activate this?. Fyi I'm using buildroot-2022.02-rc3. Thank you -------------- next part -------------- An HTML attachment was scrubbed... URL: From ps.report at gmx.net Fri Mar 11 07:24:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 08:24:13 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> Message-ID: <20220311082413.4bfe7465@gmx.net> Hello Arnout, On Thu, 10 Mar 2022 22:03:23 +0100, Arnout Vandecappelle wrote: > On 10/03/2022 21:38, Peter Seiderer wrote: > > Hello John, > > > > thanks for the patch, some minor nitpicks... > > > > Better patch subject would be: > > > > package/openssh: add upstream patch to add seccomp ppoll_time64 support > > Applied to master with this changed. > > > > > On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: > > > >> sshd is broken on 32-bit systems because ppoll_time64 is used by the > >> application although it is not allowed by the seccomp filter. > >> > >> Apply the upstream patch to fix this. > > > > Better: > > > > -add upstream patch ([1] to add seccomp ppoll_time64 support > > Since the subject now already says that it adds seccomp ppoll_time64 support, > this is redundant. Since I'm lazy :-), I didn't change this. > > > > > [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch > > There's already a reference to the upstream commit in the patch itself, so > this is not really needed. > > > > >> > >> Signed-off-by: John Keeping > >> --- > >> ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ > >> 1 file changed, 31 insertions(+) > >> create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > >> > >> diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > >> new file mode 100644 > >> index 0000000000..34b309bd9a > >> --- /dev/null > >> +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > >> @@ -0,0 +1,31 @@ > >> +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 > >> +From: Darren Tucker > >> +Date: Sat, 26 Feb 2022 14:06:14 +1100 > >> +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. > >> + > >> +Should fix sandbox violations on (some? at least i386 and armhf) 32bit > >> +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at > >> +debian.org via bz#3396. > >> + > > > > Missing: > > > > [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] > > Except for the signoff, the patch is literally the upstream patch, including > the sha1 in the From line. So an upstream reference is not really needed. Still, > it's useful so I overcame my laziness and added it. But the sha1 alone does not tell to which git repo it belongs to, but the explicit upstream link does (and has the nice effect to gain a one-click link to the corresponding patch/merge-request etc.) and is a prominent remainder in case of package version bump where the patch comes from... Regards, Peter > > Regards, > Arnout > > > >> +Signed-off-by: John Keeping > >> +--- > >> + sandbox-seccomp-filter.c | 3 +++ > >> + 1 file changed, 3 insertions(+) > >> + > >> +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c > >> +index 2e065ba3..4ce80cb2 100644 > >> +--- a/sandbox-seccomp-filter.c > >> ++++ b/sandbox-seccomp-filter.c > >> +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { > >> + #ifdef __NR_ppoll > >> + SC_ALLOW(__NR_ppoll), > >> + #endif > >> ++#ifdef __NR_ppoll_time64 > >> ++ SC_ALLOW(__NR_ppoll_time64), > >> ++#endif > >> + #ifdef __NR_poll > >> + SC_ALLOW(__NR_poll), > >> + #endif > >> +-- > >> +2.35.1 > >> + > > > > With this fixed you can add my > > > > Reviewed-by: Peter Seiderer > > > > Regards, > > Peter > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Fri Mar 11 07:33:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 08:33:33 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20220310 Message-ID: <20220311073333.29596-1-ps.report@gmx.net> - update hash of WHENCE file - update hash of LICENSE.amdgpu (copyright year update, see [1]) [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=34f9f8994a61192abfb597fc55810e3c27269ebf Signed-off-by: Peter Seiderer --- package/linux-firmware/linux-firmware.hash | 6 +++--- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 83275ec6d7..382e9cb2ba 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,9 +1,9 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz +sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE +sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c..5ccb7f10dd 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20211216 +LINUX_FIRMWARE_VERSION = 20220310 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -- 2.35.1 From clement.leger at bootlin.com Fri Mar 11 09:32:46 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Fri, 11 Mar 2022 10:32:46 +0100 Subject: [Buildroot] [PATCH v2 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220311103246.471185ee@fixe.home> Le Thu, 10 Mar 2022 17:57:28 +0100, Cl?ment L?ger a ?crit : > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > and optee-test which neess to be aligned with optee-os version. > > ---- > > Changes in v2: > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > Cl?ment L?ger (4): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > package/optee-test: bump to version 3.16.0 > > Etienne Carriere (3): > package/optee-examples: bump to version 3.16.0 > package/optee-client: bump to version 3.16.0 > package/optee-benchmark: bump to version 3.16.0 > > boot/optee-os/Config.in | 13 +++++++++++-- > boot/optee-os/optee-os.hash | 2 +- > boot/optee-os/optee-os.mk | 7 ++++++- > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > package/optee-benchmark/optee-benchmark.mk | 2 +- > package/optee-client/optee-client.hash | 4 ++-- > package/optee-client/optee-client.mk | 2 +- > package/optee-examples/optee-examples.hash | 4 ++-- > package/optee-examples/optee-examples.mk | 2 +- > package/optee-test/optee-test.hash | 4 ++-- > package/optee-test/optee-test.mk | 2 +- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 12 files changed, 37 insertions(+), 16 deletions(-) > Sadly, I used commits from Etienne Carriere as initial commits messages (using -c). I did not noticed it reused the original commit author. I will resend a V3 with authorship fixed properly. Sorry for the inconvenience. -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From quentin.schulz at theobroma-systems.com Fri Mar 11 10:09:40 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Fri, 11 Mar 2022 11:09:40 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <20220310215914.3d26c317@gmx.net> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> <20220310215914.3d26c317@gmx.net> Message-ID: <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> Hi all, On 3/10/22 21:59, Peter Seiderer wrote: > Hello *, > > On Thu, 10 Mar 2022 21:10:36 +0100, Arnout Vandecappelle wrote: > >> Hi Quentin, >> >> On 09/03/2022 15:29, Quentin Schulz wrote: >>> From: Quentin Schulz >>> >>> This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. >>> >>> The patch fails to apply because of a conflict in copyright year so it >>> needed some additional handling after downloading. >>> >>> The patch file was added by running the following command: >>> wget https://urldefense.proofpoint.com/v2/url?u=https-3A__download.qt.io_archive_qt_5.15_CVE-2D2022-2D25255-2Dqprocess5-2D15.diff&d=DwIFAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=BsFMymMtfNBibxvKyvdJPDHFdo422rhoYyW1yKTW6AhrH0dKs7xDb-efWy6vBNAT&s=-6cfccEeLqsLUibYZcNYVLGYEN_CxlShGyX6MzeFYX8&e= -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch >>> >>> [1] https://urldefense.proofpoint.com/v2/url?u=https-3A__nvd.nist.gov_vuln_detail_CVE-2D2022-2D25255&d=DwIFAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=BsFMymMtfNBibxvKyvdJPDHFdo422rhoYyW1yKTW6AhrH0dKs7xDb-efWy6vBNAT&s=qywJU5cDeT4YRPIoWShq1zOH4t4wlihP8FgpBlCIvoE&e= >>> >>> Cc: Quentin Schulz >>> Signed-off-by: Quentin Schulz >>> --- >>> ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ >>> package/qt5/qt5base/qt5base.mk | 2 + >>> 2 files changed, 58 insertions(+) >>> create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch >>> >>> diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch >>> new file mode 100644 >>> index 0000000000..dfab92a9ef >>> --- /dev/null >>> +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch >> >> Please make the patch something that approaches git-formatted. At the very >> least, the patch itself must have a description of what it does (i.e. a commit >> message) and a Signed-off-by from you. Ideally, though, you look for the >> appropriate commit in the upstream repository [1] and use that instead of a >> random diff. In that case, add something like this at the end of the description Not technically a random diff. It's hosted on an official Qt website where the tarballs used to be fetched from. There's no commit log because well, there is no commit log. I cannot invent it :) The commit you point to is completely different from the diff in this patch, which makes me uncomfortable with stealing the commit log and apply it to this diff. Also, there is no commit available for 5.15 branch (at least publicly ?) yet. See the discussion for 5.12 LTS branch: https://codereview.qt-project.org/c/qt/qtbase/+/396020 Specifically: "5.15 has ended up needing even more path corrections for helpers. Will likely be needed here as well" "Yeah, I have, so far, just manually changed tests for 5.15. But there's quite a few and took a long time to get them all, and it will have to be repeated for other modules. I was thinking about this too, but then, changing the test-runner may break other things as well. But it's worth looking into" and finally, this patchset was abandoned. I quickly checked this person's other commits on Qt Gerrit but found nothing interesting. I could have done a better job at writing my commit log and give all this info in it to explain why such an unusual patch should/could be included. >> part: >> >> [Quentin: backport from upstream commit ab6915f0efb12cfe48d1f126f4a828212f853ce5 >> in 6.2 branch] >> Signed-off-by: ... >> > > ..or wait until [2] is merged and bump the qt5base version/kde-git-revision > (but then only applicable for 2022.02.x/master and not for the older buildroot > branches)... > I needed this fixed now and that is the only reasonable way to fix the CVE at the moment. If the Buildroot project prefers to wait for the KDE PR to be merged, that's another story and I completely understand :) No hard feelings if this patch isn't merged, I understand it's not really on-par with Buildroot policies/best practices as highlighted by Arnout. Regards, Quentin From etienne.carriere at linaro.org Fri Mar 11 10:14:23 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Fri, 11 Mar 2022 11:14:23 +0100 Subject: [Buildroot] [PATCH v2 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220311103246.471185ee@fixe.home> References: <20220310165735.1102802-1-clement.leger@bootlin.com> <20220311103246.471185ee@fixe.home> Message-ID: Hello Clement, On Fri, 11 Mar 2022 at 10:34, Cl?ment L?ger wrote: > > Le Thu, 10 Mar 2022 17:57:28 +0100, > Cl?ment L?ger a ?crit : > > > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > > of python-pycryptodomex to build. This series adds support to build > > host-python-cryptography and uses it in optee-os package to build the > > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > > and optee-test which neess to be aligned with optee-os version. > > > > ---- > > > > Changes in v2: > > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > > > Cl?ment L?ger (4): > > package/python-cryptography: enable host package > > boot/optee-os: add support to build with python-cryptography > > boot/optee-os: bump to version 3.16.0 > > package/optee-test: bump to version 3.16.0 > > > > Etienne Carriere (3): > > package/optee-examples: bump to version 3.16.0 > > package/optee-client: bump to version 3.16.0 > > package/optee-benchmark: bump to version 3.16.0 > > > > boot/optee-os/Config.in | 13 +++++++++++-- > > boot/optee-os/optee-os.hash | 2 +- > > boot/optee-os/optee-os.mk | 7 ++++++- > > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > > package/optee-benchmark/optee-benchmark.mk | 2 +- > > package/optee-client/optee-client.hash | 4 ++-- > > package/optee-client/optee-client.mk | 2 +- > > package/optee-examples/optee-examples.hash | 4 ++-- > > package/optee-examples/optee-examples.mk | 2 +- > > package/optee-test/optee-test.hash | 4 ++-- > > package/optee-test/optee-test.mk | 2 +- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 12 files changed, 37 insertions(+), 16 deletions(-) > > > > Sadly, I used commits from Etienne Carriere as initial commits messages > (using -c). I did not noticed it reused the original commit author. > I will resend a V3 with authorship fixed properly. Sorry for the > inconvenience. > Acked-by: Etienne Carriere for the whole series with only a comment on patch 3/7. You forgot to update the url in the inline comment of optee-os.hash for that package only. Regards, etienne > -- > Cl?ment L?ger, > Embedded Linux and Kernel engineer at Bootlin > https://bootlin.com From clement.leger at bootlin.com Fri Mar 11 12:36:29 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:29 +0100 Subject: [Buildroot] [PATCH v3 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220311123636.13415-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which needs to be aligned with optee-os version. ---- Changes in v3: - Fix authorship for commits that were copied from Etienne ones. - Fix package URL for optee-os - Added Acked-by Etienne Carriere Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (7): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 7 ++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 38 insertions(+), 17 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:31 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:31 +0100 Subject: [Buildroot] [PATCH v3 2/7] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-3-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..f8426f9ab2 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE version below 3.16 used python-pycryptodomex package + in python scripts. Newer version uses python-cryptography. + Select this option if optee-os needs python-cryptography to + be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..57f9a17bb6 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,12 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:33 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:33 +0100 Subject: [Buildroot] [PATCH v3 4/7] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-5-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:30 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:30 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-2-clement.leger@bootlin.com> Enable host package and add needed dependencies. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..4ff61c7f86 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:35 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:35 +0100 Subject: [Buildroot] [PATCH v3 6/7] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-7-clement.leger@bootlin.com> Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:36 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:36 +0100 Subject: [Buildroot] [PATCH v3 7/7] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-8-clement.leger@bootlin.com> Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:32 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:32 +0100 Subject: [Buildroot] [PATCH v3 3/7] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-4-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index f8426f9ab2..6fe2ae95ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography. @@ -58,7 +59,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b9b0e5b43f 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:34 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:34 +0100 Subject: [Buildroot] [PATCH v3 5/7] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-6-clement.leger@bootlin.com> Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From tianyuanhao3 at 163.com Fri Mar 11 12:47:15 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Fri, 11 Mar 2022 04:47:15 -0800 Subject: [Buildroot] User and Group Utility in Buildroot In-Reply-To: References: Message-ID: <8db51f93-0b22-57b3-5a99-a4199277ea91@163.com> These tools seem to come from _shadow_, which Buildroot doesn't have. Thanks, Yuanhao On 3/10/22 23:10, Mohd Faiz Rohani wrote: > Hi Guys > > I need help here. I could not find?the correct utils for the Linux > user and group management (useradd groupadd etc. etc.) in the > Buildroot packages. Can anyone show me which utils I need to select in > order to activate this?. Fyi I'm using buildroot-2022.02-rc3. > > Thank you > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From tianyuanhao3 at 163.com Fri Mar 11 12:37:17 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Fri, 11 Mar 2022 04:37:17 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.13 In-Reply-To: <20220311044117.3213995-1-christian@paral.in> References: <20220311044117.3213995-1-christian@paral.in> Message-ID: <6920ae4c-efdc-8236-4634-b07d188bd559@163.com> I suggest waiting for this [1] to be merged before updating balena-engine. [1]: https://github.com/balena-os/balena-engine/pull/286/files Thanks, Yuanhao On 3/10/22 20:41, Christian Stewart via buildroot wrote: > https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md > > Signed-off-by: Christian Stewart > > --- > > v2: > > - rebase: update commit against upstream/master > > Signed-off-by: Christian Stewart > --- > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index ef590881f5..1054e22550 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz > +sha256 88254fe4a5bcb9801ba0094226de65696fc754eca8143f601c75ba2f95893d3b balena-engine-20.10.13.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index 0afcea3d7e..402c586468 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 20.10.12 > +BALENA_ENGINE_VERSION = 20.10.13 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 From james.knight at collins.com Fri Mar 11 15:09:43 2022 From: james.knight at collins.com (James Knight) Date: Fri, 11 Mar 2022 10:09:43 -0500 Subject: [Buildroot] [PATCH 1/1] package/chrony: bump to version 4.2 Message-ID: <20220311150943.119252-1-james.knight@collins.com> https://git.tuxfamily.org/chrony/chrony.git/tree/NEWS?id=4.2 Signed-off-by: James Knight --- package/chrony/chrony.hash | 5 +++-- package/chrony/chrony.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index f8dd1438bc7d1f08dcbdccb7bff8e03cee3e2da8..7fa67bf040da0c00e23e3e4fb5ddd4a638cb91d0 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,4 +1,5 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz +# Locally calculated after checking pgp signature +# https://download.tuxfamily.org/chrony/chrony-4.2-tar-gz-asc.txt +sha256 273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a chrony-4.2.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 5a34f70e1e992f179784ad87b240967f5cf0a30f..15b200aeffe9bd70694bb1d490535ae8785dc3fc 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 4.1 +CHRONY_VERSION = 4.2 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING -- 2.30.0.windows.1 From ben at fluff.org Fri Mar 11 17:13:25 2022 From: ben at fluff.org (Ben Dooks) Date: Fri, 11 Mar 2022 17:13:25 +0000 Subject: [Buildroot] error during cpio build failing to rm Message-ID: <20220311171325.jwcww5qb7ao5vnpy@hetzy.fluff.org> I'm getting the following error with upstream buildroot: rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/tmp/..' make: *** [fs/cpio/cpio.mk:74: /home/ben/project/buildroot/output/images/rootfs.c I've temprarily fixed this with: diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..6bb993663f 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/tmp/*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) It looks like this was introduced in 5e78e7e97d772124f0d31653aca33731abe5b4db Author: Norbert Lange Date: Sat Jun 6 00:48:57 2020 +0200 fs: clean the volatile /run and /tmp directories Any ideas on how to fix properly? -- Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear. From james.hilliard1 at gmail.com Fri Mar 11 19:17:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 12:17:17 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-weasyprint: bump to version 54.2 Message-ID: <20220311191717.3878852-1-james.hilliard1@gmail.com> Migrate from distutils to flit package infrastructure. Signed-off-by: James Hilliard --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 8d231c50ba..90ccc1d057 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 a90fd2d5a581a0e218943af3a8b64a31 weasyprint-53.4.tar.gz -sha256 10ccb17d55c73096bdf1edd3efe58cb855b07e4c307d9bad4ebc9a3f13ff4580 weasyprint-53.4.tar.gz +md5 3917447c277db6931b8370f1d725db49 weasyprint-54.2.tar.gz +sha256 d5e8aa82e3e2a2477a4543f0646d9fb14080c9ba34a0859751eb23757cc00466 weasyprint-54.2.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 0a944825bb..925de855bc 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 53.4 +PYTHON_WEASYPRINT_VERSION = 54.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 -PYTHON_WEASYPRINT_SETUP_TYPE = distutils +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 +PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 19:27:26 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 12:27:26 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: apply host platform and project base to pep517 env Message-ID: <20220311192726.3879992-1-james.hilliard1@gmail.com> The _PYTHON_HOST_PLATFORM and _PYTHON_PROJECT_BASE variables should also be set for pep517 builds as they are not setuptools/distutils specific. Signed-off-by: James Hilliard --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index f031bc8fae..52ce402281 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -113,6 +113,8 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 19:44:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 12:44:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: bump to version 21.3.0 Message-ID: <20220311194446.3952944-1-james.hilliard1@gmail.com> Migrate to new flit based build. Signed-off-by: James Hilliard --- package/python-argon2-cffi/Config.in | 8 +++----- package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 5cddb3314e..5940d1c910 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI bool "python-argon2-cffi" - depends on BR2_USE_MMU # libargon2 - depends on !BR2_STATIC_LIBS # libargon2 - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_LIBARGON2 + depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2 + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2 + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime help The secure Argon2 password hashing algorithm. diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash index 6c416ffd88..09da5855a3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.hash +++ b/package/python-argon2-cffi/python-argon2-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz # Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk index f01c940589..0fb3e50ff3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.mk +++ b/package/python-argon2-cffi/python-argon2-cffi.mk @@ -4,19 +4,11 @@ # ################################################################################ -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit PYTHON_ARGON2_CFFI_LICENSE = MIT PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 -else -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 -endif $(eval $(python-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Mar 11 20:43:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Mar 2022 21:43:32 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311123636.13415-2-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> Message-ID: <20220311214332.4405ad89@windsurf> Hello Cl?ment, On Fri, 11 Mar 2022 13:36:30 +0100 Cl?ment L?ger wrote: > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + openssl This openssl dependency seems extremely dubious. Why would a host package depend on the target variant of openssl? > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ > $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > + Spurious newline added. > $(eval $(python-package)) > +$(eval $(host-python-package)) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Mar 11 20:46:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Mar 2022 21:46:15 +0100 Subject: [Buildroot] [PATCH v3 2/7] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220311123636.13415-3-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-3-clement.leger@bootlin.com> Message-ID: <20220311214615.6f6ab65c@windsurf> Hello Cl?ment, On Fri, 11 Mar 2022 13:36:31 +0100 Cl?ment L?ger wrote: > Newer version of optee-os (>= 3.16) uses python-cryptography instead of > python-pycryptodomex in python scripts. Add support to build these > newer versions by adding a new > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will > select host-python-cryptography dependency when building optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 8 ++++++++ > boot/optee-os/optee-os.mk | 7 ++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 0974578484..f8426f9ab2 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "optee-os needs host-python-cryptography to build" Just: bool "optee-os needs host-python-cryptography" you also need to add some dependencies, because rust is not supported on all host architectures, so you need: depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) > +OPTEE_OS_DEPENDENCIES += host-python-cryptography > +else > +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex > +endif Semantically speaking, it's a bit odd that enabling BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY drops the host-python-pycryptodomex dependency. But I guess this is what makes the most sense in that situation. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Mar 11 20:47:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Mar 2022 21:47:38 +0100 Subject: [Buildroot] [PATCH v3 3/7] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-4-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-4-clement.leger@bootlin.com> Message-ID: <20220311214738.5b2142e3@windsurf> Hello Cl?ment, On Fri, 11 Mar 2022 13:36:32 +0100 Cl?ment L?ger wrote: > Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since > python-cryptography is now needed to build optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 5 +++-- > boot/optee-os/optee-os.hash | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index f8426f9ab2..6fe2ae95ac 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -18,7 +18,7 @@ choice > Select the version of OP-TEE OS you want to use > > config BR2_TARGET_OPTEE_OS_LATEST > - bool "3.15.0" > + bool "3.16.0" > help > Use the latest release tag from the OP-TEE OS official Git > repository. > @@ -50,6 +50,7 @@ endif > > config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > bool "optee-os needs host-python-cryptography to build" > + default y Rather than a "default y", I would instead make BR2_TARGET_OPTEE_OS_LATEST select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY, so that if the latest version of OP-TEE is used, BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY is forcefully selected. However, you will have to propagate the BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS to the OP-TEE package. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Fri Mar 11 21:15:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:15:59 +0100 Subject: [Buildroot] [PATCH 2/2] package/librsvg: fix loaders.cache In-Reply-To: <20220219122526.2954354-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 19 Feb 2022 13:25:26 +0100") References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> <20220219122526.2954354-2-fontaine.fabrice@gmail.com> Message-ID: <87k0d0xka8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > gdk-pixbuf-query-loaders to build a correct loaders.cache and fix the > following PPD build failure of adwaita-icon-theme raised since commit > b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates > loaders.cache: > Can't load file: Unrecognized image file format > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 11 21:20:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:20:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ipython: security bump to version 7.31.1 In-Reply-To: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:54:09 +0100") References: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnoxk2i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for > interactive computing in multiple programming languages, originally > developed for the Python programming language. Affected versions are > subject to an arbitrary code execution vulnerability achieved by not > properly managing cross user temporary files. This vulnerability allows > one user to run code as another on the same machine. All users are > advised to upgrade. > Also update indentation in hash file (two spaces) > https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 11 21:19:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:19:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-ipython: bump to version 7.28.0 Message-ID: <20220311211323.6232883C96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=688b256f9f4c6007d62b4a6ecd8177b281b4fafb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit dc34303f1bfa3cb07d19e986f0edc8991866e7c2) Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 4 ++-- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index e8e25f5cb7..5f591129a4 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 68542bca2ebf39af7d9d0557e7fb5708 ipython-7.9.0.tar.gz -sha256 dfd303b270b7b5232b3d08bd30ec6fd685d8a58cabd54055e3d69d8f029f7280 ipython-7.9.0.tar.gz +md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz +sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 8136353ae2..c669dd1b92 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.9.0 +PYTHON_IPYTHON_VERSION = 7.28.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c0/e5/ba19ae58e9bdd80832332873cb4e11a90cf2049df052c1aadeabc2cdadeb +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Fri Mar 11 21:20:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:20:02 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220311211323.6DBAB83C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84fd98b48b53065ec30f88ded5ea9a5f8c313591 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit aeb138911e773cf4011b81fc4fcec0037f366bb1) Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Fri Mar 11 21:14:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:14:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/librsvg: fix loaders.cache with with per-package directories Message-ID: <20220311211323.5689483C8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a08294ba1263d07cdd8e4a80ef7ea3c7577e4a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x host-librsvg installs a gdk-pixbuf module (aka plugin). As such, it needs to update [0] the modules cache (a kind of registry of which modules are installed and what the can handle). To that effect, it calls the utility gdk-pixbuf-queryloaders, which generates the cache of existing modules. gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been configured to be relocatable. However, it still embeds the path to where it was instaled, and thus where to look modules from. If it is run from its install location, then gdk-pixbuf-queryloaders looks modules in that location, and generates a modules cache with relative paths; otherwise, it still looks at that location, but generates a cache with absolute paths. In the later case, it will miss the modules that have not been installed by gdk-pixbuf itself. In the case of host-librsvg, that will miss the fact that librsvg just happened to have installed a module. Further down the road, packages that depend on host-librsvg, will get their PPD prepared, the path fixup hook run, so that the cache properly points to the current package's PPD, but the cache will not include the SVG module, which causes failures to load SVG images: Can't load file: Unrecognized image file format So, we need to tell gdk-pixbuf-queryloaders where the module path is, which restores the relativity of the paths it reports, by specifying the modules path pointing to the current package's PPD, passed in the environement variable GDK_PIXBUF_MODULEDIR. We need to do that at install time, so that the SVG module is properly listed in the cache, so that dependees can use it. A temporary cache is also generated at build time, but its usefullness is dubious; it seem to only be used by the test tool, which we do not run. However, for consistency-sake, we also fix that. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 [0] This will trigger file-overwrite detection in the future... But we currently do not have infrastructure to properly handle such a cache. Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword and extend an already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 63b780f5e96e2f9282fb48b2846bab1c0f4f9455) Signed-off-by: Peter Korsgaard --- ...loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 ++++++++++++++++++++++ package/librsvg/librsvg.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection From peter at korsgaard.com Fri Mar 11 21:17:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:17:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220311211327.F13A783C9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe570807b0fa02a839320250362759e327f7ad0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit aeb138911e773cf4011b81fc4fcec0037f366bb1) Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Fri Mar 11 20:51:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 21:51:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/librsvg: fix loaders.cache with with per-package directories Message-ID: <20220311211327.E567E83C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3ddfdf64c189c2e08ae83146730f4aae660784d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x host-librsvg install a gdk-pixbuf module (aka plugin). As such, it needs to update [0] the modules cache (a kind of registry of which modules are installed and what the can handle). To that effect, it calls the utility gdk-pixbuf-queryloaders, which generates the cache of existing modules. gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been configured to be relocatable. However, it still embeds the path to where it was instaled, and thus where to look modules from. If it is run from its install location, then gdk-pixbuf-queryloaders looks modules in that location, and generates a modules cache with relative paths; otherwise, it still looks at that location, but generates a cache with absolute paths. In the later case, it will miss the modules that have not been installed by gdk-pixbuf itself. In the case of host-librsvg, that will miss the fact that librsvg just happened to have installed a module. Further down the road, packages that depend on host-librsvg, will get their PPD prepared, the path fixup hook run, so that the cache properly points to the current package's PPD, but the cache will not include the SVG module, which causes failures to load CVG images: Can't load file: Unrecognized image file format So, we need to tell gdk-pixbuf-queryloaders where the module path is, which restores the relativity of the paths it reports, by specifying the modules path pointing to the current package's PPD, passed in the environement variable GDK_PIXBUF_MODULEDIR. We need to do that at install time, so that the SVG module is properly listed in the cache, so that dependees can use it. A temporary cache is also generated at build time, but its usefullness is dubious; it seem to only be used by the test tool, which we do not run. However, for consistency-sake, we also fix that. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 [0] This will trigger file-overwrite detection in the future... But we currently do not have infrastructure to properly handle such a cache. Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword and extend an already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 63b780f5e96e2f9282fb48b2846bab1c0f4f9455) Signed-off-by: Peter Korsgaard --- ...loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 ++++++++++++++++++++++ package/librsvg/librsvg.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection From peter at korsgaard.com Fri Mar 11 21:23:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:23:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/flac: security bump to version 1.3.4 Message-ID: <20220311211432.2505F83CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27503b58aa7d245981be1334111e4cbe98649144 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4c7e250c699b23051a64bc0c2ef3e3f2bd020b3d) Signed-off-by: Peter Korsgaard --- package/flac/0001-Fix-uclibc-build.patch | 81 ++++++++++++++++++++++ ...c-check-for-sys-auxv.h-before-defining-FL.patch | 36 ---------- package/flac/flac.hash | 12 ++-- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr From peter at korsgaard.com Fri Mar 11 21:22:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:22:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/flac: security bump to version 1.3.4 Message-ID: <20220311211437.556E983CA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37683e06b9daa9eff057ede540b844a12d0744f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4c7e250c699b23051a64bc0c2ef3e3f2bd020b3d) Signed-off-by: Peter Korsgaard --- package/flac/0001-Fix-uclibc-build.patch | 81 ++++++++++++++++++++++ ...c-check-for-sys-auxv.h-before-defining-FL.patch | 36 ---------- package/flac/flac.hash | 12 ++-- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr From peter at korsgaard.com Fri Mar 11 21:23:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:23:31 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 21 Feb 2022 23:00:25 +0100") References: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> Message-ID: <87bkycxjxo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release mostly fixes (security related) bugs including: > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > - Fix encoder bug CVE-2021-0561 > Also: > - Replace first patch which was reverted by > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > - Disable stack protection (enabled by default since > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > - Drop md5 which is not provided anymore > - Update indentation in hash file (two spaces) > https://github.com/xiph/flac/releases/tag/1.3.4 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin and Peter Seiderer): > - Add upstream patch Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Fri Mar 11 21:34:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 14:34:52 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: bump to version 3.7.1 Message-ID: <20220311213452.3961421-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-flit-core/python-flit-core.hash | 4 ++-- package/python-flit-core/python-flit-core.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index bd47fd4f6b..135be93660 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz -sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz +md5 4a4791e97f3a8c9a1645064a35636ee6 flit_core-3.7.1.tar.gz +sha256 14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f flit_core-3.7.1.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 8971223d1f..0e058a1f17 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_SETUP_TYPE = pep517 -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 21:38:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 14:38:57 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-installer: bump to version 0.5.1 Message-ID: <20220311213857.3962466-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-installer/python-installer.hash | 4 ++-- package/python-installer/python-installer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash index 68af457664..543bd0fa62 100644 --- a/package/python-installer/python-installer.hash +++ b/package/python-installer/python-installer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/installer/json -md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz -sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +md5 bf17db5e6b58c4cfa33642f5348d3814 installer-0.5.1.tar.gz +sha256 f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445 installer-0.5.1.tar.gz # Locally computed sha256 checksums sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 82739a8003..862a251415 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_VERSION = 0.5.1 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = distutils -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 21:49:50 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 14:49:50 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 60.9.3 Message-ID: <20220311214950.3965757-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index e04235e041..1a378d1b76 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz -sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz +md5 6c6a97cf68e1db789a2e5c054f067278 setuptools-60.9.3.tar.gz +sha256 2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 setuptools-60.9.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8653c42259..3309cd9df4 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.8.2 +PYTHON_SETUPTOOLS_VERSION = 60.9.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/14/74/54890935244ce053abcc4fa01ef4982a84743a8d128d4cf5eae56e2d156c PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From peter at korsgaard.com Fri Mar 11 21:56:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:56:34 +0100 Subject: [Buildroot] [git commit] Makefile: unexport 'DEVICE_TREE' environment variable In-Reply-To: <20220223135658.66C7883845@busybox.osuosl.org> (Yann E. MORIN's message of "Wed, 23 Feb 2022 15:03:18 +0100") References: <20220223135658.66C7883845@busybox.osuosl.org> Message-ID: <877d90xiel.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=d3910057c6ae38e2cf72e8c86cd84756fffba2ac > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > U-Boot looks for the environment variable DEVICE_TREE and uses its value if > set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since > v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting > default FIT configuration) - So unexport it like we do for other > "troublesome" environment variables to ensure consistent behaviour. > Reported-by: Neal Frager > Signed-off-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 11 21:56:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:56:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220311214814.5175783CAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d7b0e8c1ed1e15ef6841c979b75c47695f6b134 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d3910057c6ae38e2cf72e8c86cd84756fffba2ac) Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a3dfc52f51..9dc0a8673c 100644 --- a/Makefile +++ b/Makefile @@ -420,6 +420,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From james.hilliard1 at gmail.com Fri Mar 11 22:50:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 15:50:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cssselect2: bump to version 0.5.0 Message-ID: <20220311225053.3970847-1-james.hilliard1@gmail.com> Migrate to new flit based build. Signed-off-by: James Hilliard --- package/python-cssselect2/python-cssselect2.hash | 4 ++-- package/python-cssselect2/python-cssselect2.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cssselect2/python-cssselect2.hash b/package/python-cssselect2/python-cssselect2.hash index ed5b863302..fd892e297f 100644 --- a/package/python-cssselect2/python-cssselect2.hash +++ b/package/python-cssselect2/python-cssselect2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect2/json -md5 6dfd5963c8a5d85f2634d1650b1ddfe1 cssselect2-0.4.1.tar.gz -sha256 93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8 cssselect2-0.4.1.tar.gz +md5 6206ebccfdd9fc02196f60e830fa7b1f cssselect2-0.5.0.tar.gz +sha256 d98a7bbdd8ebc46093279195d669a3359bd5a23f90c19e82c19d9eeef333e617 cssselect2-0.5.0.tar.gz # Locally computed sha256 checksums sha256 6fd97229a1d1b0f6a8b41e109f413426dbc0874b1e03746d66cc33282601c2c2 LICENSE diff --git a/package/python-cssselect2/python-cssselect2.mk b/package/python-cssselect2/python-cssselect2.mk index 18e0fba839..b3ddf41fef 100644 --- a/package/python-cssselect2/python-cssselect2.mk +++ b/package/python-cssselect2/python-cssselect2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_CSSSELECT2_VERSION = 0.4.1 +PYTHON_CSSSELECT2_VERSION = 0.5.0 PYTHON_CSSSELECT2_SOURCE = cssselect2-$(PYTHON_CSSSELECT2_VERSION).tar.gz -PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0 -PYTHON_CSSSELECT2_SETUP_TYPE = distutils +PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ce/e7/1333b9042beb33a9bb425900b6d9b59035b98c31c950a323d14ceca1275e +PYTHON_CSSSELECT2_SETUP_TYPE = flit PYTHON_CSSSELECT2_LICENSE = BSD-3-Clause PYTHON_CSSSELECT2_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 22:56:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 15:56:09 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyphen: bump to version 0.12.0 Message-ID: <20220311225609.3975018-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 75ee909351..14938de9c4 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 f8ec095e4fe30dc2b518a918788b33ed pyphen-0.11.0.tar.gz -sha256 e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8 pyphen-0.11.0.tar.gz +md5 99a01a3806cc750c242cae330429a90f pyphen-0.12.0.tar.gz +sha256 b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b pyphen-0.12.0.tar.gz # Locally computed sha256 checksums sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 80f67c77c7..ac0bcf8aab 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.11.0 +PYTHON_PYPHEN_VERSION = 0.12.0 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/f8/af869a4983c1b3159945479510260985714265d48baf27d61f72b1ec8cbf -PYTHON_PYPHEN_SETUP_TYPE = distutils +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/0e/21/9e0841aa76db69e2d74cd64ea2271151d7332fa627a5f03eb0d9ccf3da87 +PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 23:30:50 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 16:30:50 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.48 Message-ID: <20220311233050.4686-1-james.hilliard1@gmail.com> Set new x11-xfixes meson config option. Signed-off-by: James Hilliard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index a9d59663ae..e6fad56698 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 +sha256 68bbf83b4c12bbcaef5d4bfb0dda86177583cf0abe0026efcfedd837b2e4926e pipewire-0.3.48.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..80246cc8d0 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.45 +PIPEWIRE_VERSION = 0.3.48 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -136,6 +136,13 @@ else PIPEWIRE_CONF_OPTS += -Dx11=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled +PIPEWIRE_DEPENDENCIES += xlib_libXfixes +else +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb -- 2.25.1 From christian at paral.in Sat Mar 12 04:55:52 2022 From: christian at paral.in (Christian Stewart) Date: Fri, 11 Mar 2022 20:55:52 -0800 Subject: [Buildroot] sshd: fails with seccomp issue on arm Message-ID: Hi all, Running sshd on an odroid xu4 (armv7) w/ Buildroot 2022.02: connections fail with seccomp errors: SECCOMP auid=4294967295 uid=103 gid=105 ses=4294967295 pid=1041 comm="sshd" exe="/usr/sbin/sshd" sig=31 arch=40000028 syscall=414 compat=0 ip=0xb6bf41b0 code=0x0 I found this relevant issue & patch added to gentoo to fix this: https://www.mail-archive.com/debian-bugs-dist at lists.debian.org/msg1844602.html https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc55aee6b2534bbc8d8fe12128c1083ee6850 Shall we include this patch in Buildroot as well? https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch I also ran into a build error with fzero-call-regs, there is a patch to fix that too: https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch Thanks & best, Christian Stewart From thomas at ruschival.de Sat Mar 12 10:44:01 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Sat, 12 Mar 2022 11:44:01 +0100 Subject: [Buildroot] [PATCH 0/1] Bump pistache, switch to meson build (test-pkg fails) Message-ID: <20220312104402.33075-1-thomas@ruschival.de> The pistache project has moved to meson build and cmake build seems to be neglected e.g. the cmake build on host did no longer install header files. This patch switches to meson build. As a nice side effect newer upstream versions already include the patches by Fabrice Fontaine so the buildroot package does no longer need the patch files. The upstream project now has a hard dependency to RapidJSON. While I tested it with a full build for Raspberry Pi Zero W and BananaPi, I can't get it to work with utils/test-pkg. I set in pistache.cfg: BR2_PACKAGE_PISTACHE=y BR2_PACKAGE_RAPIDJSON=y and ran ./utils/test-pkg -c ./pistache.cfg -p pistache -d br-test The meson-build fails complaining about missing rapidjson. I am not sure if my patch is broken or if I am just don't use the tools correctly. Any help appreciated. regards Thomas Thomas Ruschival (1): package/pistache: bump version & switch to meson build ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 9 +- 6 files changed, 11 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch -- 2.30.2 From thomas at ruschival.de Sat Mar 12 10:44:02 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Sat, 12 Mar 2022 11:44:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312104402.33075-1-thomas@ruschival.de> References: <20220312104402.33075-1-thomas@ruschival.de> Message-ID: <20220312104402.33075-2-thomas@ruschival.de> While upstream pistache has not yet released a stable 'tag' a lot has changed since June 2020: * project has moved to meson build system, cmake builds do not install headers. * patches in buildroot are no longer required * project-implemented Pistache::Optional was replaced by use of std::optional. This is only available in C++17 * dependency to rapidjson has been introduced Signed-off-by: Thomas Ruschival --- ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 9 +- 6 files changed, 11 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d..0000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec..0000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a..0000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210a..806c27077a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,23 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_RAPIDJSON depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7..9a2cd1d1f9 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea..0f49ad12db 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,7 +4,7 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE @@ -13,9 +13,10 @@ PISTACHE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) -- 2.30.2 From mohd.faiz.rohani at gmail.com Sat Mar 12 11:12:11 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sat, 12 Mar 2022 19:12:11 +0800 Subject: [Buildroot] User and Group Utility in Buildroot In-Reply-To: <8db51f93-0b22-57b3-5a99-a4199277ea91@163.com> References: <8db51f93-0b22-57b3-5a99-a4199277ea91@163.com> Message-ID: On Fri, Mar 11, 2022 at 8:47 PM TIAN Yuanhao wrote: > These tools seem to come from _shadow_, which Buildroot doesn't have. > Thank you for the information. I have read the buildroot user manual and found out that users and groups are created with the BR2_ROOTFS_USERS_TABLES. The format can be found at section 9.6 of the Buildroot manual. Thanks. Faiz > Thanks, > Yuanhao > On 3/10/22 23:10, Mohd Faiz Rohani wrote: > > Hi Guys > > > > I need help here. I could not find the correct utils for the Linux > > user and group management (useradd groupadd etc. etc.) in the > > Buildroot packages. Can anyone show me which utils I need to select in > > order to activate this?. Fyi I'm using buildroot-2022.02-rc3. > > > > Thank you > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From nicolas.cavallari at green-communications.fr Sat Mar 12 12:24:31 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Sat, 12 Mar 2022 13:24:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312104402.33075-2-thomas@ruschival.de> References: <20220312104402.33075-1-thomas@ruschival.de> <20220312104402.33075-2-thomas@ruschival.de> Message-ID: Hello, On 12/03/2022 11:44, Thomas Ruschival wrote: > While upstream pistache has not yet released a stable 'tag' > a lot has changed since June 2020: > > * project has moved to meson build system, cmake builds > do not install headers. > * patches in buildroot are no longer required > * project-implemented Pistache::Optional was replaced by > use of std::optional. This is only available in C++17 > * dependency to rapidjson has been introduced > [...] > diff --git a/package/pistache/Config.in b/package/pistache/Config.in > index 96aed5210a..806c27077a 100644 > --- a/package/pistache/Config.in > +++ b/package/pistache/Config.in > @@ -1,22 +1,23 @@ > config BR2_PACKAGE_PISTACHE > bool "pistache" > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_RAPIDJSON > depends on !BR2_TOOLCHAIN_USES_UCLIBC > depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > help > Pistache is a modern and elegant HTTP and REST framework > - for C++. It is entirely written in pure C++14 and provides > + for C++. It is entirely written in pure C++17 and provides > a clear and pleasant API. > > https://github.com/oktal/pistache > [...] > --- a/package/pistache/pistache.mk > +++ b/package/pistache/pistache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d > +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 > PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) > PISTACHE_LICENSE = Apache-2.0 > PISTACHE_LICENSE_FILES = LICENSE You need to add rapidjson to PISTACHE_DEPENDENCIES in pistache.mk, otherwise pistache may be compiled before rapidjson or without rapidjson's headers and libraries. The "depends on" in Config.in only ensures that rapidjson must be enabled if pistache is to be enabled. It does not impose any order. From thomas.petazzoni at bootlin.com Sat Mar 12 14:59:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 12 Mar 2022 15:59:13 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311123636.13415-2-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> Message-ID: <20220312155913.280739e0@windsurf> Hello, On Fri, 11 Mar 2022 13:36:30 +0100 Cl?ment L?ger wrote: > Enable host package and add needed dependencies. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index a524f729c8..4ff61c7f86 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > host-python-cffi \ > host-rustc \ > openssl > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + openssl Also, I am actually surprised this is enough. Indeed, there are some parts in Rust in python-cryptography, so we have quite some extra variables for the target packages to handle this: PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml For the last 3 variables, I can explain that it possibly worked for you because you perhaps already had the python-cryptography tarball in DL_DIR downloaded by the host variant of the package. But if you remove this tarball, and build just the host variant, I would suspect that it will fail to build. However, I can't really explain why your package works without HOST_PYTHON_CRYTOGRAPHY_ENV. Make sure to do a clean build in a Docker container that doesn't have Rust installed (there is an official Buildroot Docker image that is available for this kind of testing). Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Sat Mar 12 16:00:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:00:45 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220311082413.4bfe7465@gmx.net> References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> <20220311082413.4bfe7465@gmx.net> Message-ID: <3ce1b58b-7721-a63a-4503-11e89fd55f22@mind.be> On 11/03/2022 08:24, Peter Seiderer wrote: > Hello Arnout, > > On Thu, 10 Mar 2022 22:03:23 +0100, Arnout Vandecappelle wrote: > >> On 10/03/2022 21:38, Peter Seiderer wrote: >>> Hello John, >>> >>> thanks for the patch, some minor nitpicks... >>> >>> Better patch subject would be: >>> >>> package/openssh: add upstream patch to add seccomp ppoll_time64 support >> >> Applied to master with this changed. >> >>> >>> On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: >>> >>>> sshd is broken on 32-bit systems because ppoll_time64 is used by the >>>> application although it is not allowed by the seccomp filter. >>>> >>>> Apply the upstream patch to fix this. >>> >>> Better: >>> >>> -add upstream patch ([1] to add seccomp ppoll_time64 support >> >> Since the subject now already says that it adds seccomp ppoll_time64 support, >> this is redundant. Since I'm lazy :-), I didn't change this. >> >>> >>> [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch >> >> There's already a reference to the upstream commit in the patch itself, so >> this is not really needed. >> >>> >>>> >>>> Signed-off-by: John Keeping >>>> --- >>>> ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ >>>> 1 file changed, 31 insertions(+) >>>> create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >>>> >>>> diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >>>> new file mode 100644 >>>> index 0000000000..34b309bd9a >>>> --- /dev/null >>>> +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >>>> @@ -0,0 +1,31 @@ >>>> +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 >>>> +From: Darren Tucker >>>> +Date: Sat, 26 Feb 2022 14:06:14 +1100 >>>> +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. >>>> + >>>> +Should fix sandbox violations on (some? at least i386 and armhf) 32bit >>>> +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at >>>> +debian.org via bz#3396. >>>> + >>> >>> Missing: >>> >>> [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] >> >> Except for the signoff, the patch is literally the upstream patch, including >> the sha1 in the From line. So an upstream reference is not really needed. Still, >> it's useful so I overcame my laziness and added it. > > But the sha1 alone does not tell to which git repo it belongs to, but the explicit > upstream link does (and has the nice effect to gain a one-click link to the > corresponding patch/merge-request etc.) and is a prominent remainder in case > of package version bump where the patch comes from... I don't know about you, but the normal way that I generate patches is to clone the repo and do 'git format-patch -1 ', and then add my SoB. And if it doesn't apply cleanly, I first do 'git cherry-pick -x -s'. Obviously it's helpful to have a link there. However, requiring contributors to go and find the upstream web frontend and construct a URL is IMHO asking a lot, especially since chances are that no one is ever going to actually look at that link. There's already plenty of steps a contributor has to go through, I don't want to increase the threshold even more. Regards, Arnout > > Regards, > Peter > >> >> Regards, >> Arnout >> >> >>>> +Signed-off-by: John Keeping >>>> +--- >>>> + sandbox-seccomp-filter.c | 3 +++ >>>> + 1 file changed, 3 insertions(+) >>>> + >>>> +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c >>>> +index 2e065ba3..4ce80cb2 100644 >>>> +--- a/sandbox-seccomp-filter.c >>>> ++++ b/sandbox-seccomp-filter.c >>>> +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { >>>> + #ifdef __NR_ppoll >>>> + SC_ALLOW(__NR_ppoll), >>>> + #endif >>>> ++#ifdef __NR_ppoll_time64 >>>> ++ SC_ALLOW(__NR_ppoll_time64), >>>> ++#endif >>>> + #ifdef __NR_poll >>>> + SC_ALLOW(__NR_poll), >>>> + #endif >>>> +-- >>>> +2.35.1 >>>> + >>> >>> With this fixed you can add my >>> >>> Reviewed-by: Peter Seiderer >>> >>> Regards, >>> Peter >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sat Mar 12 16:03:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:03:47 +0100 Subject: [Buildroot] error during cpio build failing to rm In-Reply-To: <20220311171325.jwcww5qb7ao5vnpy@hetzy.fluff.org> References: <20220311171325.jwcww5qb7ao5vnpy@hetzy.fluff.org> Message-ID: On 11/03/2022 18:13, Ben Dooks wrote: > I'm getting the following error with upstream buildroot: > > rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/tmp/..' > make: *** [fs/cpio/cpio.mk:74: /home/ben/project/buildroot/output/images/rootfs.c > > I've temprarily fixed this with: > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..6bb993663f 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/tmp/*" >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > > It looks like this was introduced in 5e78e7e97d772124f0d31653aca33731abe5b4db > > Author: Norbert Lange > Date: Sat Jun 6 00:48:57 2020 +0200 > > fs: clean the volatile /run and /tmp directories > > > Any ideas on how to fix properly? There's already a patch submitted [1]. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220310120256.GA11974 at parad0x.org/ From arnout at mind.be Sat Mar 12 16:06:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:06:57 +0100 Subject: [Buildroot] sshd: fails with seccomp issue on arm In-Reply-To: References: Message-ID: <105a4a50-cc20-9286-4121-96847904e5e6@mind.be> On 12/03/2022 05:55, Christian Stewart via buildroot wrote: > Hi all, > > Running sshd on an odroid xu4 (armv7) w/ Buildroot 2022.02: > > connections fail with seccomp errors: > > SECCOMP auid=4294967295 uid=103 gid=105 ses=4294967295 pid=1041 > comm="sshd" exe="/usr/sbin/sshd" sig=31 arch=40000028 syscall=414 > compat=0 ip=0xb6bf41b0 code=0x0 > > I found this relevant issue & patch added to gentoo to fix this: > > https://www.mail-archive.com/debian-bugs-dist at lists.debian.org/msg1844602.html > > https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc55aee6b2534bbc8d8fe12128c1083ee6850 > > Shall we include this patch in Buildroot as well? You mean [1] ? > > https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch > > I also ran into a build error with fzero-call-regs, there is a patch > to fix that too: > > https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch As in [2] ? Regards, Arnout [1] https://git.buildroot.net/buildroot/commit/?id=10c1d887d6082d8806b38b86097c212c4c3ec8f9 [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220311065511.14015-1-ps.report at gmx.net/ From yann.morin.1998 at free.fr Sat Mar 12 16:19:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:19:12 +0100 Subject: [Buildroot] [PATCH v2] fs/common.mk: fix the globing pattern In-Reply-To: <20220310120256.GA11974@parad0x.org> References: <20220310101826.GA2353@parad0x.org> <20220310120256.GA11974@parad0x.org> Message-ID: <20220312161912.GF283544@scaer> Mathieu, All, On 2022-03-10 13:02 +0100, Mathieu Mirmont via buildroot spake thusly: > The FAKEROOT script uses [^x] wildcard patterns which, while supported > by many shells and interpreted like a regex, are undefined according > to POSIX. > > The dash shell (/bin/sh) on Debian testing switched to a different > fnmatch/glob implementation that does not support [^x]. Instead it > treats [^x] as either "^" or "x", and as a result buildroot fails to > build on this distro: > > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' > > The correct form should be [!x] rather than [^x]. > > Signed-off-by: Mathieu Mirmont > --- > fs/common.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..64a94d9ad8 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) I think I preferred your find-based solution, because, as far as I understand, this is still broken, as it won't match files named, for example "..foo" The find-based solution, though, should work for everything and does not risk any issue with badly interpreted blobs in varios shells and various shell versions. Regards, Yann E. MORIN. > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > -- > 2.35.1 > Changes v1 -> v2: > - Fix the regex rather than use find|xargs (suggested by Edgar Bonet & David Laight) > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 16:24:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:24:01 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <3ce1b58b-7721-a63a-4503-11e89fd55f22@mind.be> References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> <20220311082413.4bfe7465@gmx.net> <3ce1b58b-7721-a63a-4503-11e89fd55f22@mind.be> Message-ID: <20220312162401.GG283544@scaer> Arnout, Peter, All, On 2022-03-12 17:00 +0100, Arnout Vandecappelle spake thusly: > On 11/03/2022 08:24, Peter Seiderer wrote: > >But the sha1 alone does not tell to which git repo it belongs to, but the explicit > >upstream link does (and has the nice effect to gain a one-click link to the > >corresponding patch/merge-request etc.) and is a prominent remainder in case > >of package version bump where the patch comes from... > I don't know about you, but the normal way that I generate patches is to > clone the repo and do 'git format-patch -1 ', and then add my SoB. And > if it doesn't apply cleanly, I first do 'git cherry-pick -x -s'. Exactly what I do too, with an additional tag just before my SoB: [yann.morin.1998 at free.fr: backport from upstream] Signed-off-by: Yann E. MORIN > Obviously it's helpful to have a link there. However, requiring > contributors to go and find the upstream web frontend and construct a URL is > IMHO asking a lot, especially since chances are that no one is ever going to > actually look at that link. There's already plenty of steps a contributor > has to go through, I don't want to increase the threshold even more. I fully subscribe to Arnout's position. I only add an URL to the original patch if it was grabbed fro; a pending PR/MR/BZ/.. or a third-party tree. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 16:45:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:45:21 +0100 Subject: [Buildroot] [git commit] fs/common.mk: use find instead of shell glob patterns Message-ID: <20220312164122.04C5782A6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38c4f6b807e9b519922172089915559fb8642046 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Different shells can have different behaviours when it comes to globbing patterns. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that results in this new behaviour: Using bash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.[^.]* Using dash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.. The current FAKEROOT script uses this shell glob pattern which now fails on recent Debian testing systems: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' Additionally, the glob will miss files which have at least two leading dots, like ..foo ...bar or ......buz (highly improbable, but still). It seems safer to use `find | xargs rm` here instead of relying on shell globbing patterns. Signed-off-by: Mathieu Mirmont Signed-off-by: Yann E. MORIN --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..37eafac4f7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) From yann.morin.1998 at free.fr Sat Mar 12 16:52:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> References: <20220310101826.GA2353@parad0x.org> Message-ID: <20220312165226.GH283544@scaer> Mathieu, All, On 2022-03-10 11:18 +0100, Mathieu Mirmont via buildroot spake thusly: > Different shells can have different behaviours when it comes to > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > to a different fnmatch/glob implementation that results in this new > behaviour: > > Using bash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.[^.]* > > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. > > The current FAKEROOT script uses this shell glob pattern which now > fails on recent Debian testing systems: > > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' > > It seems safer to use `find | xargs rm` here instead of relying on > shell globbing patterns. > > Signed-off-by: Mathieu Mirmont I applied to master, after adding a little blurb about the ..foo files that would be missed with globs. > --- > fs/common.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..37eafac4f7 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) > + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) That could have been a single call to find: find $$(TARGET_DIR)/run/ $$(TARGET_DIR)/tmp/ -mindepth 1 [...] but there not much loss calling it twice, and the lines are shorter, which is nicer too, so I kept it as is. Applied to master, thanks. Regards, Yann E. MORIN. > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 16:56:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:56:18 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/intel-mediadriver: bump version to 22.2.1 In-Reply-To: <20220217183553.210835-1-bernd.kuhls@t-online.de> References: <20220217183553.210835-1-bernd.kuhls@t-online.de> Message-ID: <314366e5-64bd-57ea-284c-a21374d0bb91@mind.be> On 17/02/2022 19:35, Bernd Kuhls wrote: > Removed patch which was applied upstream: > https://github.com/intel/media-driver/commit/8eab97af6e1c41fc7b9d72999ecb1c22d9e52db6 > > Signed-off-by: Bernd Kuhls Both applied to master, thanks. Regards, Arnout > --- > ...001-Add-MEDIA-BUILD-HARDENING-option.patch | 106 ------------------ > .../intel-mediadriver/intel-mediadriver.hash | 2 +- > .../intel-mediadriver/intel-mediadriver.mk | 2 +- > 3 files changed, 2 insertions(+), 108 deletions(-) > delete mode 100644 package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch > > diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch > deleted file mode 100644 > index 968445759a..0000000000 > --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch > +++ /dev/null > @@ -1,106 +0,0 @@ > -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Wed, 11 Aug 2021 21:34:59 +0200 > -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option > - > -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening > -options such as stack-protector-all or FORTIFY SOURCE 2 which are not > -always available (e.g. fortify source 2 is only available on glibc >= 6 > -and not musl/uclibc-ng) > - > -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 > - > -Signed-off-by: Fabrice Fontaine > -Signed-off-by: Bernd Kuhls > -[Bernd: rebased for version 21.4.1] > ---- > - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- > - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- > - media_driver/media_top_cmake.cmake | 8 +++++++- > - 3 files changed, 27 insertions(+), 7 deletions(-) > - > -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt > -index 65f71ceef..b066138d9 100644 > ---- a/cmrtlib/linux/CMakeLists.txt > -+++ b/cmrtlib/linux/CMakeLists.txt > -@@ -32,12 +32,18 @@ else() > - endif() > - > - # Set up compile options that will be used for the Linux build > --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") > --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") > -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") > -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") > - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") > --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") > --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") > -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") > -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") > - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") > -+if(MEDIA_BUILD_HARDENING) > -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") > -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") > -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") > -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") > -+endif() > - if(MEDIA_BUILD_FATAL_WARNINGS) > - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") > - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") > -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake > -index 7a2bd64b6..98896b131 100755 > ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake > -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake > -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON > - # Other common flags > - -fmessage-length=0 > - -fvisibility=hidden > -- -fstack-protector > - -fdata-sections > - -ffunction-sections > - -Wl,--gc-sections > -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON > - -g > - ) > - > -+if(MEDIA_BUILD_HARDENING) > -+ set(MEDIA_COMPILER_FLAGS_COMMON > -+ ${MEDIA_COMPILER_FLAGS_COMMON} > -+ -fstack-protector) > -+endif() > - > - if(${UFO_MARCH} STREQUAL "slm") > - set(MEDIA_COMPILER_FLAGS_COMMON > -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") > - set(MEDIA_COMPILER_FLAGS_RELEASE > - ${MEDIA_COMPILER_FLAGS_RELEASE} > - -O2 > -- -D_FORTIFY_SOURCE=2 > - -fno-omit-frame-pointer > - ) > -+ if(MEDIA_BUILD_HARDENING) > -+ set(MEDIA_COMPILER_FLAGS_RELEASE > -+ ${MEDIA_COMPILER_FLAGS_RELEASE} > -+ -D_FORTIFY_SOURCE=2) > -+ endif() > - endif() > - > - if(NOT ${PLATFORM} STREQUAL "android") > -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake > -index f089ea45f..b0b428914 100755 > ---- a/media_driver/media_top_cmake.cmake > -+++ b/media_driver/media_top_cmake.cmake > -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) > - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") > - endif() > - > --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") > -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") > -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) > -+if(MEDIA_BUILD_HARDENING) > -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") > -+endif() > -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) > -+ > - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") > - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") > - > diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash > index ceafa20e80..7c615620ae 100644 > --- a/package/intel-mediadriver/intel-mediadriver.hash > +++ b/package/intel-mediadriver/intel-mediadriver.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz > +sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz > sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md > diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk > index d8820379e7..4895c1535d 100644 > --- a/package/intel-mediadriver/intel-mediadriver.mk > +++ b/package/intel-mediadriver/intel-mediadriver.mk > @@ -6,7 +6,7 @@ > > # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack > > -INTEL_MEDIADRIVER_VERSION = 22.1.1 > +INTEL_MEDIADRIVER_VERSION = 22.2.1 > INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive > INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz > INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sat Mar 12 16:58:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:58:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.12 In-Reply-To: <20220218105924.738666-1-fontaine.fabrice@gmail.com> References: <20220218105924.738666-1-fontaine.fabrice@gmail.com> Message-ID: On 18/02/2022 11:59, Fabrice Fontaine wrote: > https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/lxc/lxc.hash | 2 +- > package/lxc/lxc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash > index 2b58df2f1d..d460bc6a01 100644 > --- a/package/lxc/lxc.hash > +++ b/package/lxc/lxc.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz > +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk > index 08f64bcec7..9311dc8775 100644 > --- a/package/lxc/lxc.mk > +++ b/package/lxc/lxc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LXC_VERSION = 4.0.11 > +LXC_VERSION = 4.0.12 > LXC_SITE = https://linuxcontainers.org/downloads/lxc > LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ > LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From arnout at mind.be Sat Mar 12 16:58:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:58:43 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tvheadend: bump version In-Reply-To: <20220217184836.418858-1-bernd.kuhls@t-online.de> References: <20220217184836.418858-1-bernd.kuhls@t-online.de> Message-ID: <994c5deb-cd52-508c-1041-a4679de3be49@mind.be> On 17/02/2022 19:48, Bernd Kuhls wrote: > Removed patch which was applied upstream: > https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > .../0002-configure-add-execinfo-option.patch | 55 ------------------- > package/tvheadend/tvheadend.hash | 2 +- > package/tvheadend/tvheadend.mk | 2 +- > 3 files changed, 2 insertions(+), 57 deletions(-) > delete mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch > > diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch > deleted file mode 100644 > index c55d127d58..0000000000 > --- a/package/tvheadend/0002-configure-add-execinfo-option.patch > +++ /dev/null > @@ -1,55 +0,0 @@ > -From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 1 Jan 2022 16:53:29 +0100 > -Subject: [PATCH] configure: add execinfo option > - > -Add execinfo option to allow the user to disable the feature even if > -execinfo.h is found on the system > - > -Signed-off-by: Fabrice Fontaine > -[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] > ---- > - configure | 17 +++++++++++++++-- > - 1 file changed, 15 insertions(+), 2 deletions(-) > - > -diff --git a/configure b/configure > -index 4dad024c4..c087502bf 100755 > ---- a/configure > -+++ b/configure > -@@ -75,6 +75,7 @@ OPTIONS=( > - "ddci:yes" > - "cclang_threadsan:no" > - "gperftools:no" > -+ "execinfo:auto" > - ) > - > - # > -@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then > - # If we don't have libunwind then fallback to execinfo. > - if ! enabled libunwind > - then > -- check_cc_header execinfo > -+ if enabled_or_auto execinfo; then > -+ if check_cc_header execinfo; then > -+ enable execinfo > -+ else > -+ die "execinfo.h not found (use --disable-execinfo)" > -+ fi > -+ fi > - fi > - > - else > -- check_cc_header execinfo > -+ if enabled_or_auto execinfo; then > -+ if check_cc_header execinfo; then > -+ enable execinfo > -+ else > -+ die "execinfo.h not found (use --disable-execinfo)" > -+ fi > -+ fi > - fi > - check_cc_option mmx > - check_cc_option sse2 > --- > -2.33.0 > - > diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash > index db06af53b7..44ff745221 100644 > --- a/package/tvheadend/tvheadend.hash > +++ b/package/tvheadend/tvheadend.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz > +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz > sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md > diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk > index 58ebdcb054..d2547b8746 100644 > --- a/package/tvheadend/tvheadend.mk > +++ b/package/tvheadend/tvheadend.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 > +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 > TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) > TVHEADEND_LICENSE = GPL-3.0+ > TVHEADEND_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 16:58:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:58:56 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.4.0 In-Reply-To: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> References: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> Message-ID: <4993faaa-e51c-0f7c-6a1a-e4ca123dd1f3@mind.be> On 18/02/2022 18:36, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > package/harfbuzz/harfbuzz.hash | 2 +- > package/harfbuzz/harfbuzz.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash > index 61f2865563..e4674afa87 100644 > --- a/package/harfbuzz/harfbuzz.hash > +++ b/package/harfbuzz/harfbuzz.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz > +sha256 7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952 harfbuzz-3.4.0.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index 1f5dfa8822..331b35c530 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 3.3.2 > +HARFBUZZ_VERSION = 3.4.0 > HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) > HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz > HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sat Mar 12 16:59:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:10 +0100 Subject: [Buildroot] [PATCH] package/trace-cmd: bump to version 2.9.7 In-Reply-To: <20220218173613.315794-2-giulio.benetti@benettiengineering.com> References: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> <20220218173613.315794-2-giulio.benetti@benettiengineering.com> Message-ID: <9d00d702-8cb5-7738-364a-c4c4e967e88a@mind.be> On 18/02/2022 18:36, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > package/trace-cmd/trace-cmd.hash | 2 +- > package/trace-cmd/trace-cmd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash > index 00cecc7828..4d39e4d5ea 100644 > --- a/package/trace-cmd/trace-cmd.hash > +++ b/package/trace-cmd/trace-cmd.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz > +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz > sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING > sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB > sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 > diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk > index fe0cd71ec4..52bb99036c 100644 > --- a/package/trace-cmd/trace-cmd.mk > +++ b/package/trace-cmd/trace-cmd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TRACE_CMD_VERSION = 2.9.6 > +TRACE_CMD_VERSION = 2.9.7 > TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz > TRACE_CMD_SITE = \ > https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From arnout at mind.be Sat Mar 12 16:59:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:29 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-zattoo: bump version to 19.7.11-Matrix In-Reply-To: <20220218190403.475643-1-bernd.kuhls@t-online.de> References: <20220218190403.475643-1-bernd.kuhls@t-online.de> Message-ID: <94f4ba32-a06a-671e-1bb5-a59a8b5587c6@mind.be> On 18/02/2022 20:04, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- > package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash > index ac4960df92..0b88d5c747 100644 > --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash > +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz > +sha256 07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 kodi-pvr-zattoo-19.7.11-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > index 7a3b230e8b..95c5de0925 100644 > --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix > +KODI_PVR_ZATTOO_VERSION = 19.7.11-Matrix > KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) > KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ > KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 16:59:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.20.0 In-Reply-To: <20220218211458.197332-1-egorenar@linux.ibm.com> References: <20220218211458.197332-1-egorenar@linux.ibm.com> Message-ID: <60962d31-05a8-5f8b-c3cd-e149d81a2eb3@mind.be> On 18/02/2022 22:14, Alexander Egorenkov wrote: > Fixes: > - https://release-monitoring.org/project/10714/ > > Signed-off-by: Alexander Egorenkov Applied to master, thanks. Regards, Arnout > --- > package/s390-tools/s390-tools.hash | 2 +- > package/s390-tools/s390-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash > index 13c68fbf52f4..6ea8f7ea2076 100644 > --- a/package/s390-tools/s390-tools.hash > +++ b/package/s390-tools/s390-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz > +sha256 6fa6add92e896541c0ef74885a4084474fc0d77049e8ac7372872a70a46ddd74 s390-tools-2.20.0.tar.gz > sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE > diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk > index 328986bcb37c..3c386af6fd10 100644 > --- a/package/s390-tools/s390-tools.mk > +++ b/package/s390-tools/s390-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -S390_TOOLS_VERSION = 2.19.0 > +S390_TOOLS_VERSION = 2.20.0 > S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) > S390_TOOLS_LICENSE = MIT > S390_TOOLS_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 16:59:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:58 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.28 In-Reply-To: <20220219102309.15465-1-guillaume.bressaix@gmail.com> References: <20220219102309.15465-1-guillaume.bressaix@gmail.com> Message-ID: <32c388f8-e0af-3d4e-f370-1d9dece6c1ae@mind.be> On 19/02/2022 11:23, Guillaume W. Bres wrote: > Signed-off-by: Guillaume W. Bres Applied to master, thanks. Regards, Arnout > --- > package/libxcrypt/libxcrypt.hash | 2 +- > package/libxcrypt/libxcrypt.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash > index 99ddf62be0..bdda6b47c0 100644 > --- a/package/libxcrypt/libxcrypt.hash > +++ b/package/libxcrypt/libxcrypt.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz > +sha256 db7e37901969cb1d1e8020cb73a991ef81e48e31ea5b76a101862c806426b457 libxcrypt-4.4.28.tar.gz > sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk > index 65efa2bab9..f7a0fd4308 100644 > --- a/package/libxcrypt/libxcrypt.mk > +++ b/package/libxcrypt/libxcrypt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBXCRYPT_VERSION = 4.4.27 > +LIBXCRYPT_VERSION = 4.4.28 > LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) > LIBXCRYPT_LICENSE = LGPL-2.1+ > LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From arnout at mind.be Sat Mar 12 17:00:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:00:14 +0100 Subject: [Buildroot] [PATCH] package/libnids: bump version to 1.26 In-Reply-To: <20220219103507.29176-1-guillaume.bressaix@gmail.com> References: <20220219103507.29176-1-guillaume.bressaix@gmail.com> Message-ID: <22bed9cc-6ba8-f83c-f7c3-7a538f7f65eb@mind.be> On 19/02/2022 11:35, Guillaume W. Bres wrote: > Change repo source to official github.com repository which > is actively maintained. Previous sourceforge.net sources > remained untouched since 2010. > > Signed-off-by: Guillaume W. Bres Applied to master, thanks. Regards, Arnout > --- > package/libnids/libnids.hash | 4 ++-- > package/libnids/libnids.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash > index 4a2949c39d..e51dbf151c 100644 > --- a/package/libnids/libnids.hash > +++ b/package/libnids/libnids.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz > -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING > +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz > +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING > diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk > index 3e36838c40..57e68654dc 100644 > --- a/package/libnids/libnids.mk > +++ b/package/libnids/libnids.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBNIDS_VERSION = 1.24 > -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) > +LIBNIDS_VERSION = 1.26 > +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION),$(LIBNIDS_VERSION).tar.gz) > LIBNIDS_LICENSE = GPL-2.0 > LIBNIDS_LICENSE_FILES = COPYING > LIBNIDS_CPE_ID_VENDOR = libnids_project From arnout at mind.be Sat Mar 12 17:00:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:00:37 +0100 Subject: [Buildroot] [PATCH/next] package/grpc: bump to version 1.44.0 In-Reply-To: <20220221082724.2744765-1-buildroot@heine.tech> References: <20220221082724.2744765-1-buildroot@heine.tech> Message-ID: <81d17b09-3922-0e8c-6acf-a36432dc382e@mind.be> On 21/02/2022 09:27, Michael Nosthoff via buildroot wrote: > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Arnout > --- > package/grpc/grpc.hash | 2 +- > package/grpc/grpc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash > index 3da1d9a323..6db2acd759 100644 > --- a/package/grpc/grpc.hash > +++ b/package/grpc/grpc.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz > +sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz > sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index 5d8201f12f..23b92f1750 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GRPC_VERSION = 1.43.0 > +GRPC_VERSION = 1.44.0 > GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) > GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) > GRPC_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Mar 12 17:00:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:00:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312104402.33075-2-thomas@ruschival.de> References: <20220312104402.33075-1-thomas@ruschival.de> <20220312104402.33075-2-thomas@ruschival.de> Message-ID: <20220312170048.GI283544@scaer> Thomas, All, On 2022-03-12 11:44 +0100, Thomas Ruschival spake thusly: > While upstream pistache has not yet released a stable 'tag' > a lot has changed since June 2020: > > * project has moved to meson build system, cmake builds > do not install headers. > * patches in buildroot are no longer required > * project-implemented Pistache::Optional was replaced by > use of std::optional. This is only available in C++17 > * dependency to rapidjson has been introduced > > Signed-off-by: Thomas Ruschival I've marked this patch as chagnes-requested: Nicolas explained what you need to do to pass the test-pkg step. Can you look into that, test on your side, and respin an updated patch? Thanks! Regards, Yann E. MORIN. > --- > ...-add-C-language-to-project-statement.patch | 70 -------------- > ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- > ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- > package/pistache/Config.in | 9 +- > package/pistache/pistache.hash | 2 +- > package/pistache/pistache.mk | 9 +- > 6 files changed, 11 insertions(+), 212 deletions(-) > delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > > diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > deleted file mode 100644 > index c393a48d0d..0000000000 > --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > +++ /dev/null > @@ -1,70 +0,0 @@ > -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 16 Aug 2020 12:31:46 +0200 > -Subject: [PATCH] CMakeLists.txt: add C language to project statement > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -This will fix the detection of atomic: > - > --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB > --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed > --- Looking for __atomic_load_8 in atomic > --- Looking for __atomic_load_8 in atomic - not found > -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): > - Host compiler appears to require libatomic for 64-bit operations, but > - cannot find it. > -Call Stack (most recent call first): > - CMakeLists.txt:19 (include) > - > -Indeed if C language is not enabled, the test will be run with the C++ > -compiler resulting in the following error: > - > -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o > -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx > -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] > -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' > - CHECK_FUNCTION_EXISTS(void); > - ^~~~~~~~~~~~~~~~~~~~~ > -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': > -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' > - CHECK_FUNCTION_EXISTS(); > - ^ > - > -whereas with a C compiler, we'll get: > - > -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o > -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c > -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] > -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? > - CHECK_FUNCTION_EXISTS(void); > - ^~~~~~~~~~~~~~~~~~~~~ > -Linking C executable cmTC_4b0f4 > -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 > -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic > - > -Fixes: > - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 > - > -Signed-off-by: Fabrice Fontaine > ---- > - CMakeLists.txt | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index edc73c5..0286647 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) > - set(CMAKE_CXX_EXTENSIONS OFF) > - > - project (pistache > -- LANGUAGES CXX) > -+ LANGUAGES C CXX) > - > - include(GNUInstallDirs) > - > --- > -2.27.0 > - > diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > deleted file mode 100644 > index 09f59b11ec..0000000000 > --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > +++ /dev/null > @@ -1,95 +0,0 @@ > -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 15 Oct 2020 22:26:55 +0200 > -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS > - > -Don't build and install pistache_shared if the standard cmake > -BUILD_SHARED_LIBS is set to OFF > - > -Signed-off-by: Fabrice Fontaine > -[Backport from upstream: > - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 > -] > ---- > - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ > - 1 file changed, 25 insertions(+), 18 deletions(-) > - > -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > -index 6521b20..c5b049f 100644 > ---- a/src/CMakeLists.txt > -+++ b/src/CMakeLists.txt > -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) > - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) > - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) > - > --add_library(pistache_shared SHARED $) > --add_library(pistache_static STATIC $) > -+if (BUILD_SHARED_LIBS) > -+ add_library(pistache_shared SHARED $) > -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) > -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) > -+endif () > - > --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) > -+add_library(pistache_static STATIC $) > - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) > -- > --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) > - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) > - > - if (PISTACHE_USE_SSL) > - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) > -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) > - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) > - > - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) > -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) > - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) > -+ if (BUILD_SHARED_LIBS) > -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) > -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) > -+ endif () > - endif () > - > - set(Pistache_OUTPUT_NAME "pistache") > --set_target_properties(pistache_shared PROPERTIES > -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} > -- VERSION ${version} > -- SOVERSION ${VERSION_MAJOR} > --) > -+if (BUILD_SHARED_LIBS) > -+ set_target_properties(pistache_shared PROPERTIES > -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} > -+ VERSION ${version} > -+ SOVERSION ${VERSION_MAJOR} > -+ ) > -+endif () > - > - set_target_properties(pistache_static PROPERTIES > - OUTPUT_NAME ${Pistache_OUTPUT_NAME} > -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) > - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") > - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") > - > -- install( > -- TARGETS pistache_shared > -- EXPORT PistacheTargets > -- ARCHIVE DESTINATION ${lib_install_dir} > -- LIBRARY DESTINATION ${lib_install_dir} > -- RUNTIME DESTINATION ${bin_install_dir} > -- INCLUDES DESTINATION ${include_install_dir}) > -+ if (BUILD_SHARED_LIBS) > -+ install( > -+ TARGETS pistache_shared > -+ EXPORT PistacheTargets > -+ ARCHIVE DESTINATION ${lib_install_dir} > -+ LIBRARY DESTINATION ${lib_install_dir} > -+ RUNTIME DESTINATION ${bin_install_dir} > -+ INCLUDES DESTINATION ${include_install_dir}) > -+ endif() > - > - install( > - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" > --- > -2.28.0 > - > diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > deleted file mode 100644 > index be06ca760a..0000000000 > --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 5 Aug 2021 19:02:56 +0200 > -Subject: [PATCH] include/pistache/typeid.h: include cstddef > - > -Include cstddef to avoid the following build failure with gcc 11: > - > -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, > - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, > - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: > -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' > - 26 | operator size_t() const { return reinterpret_cast(id_); } > - | ^~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/pistacheio/pistache/pull/965] > ---- > - include/pistache/typeid.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h > -index 10353ca..893e7c1 100644 > ---- a/include/pistache/typeid.h > -+++ b/include/pistache/typeid.h > -@@ -7,6 +7,7 @@ > - > - #pragma once > - > -+#include > - #include > - > - namespace Pistache > --- > -2.30.2 > - > diff --git a/package/pistache/Config.in b/package/pistache/Config.in > index 96aed5210a..806c27077a 100644 > --- a/package/pistache/Config.in > +++ b/package/pistache/Config.in > @@ -1,22 +1,23 @@ > config BR2_PACKAGE_PISTACHE > bool "pistache" > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_RAPIDJSON > depends on !BR2_TOOLCHAIN_USES_UCLIBC > depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > help > Pistache is a modern and elegant HTTP and REST framework > - for C++. It is entirely written in pure C++14 and provides > + for C++. It is entirely written in pure C++17 and provides > a clear and pleasant API. > > https://github.com/oktal/pistache > > -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" > +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" > depends on !BR2_INSTALL_LIBSTDCPP || \ > BR2_TOOLCHAIN_USES_UCLIBC || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ > !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_USE_WCHAR || \ > BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash > index 5079387eb7..9a2cd1d1f9 100644 > --- a/package/pistache/pistache.hash > +++ b/package/pistache/pistache.hash > @@ -1,3 +1,3 @@ > #locally computed > -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz > +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz > sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE > diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk > index 4d6bd283ea..0f49ad12db 100644 > --- a/package/pistache/pistache.mk > +++ b/package/pistache/pistache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d > +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 > PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) > PISTACHE_LICENSE = Apache-2.0 > PISTACHE_LICENSE_FILES = LICENSE > @@ -13,9 +13,10 @@ PISTACHE_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > PISTACHE_DEPENDENCIES += openssl > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true > +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false > else > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false > endif > > -$(eval $(cmake-package)) > +$(eval $(meson-package)) > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 17:02:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:07 +0100 Subject: [Buildroot] [PATCH] package/qt5: enable for ARC In-Reply-To: <20220221140628.2295-1-abrodkin@synopsys.com> References: <20220221140628.2295-1-abrodkin@synopsys.com> Message-ID: <84862d80-ff12-8e92-e3d7-a0ee1a44485d@mind.be> On 21/02/2022 15:06, Alexey Brodkin via buildroot wrote: > Double-conversion got pulled-in Qt's sources from the upstream project > quite some time ago [1], so now Qt5 is buildable for ARC perfectly fine. > > This reverts the last part of [2], > commit e453fb9e3280 (qt5: disable qt-5.8.0 support for arc, nios2 and xtensa). > > [1] https://invent.kde.org/qt/qt/qtbase/-/commit/425df43d7fed19866fc7ceb3d26b6cc4190523f5 > [2] https://git.buildroot.net/buildroot/commit/?id=e453fb9e3280a1a1ce6180e165aab9c4f1642555 > > Signed-off-by: Alexey Brodkin > Cc: Thomas Petazzoni > Cc: Peter Seiderer Applied to master, thanks. There may be some qt5 packages that still don't build on ARC, but I guess the autobuilders will tell us. Also without JS support, half of qt5 is still not available... Regards, Arnout > --- > package/qt5/Config.in | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 8557fd1000..cbb2e06a21 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -13,7 +13,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > > comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" > depends on !BR2_ARM_CPU_ARMV4 > - depends on !BR2_arc > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ > !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 > depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 > depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ > - # no built-in double-conversion support > - depends on !BR2_arc > depends on !BR2_STATIC_LIBS > select BR2_PACKAGE_QT5BASE > help From arnout at mind.be Sat Mar 12 17:02:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:24 +0100 Subject: [Buildroot] [PATCH] package/apparmor: bump to version 3.0.4 In-Reply-To: <20220221153151.1780107-1-angelo@amarulasolutions.com> References: <20220221153151.1780107-1-angelo@amarulasolutions.com> Message-ID: On 21/02/2022 16:31, Angelo Compagnucci wrote: > Updating also the companion libapparmor library and removing upstreamed > patch. > > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/apparmor/apparmor.hash | 2 +- > package/apparmor/apparmor.mk | 2 +- > ...deprecated-distutils-with-setuptools.patch | 244 ------------------ > package/libapparmor/libapparmor.hash | 2 +- > package/libapparmor/libapparmor.mk | 2 +- > 5 files changed, 4 insertions(+), 248 deletions(-) > delete mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > > diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash > index 88280cbfcf..497491b6c9 100644 > --- a/package/apparmor/apparmor.hash > +++ b/package/apparmor/apparmor.hash > @@ -1,5 +1,5 @@ > # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace > -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz > +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz > > # locally computed > sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE > diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk > index 43bfa05308..76c9f2cafe 100644 > --- a/package/apparmor/apparmor.mk > +++ b/package/apparmor/apparmor.mk > @@ -6,7 +6,7 @@ > > # When updating the version here, please also update the libapparmor package > APPARMOR_VERSION_MAJOR = 3.0 > -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 > +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 > APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download > APPARMOR_DL_SUBDIR = libapparmor > APPARMOR_LICENSE = GPL-2.0 > diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > deleted file mode 100644 > index 5aed31d0b5..0000000000 > --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > +++ /dev/null > @@ -1,244 +0,0 @@ > -From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 > -From: Georgia Garcia > -Date: Wed, 10 Nov 2021 19:50:35 +0000 > -Subject: [PATCH] replace deprecated distutils with setuptools > - > -Adds python3 setuptools as a build dependency for libapparmor > - > -Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 > -MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 > -Signed-off-by: Georgia Garcia > -Acked-by: Christian Boltz > - > -[Retrieved (and updated to remove changes on .gitlab-ci.yml and > -README.md) from: > -https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] > -Signed-off-by: Fabrice Fontaine > ---- > - .gitignore | 3 ++ > - .gitlab-ci.yml | 2 +- > - libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- > - libraries/libapparmor/swig/python/Makefile.am | 2 +- > - libraries/libapparmor/swig/python/setup.py.in | 2 +- > - .../libapparmor/swig/python/test/Makefile.am | 2 +- > - profiles/Makefile | 2 +- > - utils/Makefile | 1 + > - utils/python-tools-setup.py | 6 ++-- > - utils/test/Makefile | 2 +- > - utils/test/README.md | 2 +- > - 11 files changed, 32 insertions(+), 28 deletions(-) > - > -diff --git a/.gitignore b/.gitignore > -index 78a06fdf9..4782a351a 100644 > ---- a/.gitignore > -+++ b/.gitignore > -@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c > - libraries/libapparmor/swig/perl/libapparmor_wrap.o > - libraries/libapparmor/swig/perl/pm_to_blib > - libraries/libapparmor/swig/python/LibAppArmor.py > -+libraries/libapparmor/swig/python/LibAppArmor.egg-info/ > - libraries/libapparmor/swig/python/build/ > - libraries/libapparmor/swig/python/libapparmor_wrap.c > - libraries/libapparmor/swig/python/Makefile > -@@ -204,6 +205,8 @@ utils/*.tmp > - utils/po/*.mo > - utils/apparmor/*.pyc > - utils/apparmor/rule/*.pyc > -+utils/apparmor.egg-info/ > -+utils/build/ > - utils/htmlcov/ > - utils/test/common_test.pyc > - utils/test/.coverage > -diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 > -index 1da29d873..f21f70ce7 100644 > ---- a/libraries/libapparmor/m4/ac_python_devel.m4 > -+++ b/libraries/libapparmor/m4/ac_python_devel.m4 > -@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. > - fi > - > - # > -- # Check if you have distutils, else fail > -+ # Check if you have setuptools, else fail > - # > -- AC_MSG_CHECKING([for the distutils Python package]) > -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` > -- if test -z "$ac_distutils_result"; then > -+ AC_MSG_CHECKING([for the setuptools Python package]) > -+ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` > -+ if test -z "$ac_setuptools_result"; then > - AC_MSG_RESULT([yes]) > - else > - AC_MSG_RESULT([no]) > -- AC_MSG_ERROR([cannot import Python module "distutils". > -+ AC_MSG_ERROR([cannot import Python module "setuptools". > - Please check your Python installation. The error was: > --$ac_distutils_result]) > -+$ac_setuptools_result]) > - PYTHON_VERSION="" > - fi > - > -@@ -88,8 +88,8 @@ $ac_distutils_result]) > - PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` > - fi > - if test -z "$PYTHON_CPPFLAGS"; then > -- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ > --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` > -+ python_path=`$PYTHON -c "import sys; import sysconfig;\ > -+sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` > - if test -n "${python_path}"; then > - python_path="-I$python_path" > - fi > -@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` > - if test -z "$PYTHON_LDFLAGS"; then > - # (makes two attempts to ensure we've got a version number > - # from the interpreter) > -- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ > --sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` > -+ py_version=`$PYTHON -c "import sys; import sysconfig; \ > -+sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` > - if test "$py_version" == "[None]"; then > - if test -n "$PYTHON_VERSION"; then > - py_version=$PYTHON_VERSION > -@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` > - fi > - fi > - > -- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ > --sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ > -+ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ > -+sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ > - "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` > - fi > - AC_MSG_RESULT([$PYTHON_LDFLAGS]) > -@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO > - # > - AC_MSG_CHECKING([for Python site-packages path]) > - if test -z "$PYTHON_SITE_PKG"; then > -- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ > --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` > -+ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ > -+sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` > - fi > - AC_MSG_RESULT([$PYTHON_SITE_PKG]) > - AC_SUBST([PYTHON_SITE_PKG]) > -@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` > - PYTHON_EXTRA_LIBS='' > - fi > - if test -z "$PYTHON_EXTRA_LIBS"; then > -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ > --conf = distutils.sysconfig.get_config_var; \ > -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ > -+conf = sysconfig.get_config_var; \ > - sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` > - fi > - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) > -@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( > - PYTHON_EXTRA_LDFLAGS='' > - fi > - if test -z "$PYTHON_EXTRA_LDFLAGS"; then > -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ > --conf = distutils.sysconfig.get_config_var; \ > -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ > -+conf = sysconfig.get_config_var; \ > - sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` > - fi > - AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) > -diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am > -index 04edff003..bf05fe0fc 100644 > ---- a/libraries/libapparmor/swig/python/Makefile.am > -+++ b/libraries/libapparmor/swig/python/Makefile.am > -@@ -21,7 +21,7 @@ install-exec-local: > - > - clean-local: > - if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi > -- rm -rf build > -+ rm -rf build LibAppArmor.egg-info > - if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi > - > - endif > -diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in > -index 32abd46b2..b23e40746 100644 > ---- a/libraries/libapparmor/swig/python/setup.py.in > -+++ b/libraries/libapparmor/swig/python/setup.py.in > -@@ -1,4 +1,4 @@ > --from distutils.core import setup, Extension > -+from setuptools import setup, Extension > - import string > - > - setup(name = 'LibAppArmor', > -diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am > -index 7287819c9..9dccfdef6 100644 > ---- a/libraries/libapparmor/swig/python/test/Makefile.am > -+++ b/libraries/libapparmor/swig/python/test/Makefile.am > -@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status > - CLEANFILES = test_python.py > - > - # bah, how brittle is this? > --PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' > -+PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' > - > - TESTS = test_python.py > - TESTS_ENVIRONMENT = \ > -diff --git a/profiles/Makefile b/profiles/Makefile > -index c471e58e8..0b7f2655d 100644 > ---- a/profiles/Makefile > -+++ b/profiles/Makefile > -@@ -41,7 +41,7 @@ ifdef USE_SYSTEM > - LOGPROF?=aa-logprof > - else > - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am > -- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") > -+ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") > - LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ > - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) > - PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) > -diff --git a/utils/Makefile b/utils/Makefile > -index 1f08f259a..91a15107b 100644 > ---- a/utils/Makefile > -+++ b/utils/Makefile > -@@ -72,6 +72,7 @@ clean: pod_clean > - rm -rf staging/ build/ > - rm -f apparmor/*.pyc apparmor/rule/*.pyc > - rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ > -+ rm -rf apparmor.egg-info/ > - > - # ${CAPABILITIES} is defined in common/Make.rules > - .PHONY: check_severity_db > -diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py > -index 30ce0cb05..2cbde8fc1 100644 > ---- a/utils/python-tools-setup.py > -+++ b/utils/python-tools-setup.py > -@@ -20,14 +20,14 @@ > - # Note: --version=... must be the last argument to this script > - # > - > --from distutils.command.install import install as _install > --from distutils.core import setup > -+from setuptools.command.install import install as _install > -+from setuptools import setup > - import os > - import shutil > - import sys > - > - class Install(_install, object): > -- '''Override distutils to install the files where we want them.''' > -+ '''Override setuptools to install the files where we want them.''' > - def run(self): > - # Now byte-compile everything > - super(Install, self).run() > -diff --git a/utils/test/Makefile b/utils/test/Makefile > -index 90354aa50..9126bdd71 100644 > ---- a/utils/test/Makefile > -+++ b/utils/test/Makefile > -@@ -32,7 +32,7 @@ ifdef USE_SYSTEM > - PARSER= > - else > - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am > -- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") > -+ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") > - LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ > - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) > - PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) > --- > -GitLab > - > diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash > index 6a19aef77a..9fbfe3b92e 100644 > --- a/package/libapparmor/libapparmor.hash > +++ b/package/libapparmor/libapparmor.hash > @@ -1,5 +1,5 @@ > # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace > -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz > +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz > > # locally computed > sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE > diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk > index 7bb849ab94..fcd3a4389b 100644 > --- a/package/libapparmor/libapparmor.mk > +++ b/package/libapparmor/libapparmor.mk > @@ -6,7 +6,7 @@ > > # When updating the version here, please also update the apparmor package > LIBAPPARMOR_VERSION_MAJOR = 3.0 > -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 > +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 > LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz > LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download > LIBAPPARMOR_LICENSE = LGPL-2.1 From arnout at mind.be Sat Mar 12 17:02:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4 In-Reply-To: <20220221192126.30231-1-petr.vorel@gmail.com> References: <20220221192126.30231-1-petr.vorel@gmail.com> Message-ID: On 21/02/2022 20:21, Petr Vorel wrote: > Remove 0001-build-add-an-option-to-not-build-man-pages.patch > as release contains very similar commit which does autodetection: > 1a474db ("build: add an option to not build man pages") > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Arnout > --- > Tested: > > > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > > andes-nds32 [ 1/45]: FAILED (not related to this change) > arm-aarch64 [ 2/45]: OK > bootlin-aarch64-glibc [ 3/45]: OK > bootlin-arcle-hs38-uclibc [ 4/45]: OK > bootlin-armv5-uclibc [ 5/45]: OK > bootlin-armv7-glibc [ 6/45]: OK > bootlin-armv7m-uclibc [ 7/45]: SKIPPED > bootlin-armv7-musl [ 8/45]: OK > bootlin-microblazeel-uclibc [ 9/45]: OK > bootlin-mipsel-uclibc [10/45]: OK > bootlin-mipsel32r6-glibc [11/45]: OK > bootlin-m68k-5208-uclibc [12/45]: SKIPPED > bootlin-m68k-68040-uclibc [13/45]: OK > bootlin-nios2-glibc [14/45]: OK > bootlin-openrisc-uclibc [15/45]: OK > bootlin-powerpc-e500mc-uclibc [16/45]: OK > bootlin-powerpc64le-power8-glibc [17/45]: OK > bootlin-riscv32-glibc [18/45]: OK > bootlin-riscv64-glibc [19/45]: OK > bootlin-riscv64-musl [20/45]: OK > bootlin-sh4-uclibc [21/45]: OK > bootlin-sparc-uclibc [22/45]: OK > bootlin-sparc64-glibc [23/45]: OK > bootlin-xtensa-uclibc [24/45]: OK > bootlin-x86-64-glibc [25/45]: OK > bootlin-x86-64-musl [26/45]: OK > bootlin-x86-64-uclibc [27/45]: OK > br-arm-basic [28/45]: SKIPPED > br-arm-full-nothread [29/45]: SKIPPED > br-arm-full-static [30/45]: OK > br-i386-pentium-mmx-musl [31/45]: OK > br-i386-pentium4-full [32/45]: OK > br-mips64-n64-full [33/45]: OK > br-mips64r6-el-hf-glibc [34/45]: OK > br-powerpc-603e-basic-cpp [35/45]: SKIPPED > br-powerpc64-power7-glibc [36/45]: OK > linaro-aarch64-be [37/45]: OK > linaro-aarch64 [38/45]: OK > linaro-arm [39/45]: OK > sourcery-arm-armv4t [40/45]: OK > sourcery-arm [41/45]: OK > sourcery-arm-thumb2 [42/45]: OK > sourcery-mips [43/45]: OK > sourcery-mips64 [44/45]: OK > sourcery-nios2 [45/45]: OK > > ...add-an-option-to-not-build-man-pages.patch | 65 ------------------- > package/libqmi/libqmi.hash | 2 +- > package/libqmi/libqmi.mk | 2 +- > 3 files changed, 2 insertions(+), 67 deletions(-) > delete mode 100644 package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch > > diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch > deleted file mode 100644 > index d9053de537..0000000000 > --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch > +++ /dev/null > @@ -1,65 +0,0 @@ > -From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 > -From: Aleksander Morgado > -Date: Wed, 3 Nov 2021 10:57:51 +0100 > -Subject: [PATCH] build: add an option to not build man pages > - > -When cross-compiling, the compiled binaries cannot be run on the build > -machine, unless one defines a helper (e.g. qemu) in the meson > -configuration, which is most of the time undesirable. > - > -If help2man is installed on the build machine, then the build would fail > -because of this, so add an option to disable generating the man pages. > - > -With later versions of meson, it will be possible to automatically > -detect this condition. > - > -Based on the same fix done in libmbim by Nicolas Cavallari, see > -https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 > - > -Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 > - > -[Retrieved (and backported) from: > -https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] > -Signed-off-by: Fabrice Fontaine > ---- > - meson.build | 8 +++++++- > - meson_options.txt | 1 + > - 2 files changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index e88b43a1..c7312146 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -223,8 +223,8 @@ if enable_gtk_doc > - subdir('docs/reference/libqmi-glib') > - endif > - > --help2man = find_program('help2man', required: false) > --if help2man.found() > -+enable_man = get_option('man') > -+if enable_man > - subdir('docs/man') > - endif > - > -@@ -237,6 +242,7 @@ summary({ > - output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' > - output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' > - output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' > -+output += ' man pages: ' + enable_man.to_string() + '\n\n' > - output += ' System paths\n' > - output += ' prefix: ' + qmi_prefix + '\n' > - output += ' udev base directory: ' + qmi_username + '\n\n' > -diff --git a/meson_options.txt b/meson_options.txt > -index 4d4f913d..bee5daac 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc > - > - option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') > - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') > -+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') > - > - option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') > --- > -GitLab > - > diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash > index 1f2da45ac0..ef2da77a2a 100644 > --- a/package/libqmi/libqmi.hash > +++ b/package/libqmi/libqmi.hash > @@ -1,4 +1,4 @@ > # Locally computed: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz > +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz > diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk > index a4839f1efb..b33e2fdc47 100644 > --- a/package/libqmi/libqmi.mk > +++ b/package/libqmi/libqmi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBQMI_VERSION = 1.30.2 > +LIBQMI_VERSION = 1.30.4 > LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) > LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) > LIBQMI_LICENSE_FILES = COPYING COPYING.LIB From arnout at mind.be Sat Mar 12 17:02:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:55 +0100 Subject: [Buildroot] [PATCH v1] package/libinput: bump version to 1.20.0 In-Reply-To: <20220221213933.457-1-ps.report@gmx.net> References: <20220221213933.457-1-ps.report@gmx.net> Message-ID: <8ab5efb5-23c6-7feb-9a74-25b646b49f61@mind.be> On 21/02/2022 22:39, Peter Seiderer wrote: > - change site URL to new gitlab.freedesktop.org location > - change hash from upstream provided to locally computed (and drop sha512) > > For details see [1] and [2]. > > [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042111.html > [2] https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/libinput/libinput.hash | 5 ++--- > package/libinput/libinput.mk | 6 +++--- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash > index f18a727810..d1c7cfb104 100644 > --- a/package/libinput/libinput.hash > +++ b/package/libinput/libinput.hash > @@ -1,6 +1,5 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html > -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz > -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz > +# Locally computed > +sha256 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85 libinput-1.20.0.tar.bz2 > > # License files > sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING > diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk > index 2f9c639c22..b814e3416d 100644 > --- a/package/libinput/libinput.mk > +++ b/package/libinput/libinput.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -LIBINPUT_VERSION = 1.19.3 > -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz > -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput > +LIBINPUT_VERSION = 1.20.0 > +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 > +LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) > LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev > LIBINPUT_INSTALL_STAGING = YES > LIBINPUT_LICENSE = MIT From yann.morin.1998 at free.fr Sat Mar 12 17:03:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:03:13 +0100 Subject: [Buildroot] [git commit] package/pkg-python: apply host platform and project base to pep517 env Message-ID: <20220312165446.C81AE82A94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f4ea8c95a3e3d6b74276884cfdae51cc8b81857 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The _PYTHON_HOST_PLATFORM and _PYTHON_PROJECT_BASE variables should also be set for pep517 builds as they are not setuptools/distutils specific. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index f031bc8fae..52ce402281 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -113,6 +113,8 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ From arnout at mind.be Sat Mar 12 17:03:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:03:22 +0100 Subject: [Buildroot] [PATCH] package/cups: bump to version 2.4.1 In-Reply-To: <20220222094913.2217366-1-angelo@amarulasolutions.com> References: <20220222094913.2217366-1-angelo@amarulasolutions.com> Message-ID: On 22/02/2022 10:49, Angelo Compagnucci wrote: > NOTICE hash is changed due to a copyright year update. > > Signed-off-by: Angelo Compagnucci ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/cups/cups.hash | 4 ++-- > package/cups/cups.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/cups/cups.hash b/package/cups/cups.hash > index b0e3654b3d..8308b7b803 100644 > --- a/package/cups/cups.hash > +++ b/package/cups/cups.hash > @@ -1,4 +1,4 @@ > # Locally calculated: > -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz > +sha256 c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 cups-2.4.1-source.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE > +sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE > diff --git a/package/cups/cups.mk b/package/cups/cups.mk > index e406d3bc64..298a6ed879 100644 > --- a/package/cups/cups.mk > +++ b/package/cups/cups.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CUPS_VERSION = 2.4.0 > +CUPS_VERSION = 2.4.1 > CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz > CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) > CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From yann.morin.1998 at free.fr Sat Mar 12 17:03:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:03:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: apply host platform and project base to pep517 env In-Reply-To: <20220311192726.3879992-1-james.hilliard1@gmail.com> References: <20220311192726.3879992-1-james.hilliard1@gmail.com> Message-ID: <20220312170346.GJ283544@scaer> Kames, All, On 2022-03-11 12:27 -0700, James Hilliard spake thusly: > The _PYTHON_HOST_PLATFORM and _PYTHON_PROJECT_BASE variables should > also be set for pep517 builds as they are not setuptools/distutils > specific. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-python.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index f031bc8fae..52ce402281 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -113,6 +113,8 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > > # Target pep517-based packages > PKG_PYTHON_PEP517_ENV = \ > + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 17:04:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:04:06 +0100 Subject: [Buildroot] [PATCH] package/cups-filters: bump to version 1.28.12 In-Reply-To: <20220222094923.2220294-1-angelo@amarulasolutions.com> References: <20220222094923.2220294-1-angelo@amarulasolutions.com> Message-ID: <51ad5bc3-69eb-6a65-3649-7e8bfe44c828@mind.be> On 22/02/2022 10:49, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. I also updated the hash file to use two spaces (check-package). Regards, Arnout > --- > package/cups-filters/cups-filters.hash | 2 +- > package/cups-filters/cups-filters.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash > index aefb67f651..5a95b998eb 100644 > --- a/package/cups-filters/cups-filters.hash > +++ b/package/cups-filters/cups-filters.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz > +sha256 3265017d2369e1130e732090165d6b4e3c0838d7ca9aa60978b087bee12247ff cups-filters-1.28.12.tar.gz > sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING > diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk > index c8f2dd0aae..f8ff42f0f4 100644 > --- a/package/cups-filters/cups-filters.mk > +++ b/package/cups-filters/cups-filters.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CUPS_FILTERS_VERSION = 1.28.10 > +CUPS_FILTERS_VERSION = 1.28.12 > CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters > CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause > CUPS_FILTERS_LICENSE_FILES = COPYING From arnout at mind.be Sat Mar 12 17:04:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:04:40 +0100 Subject: [Buildroot] [PATCH next v2 1/1] package/libgit2: bump version to 1.4.2 In-Reply-To: <20220228085659.17489-1-nicolas.cavallari@green-communications.fr> References: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> <20220228085659.17489-1-nicolas.cavallari@green-communications.fr> Message-ID: <6fe83bfc-c320-5f51-00af-dad3119a3fc6@mind.be> On 28/02/2022 09:57, Nicolas Cavallari wrote: > Licence changes mostly concern vendored dependencies (that buildroot does > not use) and a new bundled PRNG used to reimplement mkstemp() > > Some buildsystem options also changed: > - THREADSAFE is now USE_THREADS > - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. > > Signed-off-by: Nicolas Cavallari Applied to master, thanks. Thanks for the excellent commit message. Regards, Arnout > --- > package/libgit2/libgit2.hash | 4 ++-- > package/libgit2/libgit2.mk | 7 +++---- > 2 files changed, 5 insertions(+), 6 deletions(-) > > v2: bump to 1.4.2 instead of 1.4.1 > > diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash > index 07b1a260a4..ada411ea22 100644 > --- a/package/libgit2/libgit2.hash > +++ b/package/libgit2/libgit2.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz > -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING > +sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz > +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING > diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk > index 6cc0f1ea74..e94dd9c370 100644 > --- a/package/libgit2/libgit2.mk > +++ b/package/libgit2/libgit2.mk > @@ -4,21 +4,20 @@ > # > ################################################################################ > > -LIBGIT2_VERSION = 1.3.0 > +LIBGIT2_VERSION = 1.4.2 > LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) > -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) > +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) > LIBGIT2_LICENSE_FILES = COPYING > LIBGIT2_CPE_ID_VENDOR = libgit2_project > LIBGIT2_INSTALL_STAGING = YES > > LIBGIT2_CONF_OPTS = \ > -DUSE_GSSAPI=OFF \ > - -DBUILD_CLAR=OFF \ > -DUSE_ICONV=ON \ > -DREGEX_BACKEND=regcomp \ > -DUSE_HTTP_PARSER=system \ > -DUSE_NTLMCLIENT=OFF \ > - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) > + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) > > LIBGIT2_DEPENDENCIES = zlib libhttpparser > From arnout at mind.be Sat Mar 12 17:06:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:06:52 +0100 Subject: [Buildroot] [PATCH] package/python-can: bump to version 4.0.0 In-Reply-To: <20220222113326.2608582-1-angelo@amarulasolutions.com> References: <20220222113326.2608582-1-angelo@amarulasolutions.com> Message-ID: <31e94ffd-6814-e528-29d8-e140bf95bb55@mind.be> On 22/02/2022 12:33, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/python-can/python-can.hash | 2 +- > package/python-can/python-can.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash > index 5330e5899c..91b685cc17 100644 > --- a/package/python-can/python-can.hash > +++ b/package/python-can/python-can.hash > @@ -1,4 +1,4 @@ > # sha256 from https://pypi.org/pypi/python-can > -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz > +sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz > # Locally computed sha256 checksums > sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt > diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk > index 1ab813e2c9..9284a9cf99 100644 > --- a/package/python-can/python-can.mk > +++ b/package/python-can/python-can.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_CAN_VERSION = 3.3.4 > -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 > +PYTHON_CAN_VERSION = 4.0.0 > +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 > PYTHON_CAN_SETUP_TYPE = setuptools > PYTHON_CAN_LICENSE = LGPL-3.0 > PYTHON_CAN_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:07:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:07:13 +0100 Subject: [Buildroot] [PATCH] package/python-pydal: bump to version 20220213.2 In-Reply-To: <20220222113354.2609277-1-angelo@amarulasolutions.com> References: <20220222113354.2609277-1-angelo@amarulasolutions.com> Message-ID: <110c08a2-a1ec-6a20-b758-66126f605338@mind.be> On 22/02/2022 12:33, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/python-pydal/python-pydal.hash | 2 +- > package/python-pydal/python-pydal.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash > index eef00030bd..46271dfd91 100644 > --- a/package/python-pydal/python-pydal.hash > +++ b/package/python-pydal/python-pydal.hash > @@ -1,3 +1,3 @@ > # sha256 locally computed > -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz > +sha256 40a2cafb5aa830d51ababfe34a8f8a0e3b630bc4f931f04db75ed84c3f55ea38 python-pydal-20220213.2.tar.gz > sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt > diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk > index 428999f5c1..c3be683dda 100644 > --- a/package/python-pydal/python-pydal.mk > +++ b/package/python-pydal/python-pydal.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_PYDAL_VERSION = 20210626.3 > +PYTHON_PYDAL_VERSION = 20220213.2 > PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) > PYTHON_PYDAL_LICENSE = BSD-3-Clause > PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:07:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:07:29 +0100 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 In-Reply-To: <20220222113336.2608916-1-angelo@amarulasolutions.com> References: <20220222113336.2608916-1-angelo@amarulasolutions.com> Message-ID: On 22/02/2022 12:33, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/python-pillow/python-pillow.hash | 4 ++-- > package/python-pillow/python-pillow.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash > index f3ca8e6014..88a5d7cada 100644 > --- a/package/python-pillow/python-pillow.hash > +++ b/package/python-pillow/python-pillow.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pillow/json > -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz > -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz > +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz > +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz > > # Locally computed sha256 checksums > sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index 2f2e817882..901876e0ee 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_PILLOW_VERSION = 9.0.0 > -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 > +PYTHON_PILLOW_VERSION = 9.0.1 > +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 > PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz > PYTHON_PILLOW_LICENSE = HPND > PYTHON_PILLOW_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:07:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:07:44 +0100 Subject: [Buildroot] [PATCH] package/python-web2py: bump to version 2.22.3 In-Reply-To: <20220222113404.2609626-1-angelo@amarulasolutions.com> References: <20220222113404.2609626-1-angelo@amarulasolutions.com> Message-ID: <66ece35d-49bc-4fdb-fb78-d654caf0f39c@mind.be> On 22/02/2022 12:34, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/python-web2py/python-web2py.hash | 2 +- > package/python-web2py/python-web2py.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash > index 2ef52b0a5c..5830b71701 100644 > --- a/package/python-web2py/python-web2py.hash > +++ b/package/python-web2py/python-web2py.hash > @@ -1,3 +1,3 @@ > # sha256 locally computed > -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz > +sha256 a779adc5626999c854e9abc976296c2c1059bf6988a421c0bfba923f9b08d8cb python-web2py-2.22.3.tar.gz > sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE > diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk > index 3e453282a9..b1897978af 100644 > --- a/package/python-web2py/python-web2py.mk > +++ b/package/python-web2py/python-web2py.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_WEB2PY_VERSION = 2.21.1 > +PYTHON_WEB2PY_VERSION = 2.22.3 > PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) > PYTHON_WEB2PY_LICENSE = LGPL-3.0 > PYTHON_WEB2PY_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:08:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: bump to version 1.7.0 In-Reply-To: <20220222185206.230318-1-ju.o@free.fr> References: <20220222185206.230318-1-ju.o@free.fr> Message-ID: <087a4660-c51e-098f-33a5-72544c8701d6@mind.be> On 22/02/2022 19:52, Julien Olivain wrote: > For change log since 1.6.0, see: > - https://github.com/python-distro/distro/releases/tag/v1.7.0 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > Tested with: > support/testing/run-tests \ > -d dl -o output_folder -k \ > tests.package.test_python_distro.TestPythonPy3Distro > --- > package/python-distro/python-distro.hash | 2 +- > package/python-distro/python-distro.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash > index e2b3c0a444..8f09197156 100644 > --- a/package/python-distro/python-distro.hash > +++ b/package/python-distro/python-distro.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz > +sha256 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 distro-1.7.0.tar.gz > sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE > diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk > index 753e74d020..c69849b7ac 100644 > --- a/package/python-distro/python-distro.mk > +++ b/package/python-distro/python-distro.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_DISTRO_VERSION = 1.6.0 > -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 > +PYTHON_DISTRO_VERSION = 1.7.0 > +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a > PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz > PYTHON_DISTRO_LICENSE = Apache-2.0 > PYTHON_DISTRO_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:08:23 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/modem-manager: bump version to 1.18.6 In-Reply-To: <20220222192905.20456-1-petr.vorel@gmail.com> References: <20220222192905.20456-1-petr.vorel@gmail.com> Message-ID: <4aafa550-a762-e702-854a-cbc38751e8a6@mind.be> On 22/02/2022 20:29, Petr Vorel wrote: > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Arnout > --- > Changes v1->v2: > * fix version in commit message subject (Yegor Yefremov) > > package/modem-manager/modem-manager.hash | 2 +- > package/modem-manager/modem-manager.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash > index 14597215df..ea91f42fe0 100644 > --- a/package/modem-manager/modem-manager.hash > +++ b/package/modem-manager/modem-manager.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz > +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk > index a881edc272..d7e2c55bf8 100644 > --- a/package/modem-manager/modem-manager.mk > +++ b/package/modem-manager/modem-manager.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MODEM_MANAGER_VERSION = 1.16.10 > +MODEM_MANAGER_VERSION = 1.18.6 > MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz > MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager > MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From arnout at mind.be Sat Mar 12 17:08:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:08:38 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libnetfilter_conntrack: bump to version 1.0.9 In-Reply-To: <20220222205317.3161653-1-fontaine.fabrice@gmail.com> References: <20220222205317.3161653-1-fontaine.fabrice@gmail.com> Message-ID: <5582b728-f738-a680-d29a-4ab3bb90e237@mind.be> On 22/02/2022 21:53, Fabrice Fontaine wrote: > Drop patch (already in version) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ------------------- > .../libnetfilter_conntrack.hash | 4 +- > .../libnetfilter_conntrack.mk | 2 +- > 3 files changed, 3 insertions(+), 41 deletions(-) > delete mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > > diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > deleted file mode 100644 > index 0b373d9261..0000000000 > --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 12 Apr 2020 14:05:15 +0200 > -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private > - > -Since version 1.0.8 and commit > -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends > -on libmnl so add it to Libs.Private. > - > -Otherwise, applications such as dnsmasq will fail to link on: > - > -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink > -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': > -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' > - > -Fixes: > - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: commit e94172f09e4d] > ---- > - libnetfilter_conntrack.pc.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in > -index 857f993..fbd7132 100644 > ---- a/libnetfilter_conntrack.pc.in > -+++ b/libnetfilter_conntrack.pc.in > -@@ -12,5 +12,5 @@ Version: @VERSION@ > - Requires: libnfnetlink > - Conflicts: > - Libs: -L${libdir} -lnetfilter_conntrack > --Libs.private: @LIBNFNETLINK_LIBS@ > -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ > - Cflags: -I${includedir} > --- > -2.25.1 > - > diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash > index 19520aa3f0..205eecf1f3 100644 > --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash > +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash > @@ -1,5 +1,5 @@ > -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum > -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 > +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum > +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 > > # Hash for license file: > sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING > diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk > index 0a5a94be8f..e10bdd02e9 100644 > --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk > +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 > +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 > 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 From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/lxc: bump to version 4.0.12 Message-ID: <20220312170117.D37E87FF6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7b4ddd54d9d5dbeaa3646de3863f160c1504200 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7..9311dc8775 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 22.2.1 Message-ID: <20220312170117.B899E7FF6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7a71ba33db24738c6c3ab92daf82fe8348ad387 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 7cd61fe9b8..ee4f317242 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ed1d22b5c5a05d3e848e43caa2b3966dbfb7f74281a646e6d0774a0621a9b8b intel-mediasdk-22.1.0.tar.gz +sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7d57e0e928..7589ff9737 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.1.0 +INTEL_MEDIASDK_VERSION = 22.2.1 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/tvheadend: bump version Message-ID: <20220312170117.C470C82AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0846221426b1cefa9e569f1927bc6fed102acb36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-configure-add-execinfo-option.patch | 55 ---------------------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch deleted file mode 100644 index c55d127d58..0000000000 --- a/package/tvheadend/0002-configure-add-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Jan 2022 16:53:29 +0100 -Subject: [PATCH] configure: add execinfo option - -Add execinfo option to allow the user to disable the feature even if -execinfo.h is found on the system - -Signed-off-by: Fabrice Fontaine -[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] ---- - configure | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 4dad024c4..c087502bf 100755 ---- a/configure -+++ b/configure -@@ -75,6 +75,7 @@ OPTIONS=( - "ddci:yes" - "cclang_threadsan:no" - "gperftools:no" -+ "execinfo:auto" - ) - - # -@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then - # If we don't have libunwind then fallback to execinfo. - if ! enabled libunwind - then -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - - else -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - check_cc_option mmx - check_cc_option sse2 --- -2.33.0 - diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index db06af53b7..44ff745221 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 58ebdcb054..d2547b8746 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/libnids: bump version to 1.26 Message-ID: <20220312170118.20EA582AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8aefa8807ecaf219b0dc7988e6bd14c70c9c761 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Change repo source to official github.com repository which is actively maintained. Previous sourceforge.net sources remained untouched since 2010. Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libnids/libnids.hash | 4 ++-- package/libnids/libnids.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash index 4a2949c39d..e51dbf151c 100644 --- a/package/libnids/libnids.hash +++ b/package/libnids/libnids.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 3e36838c40..57e68654dc 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNIDS_VERSION = 1.24 -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) +LIBNIDS_VERSION = 1.26 +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION),$(LIBNIDS_VERSION).tar.gz) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_CPE_ID_VENDOR = libnids_project From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/qt5: enable for ARC Message-ID: <20220312170118.35D1C82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ffc6549465cb5d68b751f10603e8b0363bf9b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Double-conversion got pulled-in Qt's sources from the upstream project quite some time ago [1], so now Qt5 is buildable for ARC perfectly fine. This reverts the last part of [2], commit e453fb9e3280 (qt5: disable qt-5.8.0 support for arc, nios2 and xtensa). [1] https://invent.kde.org/qt/qt/qtbase/-/commit/425df43d7fed19866fc7ceb3d26b6cc4190523f5 [2] https://git.buildroot.net/buildroot/commit/?id=e453fb9e3280a1a1ce6180e165aab9c4f1642555 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..f2b1ff4a19 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5BASE help From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-zattoo: bump version to 19.7.11-Matrix Message-ID: <20220312170118.0705782AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e36884420d1709fabc5a8b081f5a6cbd1e59e297 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index ac4960df92..0b88d5c747 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz +sha256 07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 kodi-pvr-zattoo-19.7.11-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 7a3b230e8b..95c5de0925 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix +KODI_PVR_ZATTOO_VERSION = 19.7.11-Matrix KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/s390-tools: bump to version 2.20.0 Message-ID: <20220312170118.0FE6C82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff4e3baa40a7fc3f86efbe14cc228c8b34c8bfb4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - https://release-monitoring.org/project/10714/ Signed-off-by: Alexander Egorenkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 13c68fbf52..6ea8f7ea20 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz +sha256 6fa6add92e896541c0ef74885a4084474fc0d77049e8ac7372872a70a46ddd74 s390-tools-2.20.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 328986bcb3..3c386af6fd 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.19.0 +S390_TOOLS_VERSION = 2.20.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.2.1 Message-ID: <20220312170117.ABDBA82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ff7cb3460ae0b2d168764b89feb4e87e9024de4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://github.com/intel/media-driver/commit/8eab97af6e1c41fc7b9d72999ecb1c22d9e52db6 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Add-MEDIA-BUILD-HARDENING-option.patch | 106 --------------------- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 108 deletions(-) diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch deleted file mode 100644 index 968445759a..0000000000 --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Aug 2021 21:34:59 +0200 -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option - -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening -options such as stack-protector-all or FORTIFY SOURCE 2 which are not -always available (e.g. fortify source 2 is only available on glibc >= 6 -and not musl/uclibc-ng) - -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 21.4.1] ---- - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- - media_driver/media_top_cmake.cmake | 8 +++++++- - 3 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt -index 65f71ceef..b066138d9 100644 ---- a/cmrtlib/linux/CMakeLists.txt -+++ b/cmrtlib/linux/CMakeLists.txt -@@ -32,12 +32,18 @@ else() - endif() - - # Set up compile options that will be used for the Linux build --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -+if(MEDIA_BUILD_HARDENING) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+endif() - if(MEDIA_BUILD_FATAL_WARNINGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake -index 7a2bd64b6..98896b131 100755 ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON - # Other common flags - -fmessage-length=0 - -fvisibility=hidden -- -fstack-protector - -fdata-sections - -ffunction-sections - -Wl,--gc-sections -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON - -g - ) - -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_COMMON -+ ${MEDIA_COMPILER_FLAGS_COMMON} -+ -fstack-protector) -+endif() - - if(${UFO_MARCH} STREQUAL "slm") - set(MEDIA_COMPILER_FLAGS_COMMON -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") - set(MEDIA_COMPILER_FLAGS_RELEASE - ${MEDIA_COMPILER_FLAGS_RELEASE} - -O2 -- -D_FORTIFY_SOURCE=2 - -fno-omit-frame-pointer - ) -+ if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_RELEASE -+ ${MEDIA_COMPILER_FLAGS_RELEASE} -+ -D_FORTIFY_SOURCE=2) -+ endif() - endif() - - if(NOT ${PLATFORM} STREQUAL "android") -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake -index f089ea45f..b0b428914 100755 ---- a/media_driver/media_top_cmake.cmake -+++ b/media_driver/media_top_cmake.cmake -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") - endif() - --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") -+endif() -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) -+ - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") - diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index ceafa20e80..7c615620ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz +sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9a2b4a8753..e286a8b2c5 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.1.1 +INTEL_MEDIADRIVER_VERSION = 22.2.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/grpc: bump to version 1.44.0 Message-ID: <20220312170118.2A83082AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e27390f85467f04e62a55748fd60fb304803f6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 3da1d9a323..6db2acd759 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz +sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 5d8201f12f..23b92f1750 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.43.0 +GRPC_VERSION = 1.44.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-pydal: bump to version 20220213.2 Message-ID: <20220312170118.7EB4E82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=556e84e5b85e5be3ca27f86955bce015a90f0c50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pydal/python-pydal.hash | 2 +- package/python-pydal/python-pydal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index eef00030bd..46271dfd91 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz +sha256 40a2cafb5aa830d51ababfe34a8f8a0e3b630bc4f931f04db75ed84c3f55ea38 python-pydal-20220213.2.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 428999f5c1..c3be683dda 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20210626.3 +PYTHON_PYDAL_VERSION = 20220213.2 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/libxcrypt: bump to version 4.4.28 Message-ID: <20220312170118.18CCB82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a599e9f3717bc9c875b6ebed0f1baa8310ed096 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxcrypt/libxcrypt.hash | 2 +- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index 99ddf62be0..bdda6b47c0 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 db7e37901969cb1d1e8020cb73a991ef81e48e31ea5b76a101862c806426b457 libxcrypt-4.4.28.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 65efa2bab9..f7a0fd4308 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.27 +LIBXCRYPT_VERSION = 4.4.28 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-web2py: bump to version 2.22.3 Message-ID: <20220312170118.8870782AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9b4c11ed67055564c1b6bc8c44ec944bf458a87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci [Arnout: use 2 spaces in hash file] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-web2py/python-web2py.hash | 4 ++-- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 2ef52b0a5c..3f781a7016 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz -sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE +sha256 a779adc5626999c854e9abc976296c2c1059bf6988a421c0bfba923f9b08d8cb python-web2py-2.22.3.tar.gz +sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 3e453282a9..b1897978af 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.21.1 +PYTHON_WEB2PY_VERSION = 2.22.3 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-pillow: bump to version 9.0.1 Message-ID: <20220312170118.75CB682AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07b070be39f9c51592c85fb76cd7af00539abc19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e6014..88a5d7cada 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz # Locally computed sha256 checksums sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882..901876e0ee 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/cups: bump to version 2.4.1 Message-ID: <20220312170118.5A5E282AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bac3eadda80eea6bac376571a2cfd51b91731f4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master NOTICE hash is changed due to a copyright year update. Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cups/cups.hash | 4 ++-- package/cups/cups.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index b0e3654b3d..8308b7b803 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz +sha256 c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 cups-2.4.1-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE +sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index e406d3bc64..298a6ed879 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.0 +CUPS_VERSION = 2.4.1 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-distro: bump to version 1.7.0 Message-ID: <20220312170118.91AA382AFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=726e974f5eaff5c5abd7550e100a117a3fa0b6c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since 1.6.0, see: - https://github.com/python-distro/distro/releases/tag/v1.7.0 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-distro/python-distro.hash | 2 +- package/python-distro/python-distro.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index e2b3c0a444..8f09197156 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 distro-1.7.0.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index 753e74d020..c69849b7ac 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.6.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_VERSION = 1.7.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:56 +0100 Subject: [Buildroot] [git commit] package/libgit2: bump version to 1.4.2 Message-ID: <20220312170118.ACC3582AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba8c268e00bce6cbcb2d7d29143a34afaa5fdc46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Licence changes mostly concern vendored dependencies (that buildroot does not use) and a new bundled PRNG used to reimplement mkstemp() - added CC0 license for that. Some buildsystem options also changed: - THREADSAFE is now USE_THREADS - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4..ada411ea22 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74..e94dd9c370 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,20 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.4.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/cups-filters: bump to version 1.28.12 Message-ID: <20220312170118.63A5082AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15d7ac9499d7cad063fa43c602fd73419f971c50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci [Arnout: also update hash file to two spaces] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cups-filters/cups-filters.hash | 4 ++-- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index aefb67f651..50f755488b 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz -sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING +sha256 3265017d2369e1130e732090165d6b4e3c0838d7ca9aa60978b087bee12247ff cups-filters-1.28.12.tar.gz +sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index c8f2dd0aae..f8ff42f0f4 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.10 +CUPS_FILTERS_VERSION = 1.28.12 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/apparmor: bump to version 3.0.4 Message-ID: <20220312170118.3FC8B82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27cd0b5033bfe6fabc580659eb0c1f2efc7d4984 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updating also the companion libapparmor library and removing upstreamed patch. Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/apparmor/apparmor.hash | 2 +- package/apparmor/apparmor.mk | 2 +- ...lace-deprecated-distutils-with-setuptools.patch | 244 --------------------- package/libapparmor/libapparmor.hash | 2 +- package/libapparmor/libapparmor.mk | 2 +- 5 files changed, 4 insertions(+), 248 deletions(-) diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 88280cbfcf..497491b6c9 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 43bfa05308..76c9f2cafe 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the libapparmor package APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch deleted file mode 100644 index 5aed31d0b5..0000000000 --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 -From: Georgia Garcia -Date: Wed, 10 Nov 2021 19:50:35 +0000 -Subject: [PATCH] replace deprecated distutils with setuptools - -Adds python3 setuptools as a build dependency for libapparmor - -Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 -MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 -Signed-off-by: Georgia Garcia -Acked-by: Christian Boltz - -[Retrieved (and updated to remove changes on .gitlab-ci.yml and -README.md) from: -https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] -Signed-off-by: Fabrice Fontaine ---- - .gitignore | 3 ++ - .gitlab-ci.yml | 2 +- - libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- - libraries/libapparmor/swig/python/Makefile.am | 2 +- - libraries/libapparmor/swig/python/setup.py.in | 2 +- - .../libapparmor/swig/python/test/Makefile.am | 2 +- - profiles/Makefile | 2 +- - utils/Makefile | 1 + - utils/python-tools-setup.py | 6 ++-- - utils/test/Makefile | 2 +- - utils/test/README.md | 2 +- - 11 files changed, 32 insertions(+), 28 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 78a06fdf9..4782a351a 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c - libraries/libapparmor/swig/perl/libapparmor_wrap.o - libraries/libapparmor/swig/perl/pm_to_blib - libraries/libapparmor/swig/python/LibAppArmor.py -+libraries/libapparmor/swig/python/LibAppArmor.egg-info/ - libraries/libapparmor/swig/python/build/ - libraries/libapparmor/swig/python/libapparmor_wrap.c - libraries/libapparmor/swig/python/Makefile -@@ -204,6 +205,8 @@ utils/*.tmp - utils/po/*.mo - utils/apparmor/*.pyc - utils/apparmor/rule/*.pyc -+utils/apparmor.egg-info/ -+utils/build/ - utils/htmlcov/ - utils/test/common_test.pyc - utils/test/.coverage -diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 -index 1da29d873..f21f70ce7 100644 ---- a/libraries/libapparmor/m4/ac_python_devel.m4 -+++ b/libraries/libapparmor/m4/ac_python_devel.m4 -@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. - fi - - # -- # Check if you have distutils, else fail -+ # Check if you have setuptools, else fail - # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ AC_MSG_CHECKING([for the setuptools Python package]) -+ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` -+ if test -z "$ac_setuptools_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ AC_MSG_ERROR([cannot import Python module "setuptools". - Please check your Python installation. The error was: --$ac_distutils_result]) -+$ac_setuptools_result]) - PYTHON_VERSION="" - fi - -@@ -88,8 +88,8 @@ $ac_distutils_result]) - PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` - fi - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` -+ python_path=`$PYTHON -c "import sys; import sysconfig;\ -+sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` - if test -n "${python_path}"; then - python_path="-I$python_path" - fi -@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` - if test -z "$PYTHON_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) -- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ --sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` -+ py_version=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` - if test "$py_version" == "[None]"; then - if test -n "$PYTHON_VERSION"; then - py_version=$PYTHON_VERSION -@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` - fi - fi - -- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ --sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ -+ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ - "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` - fi - AC_MSG_RESULT([$PYTHON_LDFLAGS]) -@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO - # - AC_MSG_CHECKING([for Python site-packages path]) - if test -z "$PYTHON_SITE_PKG"; then -- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` -+ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` - fi - AC_MSG_RESULT([$PYTHON_SITE_PKG]) - AC_SUBST([PYTHON_SITE_PKG]) -@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` - PYTHON_EXTRA_LIBS='' - fi - if test -z "$PYTHON_EXTRA_LIBS"; then -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ --conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ -+conf = sysconfig.get_config_var; \ - sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) -@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( - PYTHON_EXTRA_LDFLAGS='' - fi - if test -z "$PYTHON_EXTRA_LDFLAGS"; then -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ --conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ -+conf = sysconfig.get_config_var; \ - sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) -diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am -index 04edff003..bf05fe0fc 100644 ---- a/libraries/libapparmor/swig/python/Makefile.am -+++ b/libraries/libapparmor/swig/python/Makefile.am -@@ -21,7 +21,7 @@ install-exec-local: - - clean-local: - if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi -- rm -rf build -+ rm -rf build LibAppArmor.egg-info - if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi - - endif -diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in -index 32abd46b2..b23e40746 100644 ---- a/libraries/libapparmor/swig/python/setup.py.in -+++ b/libraries/libapparmor/swig/python/setup.py.in -@@ -1,4 +1,4 @@ --from distutils.core import setup, Extension -+from setuptools import setup, Extension - import string - - setup(name = 'LibAppArmor', -diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am -index 7287819c9..9dccfdef6 100644 ---- a/libraries/libapparmor/swig/python/test/Makefile.am -+++ b/libraries/libapparmor/swig/python/test/Makefile.am -@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status - CLEANFILES = test_python.py - - # bah, how brittle is this? --PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' -+PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' - - TESTS = test_python.py - TESTS_ENVIRONMENT = \ -diff --git a/profiles/Makefile b/profiles/Makefile -index c471e58e8..0b7f2655d 100644 ---- a/profiles/Makefile -+++ b/profiles/Makefile -@@ -41,7 +41,7 @@ ifdef USE_SYSTEM - LOGPROF?=aa-logprof - else - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am -- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") -+ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") - LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) - PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) -diff --git a/utils/Makefile b/utils/Makefile -index 1f08f259a..91a15107b 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -72,6 +72,7 @@ clean: pod_clean - rm -rf staging/ build/ - rm -f apparmor/*.pyc apparmor/rule/*.pyc - rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ -+ rm -rf apparmor.egg-info/ - - # ${CAPABILITIES} is defined in common/Make.rules - .PHONY: check_severity_db -diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py -index 30ce0cb05..2cbde8fc1 100644 ---- a/utils/python-tools-setup.py -+++ b/utils/python-tools-setup.py -@@ -20,14 +20,14 @@ - # Note: --version=... must be the last argument to this script - # - --from distutils.command.install import install as _install --from distutils.core import setup -+from setuptools.command.install import install as _install -+from setuptools import setup - import os - import shutil - import sys - - class Install(_install, object): -- '''Override distutils to install the files where we want them.''' -+ '''Override setuptools to install the files where we want them.''' - def run(self): - # Now byte-compile everything - super(Install, self).run() -diff --git a/utils/test/Makefile b/utils/test/Makefile -index 90354aa50..9126bdd71 100644 ---- a/utils/test/Makefile -+++ b/utils/test/Makefile -@@ -32,7 +32,7 @@ ifdef USE_SYSTEM - PARSER= - else - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am -- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") -+ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") - LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) - PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) --- -GitLab - diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash index 6a19aef77a..9fbfe3b92e 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 7bb849ab94..fcd3a4389b 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the apparmor package LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1 From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/libqmi: bump version to 1.30.4 Message-ID: <20220312170118.4898182AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c17e3e4b9af68a84adebd26c94700274a030a79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove 0001-build-add-an-option-to-not-build-man-pages.patch as release contains very similar commit which does autodetection: 1a474db ("build: add an option to not build man pages") Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...uild-add-an-option-to-not-build-man-pages.patch | 65 ---------------------- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch deleted file mode 100644 index d9053de537..0000000000 --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Wed, 3 Nov 2021 10:57:51 +0100 -Subject: [PATCH] build: add an option to not build man pages - -When cross-compiling, the compiled binaries cannot be run on the build -machine, unless one defines a helper (e.g. qemu) in the meson -configuration, which is most of the time undesirable. - -If help2man is installed on the build machine, then the build would fail -because of this, so add an option to disable generating the man pages. - -With later versions of meson, it will be possible to automatically -detect this condition. - -Based on the same fix done in libmbim by Nicolas Cavallari, see -https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 - -Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 - -[Retrieved (and backported) from: -https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 8 +++++++- - meson_options.txt | 1 + - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e88b43a1..c7312146 100644 ---- a/meson.build -+++ b/meson.build -@@ -223,8 +223,8 @@ if enable_gtk_doc - subdir('docs/reference/libqmi-glib') - endif - --help2man = find_program('help2man', required: false) --if help2man.found() -+enable_man = get_option('man') -+if enable_man - subdir('docs/man') - endif - -@@ -237,6 +242,7 @@ summary({ - output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' - output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' - output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' -+output += ' man pages: ' + enable_man.to_string() + '\n\n' - output += ' System paths\n' - output += ' prefix: ' + qmi_prefix + '\n' - output += ' udev base directory: ' + qmi_username + '\n\n' -diff --git a/meson_options.txt b/meson_options.txt -index 4d4f913d..bee5daac 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc - - option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') -+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') - - option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') --- -GitLab - diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 1f2da45ac0..ef2da77a2a 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb..b33e2fdc47 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.2 +LIBQMI_VERSION = 1.30.4 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/modem-manager: bump version to 1.18.6 Message-ID: <20220312170118.9A76C82B58@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e3ff4c21bafb562cf12ffdab93bb40bc5aae395 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df..ea91f42fe0 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index a881edc272..d7e2c55bf8 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 +MODEM_MANAGER_VERSION = 1.18.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/harfbuzz: bump to version 3.4.0 Message-ID: <20220312170117.DFF5082AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37fe946d9d9c917f87544660aaf056066d71cb9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 61f2865563..e4674afa87 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz +sha256 7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952 harfbuzz-3.4.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 1f5dfa8822..331b35c530 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.3.2 +HARFBUZZ_VERSION = 3.4.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/trace-cmd: bump to version 2.9.7 Message-ID: <20220312170117.ECAE37FF6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df103584508586117b85f11d7fccb6b64c4b1492 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 00cecc7828..4d39e4d5ea 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index fe0cd71ec4..52bb99036c 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_VERSION = 2.9.7 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/libinput: bump version to 1.20.0 Message-ID: <20220312170118.51BBA82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9cddb7bd56b8e430f6b798426b5c111c7b7d8fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - change site URL to new gitlab.freedesktop.org location - change hash from upstream provided to locally computed (and drop sha512) For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042111.html [2] https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libinput/libinput.hash | 5 ++--- package/libinput/libinput.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f18a727810..d1c7cfb104 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz +# Locally computed +sha256 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85 libinput-1.20.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 2f9c639c22..b814e3416d 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBINPUT_VERSION = 1.19.3 -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput +LIBINPUT_VERSION = 1.20.0 +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 +LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev LIBINPUT_INSTALL_STAGING = YES LIBINPUT_LICENSE = MIT From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-can: bump to version 4.0.0 Message-ID: <20220312170118.6CD1782AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90a3e71cd2b10ec254ff7e5c9a01342c9d53730d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-can/python-can.hash | 4 ++-- package/python-can/python-can.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 5330e5899c..dd8a9b107d 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/pypi/python-can -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz +sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz # Locally computed sha256 checksums -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 1ab813e2c9..9284a9cf99 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.4 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 +PYTHON_CAN_VERSION = 4.0.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/libnetfilter_conntrack: bump to version 1.0.9 Message-ID: <20220312170118.A3FEF82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9af9dfa543907c46091c706b0f3a0eb89445ae74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...r_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ---------------------- .../libnetfilter_conntrack.hash | 4 +-- .../libnetfilter_conntrack.mk | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch deleted file mode 100644 index 0b373d9261..0000000000 --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Apr 2020 14:05:15 +0200 -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private - -Since version 1.0.8 and commit -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends -on libmnl so add it to Libs.Private. - -Otherwise, applications such as dnsmasq will fail to link on: - -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' - -Fixes: - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 - -Signed-off-by: Fabrice Fontaine -[Upstream status: commit e94172f09e4d] ---- - libnetfilter_conntrack.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in -index 857f993..fbd7132 100644 ---- a/libnetfilter_conntrack.pc.in -+++ b/libnetfilter_conntrack.pc.in -@@ -12,5 +12,5 @@ Version: @VERSION@ - Requires: libnfnetlink - Conflicts: - Libs: -L${libdir} -lnetfilter_conntrack --Libs.private: @LIBNFNETLINK_LIBS@ -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.25.1 - diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 19520aa3f0..205eecf1f3 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 # Hash for license file: sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 0a5a94be8f..e10bdd02e9 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 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 From bugzilla at busybox.net Sat Mar 12 17:18:48 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 12 Mar 2022 17:18:48 +0000 Subject: [Buildroot] [Bug 14661] Fakeroot script relies on bash-isms, does not work with dash In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 --- Comment #1 from Fabrice Fontaine --- Thanks for your bug report, this should be fixed by https://git.buildroot.net/buildroot/commit/?id=38c4f6b807e9b519922172089915559fb8642046 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Sat Mar 12 17:37:32 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 12 Mar 2022 17:37:32 +0000 Subject: [Buildroot] [Bug 14661] Fakeroot script relies on bash-isms, does not work with dash In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED CC| |yann.morin.1998 at free.fr -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Sat Mar 12 17:57:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:57:43 +0100 Subject: [Buildroot] [git commit] package/chrony: bump to version 4.2 Message-ID: <20220312174926.86E8A82D99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39d6deb60b32b86d819346ebd8fc94c7e170908e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.tuxfamily.org/chrony/chrony.git/tree/NEWS?id=4.2 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/chrony/chrony.hash | 5 +++-- package/chrony/chrony.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index f8dd1438bc..7fa67bf040 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,4 +1,5 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz +# Locally calculated after checking pgp signature +# https://download.tuxfamily.org/chrony/chrony-4.2-tar-gz-asc.txt +sha256 273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a chrony-4.2.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 5a34f70e1e..15b200aeff 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 4.1 +CHRONY_VERSION = 4.2 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Mar 12 17:58:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:58:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/chrony: bump to version 4.2 In-Reply-To: <20220311150943.119252-1-james.knight@collins.com> References: <20220311150943.119252-1-james.knight@collins.com> Message-ID: <20220312175822.GK283544@scaer> James, All, On 2022-03-11 10:09 -0500, James Knight via buildroot spake thusly: > https://git.tuxfamily.org/chrony/chrony.git/tree/NEWS?id=4.2 > > Signed-off-by: James Knight Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/chrony/chrony.hash | 5 +++-- > package/chrony/chrony.mk | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash > index f8dd1438bc7d1f08dcbdccb7bff8e03cee3e2da8..7fa67bf040da0c00e23e3e4fb5ddd4a638cb91d0 100644 > --- a/package/chrony/chrony.hash > +++ b/package/chrony/chrony.hash > @@ -1,4 +1,5 @@ > -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html > -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz > +# Locally calculated after checking pgp signature > +# https://download.tuxfamily.org/chrony/chrony-4.2-tar-gz-asc.txt > +sha256 273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a chrony-4.2.tar.gz > # Locally calculated > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index 5a34f70e1e992f179784ad87b240967f5cf0a30f..15b200aeffe9bd70694bb1d490535ae8785dc3fc 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CHRONY_VERSION = 4.1 > +CHRONY_VERSION = 4.2 > CHRONY_SITE = http://download.tuxfamily.org/chrony > CHRONY_LICENSE = GPL-2.0 > CHRONY_LICENSE_FILES = COPYING > -- > 2.30.0.windows.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Mar 12 18:12:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 12 Mar 2022 19:12:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220312181249.7288-1-fontaine.fabrice@gmail.com> openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) -- 2.34.1 From arnout at mind.be Sat Mar 12 19:42:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:42:15 +0100 Subject: [Buildroot] [PATCH] package/mono: bump to version 6.12.0.122 In-Reply-To: <20220223075322.3044754-1-angelo@amarulasolutions.com> References: <20220223075322.3044754-1-angelo@amarulasolutions.com> Message-ID: On 23/02/2022 08:53, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. I also updated the hash file with 2 spaces. Regards, Arnout > --- > package/mono/mono.hash | 2 +- > package/mono/mono.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mono/mono.hash b/package/mono/mono.hash > index 2477e9231c..ad070bf102 100644 > --- a/package/mono/mono.hash > +++ b/package/mono/mono.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz > +sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz > sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE > sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING > sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt > diff --git a/package/mono/mono.mk b/package/mono/mono.mk > index 27f7886224..219effc5d3 100644 > --- a/package/mono/mono.mk > +++ b/package/mono/mono.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MONO_VERSION = 6.12.0.90 > +MONO_VERSION = 6.12.0.122 > MONO_SITE = http://download.mono-project.com/sources/mono > MONO_SOURCE = mono-$(MONO_VERSION).tar.xz > MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial From arnout at mind.be Sat Mar 12 19:42:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:42:53 +0100 Subject: [Buildroot] [PATCH/next 1/1] Revert "heimdal: disable parallel make" In-Reply-To: <20220222214931.447344-1-bernd.kuhls@t-online.de> References: <20220222214931.447344-1-bernd.kuhls@t-online.de> Message-ID: <3c8878cb-cd8e-d09f-ca63-383b4a96c244@mind.be> On 22/02/2022 22:49, Bernd Kuhls wrote: > This reverts commit f6980126f26c63421d04a32b6710d9e3a380476a. > > Parallel make was disabled back in 2017: > https://git.buildroot.net/buildroot/commit/?id=f6980126f26c63421d04a32b6710d9e3a380476a > > Build-test with -j99 was successful. > > Signed-off-by: Bernd Kuhls ?Applied to master, thanks. ?It's unfortunate that we couldn't identify why it was fixed, but the autobuilders will complain if it isn't. ?Regards, ?Arnout > --- > package/heimdal/heimdal.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk > index ce509c7afa..a8d87531ec 100644 > --- a/package/heimdal/heimdal.mk > +++ b/package/heimdal/heimdal.mk > @@ -8,7 +8,6 @@ HEIMDAL_VERSION = 7.7.0 > HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) > HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf > HEIMDAL_INSTALL_STAGING = YES > -HEIMDAL_MAKE = $(MAKE1) > # static because of -fPIC issues with e2fsprogs on x86_64 host > HOST_HEIMDAL_CONF_OPTS = \ > --disable-shared \ From arnout at mind.be Sat Mar 12 19:43:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:43:06 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/duktape: bump to version 2.7.0 In-Reply-To: <20220222214247.3163690-1-fontaine.fabrice@gmail.com> References: <20220222214247.3163690-1-fontaine.fabrice@gmail.com> Message-ID: <40127387-dd75-3cd9-b0ea-00944c4b2f6e@mind.be> On 22/02/2022 22:42, Fabrice Fontaine wrote: > Update hash of license file (update in year: > https://github.com/svaarala/duktape/commit/03d4d728f8365021de6955c649e6dcd05dcca99f) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/duktape/duktape.hash | 4 ++-- > package/duktape/duktape.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash > index 4c55e39888..ef6f55aa9d 100644 > --- a/package/duktape/duktape.hash > +++ b/package/duktape/duktape.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz > -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt > +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz > +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt > diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk > index 89a6e451f5..674c5e9323 100644 > --- a/package/duktape/duktape.mk > +++ b/package/duktape/duktape.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DUKTAPE_VERSION = 2.6.0 > +DUKTAPE_VERSION = 2.7.0 > DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz > DUKTAPE_SITE = \ > https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) From arnout at mind.be Sat Mar 12 19:43:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:43:40 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 In-Reply-To: <20220222220255.22327-1-petr.vorel@gmail.com> References: <20220222220255.22327-1-petr.vorel@gmail.com> Message-ID: <48945229-3116-363f-f61f-89d495695cc1@mind.be> On 22/02/2022 23:02, Petr Vorel wrote: > BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. > > Changes: > * libuv (new dependency) > * openssl is now mandatory > * zlib must be detected with PKG_CONFIG_PATH (specifying zlib > installation path is not supported) > * bind9-config and isc-config.sh removed > * updated COPYRIGHT hash > > Signed-off-by: Petr Vorel Applied to master, thanks. I guess we'll get complaints if it doesn't work :-) Regards, Arnout > --- > Hi, > > time to move on to 9.16. > > Tested only local build as I don't use bind. > I'll also verify builds with utils/test-pkg. > But it'd be great if anybody could also test running bind. > > Kind regards, > Petr > > package/bind/Config.in | 12 +++++++++++- > package/bind/bind.hash | 6 +++--- > package/bind/bind.mk | 15 +++++++-------- > 3 files changed, 21 insertions(+), 12 deletions(-) > > diff --git a/package/bind/Config.in b/package/bind/Config.in > index db10ceb304..9887403ed9 100644 > --- a/package/bind/Config.in > +++ b/package/bind/Config.in > @@ -1,6 +1,11 @@ > config BR2_PACKAGE_BIND > bool "bind" > - depends on BR2_USE_MMU # fork() > + depends on BR2_USE_MMU # fork(), libuv > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv > + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv > + depends on !BR2_STATIC_LIBS # libuv > + select BR2_PACKAGE_LIBUV > + select BR2_PACKAGE_OPENSSL > help > BIND (Berkeley Internet Name Domain) is an > implementation of the Domain Name System (DNS) protocols > @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND > > https://www.isc.org/bind/ > > +comment "bind needs a toolchain w/ NPTL, dynamic library" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > + > if BR2_PACKAGE_BIND > > config BR2_PACKAGE_BIND_SERVER > diff --git a/package/bind/bind.hash b/package/bind/bind.hash > index 70299f1677..401e389e49 100644 > --- a/package/bind/bind.hash > +++ b/package/bind/bind.hash > @@ -1,4 +1,4 @@ > -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc > +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc > # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD > -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz > -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT > +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz > +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index e329c803a3..5b4c60b14c 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -4,12 +4,12 @@ > # > ################################################################################ > > -BIND_VERSION = 9.11.36 > +BIND_VERSION = 9.16.26 > +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz > BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) > # bind does not support parallel builds. > BIND_MAKE = $(MAKE1) > BIND_INSTALL_STAGING = YES > -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh > BIND_LICENSE = MPL-2.0 > BIND_LICENSE_FILES = COPYRIGHT > BIND_CPE_ID_VENDOR = isc > @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ > BIND_CONF_OPTS = \ > $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ > --without-lmdb \ > - --with-libjson=no \ > + --with-json-c=no \ > --with-randomdev=/dev/urandom \ > --enable-epoll \ > --enable-filter-aaaa \ > --disable-backtrace > > +BIND_DEPENDENCIES = libuv > + > ifeq ($(BR2_PACKAGE_ZLIB),y) > -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr > +BIND_CONF_OPTS += --with-zlib > BIND_DEPENDENCIES += zlib > +BIND_DEPENDENCIES += host-pkgconf zlib > else > BIND_CONF_OPTS += --without-zlib > endif > @@ -66,7 +69,6 @@ else > BIND_CONF_OPTS += --with-libxml2=no > endif > > -ifeq ($(BR2_PACKAGE_OPENSSL),y) > BIND_DEPENDENCIES += host-pkgconf openssl > BIND_CONF_OPTS += \ > --with-openssl=$(STAGING_DIR)/usr \ > @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes > else > BIND_CONF_OPTS += --with-gost=no > endif > -else > -BIND_CONF_OPTS += --with-openssl=no > -endif > > # Used by dnssec-keymgr > ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) From arnout at mind.be Sat Mar 12 19:43:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:43:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-plugins: bump to version 1.2.6 In-Reply-To: <20220223043320.25753-1-ckhardin@gmail.com> References: <20220223043320.25753-1-ckhardin@gmail.com> Message-ID: <4827f093-f828-2591-c7d8-de6be1900b5c@mind.be> On 23/02/2022 05:33, Charles Hardin wrote: > https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6 > > Signed-off-by: Charles Hardin Applied to master, thanks. Regards, Arnout > --- > package/alsa-plugins/alsa-plugins.hash | 2 +- > package/alsa-plugins/alsa-plugins.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash > index 8ecbd19965..2582a0d639 100644 > --- a/package/alsa-plugins/alsa-plugins.hash > +++ b/package/alsa-plugins/alsa-plugins.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 > +sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2 > sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING > sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL > diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk > index 396f47adaf..b8819151ef 100644 > --- a/package/alsa-plugins/alsa-plugins.mk > +++ b/package/alsa-plugins/alsa-plugins.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ALSA_PLUGINS_VERSION = 1.2.5 > +ALSA_PLUGINS_VERSION = 1.2.6 > ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 > ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins > ALSA_PLUGINS_LICENSE = LGPL-2.1+ From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/duktape: bump to version 2.7.0 Message-ID: <20220312193555.A17DA83A6B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5d5089789eb2a2c7881ac9b38ae547d901df997 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of license file (update in year: https://github.com/svaarala/duktape/commit/03d4d728f8365021de6955c649e6dcd05dcca99f) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/duktape/duktape.hash | 4 ++-- package/duktape/duktape.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash index 4c55e39888..ef6f55aa9d 100644 --- a/package/duktape/duktape.hash +++ b/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 89a6e451f5..674c5e9323 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUKTAPE_VERSION = 2.6.0 +DUKTAPE_VERSION = 2.7.0 DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_SITE = \ https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/bind: bump to version 9.16.26 Message-ID: <20220312193555.B7F7583A8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8adeaec8afacbc680edebae91524f6144926ac92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. Changes: * libuv (new dependency) * openssl is now mandatory * zlib must be detected with PKG_CONFIG_PATH (specifying zlib installation path is not supported) * bind9-config and isc-config.sh removed * updated COPYRIGHT hash Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bind/Config.in | 12 +++++++++++- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 15 +++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb304..9887403ed9 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND https://www.isc.org/bind/ +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677..401e389e49 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a3..5b4c60b14c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,12 +4,12 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.26 +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ - --with-libjson=no \ + --with-json-c=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ --disable-backtrace +BIND_DEPENDENCIES = libuv + ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib +BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -66,7 +69,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr \ @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes else BIND_CONF_OPTS += --with-gost=no endif -else -BIND_CONF_OPTS += --with-openssl=no -endif # Used by dnssec-keymgr ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/alsa-plugins: bump to version 1.2.6 Message-ID: <20220312193555.C1DCA83A6B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=691b1cebf56099e7f019281beb761c0b0fe4d5e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6 Signed-off-by: Charles Hardin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alsa-plugins/alsa-plugins.hash | 2 +- package/alsa-plugins/alsa-plugins.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash index 8ecbd19965..2582a0d639 100644 --- a/package/alsa-plugins/alsa-plugins.hash +++ b/package/alsa-plugins/alsa-plugins.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 +sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 396f47adaf..b8819151ef 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_PLUGINS_VERSION = 1.2.5 +ALSA_PLUGINS_VERSION = 1.2.6 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins ALSA_PLUGINS_LICENSE = LGPL-2.1+ From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] Revert "heimdal: disable parallel make" Message-ID: <20220312193555.AC31282D98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94d1a54d8b941a44e7be93fc0f82913deaed34a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit f6980126f26c63421d04a32b6710d9e3a380476a. Parallel make was disabled back in 2017: https://git.buildroot.net/buildroot/commit/?id=f6980126f26c63421d04a32b6710d9e3a380476a Build-test with -j99 was successful. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/heimdal/heimdal.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index ce509c7afa..a8d87531ec 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -8,7 +8,6 @@ HEIMDAL_VERSION = 7.7.0 HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf HEIMDAL_INSTALL_STAGING = YES -HEIMDAL_MAKE = $(MAKE1) # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ --disable-shared \ From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/mono: bump to version 6.12.0.122 Message-ID: <20220312193555.CE6A383A8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e8635ba94bfb029584171a52d135db145ac7bf1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci [Arnout: use 2 spaces in hash file] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mono/mono.hash | 8 ++++---- package/mono/mono.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 2477e9231c..8b72ae68ed 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz -sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE -sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING -sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt +sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz +sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE +sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING +sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 27f7886224..219effc5d3 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.90 +MONO_VERSION = 6.12.0.122 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial From arnout at mind.be Sat Mar 12 20:15:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:15:12 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/libva: bump version to 2.14.0 In-Reply-To: <20220223152040.188210-1-bernd.kuhls@t-online.de> References: <20220223152040.188210-1-bernd.kuhls@t-online.de> Message-ID: <9b37f529-0a40-482b-15c0-e1a9a977306b@mind.be> On 23/02/2022 16:20, Bernd Kuhls wrote: > Release notes: https://github.com/intel/libva/releases/tag/2.14.0 > > Signed-off-by: Bernd Kuhls ?Applied both to master, thanks. ?Regards, ?Arnout > --- > package/libva/libva.hash | 6 +++--- > package/libva/libva.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libva/libva.hash b/package/libva/libva.hash > index 7b66a7709d..4646a816bb 100644 > --- a/package/libva/libva.hash > +++ b/package/libva/libva.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum > -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 > +# From https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2.sha1sum > +sha1 36b482ec8c361a6c3a6198f4777409b136f2713c libva-2.14.0.tar.bz2 > # Locally computed > -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 > +sha256 511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454 libva-2.14.0.tar.bz2 > sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING > diff --git a/package/libva/libva.mk b/package/libva/libva.mk > index 6ac5386540..db1cfd29be 100644 > --- a/package/libva/libva.mk > +++ b/package/libva/libva.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBVA_VERSION = 2.13.0 > +LIBVA_VERSION = 2.14.0 > LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 > LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) > LIBVA_LICENSE = MIT From arnout at mind.be Sat Mar 12 20:15:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:15:47 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kismet: bump to version 2022-02-R1 In-Reply-To: <20220223211202.3412693-1-fontaine.fabrice@gmail.com> References: <20220223211202.3412693-1-fontaine.fabrice@gmail.com> Message-ID: <269e9b3e-35d0-a044-9d84-9e2073400852@mind.be> On 23/02/2022 22:12, Fabrice Fontaine wrote: > Linking with -latomic is handled by configure.ac since version > 2022-01-R3 and > https://github.com/kismetwireless/kismet/commit/bbdfd21e2b41bf69513ded5ae5ab5a89f22a9912 > > https://www.kismetwireless.net/release/kismet-2022-02-R1 > https://www.kismetwireless.net/release/kismet-2022-01-R3 > https://www.kismetwireless.net/release/kismet-2022-01-R2 > https://www.kismetwireless.net/release/kismet-2022-01-R1 > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/kismet/kismet.hash | 2 +- > package/kismet/kismet.mk | 6 +----- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash > index 9a9d2260b9..fc5f854b7e 100644 > --- a/package/kismet/kismet.hash > +++ b/package/kismet/kismet.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz > +sha256 aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8 kismet-2022-02-R1.tar.xz > sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE > diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk > index 819ed510d7..3992a392f8 100644 > --- a/package/kismet/kismet.mk > +++ b/package/kismet/kismet.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KISMET_VERSION = 2021-08-R1 > +KISMET_VERSION = 2022-02-R1 > KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz > KISMET_SITE = http://www.kismetwireless.net/code > KISMET_DEPENDENCIES = \ > @@ -29,10 +29,6 @@ endif > > KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" > > -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -KISMET_CONF_ENV += LIBS=-latomic > -endif > - > ifeq ($(BR2_PACKAGE_LIBCAP),y) > KISMET_DEPENDENCIES += libcap > KISMET_CONF_OPTS += --enable-libcap From arnout at mind.be Sat Mar 12 20:16:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:16:23 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/screen: bump to version 4.9.0 In-Reply-To: <20220223221358.4097881-1-fontaine.fabrice@gmail.com> References: <20220223221358.4097881-1-fontaine.fabrice@gmail.com> Message-ID: <9f14637e-c0b5-2a6d-289c-cdc4a45f197b@mind.be> On 23/02/2022 23:13, Fabrice Fontaine wrote: > - Drop latest patch (already in version) > - Update indentation in hash file (two spaces) > > https://lists.gnu.org/archive/html/screen-users/2022-02/msg00000.html > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/screen/0008-CVE-2021-26937.patch | 68 ------------------------ > package/screen/screen.hash | 6 +-- > package/screen/screen.mk | 5 +- > 3 files changed, 4 insertions(+), 75 deletions(-) > delete mode 100644 package/screen/0008-CVE-2021-26937.patch > > diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch > deleted file mode 100644 > index df7efa0294..0000000000 > --- a/package/screen/0008-CVE-2021-26937.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -Description: [CVE-2021-26937] Fix out of bounds array access > -Author: Michael Schr?der > -Bug-Debian: https://bugs.debian.org/982435 > -Bug: https://savannah.gnu.org/bugs/?60030 > -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html > -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 > -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html > - > -Downloaded from Debian: > -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch > - > -Signed-off-by: Peter Korsgaard > ---- a/encoding.c > -+++ b/encoding.c > -@@ -43,7 +43,7 @@ > - # ifdef UTF8 > - static int recode_char __P((int, int, int)); > - static int recode_char_to_encoding __P((int, int)); > --static void comb_tofront __P((int, int)); > -+static void comb_tofront __P((int)); > - # ifdef DW_CHARS > - static int recode_char_dw __P((int, int *, int, int)); > - static int recode_char_dw_to_encoding __P((int, int *, int)); > -@@ -1263,6 +1263,8 @@ > - {0x30000, 0x3FFFD}, > - }; > - > -+ if (c >= 0xdf00 && c <= 0xdfff) > -+ return 1; /* dw combining sequence */ > - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || > - (cjkwidth && > - bisearch(c, ambiguous, > -@@ -1330,11 +1332,12 @@ > - } > - > - static void > --comb_tofront(root, i) > --int root, i; > -+comb_tofront(i) > -+int i; > - { > - for (;;) > - { > -+ int root = i >= 0x700 ? 0x801 : 0x800; > - debug1("bring to front: %x\n", i); > - combchars[combchars[i]->prev]->next = combchars[i]->next; > - combchars[combchars[i]->next]->prev = combchars[i]->prev; > -@@ -1396,9 +1399,9 @@ > - { > - /* full, recycle old entry */ > - if (c1 >= 0xd800 && c1 < 0xe000) > -- comb_tofront(root, c1 - 0xd800); > -+ comb_tofront(c1 - 0xd800); > - i = combchars[root]->prev; > -- if (c1 == i + 0xd800) > -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) > - { > - /* completely full, can't recycle */ > - debug("utf8_handle_comp: completely full!\n"); > -@@ -1422,7 +1425,7 @@ > - mc->font = (i >> 8) + 0xd8; > - mc->fontx = 0; > - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); > -- comb_tofront(root, i); > -+ comb_tofront(i); > - } > - > - #else /* !UTF8 */ > diff --git a/package/screen/screen.hash b/package/screen/screen.hash > index ca74ba8913..a261d3100d 100644 > --- a/package/screen/screen.hash > +++ b/package/screen/screen.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig > -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz > +# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig > +sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz > # Locally calculated > -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/screen/screen.mk b/package/screen/screen.mk > index 843c71fc2a..3239a1c1f3 100644 > --- a/package/screen/screen.mk > +++ b/package/screen/screen.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SCREEN_VERSION = 4.8.0 > +SCREEN_VERSION = 4.9.0 > SCREEN_SITE = $(BR2_GNU_MIRROR)/screen > SCREEN_LICENSE = GPL-3.0+ > SCREEN_LICENSE_FILES = COPYING > @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" > SCREEN_CONF_OPTS = --enable-colors256 > SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin > > -# 0008_CVE-2021-26937.patch > -SCREEN_IGNORE_CVES += CVE-2021-26937 > - > ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > SCREEN_DEPENDENCIES += linux-pam > SCREEN_CONF_OPTS += --enable-pam From ju.o at free.fr Sat Mar 12 20:16:24 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:24 +0100 Subject: [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Message-ID: <20220312201627.690544-1-ju.o@free.fr> This commit reorders dependencies and Kconfig package options alphabetically for better maintainability. This commit does not change anything else. Signed-off-by: Julien Olivain --- package/poco/Config.in | 82 +++++++++++++++++++++--------------------- package/poco/poco.mk | 28 +++++++-------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index dd87ee36bb..df3d3cbc66 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_CPP_PARSER + bool "cpp_parser" + +config BR2_PACKAGE_POCO_CRYPTO + bool "crypto" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL + +config BR2_PACKAGE_POCO_DATA + bool + +config BR2_PACKAGE_POCO_DATA_MYSQL + bool "mysql" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_POCO_DATA + +config BR2_PACKAGE_POCO_DATA_SQLITE + bool "sqlite" + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_SQLITE + config BR2_PACKAGE_POCO_JSON bool "json" -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_JSON -config BR2_PACKAGE_POCO_UTIL - bool "util" - select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_MONGODB + bool "mongodb" + select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET bool "net" -config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL - config BR2_PACKAGE_POCO_NETSSL_OPENSSL bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML + select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL -config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" - config BR2_PACKAGE_POCO_PDF bool "pdf" select BR2_PACKAGE_POCO_JSON @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS bool "redis" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" - select BR2_PACKAGE_POCO_NET - -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE +config BR2_PACKAGE_POCO_UTIL + bool "util" + select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_XML + bool "xml" + select BR2_PACKAGE_EXPAT -config BR2_PACKAGE_POCO_JWT - bool "jwt" - select BR2_PACKAGE_POCO_JSON - select BR2_PACKAGE_POCO_CRYPTO +config BR2_PACKAGE_POCO_ZIP + bool "zip" + select BR2_PACKAGE_POCO_NET + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML endif # BR2_PACKAGE_POCO diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 857f215e3a..81409ffec4 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ +POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring -- 2.35.1 From ju.o at free.fr Sat Mar 12 20:16:25 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:25 +0100 Subject: [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <20220312201627.690544-2-ju.o@free.fr> For clarity, use the same names used in documentation, and component selection in configure. Valid poco component names are defined in: https://github.com/pocoproject/poco/blob/poco-1.11.1-release/components Signed-off-by: Julien Olivain --- package/poco/Config.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index df3d3cbc66..79ffac741d 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -29,10 +29,10 @@ if BR2_PACKAGE_POCO comment "poco components" config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" + bool "CppParser" config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" + bool "Crypto" select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL @@ -40,58 +40,58 @@ config BR2_PACKAGE_POCO_DATA bool config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" + bool "Data/MySQL" depends on BR2_USE_MMU # mysql select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" + bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_SQLITE config BR2_PACKAGE_POCO_JSON - bool "json" + bool "JSON" config BR2_PACKAGE_POCO_JWT - bool "jwt" + bool "JWT" select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_JSON config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" + bool "MongoDB" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET - bool "net" + bool "Net" config BR2_PACKAGE_POCO_NETSSL_OPENSSL - bool "netssl_openssl" + bool "NetSSL_OpenSSL" select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL config BR2_PACKAGE_POCO_PDF - bool "pdf" + bool "PDF" select BR2_PACKAGE_POCO_JSON select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_REDIS - bool "redis" + bool "Redis" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_UTIL - bool "util" + bool "Util" select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_XML - bool "xml" + bool "XML" select BR2_PACKAGE_EXPAT config BR2_PACKAGE_POCO_ZIP - bool "zip" + bool "Zip" select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML -- 2.35.1 From arnout at mind.be Sat Mar 12 20:16:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:16:58 +0100 Subject: [Buildroot] [PATCH] package/erlang-jiffy: bump version to 1.1.1 In-Reply-To: <20220224152339.442421-1-giulio.benetti@benettiengineering.com> References: <20220224152339.442421-1-giulio.benetti@benettiengineering.com> Message-ID: On 24/02/2022 16:23, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/erlang-jiffy/erlang-jiffy.hash | 2 +- > package/erlang-jiffy/erlang-jiffy.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash > index 93c5e1f8c8..f172d1476e 100644 > --- a/package/erlang-jiffy/erlang-jiffy.hash > +++ b/package/erlang-jiffy/erlang-jiffy.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz > +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz > sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE > diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk > index cd94632962..de2e4749fb 100644 > --- a/package/erlang-jiffy/erlang-jiffy.mk > +++ b/package/erlang-jiffy/erlang-jiffy.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ERLANG_JIFFY_VERSION = 1.0.9 > +ERLANG_JIFFY_VERSION = 1.1.1 > ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) > ERLANG_JIFFY_LICENSE = MIT (core), \ > BSD-3-Clause (Google double conversion library), \ From ju.o at free.fr Sat Mar 12 20:16:26 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:26 +0100 Subject: [Buildroot] [PATCH 3/4] package/poco: add Data/PostgreSQL support In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <20220312201627.690544-3-ju.o@free.fr> PostgreSQL support was introduced in poco v1.10.0, in commit: https://github.com/pocoproject/poco/commit/8cec8f6451b9a0ead80f655eee986040863e3526 Signed-off-by: Julien Olivain --- package/poco/Config.in | 6 ++++++ package/poco/poco.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/package/poco/Config.in b/package/poco/Config.in index 79ffac741d..714e40f447 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -45,6 +45,12 @@ config BR2_PACKAGE_POCO_DATA_MYSQL select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA +config BR2_PACKAGE_POCO_DATA_PGSQL + bool "Data/PostgreSQL" + depends on BR2_USE_MMU # postgresql + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_POSTGRESQL + config BR2_PACKAGE_POCO_DATA_SQLITE bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 81409ffec4..119711f3fd 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -15,6 +15,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_POCO_XML),expat) @@ -24,6 +25,7 @@ POCO_OMIT = Data/ODBC PageCompiler \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),,Data/PostgreSQL) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ -- 2.35.1 From ju.o at free.fr Sat Mar 12 20:16:27 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:27 +0100 Subject: [Buildroot] [PATCH 4/4] package/poco: bump to version 1.11.1 In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <20220312201627.690544-4-ju.o@free.fr> This commit drop patches, as they are now included upstream or no longer needed. It also introduces a new patch to fix a build failure for nios2. MySQL include and library paths can now be provided in variables passed to the build command. Variables MYSQL_{INC,LIB}DIR are renamed to POCO_MYSQL_{INCLUDE,LIB}. For PostgreSQL support, variables POCO_PGSQL_{INCLUDE,LIB} are also passed the same way to the build command. This poco version 1.11.1 introduces a new ActiveRecord component. For changelog, see: https://raw.githubusercontent.com/pocoproject/poco/poco-1.11.1-release/CHANGELOG Signed-off-by: Julien Olivain --- This patch series was tested with: make check-package ... 0 warnings generated ./utils/test-pkg -a -p poco ... 45 builds, 17 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...ouble-conversion-detection-to-fix-co.patch | 36 +++++++++++++++++ ...-add-the-staging-path-to-search-path.patch | 40 ------------------- .../0002-Add-support-for-m68000-1856.patch | 32 --------------- ...tils.h-backport-double-conversion-ch.patch | 34 ---------------- package/poco/Config.in | 4 ++ package/poco/poco.hash | 2 +- package/poco/poco.mk | 9 +++-- 7 files changed, 47 insertions(+), 110 deletions(-) create mode 100644 package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch delete mode 100644 package/poco/0001-poco-add-the-staging-path-to-search-path.patch delete mode 100644 package/poco/0002-Add-support-for-m68000-1856.patch delete mode 100644 package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch diff --git a/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch new file mode 100644 index 0000000000..7b31729347 --- /dev/null +++ b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch @@ -0,0 +1,36 @@ +From d328829e9cb8b9fde9e70b07f2b991972cf474d1 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 12 Mar 2022 10:34:04 +0100 +Subject: [PATCH] Add back NIOS2 double conversion detection to fix compile + errors + +The commit +https://github.com/pocoproject/poco/commit/558324f672d824300498060aff63356bc6bb8097 + +removed the nios2 support, which was originally added in +https://github.com/pocoproject/poco/commit/e7b91e8125d6910b53f94de5be4bb53f38dc77c1 + +This commit add it back. + +Signed-off-by: Julien Olivain +--- + Foundation/src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 4328344d7..0a222c77d 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -102,7 +102,8 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__EMSCRIPTEN__) ++ defined(__EMSCRIPTEN__) || \ ++ defined(nios2) || defined(__nios2) || defined(__nios2__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) +-- +2.35.1 + diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch deleted file mode 100644 index fbabfc8f26..0000000000 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH] poco: add the staging path to search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach -[J?rg: Update to version 1.6.1 from github] -Signed-off-by: J?rg Krause -[Julien: Rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Data/MySQL/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 64a7d3f82..955fee2d4 100644 ---- a/Data/MySQL/Makefile -+++ b/Data/MySQL/Makefile -@@ -6,8 +6,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ --- -2.26.2 - diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch deleted file mode 100644 index bc04a9bf69..0000000000 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof -Date: Wed, 23 Aug 2017 16:50:51 +0200 -Subject: [PATCH] Add support for m68000 (#1856) - -Originally taken from - -https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da - -Signed-off-by: Thomas Petazzoni -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index c87cee13c..e891c0f10 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -66,6 +66,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. --- -2.26.2 - diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch deleted file mode 100644 index c06eebe8b0..0000000000 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 Jul 2018 15:37:47 +0200 -Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for - AArch64 BE support - -This commit, identical to upstream double-conversion commit -https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a -allows Poco to build on AArch64 big-endian. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/pocoproject/poco/pull/2378 -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index e891c0f10..892f7db18 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__riscv) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) --- -2.26.2 - diff --git a/package/poco/Config.in b/package/poco/Config.in index 714e40f447..699495a241 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,6 +28,10 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_ACTIVERECORD + bool "ActiveRecord" + select BR2_PACKAGE_POCO_XML + config BR2_PACKAGE_POCO_CPP_PARSER bool "CppParser" diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 2a2629733d..78d7d0b96e 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz +sha256 2412a5819a239ff2ee58f81033bcc39c40460d7a8b330013a687c8c0bd2b4ac0 poco-1.11.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 119711f3fd..fcf480c2a8 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.10.1 +POCO_VERSION = 1.11.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -20,6 +20,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \ $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ @@ -74,8 +75,10 @@ endef # Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25) define POCO_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ - MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ - MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_INCLUDE=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql \ + POCO_PGSQL_INCLUDE=$(STAGING_DIR)/usr/include/postgresql \ + POCO_PGSQL_LIB=$(STAGING_DIR)/usr/lib/postgresql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef -- 2.35.1 From arnout at mind.be Sat Mar 12 20:20:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:20:57 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/efl: handle input option In-Reply-To: <20220224162517.222437-2-romain.naour@gmail.com> References: <20220224162517.222437-1-romain.naour@gmail.com> <20220224162517.222437-2-romain.naour@gmail.com> Message-ID: <6c13f61c-d2e9-5433-d331-772d7d71fbfa@mind.be> On 24/02/2022 17:25, Romain Naour wrote: > From: Fabrice Fontaine > > Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input > option on target which was added (and enabled by default) by > https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be > resulting in the following build failure when eeze is disabled: > > ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". > > Fixes: > - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e > > Signed-off-by: Fabrice Fontaine > [Romain: > Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the > upstream name. > use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM > remove duplicate libxkbcommon in EFL_DEPENDENCIES] > Signed-off-by: Romain Naour > --- > v2: rework BR2_PACKAGE_EFL_DRM > --- > package/efl/Config.in | 19 +++++++++++++++---- > package/efl/efl.mk | 9 +++++++-- > 2 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/package/efl/Config.in b/package/efl/Config.in > index 4c78bef7c8..c4f82b92e3 100644 > --- a/package/efl/Config.in > +++ b/package/efl/Config.in > @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI > so you may also trigger code paths with bugs that are never > normally used. > > +config BR2_PACKAGE_EFL_ELPUT > + bool "Enable elput support (recommended)" > + default y > + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze > + select BR2_PACKAGE_EFL_EEZE > + select BR2_PACKAGE_LIBINPUT > + select BR2_PACKAGE_LIBXKBCOMMON > + help > + Eplut is used to support gesture recognition. > + > +comment "elput needs udev /dev management" > + depends on !BR2_PACKAGE_HAS_UDEV > + > config BR2_PACKAGE_EFL_LIBSNDFILE > bool "Enable libsndfile support (recommended)" > default y > @@ -216,13 +229,11 @@ endchoice # OpenGL support > > config BR2_PACKAGE_EFL_DRM > bool "Evas DRM Engine" > - depends on BR2_PACKAGE_HAS_UDEV # efl-eeze > + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze > depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d > - select BR2_PACKAGE_EFL_EEZE > + select BR2_PACKAGE_EFL_ELPUT Is this really true? The description of elput says that it's about gesture recognition, I don't see how that's related to the DRM backend. And the help text below is saying something like "you can use input gestures both on drm and fb", so it's weird that elput is only required for drm... > select BR2_PACKAGE_LIBDRM > - select BR2_PACKAGE_LIBINPUT # For elput There was a corresponding _DEPENDENCIES += in the .mk file, I removed that since it's covered by elput. With that change, both applied to master, thanks. Regards, Arnout > - select BR2_PACKAGE_LIBXKBCOMMON > help > This option enable building support for the Evas DRM Engine. > > diff --git a/package/efl/efl.mk b/package/efl/efl.mk > index 43a2dc4fcb..bb0bd3f76d 100644 > --- a/package/efl/efl.mk > +++ b/package/efl/efl.mk > @@ -67,6 +67,13 @@ else > EFL_CONF_OPTS += -Deeze=false > endif > > +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) > +EFL_DEPENDENCIES += libinput libxkbcommon > +EFL_CONF_OPTS += -Dinput=true > +else > +EFL_CONF_OPTS += -Dinput=false > +endif > + > ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) > EFL_DEPENDENCIES += util-linux > EFL_CONF_OPTS += -Dlibmount=true > @@ -204,8 +211,6 @@ else > EFL_CONF_OPTS += -Dwl=false > endif > > -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) > - > # json evas loader is disabled by default by upstream. > # Disable libspectre (ps). > # Keep all other evas loader enabled or handled below. From arnout at mind.be Sat Mar 12 20:22:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:22:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix musl build In-Reply-To: <20220224173615.486414-1-fontaine.fabrice@gmail.com> References: <20220224173615.486414-1-fontaine.fabrice@gmail.com> Message-ID: <651e1b1e-aef7-59af-c663-bdacb858bad3@mind.be> On 24/02/2022 18:36, Fabrice Fontaine wrote: > Fix the following musl build failure raised since commit > 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: > > In file included from src/shared/queue.c:15: > ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? > 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > | ^~~~~~~ > | size_t > > Fixes: > - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 > > Signed-off-by: Fabrice Fontaine > --- > ...rc-shared-util.h-include-sys-types.h.patch | 39 +++++++++++++++++++ > 1 file changed, 39 insertions(+) > create mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch > > diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch > new file mode 100644 > index 0000000000..8a5bd64d43 > --- /dev/null > +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch > @@ -0,0 +1,39 @@ > +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 24 Feb 2022 18:19:33 +0100 > +Subject: [PATCH] src/shared/util.h: include sys/types.h > + > +Include sys/types.h to avoid the following build failure on musl raised > +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: > + > +In file included from src/shared/queue.c:15: > +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? > + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > + | ^~~~~~~ > + | size_t > + > +Fixes: > + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 > + > +Signed-off-by: Fabrice Fontaine Your upstream submission was missing the Sob, but apparently it got committed nonetheless. Applied to master, thanks. Regards, Arnout > +[Upstream status: > +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] > +--- > + src/shared/util.h | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/shared/util.h b/src/shared/util.h > +index c01eccf8a..554481e1e 100644 > +--- a/src/shared/util.h > ++++ b/src/shared/util.h > +@@ -14,6 +14,7 @@ > + #include > + #include > + #include > ++#include > + > + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) > + #define BIT(n) (1 << (n)) > +-- > +2.34.1 > + From arnout at mind.be Sat Mar 12 20:24:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:24:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS In-Reply-To: <20220224175119.487040-1-fontaine.fabrice@gmail.com> References: <20220224175119.487040-1-fontaine.fabrice@gmail.com> Message-ID: <978fe72d-8a69-727c-8cf8-ae6b769bed0d@mind.be> On 24/02/2022 18:51, Fabrice Fontaine wrote: > bpftool uses its own local copy of libbpf so add > BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure > on ARM: > > btf.c: In function 'btf_type_by_id': > btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] > if (type_id < btf->start_id) > ^ > bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > > Fixes: > - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e > > Signed-off-by: Fabrice Fontaine > --- > package/bpftool/Config.in | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in > index e81d874343..a1ef3843e6 100644 > --- a/package/bpftool/Config.in > +++ b/package/bpftool/Config.in > @@ -1,5 +1,15 @@ > +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Would it make sense to define this as "default y if BR2_PACKAGE_LIBBPF_ARCH_SUPPORTS" instead? Hm, I suppose it's possible that one of them gains a new platform before the other one is updated... > + bool > + # see libbpf/src/bpf.c > + default y if BR2_arc > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_i386 || BR2_x86_64 > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_s390x > + > config BR2_PACKAGE_BPFTOOL > bool "bpftool" > + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS > depends on !BR2_nios2 # binutils It's weird to still have this nios2 dependency here, but I guess it's nice to simply propagate all dependencies, keeping the redundant ones. Applied to master, thanks. Regards, Arnout > depends on BR2_USE_WCHAR # binutils, elfutils > depends on !BR2_STATIC_LIBS # elfutils > @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL > of eBPF programs and maps. > > comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" > + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS > depends on !BR2_nios2 > depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ > || !BR2_TOOLCHAIN_HAS_THREADS \ From arnout at mind.be Sat Mar 12 20:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:25:24 +0100 Subject: [Buildroot] [PATCH] package/rust: set musl-root for musl toolchains In-Reply-To: <20220225083037.229109-1-romain.naour@gmail.com> References: <20220225083037.229109-1-romain.naour@gmail.com> Message-ID: On 25/02/2022 09:30, Romain Naour wrote: > Without musl-root in config.toml the build stop with the following error: > > thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 > > musl-root is needed to provide the path to libc.a and libunwind.a because > rust link them statically into the standard library and liblibc [1]. > > For other libc, musl-root is not used and ignored [2]. > > [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd > [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Arnout > --- > Runtime tested with TestRust with ripgrep and bat packages. > --- > package/rust/rust.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index 4a6b04dc8c..c2e0a361dd 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS > echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ > echo '[rust]'; \ > echo 'channel = "stable"'; \ > + echo 'musl-root = "$(STAGING_DIR)"' ; \ > echo '[target.$(RUSTC_TARGET_NAME)]'; \ > echo 'cc = "$(TARGET_CROSS)gcc"'; \ > echo '[llvm]'; \ From arnout at mind.be Sat Mar 12 20:26:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:26:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build with libexecinfo In-Reply-To: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> References: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> Message-ID: On 25/02/2022 19:52, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' > > Fixes: > - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...on-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 +++++++++++++++++++ > package/rpi-userland/rpi-userland.mk | 5 ++ > 2 files changed, 63 insertions(+) > create mode 100644 package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch > > diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch > new file mode 100644 > index 0000000000..bf2a9eb6ea > --- /dev/null > +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch > @@ -0,0 +1,58 @@ > +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 25 Feb 2022 19:21:06 +0100 > +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS > + > +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to > +pass additional flags such as -lexecinfo on musl and uclibc-ng > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/raspberrypi/userland/pull/719] > +--- > + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- > + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- > + makefiles/cmake/arm-linux.cmake | 2 +- > + 3 files changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt > +index e7206cc..16c64db 100644 > +--- a/host_applications/android/apps/vidtex/CMakeLists.txt > ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt > +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) > + # Set --no-as-needed to stop the linker discarding mmal_vc_client > + # as it can't see that the constructor registers a load of functionality > + # with the MMAL core. > +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) > ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) > + > + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) > + > +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt > +index e6bd373..2f72eb2 100644 > +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt > ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt > +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) > + # Set --no-as-needed to stop the linker discarding mmal_vc_client > + # as it can't see that the constructor registers a load of functionality > + # with the MMAL core. > +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) > ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) > + > + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) > + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) > +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake > +index 957846a..e172282 100644 > +--- a/makefiles/cmake/arm-linux.cmake > ++++ b/makefiles/cmake/arm-linux.cmake > +@@ -93,7 +93,7 @@ if(ANDROID) > + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") > + > + link_directories(${ANDROID_LIBS}) > +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") > ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") > +-- > +2.34.1 > + > diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk > index 84050b6df3..3564ec0703 100644 > --- a/package/rpi-userland/rpi-userland.mk > +++ b/package/rpi-userland/rpi-userland.mk > @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr > > RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +RPI_USERLAND_DEPENDENCIES += libexecinfo > +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo > +endif > + > ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) > > RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From arnout at mind.be Sat Mar 12 20:28:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:28:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/zabbix: fix shared netsnmp build In-Reply-To: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Message-ID: <41dda551-a569-3870-483c-736296887057@mind.be> On 26/02/2022 00:05, Fabrice Fontaine wrote: > Fix the following shared build failure with netsnmp raised since the > addition of the package in commit > 42382a171277ead59e365f5920e757f01c04ac77: > > configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" > > Fixes: > - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 > > Signed-off-by: Fabrice Fontaine > --- > ...-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 +++++++++++++++++++ > package/zabbix/zabbix.mk | 2 + > 2 files changed, 46 insertions(+) > create mode 100644 package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch > > diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch > new file mode 100644 > index 0000000000..ffb1f54ba2 > --- /dev/null > +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch > @@ -0,0 +1,44 @@ > +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 25 Feb 2022 23:30:19 +0100 > +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build > + > +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails > +with the following error if the user provides the path of > +net-snmp-config through the --with-net-snmp option: > + > +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" > + > +However, the assumption that a static library will be provided by the > +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN > + > +Fixes: > + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/zabbix/zabbix/pull/61] > +--- > + m4/netsnmp.m4 | 7 +++++-- > + 1 file changed, 5 insertions(+), 2 deletions(-) > + > +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 > +index 5e84d84303..87e21a67e6 100644 > +--- a/m4/netsnmp.m4 > ++++ b/m4/netsnmp.m4 > +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], > + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) > + > + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then > +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) > +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` This whole thing looks fishy... "if static linking is NO, then link with the static library"? Anyway, applied to master, thanks. Regards, Arnout > ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then > ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` > ++ else > ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) > ++ fi > + else > + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` > + fi > +-- > +2.34.1 > + > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index e6564e68fd..a8ecbb42db 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO > ZABBIX_LICENSE = GPL-2.0+ > ZABBIX_LICENSE_FILES = README COPYING > ZABBIX_CPE_ID_VENDOR = zabbix > +# We're patching m4/netsnmp.m4 > +ZABBIX_AUTORECONF = YES > > ZABBIX_DEPENDENCIES = pcre > ZABBIX_CONF_OPTS = \ From arnout at mind.be Sat Mar 12 20:30:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:30:23 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <20220224154513.220976-1-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> Message-ID: On 24/02/2022 16:45, Romain Naour wrote: > TestRust and TestRustBin has been introduced at the time when there was > no cargo package infrastructure or any package using rust compiler > (Buildroot 2018.02). > > Since then the ripgrep package has been introduced, initially using > the generic package infrastructure and converted later to the cargo > package infrastructure. > > Due a recent change in rust/cargo removing the cargo config file [1] > the test TestRust and TestRustBin now fail to compile since they build > an hello-world crate outside of the cargo package infrastructure > without the correct environment for cross-compiling. > > Replace the 'hello-world' crate by ripgrep package and check if it > can run properly in Qemu. > > Fixes tests.package.test_rust.TestRustBin: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 > > But doesn't fixes tests.package.test_rust.TestRust due another bug: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > > [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 > > Signed-off-by: Romain Naour > Cc: Eric Le Bihan > --- > v2: no changes > --- > support/testing/tests/package/test_rust.py | 48 ++-------------------- > 1 file changed, 4 insertions(+), 44 deletions(-) > > diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py > index 884b40a4a3..a1abd20c09 100644 > --- a/support/testing/tests/package/test_rust.py > +++ b/support/testing/tests/package/test_rust.py > @@ -8,9 +8,6 @@ import infra.basetest > > class TestRustBase(infra.basetest.BRTest): > > - target = 'armv7-unknown-linux-gnueabihf' > - crate = 'hello-world' > - > def login(self): > img = os.path.join(self.builddir, "images", "rootfs.cpio") > self.emulator.boot(arch="armv7", > @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): > options=["-initrd", img]) > self.emulator.login() > > - def build_test_prog(self): > - hostdir = os.path.join(self.builddir, 'host') > - env = os.environ.copy() > - env["USER"] = "br-user" > - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] > - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') > - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') > - cargo = os.path.join(hostdir, 'bin', 'cargo') > - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), > - self.crate) > - manifest = os.path.join(workdir, 'Cargo.toml') > - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) > - > - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo init failed") > - > - cmd = [ > - cargo, 'build', '-vv', '--target', self.target, > - '--manifest-path', manifest > - ] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo build failed") > - > - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) > - self.b.build() > - shutil.rmtree(workdir) > - > - > class TestRustBin(TestRustBase): > config = \ > """ > @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") ?It now looks more like test_ripgrep than test_rust, but OK, we still have the rust-bin and full rust variants. ?Applied to master, thanks. ?Regards, ?Arnout > > > class TestRust(TestRustBase): > @@ -90,9 +50,9 @@ class TestRust(TestRustBase): > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > BR2_PACKAGE_HOST_RUST=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") From yann.morin.1998 at free.fr Sat Mar 12 20:33:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:33:35 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.48 Message-ID: <20220312202507.E350283AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4550054d2ff6e086711c7a258f6596a0ef8a9f99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set new x11-xfixes meson config option. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index a9d59663ae..e6fad56698 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 +sha256 68bbf83b4c12bbcaef5d4bfb0dda86177583cf0abe0026efcfedd837b2e4926e pipewire-0.3.48.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..80246cc8d0 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.45 +PIPEWIRE_VERSION = 0.3.48 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -136,6 +136,13 @@ else PIPEWIRE_CONF_OPTS += -Dx11=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled +PIPEWIRE_DEPENDENCIES += xlib_libXfixes +else +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb From yann.morin.1998 at free.fr Sat Mar 12 20:34:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.48 In-Reply-To: <20220311233050.4686-1-james.hilliard1@gmail.com> References: <20220311233050.4686-1-james.hilliard1@gmail.com> Message-ID: <20220312203403.GL283544@scaer> James, All, On 2022-03-11 16:30 -0700, James Hilliard spake thusly: > Set new x11-xfixes meson config option. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pipewire/pipewire.hash | 2 +- > package/pipewire/pipewire.mk | 9 ++++++++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash > index a9d59663ae..e6fad56698 100644 > --- a/package/pipewire/pipewire.hash > +++ b/package/pipewire/pipewire.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 > +sha256 68bbf83b4c12bbcaef5d4bfb0dda86177583cf0abe0026efcfedd837b2e4926e pipewire-0.3.48.tar.bz2 > sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING > sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE > diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk > index fc521c86ac..80246cc8d0 100644 > --- a/package/pipewire/pipewire.mk > +++ b/package/pipewire/pipewire.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PIPEWIRE_VERSION = 0.3.45 > +PIPEWIRE_VERSION = 0.3.48 > PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 > PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) > PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) > @@ -136,6 +136,13 @@ else > PIPEWIRE_CONF_OPTS += -Dx11=disabled > endif > > +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) > +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled > +PIPEWIRE_DEPENDENCIES += xlib_libXfixes > +else > +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled > +endif > + > ifeq ($(BR2_PACKAGE_LIBUSB),y) > PIPEWIRE_CONF_OPTS += -Dlibusb=enabled > PIPEWIRE_DEPENDENCIES += libusb > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 20:34:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:34:09 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <20220224154513.220976-2-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> <20220224154513.220976-2-romain.naour@gmail.com> Message-ID: <08edbbcf-8be3-4554-0d54-0dd349caa2ff@mind.be> On 24/02/2022 16:45, Romain Naour wrote: > The test TestRust is currently broken with ripgrep package with > the following error: > > error[E0514]: found crate `core` compiled by an incompatible version of rustc > | > = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) > = note: the following crate versions were found: > crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib > > error[E0514]: found crate `std` compiled by an incompatible version of rustc > > The problem is not really a cross-compilation issue (we are building > for an armv7 target on x86_64 host) but a problem with rust-std libraries > (rlib). > > We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same > version as the prebuilt rustc used to bootstrap the build: > > TestRust/host/bin/rustc --version > rustc 1.58.1 > > TestRustBin/host/bin/rustc --version > rustc 1.58.1 (db9d1b20b 2022-01-20) > > Indeed we are using host-rust-bin to bootstrap the host-rust compiler > package built by Buildroot. The problem is that the > libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) > and is not removed before installing host-rust built by Buildroot. > > We actually spent a lot of time to build host-rust with rust-std > and forget to install this important library HOST_DIR. > > Looking at the host-rust build directory we can notice two installer > script "install.sh" (the same scripts used to install host-rust-bin): > > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh > > The "tarball" directory is generated by the "python x.py dist" during > the install step, we have to keep it. > > Replace "python x.py install" by theses two install scripts. > Installing rust-std with the install.sh script replace the rust-std > libraries installed by host-rust-bin. Excellent description, thanks. It's almost Yann-level :-) > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > > Signed-off-by: Romain Naour > Cc: Eric Le Bihan > --- > package/rust/rust.mk | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index 46487fe4b7..4a6b04dc8c 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -67,9 +67,30 @@ define HOST_RUST_BUILD_CMDS > cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build > endef > > +HOST_RUST_INSTALL_COMMON_OPTS = \ > + --prefix=$(HOST_DIR) \ > + --disable-ldconfig > + > +HOST_RUST_INSTALL_OPTS = \ This variable is used only once, which makes it not very useful. I instead added the --components directly in HOST_RUST_INSTALL_RUSTC. I also renamend the INSTALL_COMMON_OPTS to INSTALL_OPTS since there's only one variable now. > + $(HOST_RUST_INSTALL_COMMON_OPTS) \ > + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) > + > +define HOST_RUST_INSTALL_RUSTC > + (cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ The parenthesis are not necessary - make already starts a sub-shell for every line, there's no need to add another shell level. We still have them in a lot of .mk files, but we try to avoid adding them. Applied to master with those two changes, thanks. Regards, Arnout > + ./install.sh $(HOST_RUST_INSTALL_OPTS)) > +endef > + > +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) > +define HOST_RUST_INSTALL_LIBSTD_TARGET > + (cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ > + ./install.sh $(HOST_RUST_INSTALL_COMMON_OPTS)) > +endef > +endif > + > define HOST_RUST_INSTALL_CMDS > cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist > - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install > + $(HOST_RUST_INSTALL_RUSTC) > + $(HOST_RUST_INSTALL_LIBSTD_TARGET) > endef > > $(eval $(host-generic-package)) From yann.morin.1998 at free.fr Sat Mar 12 20:36:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:36:27 +0100 Subject: [Buildroot] [PATCH v3 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220312203627.GM283544@scaer> Cl?ment, All, On 2022-03-11 13:36 +0100, Cl?ment L?ger via buildroot spake thusly: > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > and optee-test which needs to be aligned with optee-os version. Following the important review from Thomas on patch 1, I've marked this series as changes requested in Patchwork. Please, can you add me in Cc of patch 1 in a future respin (I too may have to deal with python-cryptography on the host in short order). Regards, Yann E. MORIN. > ---- > Changes in v3: > - Fix authorship for commits that were copied from Etienne ones. > - Fix package URL for optee-os > - Added Acked-by Etienne Carriere > > Changes in v2: > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > Cl?ment L?ger (7): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > package/optee-test: bump to version 3.16.0 > package/optee-examples: bump to version 3.16.0 > package/optee-client: bump to version 3.16.0 > package/optee-benchmark: bump to version 3.16.0 > > boot/optee-os/Config.in | 13 +++++++++++-- > boot/optee-os/optee-os.hash | 4 ++-- > boot/optee-os/optee-os.mk | 7 ++++++- > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > package/optee-benchmark/optee-benchmark.mk | 2 +- > package/optee-client/optee-client.hash | 4 ++-- > package/optee-client/optee-client.mk | 2 +- > package/optee-examples/optee-examples.hash | 4 ++-- > package/optee-examples/optee-examples.mk | 2 +- > package/optee-test/optee-test.hash | 4 ++-- > package/optee-test/optee-test.mk | 2 +- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 12 files changed, 38 insertions(+), 17 deletions(-) > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 20:37:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:37:08 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: bump version to 20220310 Message-ID: <20220312203525.0A16083C1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b9246703dbb92e1e556ff343746959fa04ca17e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update hash of WHENCE file - update hash of LICENSE.amdgpu (copyright year update, see [1]) [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=34f9f8994a61192abfb597fc55810e3c27269ebf Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/linux-firmware/linux-firmware.hash | 6 +++--- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 83275ec6d7..382e9cb2ba 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,9 +1,9 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz +sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE +sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c..5ccb7f10dd 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20211216 +LINUX_FIRMWARE_VERSION = 20220310 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From yann.morin.1998 at free.fr Sat Mar 12 20:44:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:44:17 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20220310 In-Reply-To: <20220311073333.29596-1-ps.report@gmx.net> References: <20220311073333.29596-1-ps.report@gmx.net> Message-ID: <20220312204417.GN283544@scaer> Peter, All, On 2022-03-11 08:33 +0100, Peter Seiderer spake thusly: > - update hash of WHENCE file > > - update hash of LICENSE.amdgpu (copyright year update, see [1]) > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=34f9f8994a61192abfb597fc55810e3c27269ebf > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/linux-firmware/linux-firmware.hash | 6 +++--- > package/linux-firmware/linux-firmware.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash > index 83275ec6d7..382e9cb2ba 100644 > --- a/package/linux-firmware/linux-firmware.hash > +++ b/package/linux-firmware/linux-firmware.hash > @@ -1,9 +1,9 @@ > # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc > -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz > +sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz > > # Hash for license files > sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis > -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu > +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu > sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell > sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware > sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt > @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS > sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom > sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon > sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware > -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE > +sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE > sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt > sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 2d103df05c..5ccb7f10dd 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LINUX_FIRMWARE_VERSION = 20211216 > +LINUX_FIRMWARE_VERSION = 20220310 > LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz > LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware > LINUX_FIRMWARE_INSTALL_IMAGES = YES > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 20:49:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:49:17 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: Add Intel WiFi 22000 series Message-ID: <20220312204122.8D48583C81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aee590b3bc953b538b87b2a97ea3d5cde6b6d90f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add Intel WiFi 22000 series firmware. This firmware supports WiFi 6 models like AX200/AX201/AX210. Signed-off-by: Stefan Agner [yann.morin.1998 at free.fr: fix prompt for consistency with other iwlwifi] Signed-off-by: Yann E. MORIN --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index c94ffe24de..4a44d4a2b6 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 + bool "Intel iwlwifi 22000" + help + Firmware files for the Intel Wifi 22000 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 5ccb7f10dd..2eec8a291a 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware From yann.morin.1998 at free.fr Sat Mar 12 20:50:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:50:55 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: Add Intel WiFi 22000 series In-Reply-To: <200a0dbe075eee7e2c6d309e8a00d68f74b671c7.1646217112.git.stefan@agner.ch> References: <200a0dbe075eee7e2c6d309e8a00d68f74b671c7.1646217112.git.stefan@agner.ch> Message-ID: <20220312205055.GO283544@scaer> Stefan, All, On 2022-03-02 11:32 +0100, Stefan Agner spake thusly: > Add Intel WiFi 22000 series firmware. This firmware supports WiFi 6 > models like AX200/AX201/AX210. > > Signed-off-by: Stefan Agner > --- > package/linux-firmware/Config.in | 6 ++++++ > package/linux-firmware/linux-firmware.mk | 5 +++++ > 2 files changed, 11 insertions(+) > > diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in > index c94ffe24de..c9294956cc 100644 > --- a/package/linux-firmware/Config.in > +++ b/package/linux-firmware/Config.in > @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX > help > Firmware files for the Cypress cyw54xxx FullMAC. > > +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 > + bool "Intel Wireless 22000 series" I've changed this to more closely match the other iwlwifi prompts that follow. Applied to master, thanks. Regards, Yann E. MORIN. > + help > + Firmware files for the Intel Wifi 22000 devices supported by > + the iwlwifi kernel driver. > + > config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 > bool "Intel iwlwifi 22260" > help > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 2d103df05c..6502b90e2d 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* > LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k > endif > > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) > +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware > +endif > + > ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) > LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode > LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 21:29:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 22:29:54 +0100 Subject: [Buildroot] [git commit] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220312212159.CEC7E83C8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66fd92a4ce0599ee8c59b9ba95bf0f2c6ec74c43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ???reserve???: bitmap.c:98:1: sorry, unimplemented: ???-fzero-call-used-regs??? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...ection-of-fzero-call-used-regs-all-suppor.patch | 38 ++++++++++++++++++++++ package/openssh/openssh.mk | 4 +++ 2 files changed, 42 insertions(+) diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From yann.morin.1998 at free.fr Sat Mar 12 21:31:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 22:31:02 +0100 Subject: [Buildroot] [PATCH v2] package/openssh: fix '-fzero-call-used-regs' option support detection In-Reply-To: <20220311065511.14015-1-ps.report@gmx.net> References: <20220311065511.14015-1-ps.report@gmx.net> Message-ID: <20220312213102.GP283544@scaer> Peter, All, On 2022-03-11 07:55 +0100, Peter Seiderer spake thusly: > - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option > support detection > > - add autoreconf as the patch touches m4/openssh.m4 > > Fixes: > > - https://bugs.busybox.net/show_bug.cgi?id=14651 > > bitmap.c: In function ?reserve?: > bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target > 98 | } > | ^ > > [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - rebased and renumbered patch from 0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > to 0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > --- > ...n-of-fzero-call-used-regs-all-suppor.patch | 38 +++++++++++++++++++ > package/openssh/openssh.mk | 4 ++ > 2 files changed, 42 insertions(+) > create mode 100644 package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > > diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > new file mode 100644 > index 0000000000..ce5c5539ff > --- /dev/null > +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > @@ -0,0 +1,38 @@ > +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 > +From: Colin Watson > +Date: Thu, 24 Feb 2022 16:04:18 +0000 > +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support > + > +GCC doesn't tell us whether this option is supported unless it runs into > +the situation where it would need to emit corresponding code. > + > +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] > +Signed-off-by: Peter Seiderer > +--- > + m4/openssh.m4 | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/m4/openssh.m4 b/m4/openssh.m4 > +index 4f9c379..8c33c70 100644 > +--- a/m4/openssh.m4 > ++++ b/m4/openssh.m4 > +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ > + #include > + #include > ++/* Trivial function to help test for -fzero-call-used-regs */ > ++void f(int n) {} > + int main(int argc, char **argv) { > + (void)argv; > + /* Some math to catch -ftrapv problems in the toolchain */ > +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { > + float l = i * 2.1; > + double m = l / 0.5; > + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; > ++ f(0); > + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); > + /* > + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does > +-- > +2.35.1 > + > diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk > index 0e0d59e6ab..84add9563d 100644 > --- a/package/openssh/openssh.mk > +++ b/package/openssh/openssh.mk > @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) > OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable > OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain > OPENSSH_LICENSE_FILES = LICENCE > + > +# patch touching m4/openssh.m4 > +OPENSSH_AUTORECONF = YES > + > OPENSSH_CONF_ENV = \ > LD="$(TARGET_CC)" \ > LDFLAGS="$(TARGET_CFLAGS)" \ > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From christian at paral.in Sun Mar 13 00:17:15 2022 From: christian at paral.in (Christian Stewart) Date: Sat, 12 Mar 2022 16:17:15 -0800 Subject: [Buildroot] sshd: fails with seccomp issue on arm In-Reply-To: <105a4a50-cc20-9286-4121-96847904e5e6@mind.be> References: <105a4a50-cc20-9286-4121-96847904e5e6@mind.be> Message-ID: hi Arnout, On Sat, Mar 12, 2022 at 8:07 AM Arnout Vandecappelle wrote: > On 12/03/2022 05:55, Christian Stewart via buildroot wrote: > > I found this relevant issue & patch added to gentoo to fix this: > > > > https://www.mail-archive.com/debian-bugs-dist at lists.debian.org/msg1844602.html > > > > https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc55aee6b2534bbc8d8fe12128c1083ee6850 > > > > Shall we include this patch in Buildroot as well? > > You mean [1] ? This is currently the most recent commit on master, and was not applied yet when I sent the email :) > > I also ran into a build error with fzero-call-regs, there is a patch > > to fix that too: > > > > https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch > > As in [2] Similarly this was applied very recently to master, I was using 2022.02 when sending this note. So, yes, this is fixed now with those things merged. Thanks, Christian From thomas.petazzoni at bootlin.com Sun Mar 13 07:07:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Mar 2022 07:07:11 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-12 Message-ID: <20220313070717.02D24409A7@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-03-12 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 5 | 1 | 0 | 6 | 2021.11.x | 2 | 1 | 0 | 3 | master | 22 | 14 | 1 | 37 | Classification of failures by reason for master ----------------------------------------------- ola-0.10.8 | 5 bluez5_utils-5.63 | 2 bind-9.16.26 | 1 exempi-2.6.1 | 1 host-delve-1.8.0 | 1 libnetfilter_conntrack-1.0.9 | 1 libuwsc | 1 mesa3d-21.3.6 | 1 uhd-3.15.0.0 | 1 vlc-3.0.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/ff816a15507e195e74208e59900f25153c94cc7b | ORPH arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/88b9f653cd5ba4d6a3e2be327cb3bf2adca56565 | i586 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4103142f6e6c0b29b3d15011f995f68513178ba0 | arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/8addb3ab2f8e19552865ae566e93870281fba2ea | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/f61914fcf0c363d819e8b189d781baf3ab9c60d5 | arm | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd | mips64el | libuwsc | TIM | http://autobuild.buildroot.net/results/7fe48d5d7da3e26410b839557756108fe953e4c6 | x86_64 | mesa3d-21.3.6 | NOK | http://autobuild.buildroot.net/results/617e3e63afc837150af50d1af46d0ad067b2d2ca | sparc | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/80a222df03acc700b3a2ca7699cba63090b8310c | powerpc64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/8b3485c5cff8ad4046f26c934ab6dc84ec8d0b5a | or1k | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/c49d30f151db17e740189140089df813e9e0e740 | i586 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/ec33c1036a81158f5190e6c74bb03743c5d45cca | sh4 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/1fa46537748ecf46f09521ee71818fe3b1a1eeeb | arm | uhd-3.15.0.0 | NOK | http://autobuild.buildroot.net/results/502ec0be78adf9fc15b39aed63de419324398882 | mips64el | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/1690c11549764f65520aafc93b32ada8b4e9b832 | Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e4b2506d4e6839dfd32ff86fa817a740d87952bd | Classification of failures by reason for 2021.11.x -------------------------------------------------- libtheora-1.1.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/8589c5fe8c1f61604b166a1dbbf0fe3288cd66f2 | ORPH -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sun Mar 13 08:44:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 09:44:58 +0100 Subject: [Buildroot] [git commit] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220313083630.948D583C41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19294eb352feb9cc96bc7eeb8942da27f715ab87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) From yann.morin.1998 at free.fr Sun Mar 13 08:45:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 09:45:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 In-Reply-To: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> References: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> Message-ID: <20220313084548.GQ283544@scaer> Fabrice, All, On 2022-03-08 19:00 +0100, Fabrice Fontaine spake thusly: > This is a patch release for version 2 & 2.4, fixing a regression > introduced in 2.4.1. > > https://github.com/cisco/libsrtp/releases/tag/v2.4.2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libsrtp/libsrtp.hash | 2 +- > package/libsrtp/libsrtp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash > index 3de0130f4c..8e51e68ac2 100644 > --- a/package/libsrtp/libsrtp.hash > +++ b/package/libsrtp/libsrtp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz > +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz > sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE > diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk > index 885f05a33c..f2ba600dd6 100644 > --- a/package/libsrtp/libsrtp.mk > +++ b/package/libsrtp/libsrtp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSRTP_VERSION = 2.4.1 > +LIBSRTP_VERSION = 2.4.2 > LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) > LIBSRTP_INSTALL_STAGING = YES > LIBSRTP_LICENSE = BSD-3-Clause > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 13 09:02:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:02:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnetfilter_conntrack: fix musl build with headers >= 5.15 Message-ID: <20220313090209.161433-1-fontaine.fabrice@gmail.com> Fix the following build failure with musl and headers >= 5.15 raised since bump to version 1.0.9 in commit 9af9dfa543907c46091c706b0f3a0eb89445ae74: In file included from /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/arpa/inet.h:9, from ../../include/internal/internal.h:14, from proto.c:2: /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd Signed-off-by: Fabrice Fontaine --- ...-fix-build-with-kernel-5-15-and-musl.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch new file mode 100644 index 0000000000..9e96594120 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch @@ -0,0 +1,60 @@ +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko +Signed-off-by: Florian Westphal + +[Retrieved from: +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] +Signed-off-by: Fabrice Fontaine +--- + include/internal/internal.h | 1 - + include/internal/proto.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/internal.h b/include/internal/internal.h +index 2ef8a90..7cd7c44 100644 +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/include/internal/proto.h b/include/internal/proto.h +index 40e7bfe..60a5f4e 100644 +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include ++#include + #include + #include + +-- +cgit v1.2.3 + -- 2.34.1 From yann.morin.1998 at free.fr Sun Mar 13 09:09:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:09:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-weasyprint: bump to version 54.2 In-Reply-To: <20220311191717.3878852-1-james.hilliard1@gmail.com> References: <20220311191717.3878852-1-james.hilliard1@gmail.com> Message-ID: <20220313090942.GR283544@scaer> Kames, All, On 2022-03-11 12:17 -0700, James Hilliard spake thusly: > Migrate from distutils to flit package infrastructure. > > Signed-off-by: James Hilliard Applied to master, thanks. But see below, please... [--SNIP--] > diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk > index 0a944825bb..925de855bc 100644 > --- a/package/python-weasyprint/python-weasyprint.mk > +++ b/package/python-weasyprint/python-weasyprint.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_WEASYPRINT_VERSION = 53.4 > +PYTHON_WEASYPRINT_VERSION = 54.2 > PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz > -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 > -PYTHON_WEASYPRINT_SETUP_TYPE = distutils > +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 > +PYTHON_WEASYPRINT_SETUP_TYPE = flit 'flit', as well as 'pep5127', are not documented in the manual: https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages Can you please send updates to fix that, now? ;-) Regards, Yann E. MORIN. > PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause > PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-setuptools: bump to version 60.9.3 Message-ID: <20220313090240.B7FE283C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a56713b5088acf386748b4bbf00035dade42b45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index e04235e041..1a378d1b76 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz -sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz +md5 6c6a97cf68e1db789a2e5c054f067278 setuptools-60.9.3.tar.gz +sha256 2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 setuptools-60.9.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8653c42259..3309cd9df4 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.8.2 +PYTHON_SETUPTOOLS_VERSION = 60.9.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/14/74/54890935244ce053abcc4fa01ef4982a84743a8d128d4cf5eae56e2d156c PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From yann.morin.1998 at free.fr Sun Mar 13 09:10:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:49 +0100 Subject: [Buildroot] [git commit] package/python-argon2-cffi: bump to version 21.3.0 Message-ID: <20220313090240.9923783C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2957f5ce743cfaf4fb3aaa98d619e83e8e6989e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate to new flit based build. Since upstream commit cb0248d29ab2 (Extract CFFI bindings into argon2-cffi-bindings), the dependency to libargon2 is carried by argon2-cffi-bindings which is already enforced in Buildroot. So drop it from python-argon2-cffi. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: - explain why we drop the dependency to libargon2 ] Signed-off-by: Yann E. MORIN --- package/python-argon2-cffi/Config.in | 8 +++----- package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 5cddb3314e..4d5a703d76 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI bool "python-argon2-cffi" - depends on BR2_USE_MMU # libargon2 - depends on !BR2_STATIC_LIBS # libargon2 - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_LIBARGON2 + depends on BR2_USE_MMU # python-argon2-cffi-bindings + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime help The secure Argon2 password hashing algorithm. diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash index 6c416ffd88..09da5855a3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.hash +++ b/package/python-argon2-cffi/python-argon2-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz # Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk index f01c940589..0fb3e50ff3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.mk +++ b/package/python-argon2-cffi/python-argon2-cffi.mk @@ -4,19 +4,11 @@ # ################################################################################ -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit PYTHON_ARGON2_CFFI_LICENSE = MIT PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 -else -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 -endif $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Mar 13 08:47:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 09:47:37 +0100 Subject: [Buildroot] [git commit] package/python-weasyprint: bump to version 54.2 Message-ID: <20220313090240.8ED7F83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7557cb05410f981fe5b8784bb321b28767ea93a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from distutils to flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 8d231c50ba..90ccc1d057 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 a90fd2d5a581a0e218943af3a8b64a31 weasyprint-53.4.tar.gz -sha256 10ccb17d55c73096bdf1edd3efe58cb855b07e4c307d9bad4ebc9a3f13ff4580 weasyprint-53.4.tar.gz +md5 3917447c277db6931b8370f1d725db49 weasyprint-54.2.tar.gz +sha256 d5e8aa82e3e2a2477a4543f0646d9fb14080c9ba34a0859751eb23757cc00466 weasyprint-54.2.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 0a944825bb..925de855bc 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 53.4 +PYTHON_WEASYPRINT_VERSION = 54.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 -PYTHON_WEASYPRINT_SETUP_TYPE = distutils +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 +PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-installer: bump to version 0.5.1 Message-ID: <20220313090240.AE33A83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1604d228d26bdbb61b2ce18329ef54e9581688 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-installer/python-installer.hash | 4 ++-- package/python-installer/python-installer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash index 68af457664..543bd0fa62 100644 --- a/package/python-installer/python-installer.hash +++ b/package/python-installer/python-installer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/installer/json -md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz -sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +md5 bf17db5e6b58c4cfa33642f5348d3814 installer-0.5.1.tar.gz +sha256 f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445 installer-0.5.1.tar.gz # Locally computed sha256 checksums sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 82739a8003..862a251415 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_VERSION = 0.5.1 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = distutils From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-flit-core: bump to version 3.7.1 Message-ID: <20220313090240.A3C3A83C77@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23b555a6ccfb80eb3d6065df753986c60b99a7a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-flit-core/python-flit-core.hash | 4 ++-- package/python-flit-core/python-flit-core.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index bd47fd4f6b..135be93660 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz -sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz +md5 4a4791e97f3a8c9a1645064a35636ee6 flit_core-3.7.1.tar.gz +sha256 14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f flit_core-3.7.1.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 8971223d1f..0e058a1f17 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_SETUP_TYPE = pep517 From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-cssselect2: bump to version 0.5.0 Message-ID: <20220313090240.C4A7B83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f74ab8d603d6782e522324019634c51247ddba5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate to new flit based build. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cssselect2/python-cssselect2.hash | 4 ++-- package/python-cssselect2/python-cssselect2.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cssselect2/python-cssselect2.hash b/package/python-cssselect2/python-cssselect2.hash index ed5b863302..fd892e297f 100644 --- a/package/python-cssselect2/python-cssselect2.hash +++ b/package/python-cssselect2/python-cssselect2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect2/json -md5 6dfd5963c8a5d85f2634d1650b1ddfe1 cssselect2-0.4.1.tar.gz -sha256 93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8 cssselect2-0.4.1.tar.gz +md5 6206ebccfdd9fc02196f60e830fa7b1f cssselect2-0.5.0.tar.gz +sha256 d98a7bbdd8ebc46093279195d669a3359bd5a23f90c19e82c19d9eeef333e617 cssselect2-0.5.0.tar.gz # Locally computed sha256 checksums sha256 6fd97229a1d1b0f6a8b41e109f413426dbc0874b1e03746d66cc33282601c2c2 LICENSE diff --git a/package/python-cssselect2/python-cssselect2.mk b/package/python-cssselect2/python-cssselect2.mk index 18e0fba839..b3ddf41fef 100644 --- a/package/python-cssselect2/python-cssselect2.mk +++ b/package/python-cssselect2/python-cssselect2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_CSSSELECT2_VERSION = 0.4.1 +PYTHON_CSSSELECT2_VERSION = 0.5.0 PYTHON_CSSSELECT2_SOURCE = cssselect2-$(PYTHON_CSSSELECT2_VERSION).tar.gz -PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0 -PYTHON_CSSSELECT2_SETUP_TYPE = distutils +PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ce/e7/1333b9042beb33a9bb425900b6d9b59035b98c31c950a323d14ceca1275e +PYTHON_CSSSELECT2_SETUP_TYPE = flit PYTHON_CSSSELECT2_LICENSE = BSD-3-Clause PYTHON_CSSSELECT2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-pyphen: bump to version 0.12.0 Message-ID: <20220313090240.CEB0A83C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=280da9f2f46c736911b156dafdfb667951788edd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 75ee909351..14938de9c4 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 f8ec095e4fe30dc2b518a918788b33ed pyphen-0.11.0.tar.gz -sha256 e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8 pyphen-0.11.0.tar.gz +md5 99a01a3806cc750c242cae330429a90f pyphen-0.12.0.tar.gz +sha256 b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b pyphen-0.12.0.tar.gz # Locally computed sha256 checksums sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 80f67c77c7..ac0bcf8aab 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.11.0 +PYTHON_PYPHEN_VERSION = 0.12.0 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/f8/af869a4983c1b3159945479510260985714265d48baf27d61f72b1ec8cbf -PYTHON_PYPHEN_SETUP_TYPE = distutils +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/0e/21/9e0841aa76db69e2d74cd64ea2271151d7332fa627a5f03eb0d9ccf3da87 +PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL From yann.morin.1998 at free.fr Sun Mar 13 09:11:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:11:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: bump to version 21.3.0 In-Reply-To: <20220311194446.3952944-1-james.hilliard1@gmail.com> References: <20220311194446.3952944-1-james.hilliard1@gmail.com> Message-ID: <20220313091116.GS283544@scaer> James, All, On 2022-03-11 12:44 -0700, James Hilliard spake thusly: > Migrate to new flit based build. > > Signed-off-by: James Hilliard > --- > package/python-argon2-cffi/Config.in | 8 +++----- > package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- > package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- > 3 files changed, 8 insertions(+), 18 deletions(-) > > diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in > index 5cddb3314e..5940d1c910 100644 > --- a/package/python-argon2-cffi/Config.in > +++ b/package/python-argon2-cffi/Config.in > @@ -1,10 +1,8 @@ > config BR2_PACKAGE_PYTHON_ARGON2_CFFI > bool "python-argon2-cffi" > - depends on BR2_USE_MMU # libargon2 > - depends on !BR2_STATIC_LIBS # libargon2 > - select BR2_PACKAGE_PYTHON_CFFI # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > - select BR2_PACKAGE_LIBARGON2 > + depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2 > + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2 So, here, you are referencing libargon2, but you do not depend on it, neither do you select it. If your dependency is just on python-argon2-cffi-bindings, then that's all you need to document, not why it needs it. And so, why is the dependency to libargon2 dropped? Given the name of the two packages, python-argon2-cffi and libargon2, they really look like they are related, so dropping the dependency on libargon2 would really need a little explanation, maybe just to state that since upstream commit cb0248d29ab2 (Extract CFFI bindings into argon2-cffi-bindings), the dependency is carried by argon2-cffi-bindings which is already enforced in Buildroot. Applied with a blurb added to that effect. Regards, Yann E. MORIN. > + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime > help > The secure Argon2 password hashing algorithm. > > diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash > index 6c416ffd88..09da5855a3 100644 > --- a/package/python-argon2-cffi/python-argon2-cffi.hash > +++ b/package/python-argon2-cffi/python-argon2-cffi.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json > -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz > -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz > +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz > +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz > # Locally computed sha256 checksums > sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE > diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk > index f01c940589..0fb3e50ff3 100644 > --- a/package/python-argon2-cffi/python-argon2-cffi.mk > +++ b/package/python-argon2-cffi/python-argon2-cffi.mk > @@ -4,19 +4,11 @@ > # > ################################################################################ > > -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 > +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 > PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz > -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 > -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools > +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 > +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit > PYTHON_ARGON2_CFFI_LICENSE = MIT > PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE > -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 > -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 > - > -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 > -else > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 > -endif > > $(eval $(python-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 13 09:21:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:21:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/bind: reorder openssl variables Message-ID: <20220313092148.353432-1-fontaine.fabrice@gmail.com> openssl is mandatory since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in the beginning of bind.mk instead of keeping them in the middle of the file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as host-pkgconf is already mandatory Signed-off-by: Fabrice Fontaine --- package/bind/bind.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5ddf7652eb..e0c81152e1 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr \ + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes -BIND_DEPENDENCIES = libuv +BIND_DEPENDENCIES = host-pkgconf libuv openssl ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib -BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -76,13 +80,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 09:21:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:21:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/bind: fix libxml2 build In-Reply-To: <20220313092148.353432-1-fontaine.fabrice@gmail.com> References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> Message-ID: <20220313092148.353432-2-fontaine.fabrice@gmail.com> Fix the following build failure with libxml2 raised since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead Fixes: - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b Signed-off-by: Fabrice Fontaine --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e0c81152e1..63cc948c73 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -74,7 +74,7 @@ BIND_CONF_OPTS += --with-gssapi=no endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-libxml2 BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 09:28:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:28:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/tree: fix build with gcc 4.8 Message-ID: <20220313092821.357580-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.0.2 in commit 11a3989dbf7ac2535fac04b24ab3d959da3686b3: color.c: In function 'parse_dir_colors': color.c:103:11: error: redeclaration of 'i' with no linkage for(int i=0; i < DOT_EXTENSION; i++) color_code[i] = NULL; ^ Fixes: - http://autobuild.buildroot.org/results/e05595696727622eaf517944d4ff4414baf66bb2 Signed-off-by: Fabrice Fontaine --- package/tree/tree.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 7c111b47d2..da0acbae49 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -11,7 +11,8 @@ TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE define TREE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + -C $(@D) endef define TREE_INSTALL_TARGET_CMDS -- 2.34.1 From james.hilliard1 at gmail.com Sun Mar 13 09:42:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 03:42:49 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: bump to version 21.3.0 In-Reply-To: <20220313091116.GS283544@scaer> References: <20220311194446.3952944-1-james.hilliard1@gmail.com> <20220313091116.GS283544@scaer> Message-ID: On Sun, Mar 13, 2022 at 3:11 AM Yann E. MORIN wrote: > > James, All, > > On 2022-03-11 12:44 -0700, James Hilliard spake thusly: > > Migrate to new flit based build. > > > > Signed-off-by: James Hilliard > > --- > > package/python-argon2-cffi/Config.in | 8 +++----- > > package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- > > package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- > > 3 files changed, 8 insertions(+), 18 deletions(-) > > > > diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in > > index 5cddb3314e..5940d1c910 100644 > > --- a/package/python-argon2-cffi/Config.in > > +++ b/package/python-argon2-cffi/Config.in > > @@ -1,10 +1,8 @@ > > config BR2_PACKAGE_PYTHON_ARGON2_CFFI > > bool "python-argon2-cffi" > > - depends on BR2_USE_MMU # libargon2 > > - depends on !BR2_STATIC_LIBS # libargon2 > > - select BR2_PACKAGE_PYTHON_CFFI # runtime > > - select BR2_PACKAGE_PYTHON_SIX # runtime > > - select BR2_PACKAGE_LIBARGON2 > > + depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2 > > + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2 > > So, here, you are referencing libargon2, but you do not depend on it, > neither do you select it. If your dependency is just on > python-argon2-cffi-bindings, then that's all you need to document, not > why it needs it. Yeah, thought I was supposed to indicate the source of those dependencies using the "# python-argon2-cffi-bindings -> libargon2" comment style in these cases. > > And so, why is the dependency to libargon2 dropped? Given the name of > the two packages, python-argon2-cffi and libargon2, they really look > like they are related, so dropping the dependency on libargon2 would > really need a little explanation, maybe just to state that since > upstream commit cb0248d29ab2 (Extract CFFI bindings into > argon2-cffi-bindings), the dependency is carried by argon2-cffi-bindings > which is already enforced in Buildroot. Yep, libargon2 dep was moved to a separate bindings package that is now transient to python-argon2-cffi instead of direct. > > Applied with a blurb added to that effect. > > Regards, > Yann E. MORIN. > > > + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime > > help > > The secure Argon2 password hashing algorithm. > > > > diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash > > index 6c416ffd88..09da5855a3 100644 > > --- a/package/python-argon2-cffi/python-argon2-cffi.hash > > +++ b/package/python-argon2-cffi/python-argon2-cffi.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json > > -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz > > -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz > > +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz > > +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz > > # Locally computed sha256 checksums > > sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE > > diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk > > index f01c940589..0fb3e50ff3 100644 > > --- a/package/python-argon2-cffi/python-argon2-cffi.mk > > +++ b/package/python-argon2-cffi/python-argon2-cffi.mk > > @@ -4,19 +4,11 @@ > > # > > ################################################################################ > > > > -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 > > +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 > > PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz > > -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 > > -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools > > +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 > > +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit > > PYTHON_ARGON2_CFFI_LICENSE = MIT > > PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE > > -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 > > -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 > > - > > -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) > > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 > > -else > > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 > > -endif > > > > $(eval $(python-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Sun Mar 13 09:52:04 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 10:52:04 +0100 Subject: [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 22.0.3 Message-ID: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 71a153e0a3..beb3cfd6ae 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz +sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 235f71341c..06628132a2 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.2 +INTEL_GMMLIB_VERSION = 22.0.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 13 09:52:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 10:52:06 +0100 Subject: [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 22.2.2 In-Reply-To: <20220313095206.1266409-1-bernd.kuhls@t-online.de> References: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Message-ID: <20220313095206.1266409-3-bernd.kuhls@t-online.de> Rebased patch 0001. Signed-off-by: Bernd Kuhls --- package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch | 2 +- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch index a7e3b70294..b3ecfc98b7 100644 --- a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch +++ b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -40,7 +40,7 @@ index 7e36ae2d..5b8b9b9d 100644 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) if( ARGV1 MATCHES hw AND Linux ) -@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) +@@ -452,7 +452,7 @@ function(configure_dependencies target dependencies variant) endforeach() set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index ee4f317242..d9acf49637 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz +sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7589ff9737..698d2348b2 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.1 +INTEL_MEDIASDK_VERSION = 22.2.2 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 13 09:52:05 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 10:52:05 +0100 Subject: [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 22.2.2 In-Reply-To: <20220313095206.1266409-1-bernd.kuhls@t-online.de> References: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Message-ID: <20220313095206.1266409-2-bernd.kuhls@t-online.de> Switch _SITE to https. Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 7c615620ae..044b9d7013 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz +sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 4895c1535d..84eda811ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,8 +6,8 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.1 -INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive +INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause INTEL_MEDIADRIVER_LICENSE_FILES = LICENSE.md -- 2.30.2 From gilles.talis at gmail.com Sun Mar 13 10:32:58 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 13 Mar 2022 11:32:58 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ocrad: bump to version 0.28 In-Reply-To: <20220227101003.3702134-1-fontaine.fabrice@gmail.com> References: <20220227101003.3702134-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, thanks for the bump. Le dim. 27 f?vr. 2022 ? 11:10, Fabrice Fontaine a ?crit : > > - Add libpng mandatory dependency > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine > --- > package/ocrad/Config.in | 1 + > package/ocrad/ocrad.hash | 4 ++-- > package/ocrad/ocrad.mk | 3 ++- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in > index 38d37c612a..b6c4300f86 100644 > --- a/package/ocrad/Config.in > +++ b/package/ocrad/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_OCRAD > bool "ocrad" > depends on BR2_INSTALL_LIBSTDCPP > + select BR2_PACKAGE_LIBPNG > help > GNU Ocrad is an OCR (Optical Character Recognition) program > based on a feature extraction method. > diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash > index 7ae38c30e8..cd5b0039ea 100644 > --- a/package/ocrad/ocrad.hash > +++ b/package/ocrad/ocrad.hash > @@ -1,3 +1,3 @@ > # Locally calculated after checking pgp signature > -sha256 a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 ocrad-0.27.tar.lz > -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING > +sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz > +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING > diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk > index e037a08195..982bb002c9 100644 > --- a/package/ocrad/ocrad.mk > +++ b/package/ocrad/ocrad.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -OCRAD_VERSION = 0.27 > +OCRAD_VERSION = 0.28 > OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz > OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad > OCRAD_LICENSE = GPL-3.0+ I have just noticed that the license has changed since version 0.24 and is now GPLv2+. Please check the licensing section in [1] > OCRAD_LICENSE_FILES = COPYING > OCRAD_INSTALL_STAGING = YES > +OCRAD_DEPENDENCIES = libpng > > # This is not a true autotools package. > define OCRAD_CONFIGURE_CMDS > -- > 2.34.1 > Can you please send an update with a fix for the license? thanks Gilles [1] https://www.gnu.org/software/ocrad/ From fontaine.fabrice at gmail.com Sun Mar 13 10:37:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 11:37:36 +0100 Subject: [Buildroot] [PATCH 1/2] Revert "package/ola: drop autoreconf" Message-ID: <20220313103737.751528-1-fontaine.fabrice@gmail.com> This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because for an unknown reason, the build fails if autoreconf is dropped: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) Fixes: - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 1874350784..5090076175 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 10:37:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 11:37:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/ola: fix build with libexecinfo In-Reply-To: <20220313103737.751528-1-fontaine.fabrice@gmail.com> References: <20220313103737.751528-1-fontaine.fabrice@gmail.com> Message-ID: <20220313103737.751528-2-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: common/.libs/libolacommon.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/4362b20d786a0f44268ec32a689c23ac6d3b71c6 Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..471ae8ed9b 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -53,6 +53,11 @@ endef OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OLA_DEPENDENCIES += libexecinfo +OLA_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ## OLA Bindings and Interface selections ifeq ($(BR2_PACKAGE_OLA_WEB),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:19:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:19:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix CVE comments Message-ID: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE comments Signed-off-by: Fabrice Fontaine --- package/qt5/qt5base/qt5base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a703481aed..f8edfe0847 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -14,8 +14,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 # A few comments: -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:26:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:26:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build on sparc v8 Message-ID: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> Fix the following build failure on sparc v8 raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: ERROR: detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr Fixes: - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log Signed-off-by: Fabrice Fontaine --- ...figure.json-fix-atomicfptr-detection.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 0000000000..5f0f81a4bd --- /dev/null +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:33:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:33:33 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nbd: security bump to version 3.24 Message-ID: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Tag as a security bump and add CVEs package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:41:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:41:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/minidlna: fix CVE-2022-26505 Message-ID: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine --- ...rotect-against-DNS-rebinding-attacks.patch | 66 +++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) create mode 100644 package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:47:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:47:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Sun Mar 13 12:21:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 06:21:11 -0600 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: migrate flit to new bootstrapping sequence Message-ID: <20220313122112.261290-1-james.hilliard1@gmail.com> There are a number of flit toolchain dependencies currently in the process of deprecating distutils based fallbacks. This will be needed in order to update tomli. We need to migrate these to use a new bootstrap based build+install sequence which relies on flit's bootstrap wheel build+install features to build and install host-python-pypa-build and host-python-installer which gives us a full pep517 toolchain. Signed-off-by: James Hilliard --- package/pkg-python.mk | 28 +++++++++++++++++--- package/python-flit-core/python-flit-core.mk | 2 +- package/python-installer/python-installer.mk | 3 ++- package/python-pep517/python-pep517.mk | 2 +- package/python-tomli/python-tomli.mk | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..6dee8aa7d1 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -212,7 +215,16 @@ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) $(2)_BASE_BUILD_CMD = -m build -n -w -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = $$(if $$(filter \ + host-python-flit-core \ + host-python-installer \ + host-python-pep517 \ + host-python-tomli,$(1)),\ + -m flit_core.wheel,\ + -m build -n -w) +$(2)_BASE_INSTALL_CMD = $$(if $$(filter host-python-flit-core,$(1)),\ + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS),\ + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS)) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") @@ -235,9 +247,19 @@ endif # ($(4),target) ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +$(2)_DEPENDENCIES += $$(if $$(filter \ + host-python-flit-core \ + host-python-installer \ + host-python-pep517 \ + host-python-pypa-build \ + host-python-tomli,$(1)),,\ + host-python-pypa-build) +$(2)_DEPENDENCIES += $$(if $$(filter \ + host-python-flit-core \ + host-python-installer,$(1)),,\ + host-python-installer) ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) endif endif # SETUP_TYPE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 0e058a1f17..d206a72f82 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 +PYTHON_FLIT_CORE_SETUP_TYPE = flit $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 862a251415..97a158b738 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE -PYTHON_INSTALLER_SETUP_TYPE = distutils +PYTHON_INSTALLER_SETUP_TYPE = flit +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src $(eval $(host-python-package)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 99aa62d51d..1ca1bc4e35 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE -PYTHON_PEP517_SETUP_TYPE = distutils +PYTHON_PEP517_SETUP_TYPE = flit HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index b8c20ca736..3539a505be 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -7,7 +7,7 @@ PYTHON_TOMLI_VERSION = 1.2.0 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa -PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_SETUP_TYPE = flit PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 12:21:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 06:21:12 -0600 Subject: [Buildroot] [PATCH 2/2] package/python-tomli: bump to version 2.0.1 In-Reply-To: <20220313122112.261290-1-james.hilliard1@gmail.com> References: <20220313122112.261290-1-james.hilliard1@gmail.com> Message-ID: <20220313122112.261290-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-tomli/python-tomli.hash | 4 ++-- package/python-tomli/python-tomli.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash index 1a274c8a40..8368f9ee13 100644 --- a/package/python-tomli/python-tomli.hash +++ b/package/python-tomli/python-tomli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tomli/json -md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz -sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +md5 d4341621d423a7ca6822e23d6d52bb9a tomli-2.0.1.tar.gz +sha256 de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f tomli-2.0.1.tar.gz # Locally computed sha256 checksums sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 3539a505be..014e8db1f6 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_VERSION = 2.0.1 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz -PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3 PYTHON_TOMLI_SETUP_TYPE = flit PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE -- 2.25.1 From bernd.kuhls at t-online.de Sun Mar 13 12:55:40 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 13:55:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot: bump version to 2.3.18 Message-ID: <20220313125540.3017299-1-bernd.kuhls@t-online.de> Release notes: https://dovecot.org/pipermail/dovecot-news/2022-February/000470.html Signed-off-by: Bernd Kuhls --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 0363b6e922..e70b266d92 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz +sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fb299a8e45..053462c6dd 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 13 13:04:24 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 14:04:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 Message-ID: <20220313130424.3046857-1-bernd.kuhls@t-online.de> Changelog: https://curl.se/changes.html Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 Signed-off-by: Bernd Kuhls --- package/libcurl/libcurl.hash | 6 +++--- package/libcurl/libcurl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 63d6ba306c..4be245041c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.81.0.tar.xz.asc +# https://curl.se/download/curl-7.82.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f271..863cc268b4 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.81.0 +LIBCURL_VERSION = 7.82.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.30.2 From thomas.petazzoni at bootlin.com Sun Mar 13 13:20:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Mar 2022 14:20:24 +0100 Subject: [Buildroot] [PATCH 1/2] Revert "package/ola: drop autoreconf" In-Reply-To: <20220313103737.751528-1-fontaine.fabrice@gmail.com> References: <20220313103737.751528-1-fontaine.fabrice@gmail.com> Message-ID: <20220313142024.56b9493e@windsurf> On Sun, 13 Mar 2022 11:37:36 +0100 Fabrice Fontaine wrote: > This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because > for an unknown reason, the build fails if autoreconf is dropped: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > > Fixes: > - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 > Signed-off-by: Fabrice Fontaine > --- > package/ola/ola.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 1874350784..5090076175 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE > OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) > OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE > OLA_INSTALL_STAGING = YES > +OLA_AUTORECONF = YES Perhaps a comment above this line would be useful, to explain why AUTORECONF is needed, otherwise there are risks for it to get dropped again in the future. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Sun Mar 13 14:37:26 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 08:37:26 -0600 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: add flit package support Message-ID: <20220313143726.267306-1-james.hilliard1@gmail.com> These packages don't have a setup.py so we instead need to parse their pyproject.toml file. Signed-off-by: James Hilliard --- utils/scanpypi | 126 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 105 insertions(+), 21 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..98426820c6 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -42,6 +42,48 @@ except ImportError: 'pip install spdx_lookup') liclookup = None +def toml_load(f): + with open(f, 'rb') as fh: + ex = None + + # Try regular tomli first + try: + from tomli import load + return load(fh) + except ImportError as e: + ex = e + + # Try pip's vendored tomli + try: + from pip._vendor.tomli import load + try: + return load(fh) + except TypeError: + # Fallback to handle older version + try: + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + return load(w) + finally: + w.detach() + except ImportError as e: + pass + + # Try regular toml last + try: + from toml import load + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + try: + return load(w) + finally: + w.detach() + except ImportError: + pass + + print('This package needs tomli') + raise ex + def setup_decorator(func, method): """ @@ -296,20 +338,52 @@ class BuildrootPackage(): current_dir = os.getcwd() os.chdir(self.tmp_extract) sys.path.insert(0, self.tmp_extract) - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - imp.load_module('__main__', s_file, s_path, s_desc) - if self.metadata_name in self.setup_args: - pass - elif self.metadata_name.replace('_', '-') in self.setup_args: - self.metadata_name = self.metadata_name.replace('_', '-') - elif self.metadata_name.replace('-', '_') in self.setup_args: - self.metadata_name = self.metadata_name.replace('-', '_') try: - self.setup_metadata = self.setup_args[self.metadata_name] - except KeyError: - # This means setup was not called - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) + imp.load_module('__main__', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') + try: + self.setup_metadata = self.setup_args[self.metadata_name] + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject_data = toml_load('pyproject.toml') + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + if build_backend is not None and build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + elif build_system.get('backend-path', None) is not None: + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + except FileNotFoundError: raise os.chdir(current_dir) sys.path.remove(self.tmp_extract) @@ -609,7 +683,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +692,17 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) + if home_page is None or len(home_page) == 0: + project_urls = md_info.get('project_urls', {}) + home_page = project_urls.get('Homepage', None) + + if home_page is not None and len(home_page) != 0: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) @@ -692,9 +773,12 @@ def main(): except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception as e: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 14:45:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 08:45:30 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-weasyprint: bump to version 54.2 In-Reply-To: <20220313090942.GR283544@scaer> References: <20220311191717.3878852-1-james.hilliard1@gmail.com> <20220313090942.GR283544@scaer> Message-ID: On Sun, Mar 13, 2022 at 3:09 AM Yann E. MORIN wrote: > > Kames, All, > > On 2022-03-11 12:17 -0700, James Hilliard spake thusly: > > Migrate from distutils to flit package infrastructure. > > > > Signed-off-by: James Hilliard > > Applied to master, thanks. > > But see below, please... > > [--SNIP--] > > diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk > > index 0a944825bb..925de855bc 100644 > > --- a/package/python-weasyprint/python-weasyprint.mk > > +++ b/package/python-weasyprint/python-weasyprint.mk > > @@ -4,10 +4,10 @@ > > # > > ################################################################################ > > > > -PYTHON_WEASYPRINT_VERSION = 53.4 > > +PYTHON_WEASYPRINT_VERSION = 54.2 > > PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz > > -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 > > -PYTHON_WEASYPRINT_SETUP_TYPE = distutils > > +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 > > +PYTHON_WEASYPRINT_SETUP_TYPE = flit > > 'flit', as well as 'pep5127', are not documented in the manual: > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages > > Can you please send updates to fix that, now? ;-) Yeah, cleaning flit/pep517 support up a bit more first, the pep517 option may not be needed except for in tree backends, I guess we should keep it around for now but not sure if any packages are going to be using it: https://peps.python.org/pep-0517/#in-tree-build-backends No packages use direct pep517 anymore as of this refactor: https://patchwork.ozlabs.org/project/buildroot/patch/20220313122112.261290-1-james.hilliard1 at gmail.com/ I've added flit/pep517 support in scanpypi as well in: https://patchwork.ozlabs.org/project/buildroot/patch/20220313143726.267306-1-james.hilliard1 at gmail.com/ Will send a docs update after those are reviewed+merged since there are potential docs implications with those changes. > > Regards, > Yann E. MORIN. > > > PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause > > PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE > > > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Fri Mar 11 21:56:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:56:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220313153102.CB17683CBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8cb00a283392b51bb34919e2366ba93762436ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d3910057c6ae38e2cf72e8c86cd84756fffba2ac) Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 49551aacc7..09bf835b05 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From yann.morin.1998 at free.fr Sun Mar 13 16:21:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 17:21:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <20220313122112.261290-1-james.hilliard1@gmail.com> References: <20220313122112.261290-1-james.hilliard1@gmail.com> Message-ID: <20220313162132.GT283544@scaer> James, All, On 2022-03-13 06:21 -0600, James Hilliard spake thusly: > There are a number of flit toolchain dependencies currently in the > process of deprecating distutils based fallbacks. > > This will be needed in order to update tomli. > > We need to migrate these to use a new bootstrap based build+install > sequence which relies on flit's bootstrap wheel build+install > features to build and install host-python-pypa-build and > host-python-installer which gives us a full pep517 toolchain. Would it be possible to split this change into separate patches: - introduce the new support, - migrate patches one by one - drop the leftovers of no longer needed stuff Also, see below... > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..6dee8aa7d1 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk [--SNIP--] > @@ -212,7 +215,16 @@ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* > else > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > $(2)_BASE_BUILD_CMD = -m build -n -w So this assignment to $(2)_BASE_BUILD_CMD... > -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > +$(2)_BASE_BUILD_CMD = $$(if $$(filter \ ... is completely overriden here... > + host-python-flit-core \ > + host-python-installer \ > + host-python-pep517 \ > + host-python-tomli,$(1)),\ > + -m flit_core.wheel,\ > + -m build -n -w) > +$(2)_BASE_INSTALL_CMD = $$(if $$(filter host-python-flit-core,$(1)),\ > + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS),\ > + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS)) > endif > else > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") > @@ -235,9 +247,19 @@ endif # ($(4),target) > ifeq ($$($(2)_SETUP_TYPE),setuptools) > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > +$(2)_DEPENDENCIES += $$(if $$(filter \ > + host-python-flit-core \ > + host-python-installer \ > + host-python-pep517 \ > + host-python-pypa-build \ > + host-python-tomli,$(1)),,\ > + host-python-pypa-build) This is totally unreadable. One can't easily spot what is filtered from what... $(2)_DEPENDENCIES += $$(if \ $$(filter \ host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ $(1)) \ , \ host-python-pypa-build ) So, what this is saying, as I can understand, is that if the current package is one of the list; host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli then we want to add host-python-pypa-build to their dependency. However, from what I understand, all those packages really are packages that implement the 'flit' and pep517 now?) infrastructure, and thus the dependency should be explicitly listed in those packages, rather than implcitly added by the infra. > +$(2)_DEPENDENCIES += $$(if $$(filter \ Why use an other assignment to the same variable? It could be a single assignment... > + host-python-flit-core \ > + host-python-installer,$(1)),,\ > + host-python-installer) Ditto, this should be explictly added to the packages. > ifeq ($$($(2)_SETUP_TYPE),flit) > -$(2)_DEPENDENCIES += host-python-flit-core > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) I don't understand how this is going to work. The dependency exclusion here is correct, indeed, I am not questionning that. However, I don't understand how host-python-flit-core can use the flit type at build time, when it is not already installed, especially since host-python-flit-core does not define any custom configure/build/install commands... You will have to add a blurb in the commit log to explain how it works... > endif > endif # SETUP_TYPE > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > index 0e058a1f17..d206a72f82 100644 > --- a/package/python-flit-core/python-flit-core.mk > +++ b/package/python-flit-core/python-flit-core.mk > @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > +PYTHON_FLIT_CORE_SETUP_TYPE = flit Yup, see my comment above, about the corresponding change in the infra. > $(eval $(host-python-package)) > diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk > index 862a251415..97a158b738 100644 > --- a/package/python-installer/python-installer.mk > +++ b/package/python-installer/python-installer.mk > @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz > PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 > PYTHON_INSTALLER_LICENSE = MIT > PYTHON_INSTALLER_LICENSE_FILES = LICENSE > -PYTHON_INSTALLER_SETUP_TYPE = distutils > +PYTHON_INSTALLER_SETUP_TYPE = flit > +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src Why do we need to provide this here? Can't that be made generic be using something like HOST_PYTHON_INSTALLER_SUBDIR=src ? python-package already uses $(2)_BUILDDIR, which by default is the same as $(2)_SRCDIR, which by default is (basically) $(@D)/$(2)_SUBDIR, so it should jsut work automatically, no? Regards, Yann E. MORIN. > $(eval $(host-python-package)) > diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk > index 99aa62d51d..1ca1bc4e35 100644 > --- a/package/python-pep517/python-pep517.mk > +++ b/package/python-pep517/python-pep517.mk > @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz > PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 > PYTHON_PEP517_LICENSE = MIT > PYTHON_PEP517_LICENSE_FILES = LICENSE > -PYTHON_PEP517_SETUP_TYPE = distutils > +PYTHON_PEP517_SETUP_TYPE = flit > HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli > > $(eval $(host-python-package)) > diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk > index b8c20ca736..3539a505be 100644 > --- a/package/python-tomli/python-tomli.mk > +++ b/package/python-tomli/python-tomli.mk > @@ -7,7 +7,7 @@ > PYTHON_TOMLI_VERSION = 1.2.0 > PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz > PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa > -PYTHON_TOMLI_SETUP_TYPE = distutils > +PYTHON_TOMLI_SETUP_TYPE = flit > PYTHON_TOMLI_LICENSE = MIT > PYTHON_TOMLI_LICENSE_FILES = LICENSE > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 16:31:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 17:31:51 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: add flit package support In-Reply-To: <20220313143726.267306-1-james.hilliard1@gmail.com> References: <20220313143726.267306-1-james.hilliard1@gmail.com> Message-ID: <20220313163151.GU283544@scaer> James, All, On 2022-03-13 08:37 -0600, James Hilliard spake thusly: > These packages don't have a setup.py so we instead need to parse their > pyproject.toml file. Please, split this into at least two patches; - offload the loading to a separate function (i.e. load_pyproject()) - introduce support for flit packages Also, even though I did not look at the code too closely, it looks like the handling of the homepage is not strictly tied to the flit support, so perhaps it should be also separated (unless it is tied to the introduction of load_pyproject()?) Anyway, separate patches into semantically contained minimalist patches, please. Alos, please try to provide more detailed explanations in your commit logs. Consider that reviewers are dumb in your area of expertise (I certainly am!), and consider what information we will need to understand the change, and also what we will need in two weeks, two months, two years when we have an issue and we want to understand how the code came to be... Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > utils/scanpypi | 126 ++++++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 105 insertions(+), 21 deletions(-) > > diff --git a/utils/scanpypi b/utils/scanpypi > index 17d8a0017a..98426820c6 100755 > --- a/utils/scanpypi > +++ b/utils/scanpypi > @@ -42,6 +42,48 @@ except ImportError: > 'pip install spdx_lookup') > liclookup = None > > +def toml_load(f): > + with open(f, 'rb') as fh: > + ex = None > + > + # Try regular tomli first > + try: > + from tomli import load > + return load(fh) > + except ImportError as e: > + ex = e > + > + # Try pip's vendored tomli > + try: > + from pip._vendor.tomli import load > + try: > + return load(fh) > + except TypeError: > + # Fallback to handle older version > + try: > + fh.seek(0) > + w = io.TextIOWrapper(fh, encoding="utf8", newline="") > + return load(w) > + finally: > + w.detach() > + except ImportError as e: > + pass > + > + # Try regular toml last > + try: > + from toml import load > + fh.seek(0) > + w = io.TextIOWrapper(fh, encoding="utf8", newline="") > + try: > + return load(w) > + finally: > + w.detach() > + except ImportError: > + pass > + > + print('This package needs tomli') > + raise ex > + > > def setup_decorator(func, method): > """ > @@ -296,20 +338,52 @@ class BuildrootPackage(): > current_dir = os.getcwd() > os.chdir(self.tmp_extract) > sys.path.insert(0, self.tmp_extract) > - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) > - imp.load_module('__main__', s_file, s_path, s_desc) > - if self.metadata_name in self.setup_args: > - pass > - elif self.metadata_name.replace('_', '-') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('_', '-') > - elif self.metadata_name.replace('-', '_') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('-', '_') > try: > - self.setup_metadata = self.setup_args[self.metadata_name] > - except KeyError: > - # This means setup was not called > - print('ERROR: Could not determine package metadata for {pkg}.\n' > - .format(pkg=self.real_name)) > + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) > + imp.load_module('__main__', s_file, s_path, s_desc) > + if self.metadata_name in self.setup_args: > + pass > + elif self.metadata_name.replace('_', '-') in self.setup_args: > + self.metadata_name = self.metadata_name.replace('_', '-') > + elif self.metadata_name.replace('-', '_') in self.setup_args: > + self.metadata_name = self.metadata_name.replace('-', '_') > + try: > + self.setup_metadata = self.setup_args[self.metadata_name] > + except KeyError: > + # This means setup was not called > + print('ERROR: Could not determine package metadata for {pkg}.\n' > + .format(pkg=self.real_name)) > + raise > + finally: > + os.chdir(current_dir) > + sys.path.remove(self.tmp_extract) > + > + def load_pyproject(self): > + """ > + Loads the corresponding pyproject.toml and store its metadata > + """ > + current_dir = os.getcwd() > + os.chdir(self.tmp_extract) > + sys.path.insert(0, self.tmp_extract) > + try: > + pyproject_data = toml_load('pyproject.toml') > + try: > + self.setup_metadata = pyproject_data.get('project', {}) > + self.metadata_name = self.setup_metadata.get('name', self.real_name) > + build_system = pyproject_data.get('build-system', {}) > + build_backend = build_system.get('build-backend', None) > + if build_backend is not None and build_backend == 'flit_core.buildapi': > + self.setup_metadata['method'] = 'flit' > + elif build_system.get('backend-path', None) is not None: > + self.setup_metadata['method'] = 'pep517' > + else: > + self.setup_metadata['method'] = 'unknown' > + except KeyError: > + # This means setup was not called > + print('ERROR: Could not determine package metadata for {pkg}.\n' > + .format(pkg=self.real_name)) > + raise > + except FileNotFoundError: > raise > os.chdir(current_dir) > sys.path.remove(self.tmp_extract) > @@ -609,7 +683,8 @@ class BuildrootPackage(): > > lines.append('\thelp\n') > > - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, > + md_info = self.metadata['info'] > + help_lines = textwrap.wrap(md_info['summary'], 62, > initial_indent='\t ', > subsequent_indent='\t ') > > @@ -617,11 +692,17 @@ class BuildrootPackage(): > if help_lines[-1][-1] != '.': > help_lines[-1] += '.' > > - # \t + two spaces is 3 char long > - help_lines.append('') > - help_lines.append('\t ' + self.metadata['info']['home_page']) > - help_lines = [x + '\n' for x in help_lines] > - lines += help_lines > + home_page = md_info.get('home_page', None) > + if home_page is None or len(home_page) == 0: > + project_urls = md_info.get('project_urls', {}) > + home_page = project_urls.get('Homepage', None) > + > + if home_page is not None and len(home_page) != 0: > + # \t + two spaces is 3 char long > + help_lines.append('') > + help_lines.append('\t ' + home_page) > + help_lines = [x + '\n' for x in help_lines] > + lines += help_lines > > with open(path_to_config, 'w') as config_file: > config_file.writelines(lines) > @@ -692,9 +773,12 @@ def main(): > except ImportError as err: > if 'buildutils' in str(err): > print('This package needs buildutils') > + continue > else: > - raise > - continue > + try: > + package.load_pyproject() > + except Exception as e: > + raise > except (AttributeError, KeyError) as error: > print('Error: Could not install package {pkg}: {error}'.format( > pkg=package.real_name, error=error)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Sun Mar 13 16:50:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 10:50:30 -0600 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: support alternative Homepage format Message-ID: <20220313165030.269338-1-james.hilliard1@gmail.com> Some packages only have a home page properly set inside project_urls. Signed-off-by: James Hilliard --- utils/scanpypi | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..681758a552 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -609,7 +609,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +618,17 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) + if home_page is None or len(home_page) == 0: + project_urls = md_info.get('project_urls', {}) + home_page = project_urls.get('Homepage', None) + + if home_page is not None and len(home_page) != 0: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 17:13:54 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 11:13:54 -0600 Subject: [Buildroot] [PATCH v2 1/2] utils/scanpypi: ensure tmp_extract is cleaned up on exception Message-ID: <20220313171355.271345-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- utils/scanpypi | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..724e59f759 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -296,23 +296,25 @@ class BuildrootPackage(): current_dir = os.getcwd() os.chdir(self.tmp_extract) sys.path.insert(0, self.tmp_extract) - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - imp.load_module('__main__', s_file, s_path, s_desc) - if self.metadata_name in self.setup_args: - pass - elif self.metadata_name.replace('_', '-') in self.setup_args: - self.metadata_name = self.metadata_name.replace('_', '-') - elif self.metadata_name.replace('-', '_') in self.setup_args: - self.metadata_name = self.metadata_name.replace('-', '_') try: - self.setup_metadata = self.setup_args[self.metadata_name] - except KeyError: - # This means setup was not called - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) - raise - os.chdir(current_dir) - sys.path.remove(self.tmp_extract) + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) + imp.load_module('__main__', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') + try: + self.setup_metadata = self.setup_args[self.metadata_name] + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) def get_requirements(self, pkg_folder): """ -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 17:13:55 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 11:13:55 -0600 Subject: [Buildroot] [PATCH v2 2/2] utils/scanpypi: add flit package support In-Reply-To: <20220313171355.271345-1-james.hilliard1@gmail.com> References: <20220313171355.271345-1-james.hilliard1@gmail.com> Message-ID: <20220313171355.271345-2-james.hilliard1@gmail.com> These packages don't have a setup.py so we instead need to parse their pyproject.toml file. Signed-off-by: James Hilliard --- Changes v1 -> v2: - remove homepage format fixes(sent as separate patch) - remove load_setup fixes - move load_pyproject cleanup to finally block --- utils/scanpypi | 80 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 724e59f759..f501b36232 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -42,6 +42,48 @@ except ImportError: 'pip install spdx_lookup') liclookup = None +def toml_load(f): + with open(f, 'rb') as fh: + ex = None + + # Try regular tomli first + try: + from tomli import load + return load(fh) + except ImportError as e: + ex = e + + # Try pip's vendored tomli + try: + from pip._vendor.tomli import load + try: + return load(fh) + except TypeError: + # Fallback to handle older version + try: + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + return load(w) + finally: + w.detach() + except ImportError as e: + pass + + # Try regular toml last + try: + from toml import load + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + try: + return load(w) + finally: + w.detach() + except ImportError: + pass + + print('This package needs tomli') + raise ex + def setup_decorator(func, method): """ @@ -316,6 +358,37 @@ class BuildrootPackage(): os.chdir(current_dir) sys.path.remove(self.tmp_extract) + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject_data = toml_load('pyproject.toml') + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + if build_backend is not None and build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + elif build_system.get('backend-path', None) is not None: + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + except FileNotFoundError: + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + def get_requirements(self, pkg_folder): """ Retrieve dependencies from the metadata found in the setup.py script of @@ -694,9 +767,12 @@ def main(): except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception as e: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) -- 2.25.1 From fontaine.fabrice at gmail.com Sun Mar 13 17:39:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 18:39:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: switch to autotools-package Message-ID: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> Switch to autotools-package to avoid the following static build failure since commit d661740201405970f65c16c39a79f4148705af30: [ 56%] Linking C executable rtl_biast /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' collect2: error: ld returned 1 exit status Drop both cmake-related patches Fixes: - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 Signed-off-by: Fabrice Fontaine --- ...pect-DESTDIR-with-install-udev-rules.patch | 31 +++++ ...sable_shared_library_target_in_build.patch | 130 ------------------ ...rsion.cmake-don-t-use-Git-version-if.patch | 47 ------- package/librtlsdr/librtlsdr.mk | 26 ++-- 4 files changed, 42 insertions(+), 192 deletions(-) create mode 100644 package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch delete mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch delete mode 100644 package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 0000000000..1aec8166cc --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465de..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41..0000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a..908be158b1 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) -- 2.34.1 From james.hilliard1 at gmail.com Sun Mar 13 17:56:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 11:56:14 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence Message-ID: <20220313175615.406390-1-james.hilliard1@gmail.com> There are a number of flit toolchain dependencies currently in the process of deprecating distutils based fallbacks. This will be needed in order to update tomli. We need to migrate these to use a new bootstrap based build+install sequence which relies on flit's bootstrap wheel build+install features to build and install host-python-pypa-build and host-python-installer which gives us a full pep517 toolchain. Note that one can run host-python-flit-core commands for building and installing itself since the package build directory is the cwd. For host-python-installer to do this we need to add the package src directory to PYTHONPATH as we need to run it from the source directory for installing itself. This is due to a directory structure that does not let us run directly from the top level. Signed-off-by: James Hilliard --- Changes v1 -> v2: - formatting/cleanup - add comments --- package/pkg-python.mk | 45 ++++++++++++++++++-- package/python-flit-core/python-flit-core.mk | 2 +- package/python-installer/python-installer.mk | 3 +- package/python-pep517/python-pep517.mk | 2 +- package/python-tomli/python-tomli.mk | 2 +- 5 files changed, 46 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..f08d8ce04c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -211,8 +214,25 @@ $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) -$(2)_BASE_BUILD_CMD = -m build -n -w -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +# Use flit built in wheel builder for packages that are host-python-pypa-build dependencies. +# This is needed to avoid a circular with host-python-pypa-build and those dependencies. +# +$(2)_BASE_BUILD_CMD = $$(if \ + $$(filter \ + host-python-flit-core host-python-installer host-python-pep517 host-python-tomli, \ + $(1)) \ + , \ + -m flit_core.wheel, \ + -m build -n -w \ + ) +# Use flit built in bootstrap_install for installing host-python-flit-core. +# This is due to host-python-installer depending on host-python-flit-core. +# +$(2)_BASE_INSTALL_CMD = $$(if \ + $$(filter host-python-flit-core,$(1)), \ + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS), \ + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) \ + ) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") @@ -235,9 +255,26 @@ endif # ($(4),target) ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +# Filter out host-python-pypa-build and any of its dependencies that need a flit based build. +# +$(2)_DEPENDENCIES += $$(if \ + $$(filter \ + host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ + $(1)) \ + ,, \ + host-python-pypa-build \ + ) +# Filter out host-python-installer and any of its dependencies that need a flit based build. +# +$(2)_DEPENDENCIES += $$(if \ + $$(filter \ + host-python-flit-core host-python-installer, \ + $(1)) \ + ,, \ + host-python-installer \ + ) ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) endif endif # SETUP_TYPE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 0e058a1f17..d206a72f82 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 +PYTHON_FLIT_CORE_SETUP_TYPE = flit $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 862a251415..97a158b738 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE -PYTHON_INSTALLER_SETUP_TYPE = distutils +PYTHON_INSTALLER_SETUP_TYPE = flit +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src $(eval $(host-python-package)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 99aa62d51d..1ca1bc4e35 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE -PYTHON_PEP517_SETUP_TYPE = distutils +PYTHON_PEP517_SETUP_TYPE = flit HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index b8c20ca736..3539a505be 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -7,7 +7,7 @@ PYTHON_TOMLI_VERSION = 1.2.0 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa -PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_SETUP_TYPE = flit PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE -- 2.25.1 From baruch at tkos.co.il Sun Mar 13 18:05:45 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 13 Mar 2022 20:05:45 +0200 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 In-Reply-To: <20220313130424.3046857-1-bernd.kuhls@t-online.de> References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> Message-ID: <877d8xd8nb.fsf@tarshish> Hi Bernd, On Sun, Mar 13 2022, Bernd Kuhls wrote: > Changelog: https://curl.se/changes.html > > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 > > Signed-off-by: Bernd Kuhls Thanks for the bump. It looks like NSS crypto back-end support requires --with-nss-deprecated now. Maybe just drop deprecated NSS support? baruch > --- > package/libcurl/libcurl.hash | 6 +++--- > package/libcurl/libcurl.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash > index 63d6ba306c..4be245041c 100644 > --- a/package/libcurl/libcurl.hash > +++ b/package/libcurl/libcurl.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://curl.se/download/curl-7.81.0.tar.xz.asc > +# https://curl.se/download/curl-7.82.0.tar.xz.asc > # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 > -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz > -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING > +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz > +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 20ebb4f271..863cc268b4 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBCURL_VERSION = 7.81.0 > +LIBCURL_VERSION = 7.82.0 > LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz > LIBCURL_SITE = https://curl.se/download > LIBCURL_DEPENDENCIES = host-pkgconf \ -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From james.hilliard1 at gmail.com Sun Mar 13 18:15:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 12:15:10 -0600 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <20220313162132.GT283544@scaer> References: <20220313122112.261290-1-james.hilliard1@gmail.com> <20220313162132.GT283544@scaer> Message-ID: On Sun, Mar 13, 2022 at 10:21 AM Yann E. MORIN wrote: > > James, All, > > On 2022-03-13 06:21 -0600, James Hilliard spake thusly: > > There are a number of flit toolchain dependencies currently in the > > process of deprecating distutils based fallbacks. > > > > This will be needed in order to update tomli. > > > > We need to migrate these to use a new bootstrap based build+install > > sequence which relies on flit's bootstrap wheel build+install > > features to build and install host-python-pypa-build and > > host-python-installer which gives us a full pep517 toolchain. > > Would it be possible to split this change into separate patches: > > - introduce the new support, > - migrate patches one by one > - drop the leftovers of no longer needed stuff > > Also, see below... > > > Signed-off-by: James Hilliard > > --- > [--SNIP--] > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > > index 52ce402281..6dee8aa7d1 100644 > > --- a/package/pkg-python.mk > > +++ b/package/pkg-python.mk > [--SNIP--] > > @@ -212,7 +215,16 @@ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* > > else > > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > > $(2)_BASE_BUILD_CMD = -m build -n -w > > So this assignment to $(2)_BASE_BUILD_CMD... > > > -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > > +$(2)_BASE_BUILD_CMD = $$(if $$(filter \ Removed in v2. > > ... is completely overriden here... > > > + host-python-flit-core \ > > + host-python-installer \ > > + host-python-pep517 \ > > + host-python-tomli,$(1)),\ > > + -m flit_core.wheel,\ > > + -m build -n -w) > > +$(2)_BASE_INSTALL_CMD = $$(if $$(filter host-python-flit-core,$(1)),\ > > + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS),\ > > + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS)) > > endif > > else > > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") > > @@ -235,9 +247,19 @@ endif # ($(4),target) > > ifeq ($$($(2)_SETUP_TYPE),setuptools) > > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > > else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > > +$(2)_DEPENDENCIES += $$(if $$(filter \ > > + host-python-flit-core \ > > + host-python-installer \ > > + host-python-pep517 \ > > + host-python-pypa-build \ > > + host-python-tomli,$(1)),,\ > > + host-python-pypa-build) > > This is totally unreadable. One can't easily spot what is filtered from > what... > > $(2)_DEPENDENCIES += $$(if \ > $$(filter \ > host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ > $(1)) \ > , \ > host-python-pypa-build > ) Reformatted in v2: https://patchwork.ozlabs.org/project/buildroot/patch/20220313175615.406390-1-james.hilliard1 at gmail.com/ > > So, what this is saying, as I can understand, is that if the current > package is one of the list; > host-python-flit-core host-python-installer host-python-pep517 > host-python-pypa-build host-python-tomli > > then we want to add host-python-pypa-build to their dependency. No, host-python-pypa-build and those packages are normally flit infra dependencies but we must exclude them as bootstrapping requires special build+install procedures needed to prevent circular dependencies. > > However, from what I understand, all those packages really are packages > that implement the 'flit' and pep517 now?) infrastructure, and thus the > dependency should be explicitly listed in those packages, rather than > implcitly added by the infra. > > > +$(2)_DEPENDENCIES += $$(if $$(filter \ > > Why use an other assignment to the same variable? It could be a single > assignment... This is an exclusion to avoid circular dependencies. > > > + host-python-flit-core \ > > + host-python-installer,$(1)),,\ > > + host-python-installer) > > Ditto, this should be explictly added to the packages. This is also an exclusion to avoid circular dependencies. > > > ifeq ($$($(2)_SETUP_TYPE),flit) > > -$(2)_DEPENDENCIES += host-python-flit-core > > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) > > I don't understand how this is going to work. The dependency exclusion > here is correct, indeed, I am not questionning that. > > However, I don't understand how host-python-flit-core can use the flit > type at build time, when it is not already installed, especially since > host-python-flit-core does not define any custom configure/build/install > commands... Flit's bootstrap builder and installer both work without special handling since we run from the package source directly, this is fine for flit since flit is pure python and does not technically need to be built before it can run. > > You will have to add a blurb in the commit log to explain how it > works... > > > endif > > endif # SETUP_TYPE > > > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > > index 0e058a1f17..d206a72f82 100644 > > --- a/package/python-flit-core/python-flit-core.mk > > +++ b/package/python-flit-core/python-flit-core.mk > > @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > > -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > > +PYTHON_FLIT_CORE_SETUP_TYPE = flit > > Yup, see my comment above, about the corresponding change in the infra. > > > $(eval $(host-python-package)) > > diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk > > index 862a251415..97a158b738 100644 > > --- a/package/python-installer/python-installer.mk > > +++ b/package/python-installer/python-installer.mk > > @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz > > PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 > > PYTHON_INSTALLER_LICENSE = MIT > > PYTHON_INSTALLER_LICENSE_FILES = LICENSE > > -PYTHON_INSTALLER_SETUP_TYPE = distutils > > +PYTHON_INSTALLER_SETUP_TYPE = flit > > +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src > > Why do we need to provide this here? Can't that be made generic be using > something like HOST_PYTHON_INSTALLER_SUBDIR=src ? This is needed to allow host-python-installer to install itself, it's a one-off special case just needed for this package to avoid a circular dependency on itself for install. > > python-package already uses $(2)_BUILDDIR, which by default is the same > as $(2)_SRCDIR, which by default is (basically) $(@D)/$(2)_SUBDIR, so it > should jsut work automatically, no? We only want to modify PYTHONPATH, the installation still should be invoked from the $(2)_BUILDDIR as we normally do. We need to add $(2)_BUILDDIR/src to the PYTHONPATH since $(TOPDIR)/support/scripts/pyinstaller.py depends on host-python-installer. > > Regards, > Yann E. MORIN. > > > $(eval $(host-python-package)) > > diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk > > index 99aa62d51d..1ca1bc4e35 100644 > > --- a/package/python-pep517/python-pep517.mk > > +++ b/package/python-pep517/python-pep517.mk > > @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz > > PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 > > PYTHON_PEP517_LICENSE = MIT > > PYTHON_PEP517_LICENSE_FILES = LICENSE > > -PYTHON_PEP517_SETUP_TYPE = distutils > > +PYTHON_PEP517_SETUP_TYPE = flit > > HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli > > > > $(eval $(host-python-package)) > > diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk > > index b8c20ca736..3539a505be 100644 > > --- a/package/python-tomli/python-tomli.mk > > +++ b/package/python-tomli/python-tomli.mk > > @@ -7,7 +7,7 @@ > > PYTHON_TOMLI_VERSION = 1.2.0 > > PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz > > PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa > > -PYTHON_TOMLI_SETUP_TYPE = distutils > > +PYTHON_TOMLI_SETUP_TYPE = flit > > PYTHON_TOMLI_LICENSE = MIT > > PYTHON_TOMLI_LICENSE_FILES = LICENSE > > > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 18:25:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 19:25:58 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: support alternative Homepage format In-Reply-To: <20220313165030.269338-1-james.hilliard1@gmail.com> References: <20220313165030.269338-1-james.hilliard1@gmail.com> Message-ID: <20220313182558.GV283544@scaer> James, All, On 2022-03-13 10:50 -0600, James Hilliard spake thusly: > Some packages only have a home page properly set inside project_urls. > > Signed-off-by: James Hilliard > --- > utils/scanpypi | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/utils/scanpypi b/utils/scanpypi > index 17d8a0017a..681758a552 100755 > --- a/utils/scanpypi > +++ b/utils/scanpypi > @@ -609,7 +609,8 @@ class BuildrootPackage(): > > lines.append('\thelp\n') > > - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, > + md_info = self.metadata['info'] > + help_lines = textwrap.wrap(md_info['summary'], 62, > initial_indent='\t ', > subsequent_indent='\t ') > > @@ -617,11 +618,17 @@ class BuildrootPackage(): > if help_lines[-1][-1] != '.': > help_lines[-1] += '.' > > - # \t + two spaces is 3 char long > - help_lines.append('') > - help_lines.append('\t ' + self.metadata['info']['home_page']) > - help_lines = [x + '\n' for x in help_lines] > - lines += help_lines > + home_page = md_info.get('home_page', None) > + if home_page is None or len(home_page) == 0: I think this can be shortened to: if not home_page: [...] Indeed: - None tets as False - an empty string tests as False So, 'not home_page' will evaluate to True if it is either None, or if its length is zero. > + project_urls = md_info.get('project_urls', {}) > + home_page = project_urls.get('Homepage', None) > + > + if home_page is not None and len(home_page) != 0: Similarly, I think this could be shortened to just; if home_page: [...] So 'home_page' will only evaluate to True if it is not None and its length is not zero. And eventually, all this can be simplified even further: home_page = md_info.get('home_page', None) or \ md_info.get('project_urls', {}).get('Homepage', None) (and squelch flake8's E127) Applied to master with the above simplification, thanks. Regards, Yann E. MORIN. > + # \t + two spaces is 3 char long > + help_lines.append('') > + help_lines.append('\t ' + home_page) > + help_lines = [x + '\n' for x in help_lines] > + lines += help_lines > > with open(path_to_config, 'w') as config_file: > config_file.writelines(lines) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 18:24:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 19:24:23 +0100 Subject: [Buildroot] [git commit] utils/scanpypi: support alternative Homepage format Message-ID: <20220313181742.3436682A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b09e05b5831541e19eb8a6cbaf216bfe08f6c8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some packages only have a home page properly set inside project_urls. Squelch flake8's E127, because a visual indent here is really nicer. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: simplify getting home_page fallbacks] Signed-off-by: Yann E. MORIN --- utils/scanpypi | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..cc13701c0e 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -609,7 +609,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +618,15 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) or \ + md_info.get('project_urls', {}).get('Homepage', None) # noqa: E127 + + if home_page: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) From peter at korsgaard.com Sun Mar 13 21:04:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:04:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.12 In-Reply-To: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:10:45 +0100") References: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> Message-ID: <87wngxwomc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, > CVE-2022-0585 and CVE-2022-0586 > https://www.wireshark.org/security/wnpa-sec-2021-22.html > https://www.wireshark.org/security/wnpa-sec-2022-01.html > https://www.wireshark.org/security/wnpa-sec-2022-02.html > https://www.wireshark.org/security/wnpa-sec-2022-03.html > https://www.wireshark.org/security/wnpa-sec-2022-04.html > https://www.wireshark.org/security/wnpa-sec-2022-05.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:05:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:05:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: security bump to version 371 In-Reply-To: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:15:08 +0100") References: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> Message-ID: <87sfrlwojx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is > enabled, allows attackers to trigger a buffer overflow in set_sixel in > graphics_sixel.c via crafted text. > Update hash of COPYING (update in year) > https://invisible-island.net/xterm/xterm.log.html#xterm_371 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:09:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:09:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/exempi: security bump to version 2.6.1 In-Reply-To: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:34:23 +0100") References: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> Message-ID: <87o829woea.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Extract from NEWS: > - Changes in v2021.08 > - Security Fixes > - Changes in v2021.07 > - Security Fixes > https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:12:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:12:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolfssl: security bump to version 5.2.0 In-Reply-To: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:50:33 +0100") References: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> Message-ID: <87k0cxwo8x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 > https://www.wolfssl.com/docs/security-vulnerabilities > https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:17:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:17:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: security bump to version 2.9.13 In-Reply-To: <20220228175245.1585-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 28 Feb 2022 18:52:45 +0100") References: <20220228175245.1585-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnlwnzy.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues: > - [CVE-2022-23308] Use-after-free of ID and IDREF attributes > - Use-after-free in xmlXIncludeCopyRange > - Fix Null-deref-in-xmlSchemaGetComponentTargetNs > - Fix memory leak in xmlXPathCompNodeTest > - Fix null pointer deref in xmlStringGetNodeList > - Fix several memory leaks found by Coverity > https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:24:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:24:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: security bump to version 2.12 In-Reply-To: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 17:05:03 +0100") References: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> Message-ID: <87bky9wnpi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, > CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): > - Potential integer underflow upon receiving STUN message > (GHSA-2qpg-f6wf-w984) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) > - Potential out-of-bounds read when parsing RTCP BYE message > (GHSA-3qx3-cg72-wrh9) > - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) > - Potential buffer overflow in pjsua_player_create(), > pjsua_recorder_create(), pjmedia_wav_player_create(), and > pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) > - Potential out-of-bound read during RTP/RTCP parsing > (GHSA-m66q-q64c-hv36) > - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > https://github.com/pjsip/pjproject/releases/tag/2.12 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:25:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:25:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: security bump to version 10.3.34 In-Reply-To: (Peter Korsgaard's message of "Mon, 28 Feb 2022 19:51:25 +0100") References: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> Message-ID: <877d8xwnnc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Hi, > On 13/02/2022 21.24, Fabrice Fontaine wrote: >> Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, >> CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, >> CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, >> CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 >> Update hash of README.md (changes not related to license: >> https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) >> https://mariadb.com/kb/en/mariadb-10334-release-notes/ >> https://mariadb.com/kb/en/mariadb-10333-release-notes/ >> https://mariadb.com/kb/en/mariadb-10332-release-notes/ >> https://mariadb.com/kb/en/mariadb-10331-release-notes/ >> Signed-off-by: Fabrice Fontaine > Committed, thanks. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:05:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:05:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xterm: security bump to version 371 Message-ID: <20220313211754.63C0883CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=350ff34a730f10ea8beacfd8d6e1eb32fe5c93f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2de5cd85423083662eb0625978ef6da7577d76c6) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Sun Mar 13 21:03:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:03:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireshark: security bump to version 3.4.12 Message-ID: <20220313211754.5A9D183CFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cfa24865aa56d69cce702ec3957e43244b005de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit db0f8006c1c8685dc98446b5b9e768e52d2f2591) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7b67e316ed..db1f71e9ef 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 7715680767..5c811319be 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From peter at korsgaard.com Sun Mar 13 21:08:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:08:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/exempi: security bump to version 2.6.1 Message-ID: <20220313211754.6E08483CFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2bb1068b43d4ef9a05b7e55693a285c68b3c2bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 55f1d0a3592253df2a356c195e5131a970eade9b) Signed-off-by: Peter Korsgaard --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From peter at korsgaard.com Sun Mar 13 21:23:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:23:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpjsip: security bump to version 2.12 Message-ID: <20220313211754.8CD4B83CFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8bec43ffc3ff0077a9df6327a156f1da671e2f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5ed26bb378c02f2ce7f7377481853b12ad55d808) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:11:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:11:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220313211754.78B2C83CFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e838466c74dd7088074156e722a2c28797eb4f2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 14e0c4de719a0d63192cc5de66a608f75297f37d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:17:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:17:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libxml2: security bump to version 2.9.13 Message-ID: <20220313211754.8320683CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d578d93e0e1dce841d8d9fe75f12d37a6c1f1661 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4b6703847376838d0b091acd9b0e0193b6439657) Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..f13eaff1ad 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Mar 13 21:25:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:25:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mariadb: security bump to version 10.3.34 Message-ID: <20220313211754.97E0083CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ef50335dd5c0735e90bf042edc876f2fe154dbf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e7a9a1bce4b081a721799ff62ee5fff8456203ce) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 374b3dc352..3fad22c8c1 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 From peter at korsgaard.com Sun Mar 13 21:08:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:08:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/exempi: security bump to version 2.6.1 Message-ID: <20220313212141.ADF1183D1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f29b1ab92e79da770b58825c0ccdcbbdd6a77a98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 55f1d0a3592253df2a356c195e5131a970eade9b) Signed-off-by: Peter Korsgaard --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From peter at korsgaard.com Sun Mar 13 21:05:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:05:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xterm: security bump to version 371 Message-ID: <20220313212141.9E0EB83CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed5497beda4da70456df19b41de5a8111194a316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2de5cd85423083662eb0625978ef6da7577d76c6) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Sun Mar 13 21:22:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:22:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpjsip: security bump to version 2.12 Message-ID: <20220313212141.D35EB83CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=909acef27b14e73d633d347d13eab04298596a99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5ed26bb378c02f2ce7f7377481853b12ad55d808) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:12:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:12:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220313212141.B978483CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1f98ccd7c1f024a659e234f3076f23130a42058 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 14e0c4de719a0d63192cc5de66a608f75297f37d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:25:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:25:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mariadb: security bump to version 10.3.34 Message-ID: <20220313212141.DEE5883D1E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77545c497e74ca68099969a86c1434d7aa695273 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e7a9a1bce4b081a721799ff62ee5fff8456203ce) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d08b768a2e..146ce0ee09 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 From peter at korsgaard.com Sun Mar 13 21:16:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:16:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libxml2: security bump to version 2.9.13 Message-ID: <20220313212141.C623D83D1E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8691a82932d1ff665729da108b4c3df6f59be802 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4b6703847376838d0b091acd9b0e0193b6439657) Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..f13eaff1ad 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Mar 13 21:02:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:02:43 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireshark: security bump to version 3.4.12 Message-ID: <20220313212141.9164C83D1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91339db0ee99a5257b7e964f0c12bd307a421e54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit db0f8006c1c8685dc98446b5b9e768e52d2f2591) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7b67e316ed..db1f71e9ef 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 0361d0bb64..a5ca4b1f73 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From clement.leger at bootlin.com Mon Mar 14 07:38:47 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 14 Mar 2022 08:38:47 +0100 Subject: [Buildroot] [PATCH v3 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220312203627.GM283544@scaer> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220312203627.GM283544@scaer> Message-ID: <20220314083847.6149edde@fixe.home> Le Sat, 12 Mar 2022 21:36:27 +0100, "Yann E. MORIN" a ?crit : > Cl?ment, All, > > On 2022-03-11 13:36 +0100, Cl?ment L?ger via buildroot spake thusly: > > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > > of python-pycryptodomex to build. This series adds support to build > > host-python-cryptography and uses it in optee-os package to build the > > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > > and optee-test which needs to be aligned with optee-os version. > > Following the important review from Thomas on patch 1, I've marked this > series as changes requested in Patchwork. > > Please, can you add me in Cc of patch 1 in a future respin (I too may > have to deal with python-cryptography on the host in short order). Ok, I'll do so ! Thanks, Cl?ment > > Regards, > Yann E. MORIN. > > > ---- > > Changes in v3: > > - Fix authorship for commits that were copied from Etienne ones. > > - Fix package URL for optee-os > > - Added Acked-by Etienne Carriere > > > > Changes in v2: > > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > > > Cl?ment L?ger (7): > > package/python-cryptography: enable host package > > boot/optee-os: add support to build with python-cryptography > > boot/optee-os: bump to version 3.16.0 > > package/optee-test: bump to version 3.16.0 > > package/optee-examples: bump to version 3.16.0 > > package/optee-client: bump to version 3.16.0 > > package/optee-benchmark: bump to version 3.16.0 > > > > boot/optee-os/Config.in | 13 +++++++++++-- > > boot/optee-os/optee-os.hash | 4 ++-- > > boot/optee-os/optee-os.mk | 7 ++++++- > > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > > package/optee-benchmark/optee-benchmark.mk | 2 +- > > package/optee-client/optee-client.hash | 4 ++-- > > package/optee-client/optee-client.mk | 2 +- > > package/optee-examples/optee-examples.hash | 4 ++-- > > package/optee-examples/optee-examples.mk | 2 +- > > package/optee-test/optee-test.hash | 4 ++-- > > package/optee-test/optee-test.mk | 2 +- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 12 files changed, 38 insertions(+), 17 deletions(-) > > > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From clement.leger at bootlin.com Mon Mar 14 08:38:26 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 14 Mar 2022 09:38:26 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311214332.4405ad89@windsurf> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> <20220311214332.4405ad89@windsurf> Message-ID: <20220314093826.5a30c765@fixe.home> Le Fri, 11 Mar 2022 21:43:32 +0100, Thomas Petazzoni a ?crit : > Hello Cl?ment, > > On Fri, 11 Mar 2022 13:36:30 +0100 > Cl?ment L?ger wrote: > > > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > > + host-python-setuptools-rust \ > > + host-python-cffi \ > > + host-rustc \ > > + openssl > > This openssl dependency seems extremely dubious. Why would a host > package depend on the target variant of openssl? Yes, of course that is a host-openssl dependency that is needed. > > > PYTHON_CRYPTOGRAPHY_ENV = \ > > $(PKG_CARGO_ENV) \ > > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > > @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ > > $(PKG_CARGO_ENV) \ > > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > > > + > > Spurious newline added. > > > $(eval $(python-package)) > > +$(eval $(host-python-package)) > > Thomas -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From clement.leger at bootlin.com Mon Mar 14 08:47:52 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 14 Mar 2022 09:47:52 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220312155913.280739e0@windsurf> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> <20220312155913.280739e0@windsurf> Message-ID: <20220314094752.7ea852c1@fixe.home> Le Sat, 12 Mar 2022 15:59:13 +0100, Thomas Petazzoni a ?crit : > Hello, > > On Fri, 11 Mar 2022 13:36:30 +0100 > Cl?ment L?ger wrote: > > > Enable host package and add needed dependencies. > > > > Acked-by: Etienne Carriere > > Signed-off-by: Cl?ment L?ger > > --- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > > index a524f729c8..4ff61c7f86 100644 > > --- a/package/python-cryptography/python-cryptography.mk > > +++ b/package/python-cryptography/python-cryptography.mk > > @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > > host-python-cffi \ > > host-rustc \ > > openssl > > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > > + host-python-setuptools-rust \ > > + host-python-cffi \ > > + host-rustc \ > > + openssl > > Also, I am actually surprised this is enough. Indeed, there are some > parts in Rust in python-cryptography, so we have quite some extra > variables for the target packages to handle this: > > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > # We need to vendor the Cargo crates at download time > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > For the last 3 variables, I can explain that it possibly worked for you > because you perhaps already had the python-cryptography tarball in > DL_DIR downloaded by the host variant of the package. But if you remove > this tarball, and build just the host variant, I would suspect that it > will fail to build. Indeed, I'm using a shared BR2_DL_DIR which might explain why it worked. > > However, I can't really explain why your package works without > HOST_PYTHON_CRYTOGRAPHY_ENV. > > Make sure to do a clean build in a Docker container that doesn't have > Rust installed (there is an official Buildroot Docker image that is > available for this kind of testing). Ok, I'll do that. > > Thanks! > > Thomas -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From peter at korsgaard.com Mon Mar 14 09:10:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:10:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: security bump version to 4.15.5 In-Reply-To: <20220222214114.374855-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 22 Feb 2022 22:41:14 +0100") References: <20220222214114.374855-1-bernd.kuhls@t-online.de> Message-ID: <8735jkx5lf.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.5.html > Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. > Signed-off-by: Bernd Kuhls For 2021.02.x / 2021.11.x I have instead bumped to 4.14.12, which contains fixes for the last two issues. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:09:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:09:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/samba4: security bump to version 4.14.12 Message-ID: <20220314090138.BF68583D28@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae76fa4469a604b034082339150b986cde5687ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://www.samba.org/samba/history/samba-4.14.12.html Fixes CVE-2021-44142 & CVE-2022-0336. Notice that upstream has decided that the fix for CVE-2021-44141 is too complex to backport, so it is NOT fixed: https://www.samba.org/samba/security/CVE-2021-44141.html Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 033d932732..0f18c76ebd 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.14.10.tar.asc -sha256 107ee862f58062682cec362ec68a24251292805f89aa4c97e7ab80237f91c7af samba-4.14.10.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.14.12.tar.asc +sha256 155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d samba-4.14.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index de019e7afc..c18d406704 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.14.10 +SAMBA4_VERSION = 4.14.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 14 09:19:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:19:48 +0100 Subject: [Buildroot] [PATCH] package/gnutls: security bump to version 3.7.3 In-Reply-To: <20220223172817.3002782-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 23 Feb 2022 18:28:17 +0100") References: <20220223172817.3002782-1-francois.perrad@gadz.org> Message-ID: <87y21cvqkr.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:19:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:19:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads In-Reply-To: <20220309173503.527227-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 18:35:03 +0100") References: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Message-ID: <87tuc0vqkg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without threads raised since bump to > version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: > kx.c: In function '_gnutls_nss_keylog_write': > kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? > 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { > | ^~~~~~~~~~~~ > | keylog_once > Fixes: > - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:20:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:20:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4450 In-Reply-To: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 23:43:02 +0100") References: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> Message-ID: <87pmmovqjo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub > repository vim/vim prior to 8.2. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:16:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:16:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4450 Message-ID: <20220314091155.251AA83D5F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a717432b35e304d345df2cedd36da67d5f6514ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 28c9cb5ff34aa98bf2d0db63f593745db006c910) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Mon Mar 14 09:05:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:05:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/samba4: security bump to version 4.14.12 Message-ID: <20220314091155.1B6FC83D5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e89b9c12d56eef237e93c4b5e5735da60e9315df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://www.samba.org/samba/history/samba-4.14.12.html Fixes CVE-2021-44142 & CVE-2022-0336. Notice that upstream has decided that the fix for CVE-2021-44141 is too complex to backport, so it is NOT fixed: https://www.samba.org/samba/security/CVE-2021-44141.html Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 033d932732..0f18c76ebd 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.14.10.tar.asc -sha256 107ee862f58062682cec362ec68a24251292805f89aa4c97e7ab80237f91c7af samba-4.14.10.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.14.12.tar.asc +sha256 155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d samba-4.14.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 5673521836..2deca70266 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.14.10 +SAMBA4_VERSION = 4.14.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 14 09:16:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:16:30 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnutls: fix build without threads Message-ID: <20220314091155.3B90183D5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8fec0fb6cac22b276700ad8f75ef987fd290fea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2f4f57b62b371252425bde4440cedcac45fcaebd) Signed-off-by: Peter Korsgaard --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From peter at korsgaard.com Mon Mar 14 09:16:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:16:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnutls: security bump to version 3.7.3 Message-ID: <20220314091155.2F29783D60@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5bbfe01c0238f998ee4ffdf46588a251db694d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0dc..2ffc6c1b4e 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index be5af1933e..49a8f49cd1 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Mon Mar 14 09:15:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:15:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4450 Message-ID: <20220314091203.71AD783D74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b20502662e935bcdf529e66792a93c84398b2e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 28c9cb5ff34aa98bf2d0db63f593745db006c910) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Mon Mar 14 09:15:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:15:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gnutls: security bump to version 3.7.3 Message-ID: <20220314091203.7E6FD83D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9250201b565b119696b6c731deb1daf93a6e59ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0dc..2ffc6c1b4e 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 11c2d81e7d..ded4a393f2 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Mon Mar 14 09:15:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:15:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gnutls: fix build without threads Message-ID: <20220314091203.88D1A83D74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbb6baf8ba33ea0cacf80fcac726c83ca26a804c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2f4f57b62b371252425bde4440cedcac45fcaebd) Signed-off-by: Peter Korsgaard --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/erlang-jiffy: bump version to 1.1.1 Message-ID: <20220314121152.EECB883E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4eaddce8db60f6840d5d3a159b7d2320f8b96f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/erlang-jiffy/erlang-jiffy.hash | 2 +- package/erlang-jiffy/erlang-jiffy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 93c5e1f8c8..f172d1476e 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index cd94632962..de2e4749fb 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 1.0.9 +ERLANG_JIFFY_VERSION = 1.1.1 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/libva-utils: bump version to 2.14.0 Message-ID: <20220314121152.D10DF82868@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b526bdb5ee40c753096a397afc2dfa2353c8dc5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/intel/libva-utils/releases/tag/2.14.0 Upstream does not provide a tarball so switch to github helper. Switch build system to meson to avoid autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libva-utils/libva-utils.hash | 4 +--- package/libva-utils/libva-utils.mk | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 18a078dc1c..5f21af800e 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva-utils/releases/download/2.13.0/libva-utils-2.13.0.tar.bz2.sha1sum -sha1 7ab945cf232387f762891f9e4f7a6cb41e0766e8 libva-utils-2.13.0.tar.bz2 # Locally computed -sha256 db3ae0bd63c2a3f6ef498450c29ffc99c387ce611e1eb5db6a8da1f88845d612 libva-utils-2.13.0.tar.bz2 +sha256 0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31 libva-utils-2.14.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index e6e31df8bd..4c527a748c 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.13.0 -LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 -LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) +LIBVA_UTILS_VERSION = 2.14.0 +LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/efl: rework eeze handling in Kconfig Message-ID: <20220314121153.1706D83E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7229db872acd6db83ccb7e4bb22cb4cfd06be75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit [1] added eeze dependency using "depends on" to several efl options (drm, libmount) instead of selecting eeze and propagate the udev reverse dependency. [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/efl/Config.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..4c78bef7c8 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +174,16 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm, efl-eeze depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,9 +216,10 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON @@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/screen: bump to version 4.9.0 Message-ID: <20220314121152.E50AC82868@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a346843eedef792f48ef6a49cc83ae89d97287fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop latest patch (already in version) - Update indentation in hash file (two spaces) https://lists.gnu.org/archive/html/screen-users/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/screen/0008-CVE-2021-26937.patch | 68 -------------------------------- package/screen/screen.hash | 6 +-- package/screen/screen.mk | 5 +-- 3 files changed, 4 insertions(+), 75 deletions(-) diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch deleted file mode 100644 index df7efa0294..0000000000 --- a/package/screen/0008-CVE-2021-26937.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: [CVE-2021-26937] Fix out of bounds array access -Author: Michael Schr??der -Bug-Debian: https://bugs.debian.org/982435 -Bug: https://savannah.gnu.org/bugs/?60030 -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html - -Downloaded from Debian: -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch - -Signed-off-by: Peter Korsgaard ---- a/encoding.c -+++ b/encoding.c -@@ -43,7 +43,7 @@ - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront(i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ca74ba8913..a261d3100d 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig +sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 843c71fc2a..3239a1c1f3 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.8.0 +SCREEN_VERSION = 4.9.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin -# 0008_CVE-2021-26937.patch -SCREEN_IGNORE_CVES += CVE-2021-26937 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix shared netsnmp build Message-ID: <20220314121153.53A3283E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=532e5063f54434cce4afec2ad5371fbf02488b67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following shared build failure with netsnmp raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...01-m4-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 ++++++++++++++++++++++ package/zabbix/zabbix.mk | 2 + 2 files changed, 46 insertions(+) diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 0000000000..ffb1f54ba2 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd..a8ecbb42db 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/rpi-userland: fix build with libexecinfo Message-ID: <20220314121153.49D6783E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc4cc27705de50356d7e9945e41bd989fdc56fe8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 ++++++++++++++++++++++ package/rpi-userland/rpi-userland.mk | 5 ++ 2 files changed, 63 insertions(+) diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch new file mode 100644 index 0000000000..bf2a9eb6ea --- /dev/null +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch @@ -0,0 +1,58 @@ +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to +pass additional flags such as -lexecinfo on musl and uclibc-ng + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- + makefiles/cmake/arm-linux.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index e7206cc..16c64db 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt +index e6bd373..2f72eb2 100644 +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake +index 957846a..e172282 100644 +--- a/makefiles/cmake/arm-linux.cmake ++++ b/makefiles/cmake/arm-linux.cmake +@@ -93,7 +93,7 @@ if(ANDROID) + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") + + link_directories(${ANDROID_LIBS}) +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") +-- +2.34.1 + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..3564ec0703 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: fix musl build Message-ID: <20220314121153.2DC4C83E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96ebed1eed6dcd55d8024cbc6fe8bec646d739c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since commit 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: In file included from src/shared/queue.c:15: ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); | ^~~~~~~ | size_t Fixes: - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...006-src-shared-util.h-include-sys-types.h.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch new file mode 100644 index 0000000000..8a5bd64d43 --- /dev/null +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch @@ -0,0 +1,39 @@ +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Feb 2022 18:19:33 +0100 +Subject: [PATCH] src/shared/util.h: include sys/types.h + +Include sys/types.h to avoid the following build failure on musl raised +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: + +In file included from src/shared/queue.c:15: +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); + | ^~~~~~~ + | size_t + +Fixes: + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] +--- + src/shared/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.h b/src/shared/util.h +index c01eccf8a..554481e1e 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + #define BIT(n) (1 << (n)) +-- +2.34.1 + From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/rust: set musl-root for musl toolchains Message-ID: <20220314121153.4008A83E42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a41b0f31dea3e62b006ac815bf628600676b328f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Without musl-root in config.toml the build stop with the following error: thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 musl-root is needed to provide the path to libc.a and libunwind.a because rust link them statically into the standard library and liblibc [1]. For other libc, musl-root is not used and ignored [2]. [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 3c560882ca..cd8c87b68d 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/kismet: bump to version 2022-02-R1 Message-ID: <20220314121152.DA7E283E42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4aaa7ac4d86b3f509dea696d972b092d09442d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Linking with -latomic is handled by configure.ac since version 2022-01-R3 and https://github.com/kismetwireless/kismet/commit/bbdfd21e2b41bf69513ded5ae5ab5a89f22a9912 https://www.kismetwireless.net/release/kismet-2022-02-R1 https://www.kismetwireless.net/release/kismet-2022-01-R3 https://www.kismetwireless.net/release/kismet-2022-01-R2 https://www.kismetwireless.net/release/kismet-2022-01-R1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kismet/kismet.hash | 2 +- package/kismet/kismet.mk | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 9a9d2260b9..fc5f854b7e 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz +sha256 aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8 kismet-2022-02-R1.tar.xz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 819ed510d7..3992a392f8 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KISMET_VERSION = 2021-08-R1 +KISMET_VERSION = 2022-02-R1 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code KISMET_DEPENDENCIES = \ @@ -29,10 +29,6 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KISMET_CONF_ENV += LIBS=-latomic -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap KISMET_CONF_OPTS += --enable-libcap From arnout at mind.be Mon Mar 14 12:17:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:41 +0100 Subject: [Buildroot] [git commit] package/zabbix: netsnmp needs mib Message-ID: <20220314121153.5D1CA83E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77f9d2d6a6fc4a6485acd7b5f1970b638764c1fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master netsnmp support needs mib to avoid the following build failure raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: checks_snmp.c: In function ???zbx_snmp_get_octet_string???: checks_snmp.c:694:35: error: invalid use of undefined type ???struct tree??? 694 | hint = (NULL != subtree ? subtree->hint : NULL); | ^~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index a8ecbb42db..adc54028ad 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -55,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Message-ID: <20220314121153.36A5283E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c750dd4e5d03430148841d2d897e90dbe19ce172 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master bpftool uses its own local copy of libbpf so add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure on ARM: btf.c: In function 'btf_type_by_id': btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (type_id < btf->start_id) ^ bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fixes: - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bpftool/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343..a1ef3843e6 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + config BR2_PACKAGE_BPFTOOL bool "bpftool" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/rust: install rustc and rust-std built by Buildroot Message-ID: <20220314121153.0D83583E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15682493918ead960d326bf24763e9b5d8d331d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The test TestRust is currently broken with ripgrep package with the following error: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 target on x86_64 host) but a problem with rust-std libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc used to bootstrap the build: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) and is not removed before installing host-rust built by Buildroot. We actually spent a lot of time to build host-rust with rust-std and forget to install this important library HOST_DIR. Looking at the host-rust build directory we can notice two installer script "install.sh" (the same scripts used to install host-rust-bin): TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh The "tarball" directory is generated by the "python x.py dist" during the install step, we have to keep it. Replace "python x.py install" by theses two install scripts. Installing rust-std with the install.sh script replace the rust-std libraries installed by host-rust-bin. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 Signed-off-by: Romain Naour Cc: Eric Le Bihan [Arnout: remove redundant parenthesis; only use a variable for the common install opts] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rust/rust.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b7..3c560882ca 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -67,9 +67,26 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +define HOST_RUST_INSTALL_RUSTC + cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/libva: bump version to 2.14.0 Message-ID: <20220314121152.C849283E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93752b8ba401d4be211b19a2753fec00d9c4d9ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/intel/libva/releases/tag/2.14.0 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libva/libva.hash | 6 +++--- package/libva/libva.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 7b66a7709d..4646a816bb 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2.sha1sum +sha1 36b482ec8c361a6c3a6198f4777409b136f2713c libva-2.14.0.tar.bz2 # Locally computed -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 +sha256 511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454 libva-2.14.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 6ac5386540..db1cfd29be 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.13.0 +LIBVA_VERSION = 2.14.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/efl: handle input option Message-ID: <20220314121153.20B6783E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70ad44ffd00786cf25145445afa374cbb295f722 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input option on target which was added (and enabled by default) by https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be resulting in the following build failure when eeze is disabled: ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". Fixes: - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e Signed-off-by: Fabrice Fontaine [Romain: Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the upstream name. use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM remove duplicate libxkbcommon in EFL_DEPENDENCIES] Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 11 ++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 4c78bef7c8..c4f82b92e3 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -216,13 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcb..d4a16475e5 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true @@ -192,7 +199,7 @@ endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) EFL_CONF_OPTS += -Ddrm=true -EFL_DEPENDENCIES += libdrm libegl libinput mesa3d +EFL_DEPENDENCIES += libdrm libegl mesa3d else EFL_CONF_OPTS += -Ddrm=false endif @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220314121153.039C583E42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0d1f211950fe7cdf1bbb52397cdb86519d4a404 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour Cc: Eric Le Bihan Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/test_rust.py | 48 +++--------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") From peter at korsgaard.com Mon Mar 14 13:20:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:20:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/seatd: security bump to version 0.6.4 In-Reply-To: <20220228213432.3289480-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Mon, 28 Feb 2022 23:34:32 +0200") References: <20220228213432.3289480-1-aperez@igalia.com> Message-ID: <87lexcvffw.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This release contains a security fix in seatd-launch which prevents > removal of files that the calling user did not have privileges to > remove. Release notes: > https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 > Signed-off-by: Adrian Perez de Castro Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 13:20:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:20:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: bump to version 1.12.22 In-Reply-To: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:17:47 +0100") References: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> Message-ID: <87h780vfff.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 13:19:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:19:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/dbus: bump to version 1.12.22 Message-ID: <20220314131209.F380D83E4D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08854c455d93067625d6737424eb68845686f1ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7af7acabe051c1b394f53fd02084be7b97d8a8d8) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 14 13:19:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:19:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/dbus: bump to version 1.12.22 Message-ID: <20220314131235.BA30383E5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=845c2d2669a9af79b56b7bb538819d96c70bbeed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7af7acabe051c1b394f53fd02084be7b97d8a8d8) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 14 13:19:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:19:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/seatd: security bump to version 0.6.4 Message-ID: <20220314131235.C302183E68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e5536ce361ffbb7b76b843eb3eaec2e78af84dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release contains a security fix in seatd-launch which prevents removal of files that the calling user did not have privileges to remove. Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 41139cb0997af800c7d89213c5d89652b65ec6cb) Signed-off-by: Peter Korsgaard --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 18f65d3aeb..88793b6dd5 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8 0.6.3.tar.gz +sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27d3155b2b..5382cad39b 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.3 +SEATD_VERSION = 0.6.4 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT From clement.leger at bootlin.com Mon Mar 14 15:31:03 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:03 +0100 Subject: [Buildroot] [PATCH v4 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220314153111.1390512-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which needs to be aligned with optee-os version. ---- Changes in v4: - Add missing variables for python host package - Found a missing DTC dependency while testing build in docker container - Fix BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY title - Change the logic to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY - optee-os now depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS Changes in v3: - Fix authorship for commits that were copied from Etienne ones. - Fix package URL for optee-os - Added Acked-by Etienne Carriere Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (8): boot/optee-os: add option to select DTC dependency package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 boot/optee-os/Config.in | 21 +++++++++++++++++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 12 ++++++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- .../python-cryptography.mk | 14 +++++++++++++ 12 files changed, 58 insertions(+), 17 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:04 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:04 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-2-clement.leger@bootlin.com> Some platforms (stm32, sam) needs DTC to build the platform device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration option to select host-dtc package when building. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..2f6143f1f4 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..9f76d8450e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -23,6 +23,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif + # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit # trusted applications. Since buildroot currently references -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:05 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:05 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-3-clement.leger@bootlin.com> Enable host package and add needed dependencies. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..8a4ffe6d75 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,14 +17,28 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:06 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:06 +0100 Subject: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-4-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 9 +++++++++ boot/optee-os/optee-os.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 2f6143f1f4..3996039191 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_OPTEE_OS bool "optee_os" depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help OP-TEE OS provides the secure world boot image and the trust application development kit of the OP-TEE project. OP-TEE OS @@ -55,6 +56,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 9f76d8450e..5313a1badc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,13 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:07 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:07 +0100 Subject: [Buildroot] [PATCH v4 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-5-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 3996039191..29924d9198 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -19,7 +19,8 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -66,7 +67,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b9b0e5b43f 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:08 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:08 +0100 Subject: [Buildroot] [PATCH v4 5/8] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-6-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:09 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:09 +0100 Subject: [Buildroot] [PATCH v4 6/8] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-7-clement.leger@bootlin.com> Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:10 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:10 +0100 Subject: [Buildroot] [PATCH v4 7/8] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-8-clement.leger@bootlin.com> Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:11 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:11 +0100 Subject: [Buildroot] [PATCH v4 8/8] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-9-clement.leger@bootlin.com> Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From etienne.carriere at linaro.org Mon Mar 14 17:20:47 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Mon, 14 Mar 2022 18:20:47 +0100 Subject: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220314153111.1390512-4-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-4-clement.leger@bootlin.com> Message-ID: Hello Cl?ment, Once bumped to 3.16.0, optee-os won't revert to pycryptodomex. Why not using a single change to upgrade optee_os to 3.16.0 and update dependencies? This would get rid of BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY. Best regards, Etienne On Mon, 14 Mar 2022 at 16:33, Cl?ment L?ger wrote: > > Newer version of optee-os (>= 3.16) uses python-cryptography instead of > python-pycryptodomex in python scripts. Add support to build these > newer versions by adding a new > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will > select host-python-cryptography dependency when building optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 9 +++++++++ > boot/optee-os/optee-os.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 2f6143f1f4..3996039191 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -1,6 +1,7 @@ > config BR2_TARGET_OPTEE_OS > bool "optee_os" > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > help > OP-TEE OS provides the secure world boot image and the trust > application development kit of the OP-TEE project. OP-TEE OS > @@ -55,6 +56,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > Select this option if your OP-TEE OS platform configuration > requires the Device Tree compiler to be available. > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "OP-TEE OS needs host-python-cryptography" > + help > + OP-TEE OS version below 3.16 used python-pycryptodomex > + package in python scripts. Newer version uses > + python-cryptography. Select this option if optee-os needs > + python-cryptography to be built. > + > config BR2_TARGET_OPTEE_OS_VERSION > string > default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 9f76d8450e..5313a1badc 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -21,7 +21,13 @@ else > OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) > endif > > -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools > + > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) > +OPTEE_OS_DEPENDENCIES += host-python-cryptography > +else > +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex > +endif > > ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > OPTEE_OS_DEPENDENCIES += host-dtc > -- > 2.34.1 > From thomas at ruschival.de Mon Mar 14 17:21:13 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Mon, 14 Mar 2022 18:21:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312170048.GI283544@scaer> References: <20220312104402.33075-1-thomas@ruschival.de> <20220312104402.33075-2-thomas@ruschival.de> <20220312170048.GI283544@scaer> Message-ID: <87sfrkpi0m.fsf@ruschival.de> Hi Yann, Nicolas, I will look into that and send an updated patch later this week. Thanks Nicolas for the hint, I forgot about the DEPENDENCIES... Regards Thomas On 2022-03-12 at 18:00 CET, Yann E. MORIN wrote: > Thomas, All, > > On 2022-03-12 11:44 +0100, Thomas Ruschival spake thusly: >> While upstream pistache has not yet released a stable 'tag' >> a lot has changed since June 2020: >> >> * project has moved to meson build system, cmake builds >> do not install headers. >> * patches in buildroot are no longer required >> * project-implemented Pistache::Optional was replaced by >> use of std::optional. This is only available in C++17 >> * dependency to rapidjson has been introduced >> >> Signed-off-by: Thomas Ruschival > > I've marked this patch as chagnes-requested: Nicolas explained what you > need to do to pass the test-pkg step. Can you look into that, test on > your side, and respin an updated patch? > > Thanks! > > Regards, > Yann E. MORIN. > >> --- >> ...-add-C-language-to-project-statement.patch | 70 -------------- >> ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- >> ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- >> package/pistache/Config.in | 9 +- >> package/pistache/pistache.hash | 2 +- >> package/pistache/pistache.mk | 9 +- >> 6 files changed, 11 insertions(+), 212 deletions(-) >> delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch >> delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch >> delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch >> >> diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch >> deleted file mode 100644 >> index c393a48d0d..0000000000 >> --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch >> +++ /dev/null >> @@ -1,70 +0,0 @@ >> -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Sun, 16 Aug 2020 12:31:46 +0200 >> -Subject: [PATCH] CMakeLists.txt: add C language to project statement >> -MIME-Version: 1.0 >> -Content-Type: text/plain; charset=UTF-8 >> -Content-Transfer-Encoding: 8bit >> - >> -This will fix the detection of atomic: >> - >> --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB >> --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed >> --- Looking for __atomic_load_8 in atomic >> --- Looking for __atomic_load_8 in atomic - not found >> -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): >> - Host compiler appears to require libatomic for 64-bit operations, but >> - cannot find it. >> -Call Stack (most recent call first): >> - CMakeLists.txt:19 (include) >> - >> -Indeed if C language is not enabled, the test will be run with the C++ >> -compiler resulting in the following error: >> - >> -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o >> -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx >> -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] >> -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' >> - CHECK_FUNCTION_EXISTS(void); >> - ^~~~~~~~~~~~~~~~~~~~~ >> -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': >> -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' >> - CHECK_FUNCTION_EXISTS(); >> - ^ >> - >> -whereas with a C compiler, we'll get: >> - >> -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o >> -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c >> -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] >> -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? >> - CHECK_FUNCTION_EXISTS(void); >> - ^~~~~~~~~~~~~~~~~~~~~ >> -Linking C executable cmTC_4b0f4 >> -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 >> -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 >> - >> -Signed-off-by: Fabrice Fontaine >> ---- >> - CMakeLists.txt | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/CMakeLists.txt b/CMakeLists.txt >> -index edc73c5..0286647 100644 >> ---- a/CMakeLists.txt >> -+++ b/CMakeLists.txt >> -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) >> - set(CMAKE_CXX_EXTENSIONS OFF) >> - >> - project (pistache >> -- LANGUAGES CXX) >> -+ LANGUAGES C CXX) >> - >> - include(GNUInstallDirs) >> - >> --- >> -2.27.0 >> - >> diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch >> deleted file mode 100644 >> index 09f59b11ec..0000000000 >> --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch >> +++ /dev/null >> @@ -1,95 +0,0 @@ >> -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Thu, 15 Oct 2020 22:26:55 +0200 >> -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS >> - >> -Don't build and install pistache_shared if the standard cmake >> -BUILD_SHARED_LIBS is set to OFF >> - >> -Signed-off-by: Fabrice Fontaine >> -[Backport from upstream: >> - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 >> -] >> ---- >> - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ >> - 1 file changed, 25 insertions(+), 18 deletions(-) >> - >> -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt >> -index 6521b20..c5b049f 100644 >> ---- a/src/CMakeLists.txt >> -+++ b/src/CMakeLists.txt >> -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) >> - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) >> - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) >> - >> --add_library(pistache_shared SHARED $) >> --add_library(pistache_static STATIC $) >> -+if (BUILD_SHARED_LIBS) >> -+ add_library(pistache_shared SHARED $) >> -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) >> -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) >> -+endif () >> - >> --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) >> -+add_library(pistache_static STATIC $) >> - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) >> -- >> --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) >> - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) >> - >> - if (PISTACHE_USE_SSL) >> - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) >> -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) >> - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) >> - >> - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) >> -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) >> - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) >> -+ if (BUILD_SHARED_LIBS) >> -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) >> -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) >> -+ endif () >> - endif () >> - >> - set(Pistache_OUTPUT_NAME "pistache") >> --set_target_properties(pistache_shared PROPERTIES >> -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} >> -- VERSION ${version} >> -- SOVERSION ${VERSION_MAJOR} >> --) >> -+if (BUILD_SHARED_LIBS) >> -+ set_target_properties(pistache_shared PROPERTIES >> -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} >> -+ VERSION ${version} >> -+ SOVERSION ${VERSION_MAJOR} >> -+ ) >> -+endif () >> - >> - set_target_properties(pistache_static PROPERTIES >> - OUTPUT_NAME ${Pistache_OUTPUT_NAME} >> -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) >> - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") >> - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") >> - >> -- install( >> -- TARGETS pistache_shared >> -- EXPORT PistacheTargets >> -- ARCHIVE DESTINATION ${lib_install_dir} >> -- LIBRARY DESTINATION ${lib_install_dir} >> -- RUNTIME DESTINATION ${bin_install_dir} >> -- INCLUDES DESTINATION ${include_install_dir}) >> -+ if (BUILD_SHARED_LIBS) >> -+ install( >> -+ TARGETS pistache_shared >> -+ EXPORT PistacheTargets >> -+ ARCHIVE DESTINATION ${lib_install_dir} >> -+ LIBRARY DESTINATION ${lib_install_dir} >> -+ RUNTIME DESTINATION ${bin_install_dir} >> -+ INCLUDES DESTINATION ${include_install_dir}) >> -+ endif() >> - >> - install( >> - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" >> --- >> -2.28.0 >> - >> diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch >> deleted file mode 100644 >> index be06ca760a..0000000000 >> --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch >> +++ /dev/null >> @@ -1,38 +0,0 @@ >> -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Thu, 5 Aug 2021 19:02:56 +0200 >> -Subject: [PATCH] include/pistache/typeid.h: include cstddef >> - >> -Include cstddef to avoid the following build failure with gcc 11: >> - >> -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, >> - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, >> - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: >> -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' >> - 26 | operator size_t() const { return reinterpret_cast(id_); } >> - | ^~~~~~ >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b >> - >> -Signed-off-by: Fabrice Fontaine >> -[Upstream status: https://github.com/pistacheio/pistache/pull/965] >> ---- >> - include/pistache/typeid.h | 1 + >> - 1 file changed, 1 insertion(+) >> - >> -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h >> -index 10353ca..893e7c1 100644 >> ---- a/include/pistache/typeid.h >> -+++ b/include/pistache/typeid.h >> -@@ -7,6 +7,7 @@ >> - >> - #pragma once >> - >> -+#include >> - #include >> - >> - namespace Pistache >> --- >> -2.30.2 >> - >> diff --git a/package/pistache/Config.in b/package/pistache/Config.in >> index 96aed5210a..806c27077a 100644 >> --- a/package/pistache/Config.in >> +++ b/package/pistache/Config.in >> @@ -1,22 +1,23 @@ >> config BR2_PACKAGE_PISTACHE >> bool "pistache" >> - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 >> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional >> depends on BR2_USE_WCHAR >> depends on BR2_TOOLCHAIN_HAS_THREADS >> depends on BR2_INSTALL_LIBSTDCPP >> + depends on BR2_PACKAGE_RAPIDJSON >> depends on !BR2_TOOLCHAIN_USES_UCLIBC >> depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 >> help >> Pistache is a modern and elegant HTTP and REST framework >> - for C++. It is entirely written in pure C++14 and provides >> + for C++. It is entirely written in pure C++17 and provides >> a clear and pleasant API. >> >> https://github.com/oktal/pistache >> >> -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" >> +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" >> depends on !BR2_INSTALL_LIBSTDCPP || \ >> BR2_TOOLCHAIN_USES_UCLIBC || \ >> - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ >> + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ >> !BR2_TOOLCHAIN_HAS_THREADS || \ >> !BR2_USE_WCHAR || \ >> BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 >> diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash >> index 5079387eb7..9a2cd1d1f9 100644 >> --- a/package/pistache/pistache.hash >> +++ b/package/pistache/pistache.hash >> @@ -1,3 +1,3 @@ >> #locally computed >> -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz >> +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz >> sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE >> diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk >> index 4d6bd283ea..0f49ad12db 100644 >> --- a/package/pistache/pistache.mk >> +++ b/package/pistache/pistache.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d >> +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 >> PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) >> PISTACHE_LICENSE = Apache-2.0 >> PISTACHE_LICENSE_FILES = LICENSE >> @@ -13,9 +13,10 @@ PISTACHE_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_OPENSSL),y) >> PISTACHE_DEPENDENCIES += openssl >> -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON >> +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true >> +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false >> else >> -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF >> +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false >> endif >> >> -$(eval $(cmake-package)) >> +$(eval $(meson-package)) >> -- >> 2.30.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From etienne.carriere at linaro.org Mon Mar 14 17:23:39 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Mon, 14 Mar 2022 18:23:39 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-2-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-2-clement.leger@bootlin.com> Message-ID: Hello Cl?ment, On Mon, 14 Mar 2022 at 16:32, Cl?ment L?ger wrote: > > Some platforms (stm32, sam) needs DTC to build the platform > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration > option to select host-dtc package when building. > > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 7 +++++++ > boot/optee-os/optee-os.mk | 4 ++++ > 2 files changed, 11 insertions(+) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 0974578484..2f6143f1f4 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_OPTEE_OS_NEEDS_DTC > + bool "OP-TEE OS needs dtc" > + select BR2_PACKAGE_HOST_DTC > + help > + Select this option if your OP-TEE OS platform configuration > + requires the Device Tree compiler to be available. > + > config BR2_TARGET_OPTEE_OS_VERSION > string > default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 166b5e693c..9f76d8450e 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -23,6 +23,10 @@ endif > > OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > +OPTEE_OS_DEPENDENCIES += host-dtc > +endif > + > # On 64bit targets, OP-TEE OS can be built in 32bit mode, or > # can be built in 64bit mode and support 32bit and 64bit > # trusted applications. Since buildroot currently references > -- > 2.34.1 > Acked-by: Etienne Carriere From thomas at ruschival.de Mon Mar 14 18:13:46 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Mon, 14 Mar 2022 19:13:46 +0100 Subject: [Buildroot] [PATCH v2 0/1] Bump pistache, switch to meson build (test-pkg o.k.) In-Reply-To: <20220312104402.33075-2-thomas@ruschival.de> References: <20220312104402.33075-2-thomas@ruschival.de> Message-ID: <20220314181347.190747-1-thomas@ruschival.de> The pistache project has moved to meson build and cmake build seems to be neglected e.g. the cmake build on host did no longer install header files. This patch switches to meson build. As a nice side effect newer upstream versions already include the patches by Fabrice Fontaine so the buildroot package does no longer need the patch files. The upstream project now has a hard dependency to RapidJSON. Tested with a full build for Raspberry Pi Zero W and BananaPi and test-pkg bootlin-armv5-uclibc [1/6]: SKIPPED bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Thomas Ruschival (1): package/pistache: bump version & switch to meson build ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 10 +- 6 files changed, 12 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch -- 2.30.2 From thomas at ruschival.de Mon Mar 14 18:13:47 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Mon, 14 Mar 2022 19:13:47 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220314181347.190747-1-thomas@ruschival.de> References: <20220312104402.33075-2-thomas@ruschival.de> <20220314181347.190747-1-thomas@ruschival.de> Message-ID: <20220314181347.190747-2-thomas@ruschival.de> While upstream pistache has not yet released a stable 'tag' a lot has changed since June 2020: * project has moved to meson build system, cmake builds do not install headers. * patches in buildroot are no longer required * project-implemented Pistache::Optional was replaced by use of std::optional. This is only available in C++17 * dependency to rapidjson has been introduced Signed-off-by: Thomas Ruschival --- ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 10 +- 6 files changed, 12 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d..0000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec..0000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a..0000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210a..806c27077a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,23 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_RAPIDJSON depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7..9a2cd1d1f9 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea..65d9b2412c 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,18 +4,20 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE PISTACHE_INSTALL_STAGING = YES +PISTACHE_DEPENDENCIES += rapidjson ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) -- 2.30.2 From james.hilliard1 at gmail.com Mon Mar 14 18:15:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:15:19 -0600 Subject: [Buildroot] [PATCH 2/2] package/bind: fix libxml2 build In-Reply-To: <20220313092148.353432-2-fontaine.fabrice@gmail.com> References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> <20220313092148.353432-2-fontaine.fabrice@gmail.com> Message-ID: On Sun, Mar 13, 2022 at 3:23 AM Fabrice Fontaine wrote: > > Fix the following build failure with libxml2 raised since bump to > version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: > > configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead > > Fixes: > - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b > > Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard > --- > package/bind/bind.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index e0c81152e1..63cc948c73 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -74,7 +74,7 @@ BIND_CONF_OPTS += --with-gssapi=no > endif > > ifeq ($(BR2_PACKAGE_LIBXML2),y) > -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr > +BIND_CONF_OPTS += --with-libxml2 > BIND_DEPENDENCIES += libxml2 > else > BIND_CONF_OPTS += --with-libxml2=no > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Mon Mar 14 18:16:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:16:34 -0600 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: bump to version 0.14.0 Message-ID: <20220314181634.2155997-1-james.hilliard1@gmail.com> Drop patches that are now upstream. Signed-off-by: James Hilliard --- ...d-check-user-xenv.sh-for-systemd-se.patch} | 0 ...treamer-check-1.0-unless-tests-are-e.patch | 33 ---------------- ...on-python-module-for-python-install.patch} | 0 ...tive-symlink-for-gstd-gst-client-exe.patch | 38 ------------------- package/gstreamer1/gstd/gstd.hash | 2 +- package/gstreamer1/gstd/gstd.mk | 2 +- 6 files changed, 2 insertions(+), 73 deletions(-) rename package/gstreamer1/gstd/{0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch => 0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch} (100%) delete mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch rename package/gstreamer1/gstd/{0005-Use-native-meson-python-module-for-python-install.patch => 0003-Use-native-meson-python-module-for-python-install.patch} (100%) delete mode 100644 package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch deleted file mode 100644 index 495fbfc3fa..0000000000 --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:49:49 -0600 -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/248] ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1d9ce9d..76990a0 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') - libd_dep = dependency('libdaemon', version : '>=0.14') - jansson_dep = dependency('jansson', version : '>=2.7') --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') - thread_dep = dependency('threads') - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') - -+gst_check_required = get_option('enable-tests').enabled() -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') -+ - systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch similarity index 100% rename from package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch rename to package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch deleted file mode 100644 index 265ea8d8c3..0000000000 --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 02:49:10 -0600 -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. - -This should fix the symlink path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/249] ---- - gst_client/gst_client_symbolic_link.sh | 2 +- - gstd/gstd_symbolic_link.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gst_client/gst_client_symbolic_link.sh -+++ b/gst_client/gst_client_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gstd/gstd_symbolic_link.sh -+++ b/gstd/gstd_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 6ec84bd58d..20c821a27f 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz +sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 959e277272..08a29f26ff 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTD_VERSION = 0.13.0 +GSTD_VERSION = 0.14.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING GSTD_LICENSE = GPL-2.0+ -- 2.25.1 From james.hilliard1 at gmail.com Mon Mar 14 18:30:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:30:14 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.3 Message-ID: <20220314183014.2173419-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d4..d909709b24 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd46..4615e839fe 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 0.61.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From james.hilliard1 at gmail.com Mon Mar 14 18:32:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:32:34 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.1 Message-ID: <20220314183234.2174325-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b2..af8b5c4de9 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d4..a58fd33a61 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.4.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE -- 2.25.1 From bernd.kuhls at t-online.de Mon Mar 14 18:43:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 19:43:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: security bump version to 2.4.53 Message-ID: <20220314184353.2639955-1-bernd.kuhls@t-online.de> Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Signed-off-by: Bernd Kuhls --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..d3857d00ad 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 -- 2.30.2 From bernd.kuhls at t-online.de Mon Mar 14 18:59:45 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 19:59:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support Message-ID: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 0db0c088cb..a6e5b06b8f 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) -- 2.30.2 From bernd.kuhls at t-online.de Mon Mar 14 19:00:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 20:00:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> <877d8xd8nb.fsf__45952.9784087621$1647195156$gmane$org@tarshish> Message-ID: Am Sun, 13 Mar 2022 20:05:45 +0200 schrieb Baruch Siach via buildroot: > It looks like NSS crypto back-end support requires --with-nss-deprecated > now. Maybe just drop deprecated NSS support? Hi Baruch, curl will drop nss support in August 2022: https://github.com/curl/curl/blob/master/docs/DEPRECATE.md Until then why not change the nss configure option? Regards, Bernd From baruch at tkos.co.il Mon Mar 14 19:17:14 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 14 Mar 2022 21:17:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 In-Reply-To: References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> <877d8xd8nb.fsf__45952.9784087621$1647195156$gmane$org@tarshish> Message-ID: <87pmmobafl.fsf@tarshish> Hi Bernd, On Mon, Mar 14 2022, Bernd Kuhls wrote: > Am Sun, 13 Mar 2022 20:05:45 +0200 schrieb Baruch Siach via buildroot: > >> It looks like NSS crypto back-end support requires --with-nss-deprecated >> now. Maybe just drop deprecated NSS support? > > curl will drop nss support in August 2022: > https://github.com/curl/curl/blob/master/docs/DEPRECATE.md > > Until then why not change the nss configure option? Upstream decision to deprecate NSS support hints that NSS is already not the best choice for curl crypto back-end. The DEPRECATE.md document lists specific issues with NSS. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From baruch at tkos.co.il Mon Mar 14 19:31:15 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 14 Mar 2022 21:31:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support In-Reply-To: <20220314185945.2823356-1-bernd.kuhls@t-online.de> References: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Message-ID: <87lexcbaa9.fsf@tarshish> Hi Bernd, On Mon, Mar 14 2022, Bernd Kuhls wrote: > Contrary to the helptext > https://github.com/curl/curl/blob/master/configure.ac#L152 > > the configure option is called --with-libgsasl: > https://github.com/curl/curl/blob/master/configure.ac#L1989 > > Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Thanks, baruch > --- > package/libcurl/libcurl.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 0db0c088cb..a6e5b06b8f 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -128,9 +128,9 @@ endif > > ifeq ($(BR2_PACKAGE_LIBGSASL),y) > LIBCURL_DEPENDENCIES += libgsasl > -LIBCURL_CONF_OPTS += --with-gsasl > +LIBCURL_CONF_OPTS += --with-libgsasl > else > -LIBCURL_CONF_OPTS += --without-gsasl > +LIBCURL_CONF_OPTS += --without-libgsasl > endif > > ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From huth at tuxfamily.org Mon Mar 14 19:57:09 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Mon, 14 Mar 2022 20:57:09 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/kvm-unit-tests: bump to version 2022-03-08 In-Reply-To: <20220310221908.30588-1-fontaine.fabrice@gmail.com> References: <20220310221908.30588-1-fontaine.fabrice@gmail.com> Message-ID: <20220314205709.0024bd95@tuxfamily.org> Am Thu, 10 Mar 2022 23:19:08 +0100 schrieb Fabrice Fontaine : > - Switch site: > https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 > - Update first patch > - Drop second patch (binutils < 2.23 is not supported by buildroot > anymore) > - Drop third and fourth patches (already in version) > - This bump will fix the following build failure with powerpc and gcc 11 > thanks to > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 > > /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian > > Fixes: > - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Huth): > - Drop second patch > > ...emove-Werror-to-avoid-build-failures.patch | 17 +-- > ...vm-unit-tests-test-for-rdseed-rdrand.patch | 110 ------------------ > ...3-Makefile-fix-stack-protector-tests.patch | 36 ------ > ...issue-with-the-linker-from-Fedora-32.patch | 61 ---------- > package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- > package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- > 6 files changed, 14 insertions(+), 218 deletions(-) > delete mode 100644 package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch Reviewed-by: Thomas Huth From thomas.petazzoni at bootlin.com Mon Mar 14 20:23:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 14 Mar 2022 21:23:39 +0100 Subject: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-4-clement.leger@bootlin.com> Message-ID: <20220314212339.45d1da77@windsurf> Hello Etienne, On Mon, 14 Mar 2022 18:20:47 +0100 Etienne Carriere wrote: > Once bumped to 3.16.0, optee-os won't revert to pycryptodomex. > Why not using a single change to upgrade optee_os to 3.16.0 and update > dependencies? > This would get rid of BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY. OP-TEE is one of those Buildroot packages for which we offer a version selection (because it is heavily tied to the hardware, like a bootloader or the Linux kernel). So you can't assume that everybody will be building 3.16.x or newer. Some people will probably still be using older versions for quite some time, which we still have to support. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ps.report at gmx.net Mon Mar 14 20:28:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Mar 2022 21:28:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: security bump version to 2.4.53 In-Reply-To: <20220314184353.2639955-1-bernd.kuhls@t-online.de> References: <20220314184353.2639955-1-bernd.kuhls@t-online.de> Message-ID: <20220314212825.72645f04@gmx.net> Hello Bernd, On Mon, 14 Mar 2022 19:43:53 +0100, Bernd Kuhls wrote: > Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 > > Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. From the Changelog: *) Support pcre2 (10.x) library in place of the now end-of-life pcre (8.x) for regular expression evaluation. This depends on locating pcre2-config. [William Rowe, Petr Pisar , Rainer Jung] Time to switch from pcre dependency to pcre2? Regards, Peter > > Signed-off-by: Bernd Kuhls > --- > package/apache/apache.hash | 6 +++--- > package/apache/apache.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/apache/apache.hash b/package/apache/apache.hash > index 014d920772..11dcdefe46 100644 > --- a/package/apache/apache.hash > +++ b/package/apache/apache.hash > @@ -1,5 +1,5 @@ > -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} > -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 > -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 > +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} > +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 > +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 > # Locally computed > sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index b280d4dc3a..d3857d00ad 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -APACHE_VERSION = 2.4.52 > +APACHE_VERSION = 2.4.53 > APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 > APACHE_SITE = https://downloads.apache.org/httpd > APACHE_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Mon Mar 14 20:31:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Mar 2022 21:31:49 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220314153111.1390512-3-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-3-clement.leger@bootlin.com> Message-ID: <20220314203149.GW283544@scaer> Cl?ment, All, On 2022-03-14 16:31 +0100, Cl?ment L?ger via buildroot spake thusly: > Enable host package and add needed dependencies. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > package/python-cryptography/python-cryptography.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index a524f729c8..8a4ffe6d75 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -17,14 +17,28 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > host-python-cffi \ > host-rustc \ > openssl > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + host-openssl > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > # We need to vendor the Cargo crates at download time > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo I think the host variant should automatically inherit that setting from the target variant. Afterall, it seems reasonable to expect that the download of the host and target variants should usually be exactly the same. > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc Ditto for the download dependencies. Although that may intoduce a circular dependency (i.e.: foo has host-foo as a download dependency, so of course host-foo can't have host-foo as download dependency...) > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml I am going to suggest that should also be the case for the _DL_ENV. Note however that you would anyway need to override it for this package, becasue thwe host and target variants have different go env. So, something like (with _DL_SUBDIR thrown into the mix; of course, the whole was thoroughly untested): package/pkg-generic: host variant inherits download settings Blablabla Afterall, it seems reasonable to expect that the download of the host and target variants should usually be exactly the same, but packages can still override that for the host vairant in special cases blablabla... Signed-off-by: Yann E. MORIN diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) Thoughts? Regards, Yann E. MORIN. > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From huth at tuxfamily.org Mon Mar 14 20:32:26 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Mon, 14 Mar 2022 21:32:26 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220314203226.4481-1-huth@tuxfamily.org> I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 70d71186ed..4083e87d30 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2753,8 +2753,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni -- 2.34.1 From yann.morin.1998 at free.fr Mon Mar 14 20:59:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Mar 2022 21:59:26 +0100 Subject: [Buildroot] [git commit] boot/optee-os: add option to select DTC dependency Message-ID: <20220314205118.1FB3283E75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67be54cd943a466aab6bf53df2aa9e712da43556 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some platforms (stm32, sam) needs DTC to build the platform device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration option to select host-dtc package when building. Signed-off-by: Cl??ment L??ger Acked-by: Etienne Carriere [yann.morin.1998 at free.fr: move option] Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..ea16550b72 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -54,6 +54,13 @@ config BR2_TARGET_OPTEE_OS_VERSION default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..9f76d8450e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -23,6 +23,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif + # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit # trusted applications. Since buildroot currently references From yann.morin.1998 at free.fr Mon Mar 14 21:01:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Mar 2022 22:01:32 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-2-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-2-clement.leger@bootlin.com> Message-ID: <20220314210132.GX283544@scaer> Cl?ment, All, On 2022-03-14 16:31 +0100, Cl?ment L?ger via buildroot spake thusly: > Some platforms (stm32, sam) needs DTC to build the platform > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration > option to select host-dtc package when building. > > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 7 +++++++ > boot/optee-os/optee-os.mk | 4 ++++ > 2 files changed, 11 insertions(+) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 0974578484..2f6143f1f4 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_OPTEE_OS_NEEDS_DTC > + bool "OP-TEE OS needs dtc" > + select BR2_PACKAGE_HOST_DTC > + help > + Select this option if your OP-TEE OS platform configuration > + requires the Device Tree compiler to be available. The following option, BR2_TARGET_OPTEE_OS_VERSION, is related to the version selection, above, so adding this new option right in the middle is not very great. I've moved that new option below. Applied to master, thanks. Regards, Yann E. MORIN. > config BR2_TARGET_OPTEE_OS_VERSION > string > default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 166b5e693c..9f76d8450e 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -23,6 +23,10 @@ endif > > OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > +OPTEE_OS_DEPENDENCIES += host-dtc > +endif > + > # On 64bit targets, OP-TEE OS can be built in 32bit mode, or > # can be built in 64bit mode and support 32bit and 64bit > # trusted applications. Since buildroot currently references > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Mon Mar 14 21:20:00 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 22:20:00 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/apache: security bump version to 2.4.53 Message-ID: <20220314212000.2949718-1-bernd.kuhls@t-online.de> Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls --- v2: switch from pcre to pcre2 (Peter S.) package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ -- 2.30.2 From noreply at busybox.net Mon Mar 14 19:41:19 2022 From: noreply at busybox.net (busybox.net) Date: 15 Mar 2022 03:41:19 +0800 Subject: [Buildroot] Important Security Alert for buildroot@busybox.net (3) Message-ID: <20220315034119.E49E19B144111DD5@busybox.net> An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Tue Mar 15 08:10:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 09:10:41 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220314203149.GW283544@scaer> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-3-clement.leger@bootlin.com> <20220314203149.GW283544@scaer> Message-ID: <20220315091041.015209a9@windsurf> On Mon, 14 Mar 2022 21:31:49 +0100 "Yann E. MORIN" wrote: > I think the host variant should automatically inherit that setting from > the target variant. > > Afterall, it seems reasonable to expect that the download of the host > and target variants should usually be exactly the same. I agree, but I thought this was really too much outside of what Cl?ment is trying to achieve in this patch series (I helped Cl?ment internally by reviewing/discussing this patch series, and indeed identified the fact that those variables should be inherited between target/host). But of course if as a maintainer you think this is something that is really needed as a pre-requisite to merge those patches, we can ask Cl?ment to work on this :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From bugzilla at busybox.net Tue Mar 15 08:51:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 08:51:04 +0000 Subject: [Buildroot] [Bug 13731] Readline Patch is missing Author Information In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13731 --- Comment #2 from Andrei Gherghescu --- (In reply to Fabrice Fontaine from comment #1) Shouldn't this ticket be closed as the corrected patch was merged into master? -- You are receiving this mail because: You are on the CC list for the bug. From angelo at amarulasolutions.com Tue Mar 15 09:02:09 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 15 Mar 2022 10:02:09 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3 Message-ID: <20220315090209.206025-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 36744c5337..3678ee061f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.104-cip3)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf856..18480a87bf 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz +sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes -- 2.25.1 From angelo at amarulasolutions.com Tue Mar 15 09:02:20 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 15 Mar 2022 10:02:20 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3-rt3 Message-ID: <20220315090220.206426-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 3678ee061f..9d2ccd59cb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.104-cip3-rt3)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 18480a87bf..976f1d07c0 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -- 2.25.1 From bugzilla at busybox.net Tue Mar 15 11:50:05 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 11:50:05 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 --- Comment #8 from Andrei Gherghescu --- (In reply to mbuil from comment #0) Can you provide the linux kernel config and a board config you used for this? I could try to reproduce, but I don't know what exactly your configuration was. -- You are receiving this mail because: You are on the CC list for the bug. From hrsourabh011 at gmail.com Tue Mar 15 13:05:08 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Tue, 15 Mar 2022 14:05:08 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: Helllo Jan, Thanks for the answer. >From Buildroot 2021 release "ctrl_interface" is disabled and so I have commented out below line in etc/wpa_supplicant.conf file # ctrl_interface=/var/run/wpa_supplicant And also in my rootfs, there is no "/var/run/wpa_supplicant" file. I have set below options in menuconfig [image: menuconfig.PNG] Then doing make clean & make results in below errors: >>> wpa_supplicant 2.10 Installing to staging directory /usr/bin/install -m 0644 -D /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so /usr/bin/install: cannot stat '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': No such file or directory make[1]: *** [package/pkg-generic.mk:331: /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] Error 1 make: *** [Makefile:23: _all] Error 2 Can you please let me know what could be the issue and how to resolve it? Thanks in advance On Thu, 10 Mar 2022 at 19:03, Jan Havran wrote: > Hi Sourabh, > > after enabling RPi firmware you must load the Wifi driver - since you are > using > systemd, it should by handled by udev on start I think. > > So you probably just need to configure /etc/network/interfaces to start > wpa_supplicant > on wlan0 with /etc/wpa_supplicant.conf file, where you can put your > credentials. > Or at least that is what I have done, but I am not using systemd. > > I did something similar some time ago, you can check it here: > > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > (note that to make "my" credentials public in that commit was an > intention). > > P.S.: if you want to have any modifications to be part of your image with > filesystem, > you can do it by using rootfs overlays for example: > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > Regards, > > Jan Havran > > V Thu, Mar 10, 2022 at 05:43:27PM +0100, Sourabh Hegde napsal(a): > > Hello All, > > > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > > start-up. I am using Buildroot based Linux distribution. I have worked > with > > Yocto before and it provides systemd-networkd and wpa_supplicant feature > to > > connect to wifi on boot. I am lloking something similar in Buildroot but > > couldn't find any notes online. > > > > So far, I think I have enabled the necessary config/driver using "make > > menuconfig" : > > [image: wpa_supplicant.png] > > [image: firmware.png] > > > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > > suggestion would be helpful. > > > > Can anyone please let me know how to proceed further with it? > > > > Your help will be much appreciated. > > > > Thanks in advance. > > > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > > and let me know if any info is missing here. > > > > Regards, > > > > Sourabh > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: menuconfig.PNG Type: image/png Size: 19269 bytes Desc: not available URL: From joel at jms.id.au Tue Mar 15 13:07:37 2022 From: joel at jms.id.au (Joel Stanley) Date: Tue, 15 Mar 2022 23:37:37 +1030 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le Message-ID: <20220315130737.428449-1-joel@jms.id.au> When generating a filesystem image on a power10 build machine running Ubuntu, we see a segfault when fakeroot is running chmod. This has been reported and fixed upstream in Debian in version 1.26-1.2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 Add the samae patch to resolve the segfault. Signed-off-by: Joel Stanley --- This isn't a commit in the fakeroot tree, rather a patch from the Debian packaging. I would appreciate if this was added to the 2022.02 stable tree. Signed-off-by: Joel Stanley --- .../fakeroot/fix-prototype-generation.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/fakeroot/fix-prototype-generation.patch diff --git a/package/fakeroot/fix-prototype-generation.patch b/package/fakeroot/fix-prototype-generation.patch new file mode 100644 index 000000000000..38d32ff3b22c --- /dev/null +++ b/package/fakeroot/fix-prototype-generation.patch @@ -0,0 +1,59 @@ +Subject: Fix prototype generation for openat +Author: Christoph Biedl +Date: 2021-12-30 +Bug-Debian: https://bugs.debian.org/995393 +Forwarded: Yes (implicitely) + + As jrtc27 pointed out in IRC, ppc64el is more strict than other + architectures when it comes to va_arg handling: + + it's that ppc64le uses the elfv2 abi, and for variadic calls you + must reserve space for a parameter save area + + So enhance wrapawk to create a proper prototype and argument + handling although it's specific to the openat call. Also add the + missing documentation for the sixth column to wrapfunc.inp. + +--- a/wrapawk ++++ b/wrapawk +@@ -37,7 +37,25 @@ + argtype=$3; + argname=$4; + MACRO=$5; +- if(MACRO){ ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -9,8 +9,10 @@ + /**/ */ + /* each line of this file lists 4 fields, seperated by a ";". */ + /* The first field is the name of the wrapped function, then it's return */ +-/* value. After that come the function arguments with types, and the last */ ++/* value. After that come the function arguments with types, and the fifth */ + /* field contains the function arguments without types. */ ++/* A sixth field is a special needed when wrapping the openat syscall. */ ++/* Otherwise it's like the third (function arguments with types). */ + /**/ + + /* __*xstat are used on glibc systems instead of just *xstat. */ -- 2.35.1 From mirza.kapetanovic at gmail.com Tue Mar 15 14:26:40 2022 From: mirza.kapetanovic at gmail.com (Mirza Kapetanovic) Date: Tue, 15 Mar 2022 15:26:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpi-gpio: enable package on aarch64 Message-ID: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. Signed-off-by: Mirza Kapetanovic --- package/python-rpi-gpio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb06..f3c0928c62 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. -- 2.25.1 From fontaine.fabrice at gmail.com Tue Mar 15 17:32:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 18:32:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo Message-ID: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 Signed-off-by: Fabrice Fontaine --- package/grpc/grpc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 23b92f1750..9138b4ea59 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +GRPC_DEPENDENCIES += libexecinfo +GRPC_EXE_LINKER_FLAGS += -lexecinfo +endif + # grpc can use __atomic builtins, so we need to link with # libatomic when available ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +GRPC_EXE_LINKER_FLAGS += -latomic endif GRPC_CFLAGS = $(TARGET_CFLAGS) -- 2.35.1 From fperrad at gmail.com Tue Mar 15 17:33:24 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 15 Mar 2022 18:33:24 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.1 Message-ID: <20220315173324.1113174-1-francois.perrad@gadz.org> diff README: -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Larry Wall and others. +2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 +by Larry Wall and others. Signed-off-by: Francois Perrad --- package/perl/perl.hash | 14 +++++++------- package/perl/perl.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b0f60ef6f..d8344d975 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt +md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz +sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz +sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.hash +sha256 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335 perl-cross-1.3.7.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index d7f9c58dd..392fb8b6e 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.6 +PERL_CROSS_VERSION = 1.3.7 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz -- 2.32.0 From fontaine.fabrice at gmail.com Tue Mar 15 17:34:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 18:34:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING -- 2.35.1 From bugzilla at busybox.net Tue Mar 15 19:15:37 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 19:15:37 +0000 Subject: [Buildroot] [Bug 14146] Cannot build for beaglebone black. Build fails with errors In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14146 --- Comment #3 from Andrei Gherghescu --- Dear Afua, You should check your GCC version. I get the same error with GCC 10. It looks that this is due to the kernel version and GCC 10 combination as reported here: https://lkml.org/lkml/2020/4/1/1206 This was fixed in release 2021.08.1 with the upgrade to 5.10.30-ti-r3 as Adam Duskett also mentioned. You should switch to that release. If you need to stick with 4.19 kernel for whatever reason, then you can use 4.19.94-ti-r72, as listed here https://github.com/beagleboard/linux/tags 4.19.94-ti-r72 kernel builds fine with GCC 10. Change to the following line in your config. BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.94-ti-r72)/linux-4.19.94-ti-r72.tar.gz" Regards, Andrei -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 15 19:45:31 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 19:45:31 +0000 Subject: [Buildroot] [Bug 13731] Readline Patch is missing Author Information In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13731 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Tue Mar 15 20:00:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:00:54 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: On 15/03/2022 14:05, Sourabh Hegde wrote: > Helllo Jan, > > Thanks for the answer. > > From Buildroot 2021 release "ctrl_interface" is disabled and so I have It's disabled unless BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > commented out below line in etc/wpa_supplicant.conf file > > # |ctrl_interface=/var/run/wpa_supplicant| This shouldn't be needed. AFAIK wpa_supplicant ignores the option if CTRL_IFACE is not enabled. > | > | > |And also in my rootfs, there is no "|/var/run/wpa_supplicant|" file. The file (actually, named pipe) is created when wpa_supplicants starts up. /var/run is a tmpfs so it can only be created at runtime. > | > | > | > |I have set below options in menuconfig| > | > | > menuconfig.PNG > > Then doing make clean & make results in below errors: > > >>> wpa_supplicant 2.10 Installing to staging directory > /usr/bin/install -m 0644 -D > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so > /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so > /usr/bin/install: cannot stat > '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': > No such file or directory > make[1]: *** [package/pkg-generic.mk:331 : > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] > Error 1 > make: *** [Makefile:23: _all] Error 2 > > Can you please let me know what could be the issue and how to resolve it? I've tried to build the same configuration (with current git master) and it builds without problems. Please supply the defconfig and also the full build log (by uploading to a pastebin). Regards, Arnout > > Thanks in advance > || > > On Thu, 10 Mar 2022 at 19:03, Jan Havran > wrote: > > Hi Sourabh, > > after enabling RPi firmware you must load the Wifi driver - since you are using > systemd, it should by handled by udev on start I think. > > So you probably just need to configure /etc/network/interfaces to start > wpa_supplicant > on wlan0 with /etc/wpa_supplicant.conf file, where you can put your credentials. > Or at least that is what I have done, but I am not using systemd. > > I did something similar some time ago, you can check it here: > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > (note that to make "my" credentials public in that commit was an intention). > > P.S.: if you want to have any modifications to be part of your image with > filesystem, > you can do it by using rootfs overlays for example: > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > Regards, > > Jan Havran > > V?Thu, Mar 10, 2022 at 05:43:27PM +0100,?Sourabh Hegde napsal(a): > > Hello All, > > > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > > start-up. I am using Buildroot based Linux distribution. I have worked with > > Yocto before and it provides systemd-networkd and wpa_supplicant feature to > > connect to wifi on boot. I am lloking something similar in Buildroot but > > couldn't find any notes online. > > > > So far, I think I have enabled the necessary config/driver using "make > > menuconfig" : > > [image: wpa_supplicant.png] > > [image: firmware.png] > > > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > > suggestion would be helpful. > > > > Can anyone please let me know how to proceed further with it? > > > > Your help will be much appreciated. > > > > Thanks in advance. > > > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > > and let me know if any info is missing here. > > > > Regards, > > > > Sourabh > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Mar 15 20:15:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:15:34 +0100 Subject: [Buildroot] [PATCH/next v2 1/2] package/bubblewrap: bump to version 0.6.1 In-Reply-To: <20220226161444.2221042-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> <20220226161444.2221042-1-aperez@igalia.com> Message-ID: On 26/02/2022 17:14, Adrian Perez de Castro wrote: > This version includes a new feature which allows specifying multiple > seccomp filters. There is now a Meson-based build system as well, but > for the moment the build recipe keeps using the autotools based one. > Release notes can be found at: > > https://github.com/containers/bubblewrap/releases/tag/v0.6.0 > https://github.com/containers/bubblewrap/releases/tag/v0.6.1 > > Signed-off-by: Adrian Perez de Castro Applied both to master, thanks. Regards, Arnout > --- > package/bubblewrap/bubblewrap.hash | 4 ++-- > package/bubblewrap/bubblewrap.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash > index 88aba150cd..c3bf4d8212 100644 > --- a/package/bubblewrap/bubblewrap.hash > +++ b/package/bubblewrap/bubblewrap.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 > -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz > +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.1 > +sha256 9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 bubblewrap-0.6.1.tar.xz > > # Hash for license files: > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING > diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk > index 5f3d95e826..1ca2029700 100644 > --- a/package/bubblewrap/bubblewrap.mk > +++ b/package/bubblewrap/bubblewrap.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BUBBLEWRAP_VERSION = 0.5.0 > +BUBBLEWRAP_VERSION = 0.6.1 > BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) > BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz > BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap From arnout at mind.be Tue Mar 15 20:15:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:15:50 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/cukinia: bump to version 0.6.0 In-Reply-To: <20220226182356.3035297-1-fontaine.fabrice@gmail.com> References: <20220226182356.3035297-1-fontaine.fabrice@gmail.com> Message-ID: <470a4f5c-1015-d48c-4a6d-5509194f5374@mind.be> On 26/02/2022 19:23, Fabrice Fontaine wrote: > https://github.com/savoirfairelinux/cukinia/compare/v0.5.1...v0.6.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/cukinia/cukinia.hash | 2 +- > package/cukinia/cukinia.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash > index e6ae602011..6e76a6ab88 100644 > --- a/package/cukinia/cukinia.hash > +++ b/package/cukinia/cukinia.hash > @@ -1,4 +1,4 @@ > # locally computed > -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz > +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 > diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk > index 84d4e60ea8..798c199b67 100644 > --- a/package/cukinia/cukinia.mk > +++ b/package/cukinia/cukinia.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CUKINIA_VERSION = 0.5.1 > +CUKINIA_VERSION = 0.6.0 > CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) > CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 > CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 From arnout at mind.be Tue Mar 15 20:16:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:16:07 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/botan: bump to version 2.19.1 In-Reply-To: <20220227091533.3645027-1-fontaine.fabrice@gmail.com> References: <20220227091533.3645027-1-fontaine.fabrice@gmail.com> Message-ID: On 27/02/2022 10:15, Fabrice Fontaine wrote: > - Drop patch (not needed since > https://github.com/randombit/botan/commit/97483f93bdcfcb2cc86bcb103802be55c24ad633) > - Update hash of license file (update in year: > https://github.com/randombit/botan/commit/ff62a51ac2ed2e265edaf51b532d32eed5864d4b) > > https://github.com/randombit/botan/blob/2.19.1/news.rst > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...d-a-miscompilation-issue-in-clang-12.patch | 144 ------------------ > package/botan/botan.hash | 4 +- > package/botan/botan.mk | 2 +- > 3 files changed, 3 insertions(+), 147 deletions(-) > delete mode 100644 package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch > > diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch > deleted file mode 100644 > index b43aeafe13..0000000000 > --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch > +++ /dev/null > @@ -1,144 +0,0 @@ > -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Tue, 9 Nov 2021 19:01:20 +0100 > -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 > - (XCode 13)" > - > -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/randombit/botan/issues/2845] > ---- > - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- > - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- > - 2 files changed, 22 insertions(+), 70 deletions(-) > - > -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp > -index 289e451ff..690c2b264 100644 > ---- a/src/lib/hash/sha3/sha3.cpp > -+++ b/src/lib/hash/sha3/sha3.cpp > -@@ -11,47 +11,23 @@ > - #include > - #include > - > --#include > -- > - namespace Botan { > - > - namespace { > - > --// This is a workaround for a suspected bug in clang 12 (and XCode 13) > --// that caused a miscompile of the SHA3 implementation for optimization > --// level -O2 and higher. > --// > --// For details, see: https://github.com/randombit/botan/issues/2802 > --#if defined(__clang__) && \ > -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ > -- (!defined(__apple_build_version__) && __clang_major__ == 12)) > --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) > --#else > --#define BOTAN_WORKAROUND_MAYBE_INLINE inline > --#endif > -- > --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple > -- xor_CNs(const uint64_t A[25]) > -- { > -- return { > -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], > -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], > -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], > -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], > -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; > -- } > -- > --#undef BOTAN_WORKAROUND_MAYBE_INLINE > -- > - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) > - { > -- const auto Cs = xor_CNs(A); > -- > -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); > -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); > -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); > -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); > -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); > -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; > -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; > -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; > -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; > -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; > -+ > -+ const uint64_t D0 = rotl<1>(C0) ^ C3; > -+ const uint64_t D1 = rotl<1>(C1) ^ C4; > -+ const uint64_t D2 = rotl<1>(C2) ^ C0; > -+ const uint64_t D3 = rotl<1>(C3) ^ C1; > -+ const uint64_t D4 = rotl<1>(C4) ^ C2; > - > - const uint64_t B00 = A[ 0] ^ D1; > - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); > -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp > -index c7f1914a3..a9650ad9d 100644 > ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp > -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp > -@@ -8,47 +8,23 @@ > - #include > - #include > - > --#include > -- > - namespace Botan { > - > - namespace { > - > --// This is a workaround for a suspected bug in clang 12 (and XCode 13) > --// that caused a miscompile of the SHA3 implementation for optimization > --// level -O2 and higher. > --// > --// For details, see: https://github.com/randombit/botan/issues/2802 > --#if defined(__clang__) && \ > -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ > -- (!defined(__apple_build_version__) && __clang_major__ == 12)) > --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) > --#else > --#define BOTAN_WORKAROUND_MAYBE_INLINE inline > --#endif > -- > --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple > -- xor_CNs(const uint64_t A[25]) > -- { > -- return { > -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], > -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], > -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], > -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], > -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; > -- } > -- > --#undef BOTAN_WORKAROUND_MAYBE_INLINE > -- > - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) > - { > -- const auto Cs = xor_CNs(A); > -- > -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); > -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); > -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); > -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); > -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); > -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; > -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; > -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; > -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; > -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; > -+ > -+ const uint64_t D0 = rotl<1>(C0) ^ C3; > -+ const uint64_t D1 = rotl<1>(C1) ^ C4; > -+ const uint64_t D2 = rotl<1>(C2) ^ C0; > -+ const uint64_t D3 = rotl<1>(C3) ^ C1; > -+ const uint64_t D4 = rotl<1>(C4) ^ C2; > - > - const uint64_t B00 = A[ 0] ^ D1; > - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); > --- > -2.33.0 > - > diff --git a/package/botan/botan.hash b/package/botan/botan.hash > index 91e1bf741a..2729cb493f 100644 > --- a/package/botan/botan.hash > +++ b/package/botan/botan.hash > @@ -1,4 +1,4 @@ > # From https://botan.randombit.net/releases/sha256sums.txt > -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz > +sha256 e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 Botan-2.19.1.tar.xz > # Locally computed > -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt > +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt > diff --git a/package/botan/botan.mk b/package/botan/botan.mk > index ebff1343b1..f9ebcf8d0a 100644 > --- a/package/botan/botan.mk > +++ b/package/botan/botan.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BOTAN_VERSION = 2.18.2 > +BOTAN_VERSION = 2.19.1 > BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz > BOTAN_SITE = http://botan.randombit.net/releases > BOTAN_LICENSE = BSD-2-Clause From arnout at mind.be Tue Mar 15 20:17:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:17:20 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libsecret: bump to version 0.20.5 In-Reply-To: <20220227100104.3694504-1-fontaine.fabrice@gmail.com> References: <20220227100104.3694504-1-fontaine.fabrice@gmail.com> Message-ID: On 27/02/2022 11:01, Fabrice Fontaine wrote: > - Switch to meson-package > - Add bash-completion and tpm2-tss optional dependencies > > https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libsecret/libsecret.hash | 4 ++-- > package/libsecret/libsecret.mk | 36 +++++++++++++++++++++----------- > 2 files changed, 26 insertions(+), 14 deletions(-) > > diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash > index 792ec838e3..4eb3d9b95c 100644 > --- a/package/libsecret/libsecret.hash > +++ b/package/libsecret/libsecret.hash > @@ -1,5 +1,5 @@ > -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum > -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz > +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum > +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz > > # Hash for license file: > sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING > diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk > index 4d14c231d7..82fe38ac1a 100644 > --- a/package/libsecret/libsecret.mk > +++ b/package/libsecret/libsecret.mk > @@ -5,33 +5,45 @@ > ################################################################################ > > LIBSECRET_VERSION_MAJOR = 0.20 > -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 > +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 > LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) > LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz > LIBSECRET_INSTALL_STAGING = YES > LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) > -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) > +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) > LIBSECRET_CONF_OPTS = \ > - --disable-manpages \ > - --disable-strict \ > - --disable-coverage \ > - --enable-vala=no > + -Dgtk_doc=false \ > + -Dmanpage=false \ > + -Dvapi=false > LIBSECRET_LICENSE = LGPL-2.1+ > LIBSECRET_LICENSE_FILES = COPYING > > +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) > +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled > +LIBSECRET_DEPENDENCIES += bash-completion > +else > +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled > +endif > + > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -LIBSECRET_CONF_OPTS += --enable-introspection=yes > +LIBSECRET_CONF_OPTS += -Dintrospection=true > LIBSECRET_DEPENDENCIES += gobject-introspection > else > -LIBSECRET_CONF_OPTS += --enable-introspection=no > +LIBSECRET_CONF_OPTS += -Dintrospection=false > endif > > ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > LIBSECRET_DEPENDENCIES += libgcrypt > -LIBSECRET_CONF_OPTS += --enable-gcrypt \ > - --with-libgcrypt-prefix=$(STAGING_DIR)/usr > +LIBSECRET_CONF_OPTS += -Dgcrypt=true > +else > +LIBSECRET_CONF_OPTS += -Dgcrypt=false > +endif > + > +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) > +LIBSECRET_CONF_OPTS += -Dtpm2=true > +LIBSECRET_DEPENDENCIES += tpm2-tss > else > -LIBSECRET_CONF_OPTS += --disable-gcrypt > +LIBSECRET_CONF_OPTS += -Dtpm2=false > endif > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) From arnout at mind.be Tue Mar 15 20:17:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:17:43 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/valijson: drop boost dependency In-Reply-To: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> References: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> Message-ID: On 27/02/2022 11:35, Fabrice Fontaine wrote: > boost is not mandatory since the deactivation of tests when bumping to > version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and > https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/valijson/Config.in | 8 ++------ > package/valijson/valijson.mk | 1 - > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/package/valijson/Config.in b/package/valijson/Config.in > index 10721b3703..07706cd963 100644 > --- a/package/valijson/Config.in > +++ b/package/valijson/Config.in > @@ -1,10 +1,6 @@ > config BR2_PACKAGE_VALIJSON > bool "valijson" > - depends on BR2_USE_WCHAR > depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_TOOLCHAIN_HAS_THREADS > - select BR2_PACKAGE_BOOST > - select BR2_PACKAGE_BOOST_REGEX > help > Valijson is a header-only JSON Schema Validation library for > C++. Valijson provides a simple validation API that allows > @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON > > https://github.com/tristanpenman/valijson > > -comment "valijson needs a toolchain w/ C++, threads, wchar support" > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR > +comment "valijson needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk > index e425757d26..71c5b05f2b 100644 > --- a/package/valijson/valijson.mk > +++ b/package/valijson/valijson.mk > @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE > VALIJSON_CPE_ID_VENDOR = valijson_project > VALIJSON_INSTALL_STAGING = YES > VALIJSON_INSTALL_TARGET = NO > -VALIJSON_DEPENDENCIES = boost > VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE > > $(eval $(cmake-package)) From arnout at mind.be Tue Mar 15 20:18:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:18:36 +0100 Subject: [Buildroot] [PATCH] package/shairport-sync: install dbus policy file to target In-Reply-To: <20220228022840.2140908-1-t123yh.xyz@gmail.com> References: <20220228022840.2140908-1-t123yh.xyz@gmail.com> Message-ID: On 28/02/2022 03:28, Yunhao Tian wrote: > This adds two extra commands to install dbus policy config > to target if dbus option is enabled. > > Signed-off-by: Yunhao Tian > --- > package/shairport-sync/shairport-sync.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk > index 487e0c05e5..ab67da3964 100644 > --- a/package/shairport-sync/shairport-sync.mk > +++ b/package/shairport-sync/shairport-sync.mk > @@ -59,6 +59,14 @@ endif > ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) > SHAIRPORT_SYNC_DEPENDENCIES += libglib2 > SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface > +define SHAIRPORT_SYNC_INSTALL_DBUS > + $(INSTALL) -m 0644 -D \ > + $(@D)/scripts/shairport-sync-dbus-policy.conf \ > + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf > + $(INSTALL) -m 0644 -D \ > + $(@D)/scripts/shairport-sync-mpris-policy.conf \ > + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf > +endef > else > SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface > endif > @@ -77,11 +85,13 @@ else > SHAIRPORT_SYNC_CONF_OPTS += --without-mqtt-client > endif > > + You shouldn't add this empty line. check-package detects that. Applied to master with that changed, thanks. Regards, Arnout > define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS > $(INSTALL) -D -m 0755 $(@D)/shairport-sync \ > $(TARGET_DIR)/usr/bin/shairport-sync > $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ > $(TARGET_DIR)/etc/shairport-sync.conf > + $(SHAIRPORT_SYNC_INSTALL_DBUS) > endef > > define SHAIRPORT_SYNC_INSTALL_INIT_SYSV From arnout at mind.be Tue Mar 15 19:54:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:15 +0100 Subject: [Buildroot] [git commit] package/bubblewrap: bump to version 0.6.1 Message-ID: <20220315201012.7847683F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d589604b46dbfea8df5f1e73baa025ace8b7e92f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version includes a new feature which allows specifying multiple seccomp filters. There is now a Meson-based build system as well, but for the moment the build recipe keeps using the autotools based one. Release notes can be found at: https://github.com/containers/bubblewrap/releases/tag/v0.6.0 https://github.com/containers/bubblewrap/releases/tag/v0.6.1 Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cd..c3bf4d8212 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.1 +sha256 9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 bubblewrap-0.6.1.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826..1ca2029700 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.6.1 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap From arnout at mind.be Tue Mar 15 19:54:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:20 +0100 Subject: [Buildroot] [git commit] package/cukinia: bump to version 0.6.0 Message-ID: <20220315201012.9A45883F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=978b6be59f144bc5f7e2f0948cb357415238d56a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/savoirfairelinux/cukinia/compare/v0.5.1...v0.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cukinia/cukinia.hash | 2 +- package/cukinia/cukinia.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash index e6ae602011..6e76a6ab88 100644 --- a/package/cukinia/cukinia.hash +++ b/package/cukinia/cukinia.hash @@ -1,4 +1,4 @@ # locally computed -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk index 84d4e60ea8..798c199b67 100644 --- a/package/cukinia/cukinia.mk +++ b/package/cukinia/cukinia.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUKINIA_VERSION = 0.5.1 +CUKINIA_VERSION = 0.6.0 CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 From arnout at mind.be Tue Mar 15 19:54:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:18 +0100 Subject: [Buildroot] [git commit] package/bubblewrap: switch to the meson build system Message-ID: <20220315201012.8D91183F84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eceb90dc76f8e1a49e92076fd032dc98622a4535 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 1ca2029700..5875b0d6e2 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Mar 15 19:54:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:26 +0100 Subject: [Buildroot] [git commit] package/libsecret: bump to version 0.20.5 Message-ID: <20220315201012.B196883F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2106f02bae984e97bc151fe47de0a792b84919a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package - Add bash-completion and tpm2-tss optional dependencies https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsecret/libsecret.hash | 4 ++-- package/libsecret/libsecret.mk | 36 ++++++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index 792ec838e3..4eb3d9b95c 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index 4d14c231d7..82fe38ac1a 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,33 +5,45 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSECRET_CONF_OPTS = \ - --disable-manpages \ - --disable-strict \ - --disable-coverage \ - --enable-vala=no + -Dgtk_doc=false \ + -Dmanpage=false \ + -Dvapi=false LIBSECRET_LICENSE = LGPL-2.1+ LIBSECRET_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled +LIBSECRET_DEPENDENCIES += bash-completion +else +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSECRET_CONF_OPTS += --enable-introspection=yes +LIBSECRET_CONF_OPTS += -Dintrospection=true LIBSECRET_DEPENDENCIES += gobject-introspection else -LIBSECRET_CONF_OPTS += --enable-introspection=no +LIBSECRET_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSECRET_DEPENDENCIES += libgcrypt -LIBSECRET_CONF_OPTS += --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSECRET_CONF_OPTS += -Dgcrypt=true +else +LIBSECRET_CONF_OPTS += -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +LIBSECRET_CONF_OPTS += -Dtpm2=true +LIBSECRET_DEPENDENCIES += tpm2-tss else -LIBSECRET_CONF_OPTS += --disable-gcrypt +LIBSECRET_CONF_OPTS += -Dtpm2=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Mar 15 19:54:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:31 +0100 Subject: [Buildroot] [git commit] package/valijson: bump to version 0.6 Message-ID: <20220315201012.C9A5483F85@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a5476ef0d4eb417df6787b68125862aa30a6b4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/tristanpenman/valijson/releases/tag/v0.6 https://github.com/tristanpenman/valijson/releases/tag/v0.5 https://github.com/tristanpenman/valijson/releases/tag/v0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/valijson/valijson.hash | 2 +- package/valijson/valijson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index e184ccb7c0..0aab93dd2a 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz +sha256 e06bf78fc1d26d4956fabc182408ebbbc47e3a6699778cda4aa439c2a6110b09 valijson-0.6.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 71c5b05f2b..4b1f722f77 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALIJSON_VERSION = 0.3 +VALIJSON_VERSION = 0.6 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE From arnout at mind.be Tue Mar 15 19:54:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:29 +0100 Subject: [Buildroot] [git commit] package/valijson: drop boost dependency Message-ID: <20220315201012.BCC3483F84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9391c7dd21dee3eff04e665bf6a92ef6fc5f234 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master boost is not mandatory since the deactivation of tests when bumping to version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/valijson/Config.in | 8 ++------ package/valijson/valijson.mk | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b3703..07706cd963 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26..71c5b05f2b 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) From arnout at mind.be Tue Mar 15 20:01:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 21:01:20 +0100 Subject: [Buildroot] [git commit] package/shairport-sync: install dbus policy file to target Message-ID: <20220315201012.DB14583F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d74963400633ec9056646fdc50a91a046489a719 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This adds two extra commands to install dbus policy config to target if dbus option is enabled. Signed-off-by: Yunhao Tian Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/shairport-sync/shairport-sync.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e5..4430014ec9 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -82,6 +90,7 @@ define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV From arnout at mind.be Tue Mar 15 19:54:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:23 +0100 Subject: [Buildroot] [git commit] package/botan: bump to version 2.19.1 Message-ID: <20220315201012.A55BF83F85@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e28156074d296f02b02b7f01767fda314365b890 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (not needed since https://github.com/randombit/botan/commit/97483f93bdcfcb2cc86bcb103802be55c24ad633) - Update hash of license file (update in year: https://github.com/randombit/botan/commit/ff62a51ac2ed2e265edaf51b532d32eed5864d4b) https://github.com/randombit/botan/blob/2.19.1/news.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...around-a-miscompilation-issue-in-clang-12.patch | 144 --------------------- package/botan/botan.hash | 4 +- package/botan/botan.mk | 2 +- 3 files changed, 3 insertions(+), 147 deletions(-) diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch deleted file mode 100644 index b43aeafe13..0000000000 --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 9 Nov 2021 19:01:20 +0100 -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 - (XCode 13)" - -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/randombit/botan/issues/2845] ---- - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- - 2 files changed, 22 insertions(+), 70 deletions(-) - -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp -index 289e451ff..690c2b264 100644 ---- a/src/lib/hash/sha3/sha3.cpp -+++ b/src/lib/hash/sha3/sha3.cpp -@@ -11,47 +11,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -index c7f1914a3..a9650ad9d 100644 ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -@@ -8,47 +8,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); --- -2.33.0 - diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 91e1bf741a..2729cb493f 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz +sha256 e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 Botan-2.19.1.tar.xz # Locally computed -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index ebff1343b1..f9ebcf8d0a 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.18.2 +BOTAN_VERSION = 2.19.1 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From ps.report at gmx.net Tue Mar 15 20:33:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 15 Mar 2022 21:33:47 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: <20220315213347.09ddc034@gmx.net> On Tue, 15 Mar 2022 21:00:54 +0100, Arnout Vandecappelle wrote: > On 15/03/2022 14:05, Sourabh Hegde wrote: > > Helllo Jan, > > > > Thanks for the answer. > > > > From Buildroot 2021 release "ctrl_interface" is disabled and so I have > > It's disabled unless BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > > > commented out below line in etc/wpa_supplicant.conf file > > > > # |ctrl_interface=/var/run/wpa_supplicant| > > This shouldn't be needed. AFAIK wpa_supplicant ignores the option if > CTRL_IFACE is not enabled. > > > | > > | > > |And also in my rootfs, there is no "|/var/run/wpa_supplicant|" file. > > The file (actually, named pipe) is created when wpa_supplicants starts up. > /var/run is a tmpfs so it can only be created at runtime. > > > | > > | > > | > > |I have set below options in menuconfig| > > | > > | > > menuconfig.PNG > > > > Then doing make clean & make results in below errors: > > > > >>> wpa_supplicant 2.10 Installing to staging directory > > /usr/bin/install -m 0644 -D > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so > > /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so > > /usr/bin/install: cannot stat > > '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': > > No such file or directory > > make[1]: *** [package/pkg-generic.mk:331 : > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] > > Error 1 > > make: *** [Makefile:23: _all] Error 2 > > > > Can you please let me know what could be the issue and how to resolve it? > > I've tried to build the same configuration (with current git master) and it > builds without problems. Problem introduced on buildroot git master with wpa_supplicant version bump [1] and fixed with [2]... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=39381a467cd2cfc15f77d3f9adbf329d2f92e312 [2] https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=c4eebf191c781a3ea6b5eb1811cc17ae92ea2fb2 > > Please supply the defconfig and also the full build log (by uploading to a > pastebin). > > Regards, > Arnout > > > > > > Thanks in advance > > || > > > > On Thu, 10 Mar 2022 at 19:03, Jan Havran > > wrote: > > > > Hi Sourabh, > > > > after enabling RPi firmware you must load the Wifi driver - since you are using > > systemd, it should by handled by udev on start I think. > > > > So you probably just need to configure /etc/network/interfaces to start > > wpa_supplicant > > on wlan0 with /etc/wpa_supplicant.conf file, where you can put your credentials. > > Or at least that is what I have done, but I am not using systemd. > > > > I did something similar some time ago, you can check it here: > > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > > > > (note that to make "my" credentials public in that commit was an intention). > > > > P.S.: if you want to have any modifications to be part of your image with > > filesystem, > > you can do it by using rootfs overlays for example: > > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > > > > Regards, > > > > Jan Havran > > > > V?Thu, Mar 10, 2022 at 05:43:27PM +0100,?Sourabh Hegde napsal(a): > > > Hello All, > > > > > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > > > start-up. I am using Buildroot based Linux distribution. I have worked with > > > Yocto before and it provides systemd-networkd and wpa_supplicant feature to > > > connect to wifi on boot. I am lloking something similar in Buildroot but > > > couldn't find any notes online. > > > > > > So far, I think I have enabled the necessary config/driver using "make > > > menuconfig" : > > > [image: wpa_supplicant.png] > > > [image: firmware.png] > > > > > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > > > suggestion would be helpful. > > > > > > Can anyone please let me know how to proceed further with it? > > > > > > Your help will be much appreciated. > > > > > > Thanks in advance. > > > > > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > > > and let me know if any info is missing here. > > > > > > Regards, > > > > > > Sourabh > > > > > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Tue Mar 15 20:54:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 15 Mar 2022 21:54:05 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n Message-ID: <20220315205405.9291-1-ps.report@gmx.net> Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom?? Mr?z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay -- 2.35.1 From bugzilla at busybox.net Tue Mar 15 20:59:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 20:59:11 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 --- Comment #9 from Peter Seiderer --- Re-add bug description from one of the duplicates: > From mbuil at suse.com 2021-07-08 15:27:37 UTC > > Since 1.6, iptables supports the MASQUERADE target options: > > MASQUERADE target options: > --to-ports [-] > Port (range) to map to. > --random > Randomize source port. > --random-fully > Fully randomize source port. > > When building iptables-nft, the MASQUERADE target options are included in the iptables-nft binary, however, they are not in the ip6tables-nft: > > $> sudo ./output/target/usr/sbin/iptables-nft -A POSTROUTING -s 10.244.0.0/16 ! -d 224.0.0.0/4 -j MASQUERADE --help | grep random > --random > --random-fully > Fully randomize source port. > $> sudo ./output/target/usr/sbin/ip6tables-nft -A POSTROUTING -s 10.244.0.0/16 ! -d 224.0.0.0/4 -j MASQUERADE --help | grep random > $> > > Those targets come from the files libipt_MASQUERADE.c and libip6t_MASQUERADE.c in https://git.netfilter.org/iptables/tree/extensions but for some reason the ip6 one does not get included in the binary -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Tue Mar 15 20:57:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 21:57:07 +0100 Subject: [Buildroot] [git commit] package/mtools: bump version to 4.0.38 Message-ID: <20220315205049.DE4C383F95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88de5d08226b490ea2784fbfd0580dd3430b5699 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486f..a162bfdc95 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231..c875814bc7 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Tue Mar 15 20:59:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 21:59:35 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.38 In-Reply-To: <20220311065928.14849-1-ps.report@gmx.net> References: <20220311065928.14849-1-ps.report@gmx.net> Message-ID: <20220315215935.6341fafd@windsurf> On Fri, 11 Mar 2022 07:59:28 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html > > Signed-off-by: Peter Seiderer > --- > package/mtools/mtools.hash | 2 +- > package/mtools/mtools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Tue Mar 15 20:59:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 21:59:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls Message-ID: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command FAILED: src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine --- ...-meson.build-fix-g_ir_compiler-calls.patch | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 0000000000..3961ad0564 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + -- 2.35.1 From bugzilla at busybox.net Tue Mar 15 21:03:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 21:03:23 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 --- Comment #10 from Peter Seiderer --- (In reply to Peter Seiderer from comment #9) Not reproducible here (raspberrypi0w_defconfig with glibc, gcc-11.x, eudev): $ ip6tables-nft -A POSTROUTING -s 10.244.0.0/16 ! -d 224.0.0.0/4 -j MASQUERADE --help ip6tables v1.8.7 [...] MASQUERADE target options: --to-ports [-] Port (range) to map to. --random Randomize source port. --random-fully Fully randomize source port. -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Tue Mar 15 21:05:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 22:05:31 +0100 Subject: [Buildroot] [PATCH v1] package/wget: bump version to 1.21.3 In-Reply-To: <20220311065042.8687-1-ps.report@gmx.net> References: <20220311065042.8687-1-ps.report@gmx.net> Message-ID: <20220315220531.2bac9c2d@windsurf> Hello Peter, On Fri, 11 Mar 2022 07:50:42 +0100 Peter Seiderer wrote: > - explicit set some default options (--without-metalink, --enable-opie, > --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, > --disable-assert) > > - add optional libpsl dependency > > - remove legacy --with-libidn option (see [1]), replace with > new --enable-iri option in case libiconv and libidn2 are available > > - use explicit --with-libuuid option > > - add optional c-ares dependency > > For details see [2]. > > [1] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > [2] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > > Signed-off-by: Peter Seiderer You're mixing up a minor version bump with a significant rework of the package, which is unrelated to the version bump. This really needs separate commit. Also, see below. > +WGET_CONF_OPTS = \ > + --without-metalink \ > + --enable-opie \ > + --enable-digest \ > + --enable-ntlm \ So opie, digest and ntlm enabled is the default? > + --disable-debug \ > + --disable-valgrind-tests \ > + --disable-assert > + > +ifeq ($(BR2_PACKAGE_LIBPSL),y) > +WGET_CONF_OPTS += --with-libpsl > +WGET_DEPENDENCIES += libpsl > +else > +WGET_CONF_OPTS += --without-libpsl > +endif > + > ifeq ($(BR2_PACKAGE_GNUTLS),y) > WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > @@ -22,19 +38,18 @@ else > WGET_CONF_OPTS += --without-ssl > endif > > -ifeq ($(BR2_PACKAGE_LIBICONV),y) > -WGET_DEPENDENCIES += libiconv > -endif > - > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > -WGET_CONF_OPTS += --with-libidn > -WGET_DEPENDENCIES += libidn2 > +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) This is very likely wrong. Indeed BR2_PACKAGE_LIBICONV=y is only possible when the toolchain does *not* have locale support. When the toolchain has locale support, iconv support is provided by the toolchain itself. Could you revisit this, and also clarify the interaction between --enable-iri/--disable-iri on one side and --with-libidn/--without-libidn on the other side? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Mar 15 21:06:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 22:06:11 +0100 Subject: [Buildroot] [git commit] package/ts4900-fpga: bump version to 20170510 Message-ID: <20220315205750.DC9C983F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=503948f452d0cb46cbc7990ecaeabd60f2b3dfd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte transmits. Signed-off-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni --- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 9ffff643af..1d3c62bfd1 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index a3e42c0812..73e7a28e31 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,7 +4,7 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. From thomas.petazzoni at bootlin.com Tue Mar 15 21:06:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 22:06:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/ts4900-fpga: bump version to 20170510 In-Reply-To: <20220310185921.8852-1-kris@embeddedTS.com> References: <20220310185921.8852-1-kris@embeddedTS.com> Message-ID: <20220315220639.29413684@windsurf> On Thu, 10 Mar 2022 10:59:21 -0800 Kris Bahnsen via buildroot wrote: > Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte > transmits. > > Signed-off-by: Kris Bahnsen > --- > package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- > package/ts4900-fpga/ts4900-fpga.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Tue Mar 15 21:11:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:11:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: bump version to 0.4.8 In-Reply-To: <20220228161345.378966-1-theo.lebrun@bootlin.com> References: <20220228161345.378966-1-theo.lebrun@bootlin.com> Message-ID: <80b6dcef-8b08-5ee0-9c82-b10758a5af54@mind.be> On 28/02/2022 17:13, Th?o Lebrun via buildroot wrote: > Changelog: > https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst > > Signed-off-by: Th?o Lebrun Applied to master, thanks. Regards, Arnout > --- > package/wireplumber/wireplumber.hash | 2 +- > package/wireplumber/wireplumber.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash > index 561fcc2e5e..206d7d15af 100644 > --- a/package/wireplumber/wireplumber.hash > +++ b/package/wireplumber/wireplumber.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 > +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 > sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > index 2dab6042ea..3bf7cece45 100644 > --- a/package/wireplumber/wireplumber.mk > +++ b/package/wireplumber/wireplumber.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WIREPLUMBER_VERSION = 0.4.2 > +WIREPLUMBER_VERSION = 0.4.8 > WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 > WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) > WIREPLUMBER_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:11:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:11:57 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix kernel image format for aarch64 BE In-Reply-To: <20220228162632.2777188-1-remi.duraffort@linaro.org> References: <20220228162632.2777188-1-remi.duraffort@linaro.org> Message-ID: <43f2b96c-16e0-b37c-7c41-25d4332ce2e6@mind.be> On 28/02/2022 17:26, R?mi Duraffort wrote: > Signed-off-by: R?mi Duraffort > --- > linux/Config.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in > index 13d99bd09d..1f2a8db545 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE > > config BR2_LINUX_KERNEL_IMAGE > bool "Image" > - depends on BR2_aarch64 || BR2_riscv > + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be I changed the order here so the two aarch64 ones are next to each other. Applied to master with that changed, thanks. Regards, Arnout > > config BR2_LINUX_KERNEL_IMAGEGZ > bool "Image.gz" > - depends on BR2_aarch64 || BR2_riscv > + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be > > config BR2_LINUX_KERNEL_LINUX_BIN > bool "linux.bin" From arnout at mind.be Tue Mar 15 21:13:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:13:16 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <20220224154513.220976-1-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> Message-ID: <3897f71d-5622-b118-09a7-b23da8eb87c7@mind.be> On 24/02/2022 16:45, Romain Naour wrote: > TestRust and TestRustBin has been introduced at the time when there was > no cargo package infrastructure or any package using rust compiler > (Buildroot 2018.02). > > Since then the ripgrep package has been introduced, initially using > the generic package infrastructure and converted later to the cargo > package infrastructure. > > Due a recent change in rust/cargo removing the cargo config file [1] > the test TestRust and TestRustBin now fail to compile since they build > an hello-world crate outside of the cargo package infrastructure > without the correct environment for cross-compiling. > > Replace the 'hello-world' crate by ripgrep package and check if it > can run properly in Qemu. > > Fixes tests.package.test_rust.TestRustBin: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 > > But doesn't fixes tests.package.test_rust.TestRust due another bug: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > > [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 > > Signed-off-by: Romain Naour > Cc: Eric Le Bihan ?This introduced a few flake8 errors, which I fixed now. In the future: run flake8! (I also always forget :-)) ?Regards, ?Arnout > --- > v2: no changes > --- > support/testing/tests/package/test_rust.py | 48 ++-------------------- > 1 file changed, 4 insertions(+), 44 deletions(-) > > diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py > index 884b40a4a3..a1abd20c09 100644 > --- a/support/testing/tests/package/test_rust.py > +++ b/support/testing/tests/package/test_rust.py > @@ -8,9 +8,6 @@ import infra.basetest > > class TestRustBase(infra.basetest.BRTest): > > - target = 'armv7-unknown-linux-gnueabihf' > - crate = 'hello-world' > - > def login(self): > img = os.path.join(self.builddir, "images", "rootfs.cpio") > self.emulator.boot(arch="armv7", > @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): > options=["-initrd", img]) > self.emulator.login() > > - def build_test_prog(self): > - hostdir = os.path.join(self.builddir, 'host') > - env = os.environ.copy() > - env["USER"] = "br-user" > - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] > - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') > - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') > - cargo = os.path.join(hostdir, 'bin', 'cargo') > - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), > - self.crate) > - manifest = os.path.join(workdir, 'Cargo.toml') > - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) > - > - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo init failed") > - > - cmd = [ > - cargo, 'build', '-vv', '--target', self.target, > - '--manifest-path', manifest > - ] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo build failed") > - > - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) > - self.b.build() > - shutil.rmtree(workdir) > - > - > class TestRustBin(TestRustBase): > config = \ > """ > @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") > > > class TestRust(TestRustBase): > @@ -90,9 +50,9 @@ class TestRust(TestRustBase): > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > BR2_PACKAGE_HOST_RUST=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") From arnout at mind.be Tue Mar 15 21:13:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:13:40 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ace: bump to version 7.0.6 In-Reply-To: <20220301223416.947624-1-fontaine.fabrice@gmail.com> References: <20220301223416.947624-1-fontaine.fabrice@gmail.com> Message-ID: On 01/03/2022 23:34, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/ace/ace.hash | 5 ++++- > package/ace/ace.mk | 4 ++-- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/ace/ace.hash b/package/ace/ace.hash > index 92fd42e131..2387927879 100644 > --- a/package/ace/ace.hash > +++ b/package/ace/ace.hash > @@ -1,3 +1,6 @@ > +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: > +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 > + > # Locally Computed: > -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz > +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 > sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING > diff --git a/package/ace/ace.mk b/package/ace/ace.mk > index 8df89d8c6f..7299f0d40c 100644 > --- a/package/ace/ace.mk > +++ b/package/ace/ace.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -ACE_VERSION = 7.0.1 > -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz > +ACE_VERSION = 7.0.6 > +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 > ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions > ACE_LICENSE = DOC > ACE_LICENSE_FILES = COPYING From arnout at mind.be Tue Mar 15 21:13:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:13:57 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libfreeglut: bump to version 3.2.2 In-Reply-To: <20220301225107.988549-1-fontaine.fabrice@gmail.com> References: <20220301225107.988549-1-fontaine.fabrice@gmail.com> Message-ID: On 01/03/2022 23:51, Fabrice Fontaine wrote: > - Drop patch (already in version) > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ropped-up-with-the-release-of-gcc-10.patch | 69 ------------------- > package/libfreeglut/libfreeglut.hash | 10 +-- > package/libfreeglut/libfreeglut.mk | 2 +- > 3 files changed, 6 insertions(+), 75 deletions(-) > delete mode 100644 package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch > > diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch > deleted file mode 100644 > index e98e71537f..0000000000 > --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 > -From: jtsiomb > -Date: Fri, 21 Feb 2020 22:25:31 +0000 > -Subject: [PATCH] Work-around for an issue which cropped up with the release of > - gcc-10. In their infinite wisdom, they decided to build with -fno-common as > - default from now on, breaking every piece of C code which used to declare > - common symbols in header files, as was the convention since the dawn of time. > - We now have to duplicate all declarations to an arbitrary source file, and > - change the header-file ones to prefix them with extern. > - > -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk at 1863 7f0cb862-5218-0410-a997-914c9d46530a > -[Retrieved from: > -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] > -Signed-off-by: Fabrice Fontaine > ---- > - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ > - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- > - 2 files changed, 21 insertions(+), 7 deletions(-) > - > -diff --git a/src/fg_gl2.c b/src/fg_gl2.c > -index 38b0acbb..54b4285b 100644 > ---- a/src/fg_gl2.c > -+++ b/src/fg_gl2.c > -@@ -27,6 +27,20 @@ > - #include "fg_internal.h" > - #include "fg_gl2.h" > - > -+#ifndef GL_ES_VERSION_2_0 > -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed > -+ * names are defined in fg_gl2.h header to reference them, for any other case, > -+ * define them as function pointers here. > -+ */ > -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; > -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; > -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; > -+FGH_PFNGLBUFFERDATAPROC fghBufferData; > -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; > -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; > -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; > -+#endif > -+ > - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { > - if (fgStructure.CurrentWindow != NULL) > - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; > -diff --git a/src/fg_gl2.h b/src/fg_gl2.h > -index ab8ba5c7..fb3d4676 100644 > ---- a/src/fg_gl2.h > -+++ b/src/fg_gl2.h > -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); > - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); > - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); > - > --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; > --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; > --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; > --FGH_PFNGLBUFFERDATAPROC fghBufferData; > --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; > --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; > --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; > -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; > -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; > -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; > -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; > -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; > -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; > -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; > - > - # endif > - > diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash > index 2771cbde2f..ce9fb9e299 100644 > --- a/package/libfreeglut/libfreeglut.hash > +++ b/package/libfreeglut/libfreeglut.hash > @@ -1,6 +1,6 @@ > -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ > -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz > -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz > +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ > +md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz > +sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz > # Locally computed > -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz > -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING > +sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz > +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING > diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk > index 379de3121b..484b0f4b97 100644 > --- a/package/libfreeglut/libfreeglut.mk > +++ b/package/libfreeglut/libfreeglut.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFREEGLUT_VERSION = 3.2.1 > +LIBFREEGLUT_VERSION = 3.2.2 > LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz > LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut > LIBFREEGLUT_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:14:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:14:51 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/parted: bump to version 3.4 In-Reply-To: <20220301230504.1000454-1-fontaine.fabrice@gmail.com> References: <20220301230504.1000454-1-fontaine.fabrice@gmail.com> Message-ID: <69767a0f-a765-7149-381a-5ad3e07f4531@mind.be> On 02/03/2022 00:05, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://git.savannah.gnu.org/cgit/parted.git/tree/NEWS?h=v3.4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/parted/parted.hash | 4 ++-- > package/parted/parted.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/parted/parted.hash b/package/parted/parted.hash > index 2c466eb8d2..392436ec4b 100644 > --- a/package/parted/parted.hash > +++ b/package/parted/parted.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz > +sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz > > # Locally calculated > -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING > +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING > diff --git a/package/parted/parted.mk b/package/parted/parted.mk > index 66940fc516..23158179e4 100644 > --- a/package/parted/parted.mk > +++ b/package/parted/parted.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PARTED_VERSION = 3.3 > +PARTED_VERSION = 3.4 > PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz > PARTED_SITE = $(BR2_GNU_MIRROR)/parted > PARTED_DEPENDENCIES = host-pkgconf util-linux From arnout at mind.be Tue Mar 15 21:15:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:15:08 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libscrypt: bump to version 1.22 In-Reply-To: <20220301232111.1092975-1-fontaine.fabrice@gmail.com> References: <20220301232111.1092975-1-fontaine.fabrice@gmail.com> Message-ID: <71ec36a0-eef9-a6a5-c7b4-ea8d2a4d64b5@mind.be> On 02/03/2022 00:21, Fabrice Fontaine wrote: > - Drop patch and use {C,LD}FLAGS_EXTRA which are available since > https://github.com/technion/libscrypt/commit/bdfec26744122e8f52a58bc086c89b27faaf5888 > - While at it, also move PREFIX to LIBSCRYPT_MAKE_OPTS as advocated by > Arnout in > https://patchwork.ozlabs.org/project/buildroot/patch/20220221172900.1937856-1-fontaine.fabrice at gmail.com/ > - Update indentation in hash file (two spaces) > > https://github.com/technion/libscrypt/compare/v1.21...v1.22 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ions-to-CFLAGS-and-LDFLAGS-variables.patch | 34 ------------------- > package/libscrypt/libscrypt.hash | 4 +-- > package/libscrypt/libscrypt.mk | 14 +++++--- > 3 files changed, 12 insertions(+), 40 deletions(-) > delete mode 100644 package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch > > diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch > deleted file mode 100644 > index a023a6fe1c..0000000000 > --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= > -Date: Tue, 14 Mar 2017 09:23:51 +0100 > -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -This also removes a number of hard-coded CFLAGS, leaving it up to the > -user to pass appropriate optimization/hardening flags. > - > -Signed-off-by: Stefan S?rensen > ---- > - Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 7022a4a..3098a9a 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d > - INSTALL_DATA ?= install > - > - CC?=gcc > --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC > --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version > -+override CFLAGS+=-fPIC > -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version > - CFLAGS_EXTRA?=-Wl,-rpath=. > - > - all: reference > --- > -2.7.4 > - > diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash > index fda63d1c0d..fcdc4bbeeb 100644 > --- a/package/libscrypt/libscrypt.hash > +++ b/package/libscrypt/libscrypt.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz > -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE > +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz > +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE > diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk > index fa89ed31bc..d28bd4e900 100644 > --- a/package/libscrypt/libscrypt.mk > +++ b/package/libscrypt/libscrypt.mk > @@ -4,23 +4,29 @@ > # > ################################################################################ > > -LIBSCRYPT_VERSION = 1.21 > +LIBSCRYPT_VERSION = 1.22 > LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) > LIBSCRYPT_LICENSE = BSD-2-Clause > LIBSCRYPT_LICENSE_FILES = LICENSE > LIBSCRYPT_INSTALL_STAGING = YES > > +LIBSCRYPT_MAKE_OPTS = \ > + $(TARGET_CONFIGURE_OPTS) \ > + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ > + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ > + PREFIX=/usr > + > define LIBSCRYPT_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) > endef > > define LIBSCRYPT_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ > DESTDIR=$(STAGING_DIR) install > endef > > define LIBSCRYPT_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ > DESTDIR=$(TARGET_DIR) install > endef > From arnout at mind.be Tue Mar 15 21:15:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:15:30 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.7 In-Reply-To: <20220302173433.28939-1-bernd.kuhls@t-online.de> References: <20220302173433.28939-1-bernd.kuhls@t-online.de> Message-ID: <79c9a68c-4b86-3201-8efb-a6e3eae29bf9@mind.be> On 02/03/2022 18:34, Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > package/mesa3d/mesa3d.hash | 6 +++--- > package/mesa3d/mesa3d.mk | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk > index c8573fafad..736dedc25e 100644 > --- a/package/mesa3d-headers/mesa3d-headers.mk > +++ b/package/mesa3d-headers/mesa3d-headers.mk > @@ -12,7 +12,7 @@ endif > > # Not possible to directly refer to mesa3d variables, because of > # first/second expansion trickery... > -MESA3D_HEADERS_VERSION = 21.3.6 > +MESA3D_HEADERS_VERSION = 21.3.7 > MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz > MESA3D_HEADERS_SITE = https://archive.mesa3d.org > MESA3D_HEADERS_DL_SUBDIR = mesa3d > diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash > index d64b833100..b680411051 100644 > --- a/package/mesa3d/mesa3d.hash > +++ b/package/mesa3d/mesa3d.hash > @@ -1,6 +1,6 @@ > -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html > -sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz > -sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html > +sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz > +sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz > > # License > sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 95618b2072..d0b12932c4 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # When updating the version, please also update mesa3d-headers > -MESA3D_VERSION = 21.3.6 > +MESA3D_VERSION = 21.3.7 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos From fontaine.fabrice at gmail.com Tue Mar 15 21:16:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 22:16:52 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-avro: renumber patch Message-ID: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine --- ...h => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/python-avro/{0002-drop-install-time-linting-and-imports-sorting.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} (100%) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 15 21:16:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 22:16:53 +0100 Subject: [Buildroot] [PATCH 2/2] package/{avro-c, python-avro}: bump to version 1.11.0 In-Reply-To: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> References: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Message-ID: <20220315211653.2297582-2-fontaine.fabrice@gmail.com> - Drop avro-c patch (already in version) - Drop python-avro patch (not needed anymore) https://github.com/apache/avro/releases/tag/release-1.11.0 Signed-off-by: Fabrice Fontaine --- ...d-failure-without-a-C-compiler-again.patch | 34 -------------- package/avro-c/avro-c.hash | 4 +- package/avro-c/avro-c.mk | 2 +- ...all-time-linting-and-imports-sorting.patch | 46 ------------------- package/python-avro/python-avro.hash | 4 +- package/python-avro/python-avro.mk | 5 +- 6 files changed, 8 insertions(+), 87 deletions(-) delete mode 100644 package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch delete mode 100644 package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch diff --git a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch b/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch deleted file mode 100644 index 8f7e59cf62..0000000000 --- a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Jul 2020 09:35:09 +0200 -Subject: [PATCH] cmake: Build failure without a C++ compiler (again) - -avro-c fails to build (again) without a C++ compiler because commit -664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by -commit 414a51fdc1856083bb16851f09a4c61a48796132 - -Fixes: - - http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c8d7aaf..aa923e18 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # under the License. - # - cmake_minimum_required(VERSION 3.1) --project(AvroC) -+project(AvroC C) - enable_testing() - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) --- -2.27.0 - diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index c4fd7d3f57..7a4a6f7aca 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 -sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/c/avro-c-1.11.0.tar.gz.sha512 +sha512 5369ec11832e0ce1aa0181d594f657bae82ab5fb317ec1bee5ba190de9ed42956b425a5bf7e423940e8f871a54ae1246b92db2ce8562f270b4a05523ec4b60ae avro-c-1.11.0.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index ee6e864161..262a0fee5f 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRO_C_VERSION = 1.10.0 +AVRO_C_VERSION = 1.11.0 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch deleted file mode 100644 index 41231e923d..0000000000 --- a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Mon, 17 Feb 2020 15:12:13 +0100 -Subject: [PATCH] drop install time linting and imports sorting - -Since the 1.9.2 release, the setup script is also performing code linting -tasks, which require additional python libraries. - -These linting tasks are not needed anyway, since they are intended to prepare -the code for distribution, but the Buildroot package is already using a -distributed version. We therefore simply remove them. - -Signed-off-by: Titouan Christophe ---- - setup.cfg | 2 -- - setup.py | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 7b5de18..d46a36e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -25,8 +25,6 @@ package_dir = - include_package_data = true - packages = avro - setup_requires = -- isort -- pycodestyle - install_requires = - zip_safe = true - scripts = -diff --git a/setup.py b/setup.py -index f6297bb..91d3287 100755 ---- a/setup.py -+++ b/setup.py -@@ -164,7 +164,6 @@ def main(): - setuptools.setup(cmdclass={ - "clean": CleanCommand, - "generate_interop_data": GenerateInteropDataCommand, -- "lint": LintCommand, - }) - - --- -2.24.1 - diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index 2428be96e5..d752fa8ae6 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 -sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/py/avro-1.11.0.tar.gz.sha512 +sha512 8af67deb33b9990b74ffd7ab5c3c55e13a649070b4623c7bbe2b278287fd0929e57ed6d0344f9e93f3eb79663b43f75891d0810812349dfaecce65fdd9b44e93 avro-1.11.0.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index dd6008b1ba..0c4c431777 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -5,8 +5,9 @@ ################################################################################ PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) -PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3 -PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz +PYTHON_AVRO_SITE = \ + https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py +PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE PYTHON_AVRO_SETUP_TYPE = setuptools -- 2.35.1 From arnout at mind.be Tue Mar 15 21:19:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:19:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/{gnupg, gnupg2}: use gnupg2 by default In-Reply-To: <20220302210150.33658-1-ju.o@free.fr> References: <20220302210150.33658-1-ju.o@free.fr> Message-ID: <5424d33f-c1db-f3ed-ff87-b3cfb061be33@mind.be> On 02/03/2022 22:01, Julien Olivain wrote: > This patch reverses the logic to select gnupg2 by default, while still > allowing to select gnupg (v1). > > Quoting: https://gnupg.org/download/index.html > """ > GnuPG 1.4 is the old, single binary version which still support the > unsafe PGP-2 keys. This branch has no dependencies on the above listed > libraries or the Pinentry. However, it lacks many modern features and > will receive only important updates. > """ > > gnupg 1.4 is kept in Buildroot for now, as the package is still > maintained upstream. It might still be useful is some specific cases: > - it has a smaller footprint (compared to v2), > - it has less dependencies (only zlib), > - it has less build dependencies (can build static, no need for > MMU/threads, ...) > > Most Linux distributions are now shipping gnupg2 by default. gnupg v1 > is now more for legacy/compatibility/specific cases. > > There is currently only two packages selecting gnupg in Buildroot: > gpgme and python-gnupg > This commit also reverses the logic for those packages. > > Signed-off-by: Julien Olivain > --- > Tested with: > > support/testing/run-tests \ > -d dl -o output_folder \ > -k tests.package.test_python_gnupg.TestPythonPy3GnuPG You should also test such changes in Config.in dependency handling with: while true; do make randconfig; done There are still a few errors that come out of that, but you can check that you don't introduce new ones. Which you did :-) > > Note: this change was quickly discussed in: > https://lists.buildroot.org/pipermail/buildroot/2022-January/634021.html > --- > package/gnupg/Config.in | 1 - > package/gnupg2/Config.in | 1 + > package/libgpgme/Config.in | 2 +- > package/python-gnupg/Config.in | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in > index 2db46318f1..e92fca709d 100644 > --- a/package/gnupg/Config.in > +++ b/package/gnupg/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_GNUPG > bool "gnupg" > - depends on !BR2_PACKAGE_GNUPG2 > select BR2_PACKAGE_ZLIB > help > GnuPG is the GNU project's complete and free implementation > diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in > index ef1817ef02..9438cf69f6 100644 > --- a/package/gnupg2/Config.in > +++ b/package/gnupg2/Config.in > @@ -8,6 +8,7 @@ config BR2_PACKAGE_GNUPG2 > depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth > depends on BR2_USE_MMU # libassuan, libnpth > depends on !BR2_STATIC_LIBS I could fix those by moving all the dependencies to a new blind symbol BR2_PACKAGE_GNUPG2_DEPENDS... > + depends on !BR2_PACKAGE_GNUPG > select BR2_PACKAGE_ZLIB > select BR2_PACKAGE_LIBGPG_ERROR > select BR2_PACKAGE_LIBGCRYPT > diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in > index 4aabd06367..20f491b664 100644 > --- a/package/libgpgme/Config.in > +++ b/package/libgpgme/Config.in > @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBGPGME > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error > depends on BR2_USE_MMU # libassuan > #gnupg is not needed to build, but at runtime. > - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 > + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG And changing this into select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime See what got committed for the full context. Also, there's package/gcr that had some missing dependencies, so I fixed that in a separate commit as well. Applied to master, thanks. Regards, Arnout > select BR2_PACKAGE_LIBGPG_ERROR > select BR2_PACKAGE_LIBASSUAN > help > diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in > index 038a940778..54f8fb6a29 100644 > --- a/package/python-gnupg/Config.in > +++ b/package/python-gnupg/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_PYTHON_GNUPG > bool "python-gnupg" > - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime > + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime > help > A wrapper for the Gnu Privacy Guard (GPG or GnuPG). > From arnout at mind.be Tue Mar 15 21:19:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:19:42 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libss7: bump to version 2.0.1 In-Reply-To: <20220302212621.2357671-1-fontaine.fabrice@gmail.com> References: <20220302212621.2357671-1-fontaine.fabrice@gmail.com> Message-ID: <650ae221-efed-6e35-a653-ff2170f915a1@mind.be> On 02/03/2022 22:26, Fabrice Fontaine wrote: > http://downloads.asterisk.org/pub/telephony/libss7/releases/libss7-2.0.1-summary.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libss7/libss7.hash | 4 ++-- > package/libss7/libss7.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash > index 8e1d6635db..442422fcd9 100644 > --- a/package/libss7/libss7.hash > +++ b/package/libss7/libss7.hash > @@ -1,6 +1,6 @@ > # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ > -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz > -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz > +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz > +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz > > # License file, locally calculated > sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE > diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk > index 151b6a61b5..faa147c78e 100644 > --- a/package/libss7/libss7.mk > +++ b/package/libss7/libss7.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSS7_VERSION = 2.0.0 > +LIBSS7_VERSION = 2.0.1 > LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases > > LIBSS7_LICENSE = GPL-2.0 From arnout at mind.be Tue Mar 15 21:20:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:20:02 +0100 Subject: [Buildroot] [PATCH/next v3 1/1] package/kodi: bump version to 19.4 In-Reply-To: <20220303174121.55867-1-bernd.kuhls@t-online.de> References: <20220303174121.55867-1-bernd.kuhls@t-online.de> Message-ID: <2a12dfa3-9ca9-193f-bdd8-690e489df42e@mind.be> On 03/03/2022 18:41, Bernd Kuhls wrote: > Add dependencies to giflib, libjpeg and libpng due to > https://github.com/xbmc/xbmc/pull/20462 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > v3: removed remnants from internal patch, sorry for the noise > v2: added dependencies to giflib, libjpeg and libpng > > package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- > package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- > package/kodi/Config.in | 3 +++ > package/kodi/kodi.hash | 2 +- > package/kodi/kodi.mk | 5 ++++- > 5 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > index 81fc2bb9f1..8cc2297bdb 100644 > --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix > +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix > KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) > KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz > KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi > diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk > index 2ebcd7d8de..4733399edc 100644 > --- a/package/kodi-texturepacker/kodi-texturepacker.mk > +++ b/package/kodi-texturepacker/kodi-texturepacker.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix > +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix > KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) > KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz > KODI_TEXTUREPACKER_DL_SUBDIR = kodi > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index f31bf19b99..ebc95343a9 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI > select BR2_PACKAGE_FONTCONFIG # needed for libass > select BR2_PACKAGE_FREETYPE > select BR2_PACKAGE_FSTRCMP > + select BR2_PACKAGE_GIFLIB > + select BR2_PACKAGE_JPEG > select BR2_PACKAGE_LIBASS > select BR2_PACKAGE_LIBCDIO > select BR2_PACKAGE_LIBCROSSGUID > @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI > select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE > select BR2_PACKAGE_LIBPLIST > + select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_LZO > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_PCRE > diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash > index 7f96af385a..a17e0fb29f 100644 > --- a/package/kodi/kodi.hash > +++ b/package/kodi/kodi.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz > +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz > sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz > sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz > sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index 56e901fa17..7326cd536d 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -6,7 +6,7 @@ > > # When updating the version, please also update kodi-jsonschemabuilder > # and kodi-texturepacker > -KODI_VERSION_MAJOR = 19.3 > +KODI_VERSION_MAJOR = 19.4 > KODI_VERSION_NAME = Matrix > KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) > KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) > @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ > fontconfig \ > freetype \ > fstrcmp \ > + giflib \ > host-flatbuffers \ > host-gawk \ > host-gettext \ > @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ > host-nasm \ > host-swig \ > host-xmlstarlet \ > + jpeg \ > libass \ > libcdio \ > libcrossguid \ > @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ > libegl \ > libfribidi \ > libplist \ > + libpng \ > lzo \ > openssl \ > pcre \ From arnout at mind.be Tue Mar 15 21:20:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:20:19 +0100 Subject: [Buildroot] [PATCH/next] package/libnss: bump to version 3.76 In-Reply-To: <20220304213828.3870123-1-giulio.benetti@benettiengineering.com> References: <20220304213828.3870123-1-giulio.benetti@benettiengineering.com> Message-ID: <42548c26-0cba-d9db-4069-30e82e83ce16@mind.be> On 04/03/2022 22:38, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > package/libnss/libnss.hash | 4 ++-- > package/libnss/libnss.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash > index 07fb340c33..b4b8be11f6 100644 > --- a/package/libnss/libnss.hash > +++ b/package/libnss/libnss.hash > @@ -1,4 +1,4 @@ > -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS > -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz > +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_RTM/src/SHA256SUMS > +sha256 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 nss-3.76.tar.gz > # Locally calculated > sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index a9549e48dd..2f7a265136 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBNSS_VERSION = 3.75 > +LIBNSS_VERSION = 3.76 > LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz > LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src > LIBNSS_DISTDIR = dist From arnout at mind.be Tue Mar 15 21:20:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:20:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: bump to version v0.3.20 In-Reply-To: <20220305175041.2225915-1-ju.o@free.fr> References: <20220305175041.2225915-1-ju.o@free.fr> Message-ID: <312e14e4-4f32-98c2-ed42-0e40e18ff7c5@mind.be> On 05/03/2022 18:50, Julien Olivain wrote: > This commit dropped a patch included upstream. The other patch was > rebased. > > For change log since v0.3.18, see: > - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19 > - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > Tested with: > > make check-package > ... > 0 warnings generated > > ./utils/test-pkg -p openblas -a > ... > 45 builds, 25 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > ...nsider-Os-when-determining-LAPACK_NO.patch | 31 ------------------- > ...on-t-specify-optimization-level-bui.patch} | 9 +++--- > package/openblas/openblas.hash | 2 +- > package/openblas/openblas.mk | 2 +- > 4 files changed, 6 insertions(+), 38 deletions(-) > delete mode 100644 package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch > rename package/openblas/{0002-Makefile.system-don-t-specify-optimization-level-bui.patch => 0001-Makefile.system-don-t-specify-optimization-level-bui.patch} (86%) > > diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch > deleted file mode 100644 > index f9278bd099..0000000000 > --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 > -From: Thomas De Schampheleire > -Date: Fri, 5 Mar 2021 11:15:52 +0100 > -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags > - > -gcc also supports -O, -Og and -Os as optimization flags. > -They may be given on the make command-line by users. > - > -For the calculation of LAPACK_NOOPT, all such flags should be considered. > - > -Signed-off-by: Thomas De Schampheleire > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index a22e16ba..fc5fe3f5 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -32,7 +32,7 @@ export NOFORTRAN > - export NO_LAPACK > - endif > - > --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) > -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) > - > - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test > - > --- > -2.26.2 > - > diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch > similarity index 86% > rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch > rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch > index bcc3e0eb6a..e0c738748a 100644 > --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch > +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch > @@ -1,4 +1,4 @@ > -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 > +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 > From: Thomas De Schampheleire > Date: Fri, 5 Mar 2021 14:09:23 +0100 > Subject: [PATCH] Makefile.system: don't specify optimization level > @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. > Remove the optimization level specified in openblas itself. > > Signed-off-by: Thomas De Schampheleire > - > --- > Makefile.system | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.system b/Makefile.system > -index 1e30d05a..04b0be16 100644 > +index 438a8148..9de1bbd5 100644 > --- a/Makefile.system > +++ b/Makefile.system > -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g > +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g > endif > > ifndef COMMON_OPT > @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644 > > override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) > -- > -2.26.2 > +2.35.1 > > diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash > index a1e35f4fc4..71fc4d34c5 100644 > --- a/package/openblas/openblas.hash > +++ b/package/openblas/openblas.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz > +sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz > sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE > diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk > index 4d506fa618..608c2f24ea 100644 > --- a/package/openblas/openblas.mk > +++ b/package/openblas/openblas.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -OPENBLAS_VERSION = 0.3.18 > +OPENBLAS_VERSION = 0.3.20 > OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) > OPENBLAS_LICENSE = BSD-3-Clause > OPENBLAS_LICENSE_FILES = LICENSE From arnout at mind.be Tue Mar 15 21:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:09:59 +0100 Subject: [Buildroot] [git commit] package/wireplumber: bump version to 0.4.8 Message-ID: <20220315211222.9FED78408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38dbc73d3989c9081f94f1ed1380af3b3be02bf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst Signed-off-by: Th??o Lebrun Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wireplumber/wireplumber.hash | 2 +- package/wireplumber/wireplumber.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 561fcc2e5e..206d7d15af 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..3bf7cece45 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.4.2 +WIREPLUMBER_VERSION = 0.4.8 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.7 Message-ID: <20220315211222.D56688408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bc66b940cb8655cb0694e0c6a1c74f1eb9c007c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c8573fafad..736dedc25e 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.6 +MESA3D_HEADERS_VERSION = 21.3.7 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d64b833100..b680411051 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html -sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz -sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html +sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz +sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 95618b2072..d0b12932c4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.6 +MESA3D_VERSION = 21.3.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/ace: bump to version 7.0.6 Message-ID: <20220315211222.B119A8408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=539d915e44ae3b9a826966f106a3cfb3ced1801e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ace/ace.hash | 5 ++++- package/ace/ace.mk | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/ace/ace.hash b/package/ace/ace.hash index 92fd42e131..2387927879 100644 --- a/package/ace/ace.hash +++ b/package/ace/ace.hash @@ -1,3 +1,6 @@ +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 + # Locally Computed: -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk index 8df89d8c6f..7299f0d40c 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -4,8 +4,8 @@ # ################################################################################ -ACE_VERSION = 7.0.1 -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_VERSION = 7.0.6 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions ACE_LICENSE = DOC ACE_LICENSE_FILES = COPYING From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/parted: bump to version 3.4 Message-ID: <20220315211222.C3D088408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e0bf309a46dcda2be8c2491ac0aabc5883f5c89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://git.savannah.gnu.org/cgit/parted.git/tree/NEWS?h=v3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/parted/parted.hash | 4 ++-- package/parted/parted.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 2c466eb8d2..392436ec4b 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz +sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz # Locally calculated -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 66940fc516..23158179e4 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.3 +PARTED_VERSION = 3.4 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux From arnout at mind.be Tue Mar 15 21:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:09:59 +0100 Subject: [Buildroot] [git commit] linux: make Image{, .gz} format available for aarch64 BE Message-ID: <20220315211222.A79748408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1579589e0a7d1870aa0ad587acd78f799f31257 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Just like aarch64, aarch64 BE supports the Image and Image.gz format. Signed-off-by: R??mi Duraffort Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 36744c5337..043e7c6574 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/libfreeglut: bump to version 3.2.2 Message-ID: <20220315211222.BACBD8408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3f25dffbcb6b4a3f3d0cad968bc5e4499529e61 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ich-cropped-up-with-the-release-of-gcc-10.patch | 69 ---------------------- package/libfreeglut/libfreeglut.hash | 10 ++-- package/libfreeglut/libfreeglut.mk | 2 +- 3 files changed, 6 insertions(+), 75 deletions(-) diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch deleted file mode 100644 index e98e71537f..0000000000 --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 -From: jtsiomb -Date: Fri, 21 Feb 2020 22:25:31 +0000 -Subject: [PATCH] Work-around for an issue which cropped up with the release of - gcc-10. In their infinite wisdom, they decided to build with -fno-common as - default from now on, breaking every piece of C code which used to declare - common symbols in header files, as was the convention since the dawn of time. - We now have to duplicate all declarations to an arbitrary source file, and - change the header-file ones to prefix them with extern. - -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk at 1863 7f0cb862-5218-0410-a997-914c9d46530a -[Retrieved from: -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] -Signed-off-by: Fabrice Fontaine ---- - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c -index 38b0acbb..54b4285b 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index 2771cbde2f..ce9fb9e299 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ +md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz +sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz # Locally computed -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING +sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 379de3121b..484b0f4b97 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.1 +LIBFREEGLUT_VERSION = 3.2.2 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut LIBFREEGLUT_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/libscrypt: bump to version 1.22 Message-ID: <20220315211222.CC6208408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4542c6714d3951070c31739d24e4bd42b446fbae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch and use {C,LD}FLAGS_EXTRA which are available since https://github.com/technion/libscrypt/commit/bdfec26744122e8f52a58bc086c89b27faaf5888 - While at it, also move PREFIX to LIBSCRYPT_MAKE_OPTS as advocated by Arnout in https://patchwork.ozlabs.org/project/buildroot/patch/20220221172900.1937856-1-fontaine.fabrice at gmail.com/ - Update indentation in hash file (two spaces) https://github.com/technion/libscrypt/compare/v1.21...v1.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...g-options-to-CFLAGS-and-LDFLAGS-variables.patch | 34 ---------------------- package/libscrypt/libscrypt.hash | 4 +-- package/libscrypt/libscrypt.mk | 14 ++++++--- 3 files changed, 12 insertions(+), 40 deletions(-) diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch deleted file mode 100644 index a023a6fe1c..0000000000 --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Tue, 14 Mar 2017 09:23:51 +0100 -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This also removes a number of hard-coded CFLAGS, leaving it up to the -user to pass appropriate optimization/hardening flags. - -Signed-off-by: Stefan S??rensen ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7022a4a..3098a9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d - INSTALL_DATA ?= install - - CC?=gcc --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version -+override CFLAGS+=-fPIC -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - CFLAGS_EXTRA?=-Wl,-rpath=. - - all: reference --- -2.7.4 - diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash index fda63d1c0d..fcdc4bbeeb 100644 --- a/package/libscrypt/libscrypt.hash +++ b/package/libscrypt/libscrypt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index fa89ed31bc..d28bd4e900 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -4,23 +4,29 @@ # ################################################################################ -LIBSCRYPT_VERSION = 1.21 +LIBSCRYPT_VERSION = 1.22 LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) LIBSCRYPT_LICENSE = BSD-2-Clause LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES +LIBSCRYPT_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ + PREFIX=/usr + define LIBSCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) endef define LIBSCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(STAGING_DIR) install endef define LIBSCRYPT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) install endef From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/gcr: depends on !gnupg Message-ID: <20220315211222.E6D258408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5783a418f4b30931068b81f850fc06cd8d3d9732 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From arnout at mind.be Tue Mar 15 21:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] package/openblas: bump to version v0.3.20 Message-ID: <20220315211223.1798D8408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c2f90f44d6d563d4a641d3f634aab8637e53bfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit dropped a patch included upstream. The other patch was rebased. For change log since v0.3.18, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19 - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...so-consider-Os-when-determining-LAPACK_NO.patch | 31 ---------------------- ...tem-don-t-specify-optimization-level-bui.patch} | 9 +++---- package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 2 +- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch deleted file mode 100644 index f9278bd099..0000000000 --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:15:52 +0100 -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags - -gcc also supports -O, -Og and -Os as optimization flags. -They may be given on the make command-line by users. - -For the calculation of LAPACK_NOOPT, all such flags should be considered. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a22e16ba..fc5fe3f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ export NOFORTRAN - export NO_LAPACK - endif - --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) - - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test - --- -2.26.2 - diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 86% rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch index bcc3e0eb6a..e0c738748a 100644 --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -1,4 +1,4 @@ -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 5 Mar 2021 14:09:23 +0100 Subject: [PATCH] Makefile.system: don't specify optimization level @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. Remove the optimization level specified in openblas itself. Signed-off-by: Thomas De Schampheleire - --- Makefile.system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system -index 1e30d05a..04b0be16 100644 +index 438a8148..9de1bbd5 100644 --- a/Makefile.system +++ b/Makefile.system -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g endif ifndef COMMON_OPT @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644 override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -- -2.26.2 +2.35.1 diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a1e35f4fc4..71fc4d34c5 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz +sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..608c2f24ea 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.18 +OPENBLAS_VERSION = 0.3.20 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/kodi: bump version to 19.4 Message-ID: <20220315211223.04EE48408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a0fb798be7432fb88047eb3a7d6a0915879b7ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add dependencies to giflib, libjpeg and libpng due to https://github.com/xbmc/xbmc/pull/20462 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/Config.in | 3 +++ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 5 ++++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 6896e85e7b..c8e1e5d0ed 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 58ad115475..c41c515d10 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ From arnout at mind.be Tue Mar 15 21:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] support/testing: test_rust.py: fix flake8 errors Message-ID: <20220315211223.1F9208408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12588a667a6e4d3c852a82a9d89c58bcf43eea1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix flake8 errors introduced in commit f0d1f21195 Fixes: support/testing/tests/package/test_rust.py:2:1: F401 'tempfile' imported but unused support/testing/tests/package/test_rust.py:3:1: F401 'subprocess' imported but unused support/testing/tests/package/test_rust.py:4:1: F401 'shutil' imported but unused support/testing/tests/package/test_rust.py:18:1: E302 expected 2 blank lines, found 1 --- support/testing/tests/package/test_rust.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index a1abd20c09..fb9dd2d916 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,7 +1,4 @@ import os -import tempfile -import subprocess -import shutil import infra.basetest @@ -15,6 +12,7 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() + class TestRustBin(TestRustBase): config = \ """ From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/libss7: bump to version 2.0.1 Message-ID: <20220315211222.EF4F88408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c7e517e4b2e17d4a244da9268b4b0071bddc4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master http://downloads.asterisk.org/pub/telephony/libss7/releases/libss7-2.0.1-summary.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libss7/libss7.hash | 4 ++-- package/libss7/libss7.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash index 8e1d6635db..442422fcd9 100644 --- a/package/libss7/libss7.hash +++ b/package/libss7/libss7.hash @@ -1,6 +1,6 @@ # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz # License file, locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk index 151b6a61b5..faa147c78e 100644 --- a/package/libss7/libss7.mk +++ b/package/libss7/libss7.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSS7_VERSION = 2.0.0 +LIBSS7_VERSION = 2.0.1 LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases LIBSS7_LICENSE = GPL-2.0 From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/{gnupg, gnupg2}: use gnupg2 by default Message-ID: <20220315211222.DE6128408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56b49691abf4625d3d5915f3956b02f0fbd2ed4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch reverses the logic to select gnupg2 by default, while still allowing to select gnupg (v1). Quoting: https://gnupg.org/download/index.html """ GnuPG 1.4 is the old, single binary version which still support the unsafe PGP-2 keys. This branch has no dependencies on the above listed libraries or the Pinentry. However, it lacks many modern features and will receive only important updates. """ gnupg 1.4 is kept in Buildroot for now, as the package is still maintained upstream. It might still be useful is some specific cases: - it has a smaller footprint (compared to v2), - it has less dependencies (only zlib), - it has less build dependencies (can build static, no need for MMU/threads, ...) Most Linux distributions are now shipping gnupg2 by default. gnupg v1 is now more for legacy/compatibility/specific cases. There is currently only two packages selecting gnupg in Buildroot: gpgme and python-gnupg This commit also reverses the logic for those packages. However, this means we also need to propagate the dependencies of gnupg2, and still select gnupg if those dependencies are not met. To simplify this, add a blind option BR2_PACKAGE_GNUPG2_DEPENDS. Note that due to the intricacies of Kconfig dependencies, "depends on !BR2_PACKAGE_GNUPG" must *not* be part of BR2_PACKAGE_GNUPG2_DEPENDS. Signed-off-by: Julien Olivain [Arnout: rework dependency handling to make sure gnupg2 dependencies are properly propagated] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gnupg/Config.in | 1 - package/gnupg2/Config.in | 14 ++++++++++++-- package/libgpgme/Config.in | 4 ++-- package/python-gnupg/Config.in | 3 ++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in index 2db46318f1..e92fca709d 100644 --- a/package/gnupg/Config.in +++ b/package/gnupg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_GNUPG bool "gnupg" - depends on !BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_ZLIB help GnuPG is the GNU project's complete and free implementation diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index ef1817ef02..043d53554c 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -2,12 +2,22 @@ comment "gnupg2 needs a toolchain w/ threads and dynamic library support" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_GNUPG2 - bool "gnupg2" +# helper to make it easier to select gnupg2 or gnupg; usage: +# select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG +# select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS + +config BR2_PACKAGE_GNUPG2_DEPENDS + bool + default y depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth depends on BR2_USE_MMU # libassuan, libnpth depends on !BR2_STATIC_LIBS + +config BR2_PACKAGE_GNUPG2 + bool "gnupg2" + depends on BR2_PACKAGE_GNUPG2_DEPENDS + depends on !BR2_PACKAGE_GNUPG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGCRYPT diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in index 4aabd06367..16ce27d0ef 100644 --- a/package/libgpgme/Config.in +++ b/package/libgpgme/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBGPGME bool "libgpgme" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_USE_MMU # libassuan - #gnupg is not needed to build, but at runtime. - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBASSUAN help diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in index 038a940778..234792977a 100644 --- a/package/python-gnupg/Config.in +++ b/package/python-gnupg/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_GNUPG bool "python-gnupg" - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime help A wrapper for the Gnu Privacy Guard (GPG or GnuPG). From arnout at mind.be Tue Mar 15 21:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] package/libnss: bump to version 3.76 Message-ID: <20220315211223.0E6B18408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e1e941b67035187d153eeb4ececb69fde104311 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 07fb340c33..b4b8be11f6 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_RTM/src/SHA256SUMS +sha256 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 nss-3.76.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a9549e48dd..2f7a265136 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.75 +LIBNSS_VERSION = 3.76 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From fontaine.fabrice at gmail.com Tue Mar 15 21:41:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 22:41:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbdplus: bump to version 0.2.0 Message-ID: <20220315214113.2322315-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://code.videolan.org/videolan/libbdplus/-/blob/0.2.0/ChangeLog Signed-off-by: Fabrice Fontaine --- package/libbdplus/libbdplus.hash | 6 +++--- package/libbdplus/libbdplus.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash index 6abc0e4970..2445af6e82 100644 --- a/package/libbdplus/libbdplus.hash +++ b/package/libbdplus/libbdplus.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk index b0e8b1488d..600cb6b545 100644 --- a/package/libbdplus/libbdplus.mk +++ b/package/libbdplus/libbdplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBDPLUS_VERSION = 0.1.2 +LIBBDPLUS_VERSION = 0.2.0 LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 LIBBDPLUS_LICENSE = LGPL-2.1+ -- 2.35.1 From arnout at mind.be Tue Mar 15 21:43:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:43:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/boinc: disable fcgi In-Reply-To: <20220308211205.3682-1-fontaine.fabrice@gmail.com> References: <20220308211205.3682-1-fontaine.fabrice@gmail.com> Message-ID: <310520fc-337b-37d3-06b7-b2c236c585b7@mind.be> On 08/03/2022 22:12, Fabrice Fontaine wrote: > libfcgi raises the following build failure with glibc 2.34 and gcc > 11.2.0: > > In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, > from boinc_fcgi.h:19, > from coproc.cpp:22: > /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous > 582 | __attribute_malloc__ __attr_dealloc_fclose; > | ^~~~~~~~~~~~~~~~~~~~~ > > RawTherapee has the same kind of issue: > - https://github.com/Beep6581/RawTherapee/issues/6324 > - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 > > Fixes: > - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/boinc/boinc.mk | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk > index 7f78c427ea..0d992f136c 100644 > --- a/package/boinc/boinc.mk > +++ b/package/boinc/boinc.mk > @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ > BOINC_CONF_OPTS = \ > --disable-apps \ > --disable-boinczip \ > + --disable-fcgi \ > --disable-manager \ > --disable-server \ > --enable-client \ > @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) > BOINC_DEPENDENCIES += freetype > endif > > -ifeq ($(BR2_PACKAGE_LIBFCGI),y) > -BOINC_DEPENDENCIES += libfcgi > -BOINC_CONF_OPTS += --enable-fcgi > -else > -BOINC_CONF_OPTS += --disable-fcgi > -endif > - > BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" > > # Remove boinc-client because it is incompatible with buildroot From arnout at mind.be Tue Mar 15 21:45:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:45:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix dnssec static build In-Reply-To: <20220308231733.176991-1-fontaine.fabrice@gmail.com> References: <20220308231733.176991-1-fontaine.fabrice@gmail.com> Message-ID: On 09/03/2022 00:17, Fabrice Fontaine wrote: > Drop -DHAVE_DNSSEC_STATIC which has been added by commit > e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises > the following static build failure because dnsmasq will wrongly append > "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": > > /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' > > Strangely enough, this is the first time this build failure is raised by > the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: > https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 I also couldn't find an explanation, except that static build with dnssec is probably relatively rare, and it can be hidden by all the other errors that were there - e.g. apparently before the last bump, the build already failed because of nettle. Applied to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e > > Signed-off-by: Fabrice Fontaine > --- > package/dnsmasq/dnsmasq.mk | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk > index 0569475fc4..230e4a8116 100644 > --- a/package/dnsmasq/dnsmasq.mk > +++ b/package/dnsmasq/dnsmasq.mk > @@ -26,9 +26,6 @@ endif > ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) > DNSMASQ_DEPENDENCIES += gmp nettle > DNSMASQ_COPTS += -DHAVE_DNSSEC > -ifeq ($(BR2_STATIC_LIBS),y) > -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC > -endif > endif > > ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) From arnout at mind.be Tue Mar 15 21:47:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:47:10 +0100 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC In-Reply-To: <20220309132835.7251-1-abrodkin@synopsys.com> References: <20220309132835.7251-1-abrodkin@synopsys.com> Message-ID: <0fc0da93-ce87-7965-be20-f197d0825cbe@mind.be> On 09/03/2022 14:28, Alexey Brodkin via buildroot wrote: > This patch adds support of ARC architecture in Qt's JS core and Webkit. > The change itself is quite straight-forward: > > 1. Enable JS core for ARC > 2. Make sure so-called "large memory model" is used, > i.e. relocations with long jumps are being generated for global > symbols, as otherwise insanely huge libqt5webkit.so fails to link > because some symbols might be more than 32 MiB away from each other. > 3. Make the original WebKit build system aware of yet another CPU > architecture with explicitly disabled JIT in JS core for ARC. > > Obviously, this one depends on [1]. > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ > > Signed-off-by: Alexey Brodkin > Cc: Thomas Petazzoni > Cc: Peter Seiderer > --- > package/qt5/Config.in | 2 +- > package/qt5/qt5base/qt5base.mk | 13 +++ > .../0005-Add-support-for-ARC-processors.patch | 93 +++++++++++++++++++ > 3 files changed, 107 insertions(+), 1 deletion(-) > create mode 100644 package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index f2b1ff4a19..cbb2e06a21 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > bool > default y > # Javascript engine is only available on certain architectures > - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel > + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc > # ARM needs BLX, so v5t+ > depends on !BR2_ARM_CPU_ARMV4 > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef38d03253..b25e0f44b6 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -201,6 +201,19 @@ endif > QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) > QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) > > +ifeq ($(BR2_arc),y) > +# In case of -Os (which is default in BR) gcc will use millicode implementation > +# from libgcc. That along with performance degradation may lead to issues during > +# linkage stage. In case of QtWebkit exactly that happens - millicode functions > +# get put way too far from caller functions and so linker fails. > +# To solve that problem we explicitly disable millicode call generation for Qt. > +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) > +# it's good to firce compiler to not assume short or even medium-length calls > +# could be used. I.e. always use long jump instaructions. > +# Otherwise there's a high risk of hitting link-time failures. > +QT5BASE_CFLAGS += -mno-millicode -mlong-calls > +endif > + > ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) > QT5BASE_CONFIGURE_OPTS += -eglfs > QT5BASE_DEPENDENCIES += libegl > diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > new file mode 100644 > index 0000000000..92f023eab6 > --- /dev/null > +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > @@ -0,0 +1,93 @@ > +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 > +From: Alexey Brodkin > +Date: Mon, 21 Feb 2022 18:28:00 +0300 > +Subject: [PATCH] Add support for ARC processors > + > +Signed-off-by: Alexey Brodkin Upstream status of this patch? Anyway, applied to master, thanks. Regards, Arnout > +--- > + CMakeLists.txt | 4 +++- > + Source/JavaScriptCore/CMakeLists.txt | 3 ++- > + Source/WTF/wtf/Platform.h | 8 ++++++++ > + Source/WTF/wtf/dtoa/utils.h | 2 +- > + Source/cmake/OptionsQt.cmake | 4 ++++ > + 5 files changed, 18 insertions(+), 3 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 31a2ea1fd..f0dfbda5b 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) > + else () > + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) > + endif () > +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") > ++ set(WTF_CPU_ARC 1) > ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > + set(WTF_CPU_ARM 1) > + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") > + set(WTF_CPU_ARM64 1) > +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt > +index 937b3ed00..205dde288 100644 > +--- a/Source/JavaScriptCore/CMakeLists.txt > ++++ b/Source/JavaScriptCore/CMakeLists.txt > +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) > + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) > + endif () > + > +-if (WTF_CPU_ARM) > ++if (WTF_CPU_ARC) > ++elseif (WTF_CPU_ARM) > + elseif (WTF_CPU_ARM64) > + elseif (WTF_CPU_ALPHA) > + elseif (WTF_CPU_HPPA) > +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h > +index 5717f3ea1..b327ed693 100644 > +--- a/Source/WTF/wtf/Platform.h > ++++ b/Source/WTF/wtf/Platform.h > +@@ -349,6 +349,14 @@ > + > + #endif /* ARM */ > + > ++/* CPU(ARC) - ARC */ > ++#if defined(__arc__) > ++#define WTF_CPU_ARC 1 > ++#if defined(__BIG_ENDIAN__) > ++#define WTF_CPU_BIG_ENDIAN 1 > ++#endif > ++#endif > ++ > + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) > + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 > + #endif > +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h > +index 889642cee..8f1e9933e 100644 > +--- a/Source/WTF/wtf/dtoa/utils.h > ++++ b/Source/WTF/wtf/dtoa/utils.h > +@@ -49,7 +49,7 @@ > + defined(__ARMEL__) || \ > + defined(_MIPS_ARCH_MIPS32R2) > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) > ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > + #elif defined(_M_IX86) || defined(__i386__) > + #if defined(_WIN32) > +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake > +index ec6081de0..e1a5efc1e 100644 > +--- a/Source/cmake/OptionsQt.cmake > ++++ b/Source/cmake/OptionsQt.cmake > +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) > + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > + endif () > + > ++if (WTF_CPU_ARC) > ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > ++endif () > ++ > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) > + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) > +-- > +2.25.1 > + From arnout at mind.be Tue Mar 15 21:47:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:47:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: bump to version 6.03 In-Reply-To: <20220309210953.540376-1-fontaine.fabrice@gmail.com> References: <20220309210953.540376-1-fontaine.fabrice@gmail.com> Message-ID: On 09/03/2022 22:09, Fabrice Fontaine wrote: > xlib_libXft and xlib_libXi are now mandatory > > https://www.jwz.org/xscreensaver/changelog.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/xscreensaver/Config.in | 2 ++ > package/xscreensaver/xscreensaver.hash | 2 +- > package/xscreensaver/xscreensaver.mk | 18 +++--------------- > 3 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in > index 10b2b7012c..48eefdfa70 100644 > --- a/package/xscreensaver/Config.in > +++ b/package/xscreensaver/Config.in > @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_JPEG > select BR2_PACKAGE_XLIB_LIBX11 > + select BR2_PACKAGE_XLIB_LIBXFT > + select BR2_PACKAGE_XLIB_LIBXI > select BR2_PACKAGE_XLIB_LIBXT > help > XScreenSaver is the standard screen saver collection shipped > diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash > index 26ecd8bbbf..27ef7d8f00 100644 > --- a/package/xscreensaver/xscreensaver.hash > +++ b/package/xscreensaver/xscreensaver.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz > +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz > sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h > sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h > diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk > index 46dedc3211..0a91d22d14 100644 > --- a/package/xscreensaver/xscreensaver.mk > +++ b/package/xscreensaver/xscreensaver.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XSCREENSAVER_VERSION = 5.45 > +XSCREENSAVER_VERSION = 6.03 > XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver > > # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. > @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ > libgtk2 \ > libxml2 \ > xlib_libX11 \ > + xlib_libXft \ > + xlib_libXi \ > xlib_libXt \ > $(TARGET_NLS_DEPENDENCIES) \ > host-intltool > @@ -51,20 +53,6 @@ else > XSCREENSAVER_CONF_OPTS += --with-systemd=no > endif > > -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) > -XSCREENSAVER_CONF_OPTS += --with-xft=yes > -XSCREENSAVER_DEPENDENCIES += xlib_libXft > -else > -XSCREENSAVER_CONF_OPTS += --with-xft=no > -endif > - > -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) > -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes > -XSCREENSAVER_DEPENDENCIES += xlib_libXi > -else > -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no > -endif > - > ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) > XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes > XSCREENSAVER_DEPENDENCIES += xlib_libXinerama From arnout at mind.be Tue Mar 15 21:47:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:47:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: add USBGUARD_CPE_ID_VENDOR In-Reply-To: <20220309213459.677932-1-fontaine.fabrice@gmail.com> References: <20220309213459.677932-1-fontaine.fabrice@gmail.com> Message-ID: On 09/03/2022 22:34, Fabrice Fontaine wrote: > cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/usbguard/usbguard.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk > index 8df8aedeb3..54a4031056 100644 > --- a/package/usbguard/usbguard.mk > +++ b/package/usbguard/usbguard.mk > @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 > USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) > USBGUARD_LICENSE = GPL-2.0+ > USBGUARD_LICENSE_FILES = LICENSE > +USBGUARD_CPE_ID_VENDOR = usbguard_project > USBGUARD_SELINUX_MODULES = usbguard > USBGUARD_CONF_OPTS = \ > --with-bundled-catch \ From arnout at mind.be Tue Mar 15 21:48:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:48:12 +0100 Subject: [Buildroot] [PATCH] docs/manual: Remove link to emdebian and replace with debian port page In-Reply-To: <20220309215531.638593-1-yannick.brosseau@gmail.com> References: <20220309215531.638593-1-yannick.brosseau@gmail.com> Message-ID: <3f1330db-ce9e-dfa5-4b61-beba3b200ebe@mind.be> On 09/03/2022 22:55, Yannick Brosseau wrote: > In the list of full distribution, the FAQ contains a link to Emdebian. > This project stopped receiving updates in 2014 and the main web page does not exist anymore. > This replace the entry with a link to the Debian ports page. > > Signed-off-by: Yannick Brosseau Applied to master, thanks. Regards, Arnout > --- > docs/manual/faq-troubleshooting.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt > index 5adf3fa6ce..b08bf9bc4a 100644 > --- a/docs/manual/faq-troubleshooting.txt > +++ b/docs/manual/faq-troubleshooting.txt > @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: > > * http://www.openembedded.org[openembedded] > * https://www.yoctoproject.org[yocto] > -* http://www.emdebian.org[emdebian] > +* https://www.debian.org/ports/[Debian] > * https://fedoraproject.org/wiki/Architectures[Fedora] > * http://en.opensuse.org/Portal:ARM[openSUSE ARM] > * http://archlinuxarm.org[Arch Linux ARM] From arnout at mind.be Tue Mar 15 21:48:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:48:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: bump to version LTS_01_2022_Ref01 In-Reply-To: <20220309220219.787315-1-fontaine.fabrice@gmail.com> References: <20220309220219.787315-1-fontaine.fabrice@gmail.com> Message-ID: <9e834c37-6052-93c5-9ee7-b73268a7389b@mind.be> On 09/03/2022 23:02, Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_01_2022_Ref01 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...c-fix-mismatching-function-prototype.patch | 35 ------------------- > package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- > package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- > 3 files changed, 2 insertions(+), 37 deletions(-) > delete mode 100644 package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch > > diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch > deleted file mode 100644 > index 0c262e6c46..0000000000 > --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 > -From: Francesco Giancane <30423178+fgiancane8 at users.noreply.github.com> > -Date: Fri, 2 Jul 2021 20:47:38 +0200 > -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) > - > -The reported function raises a warning when compilers assert the flag > -`-Warray-parameter=`, signaling that an array-type argument was promoted > -to a pointer-type argument. > - > -While in practice in most C implementations this is correct, fixing the > -warning (and, in this case, indicating the maximum size for the array) > -would represent a best-practice for finding out-of-bound accesses or > -identifying wrongly-sized arrays passed in the function. > - > -Signed-off-by: Francesco Giancane > -[Retrieved from: > -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] > -Signed-off-by: Fabrice Fontaine > ---- > - src/hmac.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/hmac.c b/src/hmac.c > -index 53f2411f8..160af9d2f 100644 > ---- a/c-utility/src/hmac.c > -+++ b/c-utility/src/hmac.c > -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, > - * sha Error Code. > - * > - */ > --int hmacResult(HMACContext *ctx, uint8_t *digest) > -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) > - { > - if (!ctx) return shaNull; > - > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash > index 72fa99c44d..5dbb530954 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash > @@ -1,5 +1,5 @@ > # Locally computed: > -sha256 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz > +sha256 082e41f7cdf06fec036b8cfa1793f03e81ba527b55ea13c66be0e4cf9f20ff7b azure-iot-sdk-c-LTS_01_2022_Ref01-br1.tar.gz > > # Hash for license files: > sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > index e6de8c851b..874646c445 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 > +AZURE_IOT_SDK_C_VERSION = LTS_01_2022_Ref01 > AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c > AZURE_IOT_SDK_C_SITE_METHOD = git > AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From arnout at mind.be Tue Mar 15 21:48:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:48:50 +0100 Subject: [Buildroot] [PATCH] package/libgcrypt: bump to version 1.10.0 In-Reply-To: <20220310114047.919725-1-francois.perrad@gadz.org> References: <20220310114047.919725-1-francois.perrad@gadz.org> Message-ID: <73df06d6-44e7-09fb-06ae-6dc5089d338b@mind.be> On 10/03/2022 12:40, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > .../0001-configure.ac-add-an-option-to-disable-tests.patch | 2 +- > package/libgcrypt/libgcrypt.hash | 6 ++---- > package/libgcrypt/libgcrypt.mk | 2 +- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch > index 4ef02fba6..e32f93863 100644 > --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch > +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch > @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac > index e8c8cd39..1a6b61e5 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], > +@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], > AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) > > > diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash > index 23562d0ed..2ea4d74c2 100644 > --- a/package/libgcrypt/libgcrypt.hash > +++ b/package/libgcrypt/libgcrypt.hash > @@ -1,7 +1,5 @@ > -# From https://www.gnupg.org/download/integrity_check.html > -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 > # Locally calculated after checking signature > -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig > +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig > # using key 6DAA6E64A76D2840571B4902528897B826403ADA > -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 > +sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 > sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB > diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk > index e5fdfcfc8..c6c88f607 100644 > --- a/package/libgcrypt/libgcrypt.mk > +++ b/package/libgcrypt/libgcrypt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBGCRYPT_VERSION = 1.9.4 > +LIBGCRYPT_VERSION = 1.10.0 > LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 > LIBGCRYPT_LICENSE = LGPL-2.1+ > LIBGCRYPT_LICENSE_FILES = COPYING.LIB From arnout at mind.be Tue Mar 15 21:49:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:49:08 +0100 Subject: [Buildroot] [PATCH] package/libglib2: bump to version 2.70.4 In-Reply-To: <20220310114122.919781-1-francois.perrad@gadz.org> References: <20220310114122.919781-1-francois.perrad@gadz.org> Message-ID: <9b06cb4d-5616-8c9e-5686-5b3f66690605@mind.be> On 10/03/2022 12:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- > ...03-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- > ...son.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 2 +- > 5 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > index 2f9522893..b5603c92f 100644 > --- a/package/libglib2/0002-remove-cpp-requirement.patch > +++ b/package/libglib2/0002-remove-cpp-requirement.patch > @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 > @@ -1,4 +1,4 @@ > -project('glib', 'c', 'cpp', > +project('glib', 'c', > - version : '2.70.0', > + version : '2.70.4', > # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships > meson_version : '>= 0.49.2', > @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', > @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 > > cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() > > -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs > +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs > #endif''') > endif > > @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 > g_have_gnuc_varargs = cc.compiles(''' > void some_func (void) { > int a(int p1, int p2, int p3); > -@@ -2330,7 +2315,6 @@ subdir('gobject') > +@@ -2339,7 +2324,6 @@ subdir('gobject') > subdir('gthread') > subdir('gmodule') > subdir('gio') > diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch > index 67aea7982..e21239301 100644 > --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch > +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch > @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build > index 3c615b7..7cae4e8 100644 > --- a/meson.build > +++ b/meson.build > -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' > +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' > # building with -Wbad-function-cast. > '-Wno-bad-function-cast', > '-Wno-cast-function-type', > diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > index a29587bd3..db77a7320 100644 > --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build > index 29473d26b..112d4ada9 100644 > --- a/gio/meson.build > +++ b/gio/meson.build > -@@ -831,6 +831,7 @@ pkg.generate(libgio, > +@@ -841,6 +841,7 @@ pkg.generate(libgio, > variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), > 'schemasdir=' + join_paths('${datadir}', schemas_subdir), > 'bindir=' + join_paths('${prefix}', get_option('bindir')), > @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build > index f78f32969..6c5486699 100644 > --- a/glib/meson.build > +++ b/glib/meson.build > -@@ -377,6 +377,7 @@ pkg.generate(libglib, > +@@ -384,6 +384,7 @@ pkg.generate(libglib, > subdirs : ['glib-2.0'], > extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, > variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash > index 580be3e08..f0f0cb55a 100644 > --- a/package/libglib2/libglib2.hash > +++ b/package/libglib2/libglib2.hash > @@ -1,4 +1,4 @@ > -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum > -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz > +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum > +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz > # License files, locally calculated > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > index d3cba1a8b..18f5b329c 100644 > --- a/package/libglib2/libglib2.mk > +++ b/package/libglib2/libglib2.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGLIB2_VERSION_MAJOR = 2.70 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz > LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) > LIBGLIB2_LICENSE = LGPL-2.1+ From arnout at mind.be Tue Mar 15 21:49:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:49:28 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.33 In-Reply-To: <20220310114141.919836-1-francois.perrad@gadz.org> References: <20220310114141.919836-1-francois.perrad@gadz.org> Message-ID: <71887a9d-2d28-0bd1-22bc-b9a9cd8c7968@mind.be> On 10/03/2022 12:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/libgtk3/libgtk3.hash | 4 ++-- > package/libgtk3/libgtk3.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash > index c23abcb51..23ce1f42b 100644 > --- a/package/libgtk3/libgtk3.hash > +++ b/package/libgtk3/libgtk3.hash > @@ -1,5 +1,5 @@ > -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum > -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz > +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum > +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz > > # Hash for license file: > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING > diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk > index f298afade..cd0a75eb2 100644 > --- a/package/libgtk3/libgtk3.mk > +++ b/package/libgtk3/libgtk3.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGTK3_VERSION_MAJOR = 3.24 > -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 > +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 > LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz > LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) > LIBGTK3_LICENSE = LGPL-2.0+ From arnout at mind.be Tue Mar 15 21:49:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:49:48 +0100 Subject: [Buildroot] [PATCH] package/moarvm: bump to version 2022.02 In-Reply-To: <20220310114153.919891-1-francois.perrad@gadz.org> References: <20220310114153.919891-1-francois.perrad@gadz.org> Message-ID: On 10/03/2022 12:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/moarvm/moarvm.hash | 2 +- > package/moarvm/moarvm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash > index 01e3ee4ae..58e3ce8ac 100644 > --- a/package/moarvm/moarvm.hash > +++ b/package/moarvm/moarvm.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz > +sha256 4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 MoarVM-2022.02.tar.gz > sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt > diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk > index 99e26c73c..db336bfe4 100644 > --- a/package/moarvm/moarvm.mk > +++ b/package/moarvm/moarvm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MOARVM_VERSION = 2021.10 > +MOARVM_VERSION = 2022.02 > MOARVM_SITE = http://moarvm.com/releases > MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz > MOARVM_LICENSE = Artistic-2.0 From arnout at mind.be Tue Mar 15 21:50:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:50:06 +0100 Subject: [Buildroot] [PATCH] package/nano: bump to version 6.2 In-Reply-To: <20220310114201.919946-1-francois.perrad@gadz.org> References: <20220310114201.919946-1-francois.perrad@gadz.org> Message-ID: <4397d658-78de-2e9a-66a5-69d339caab96@mind.be> On 10/03/2022 12:42, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/nano/nano.hash | 4 ++-- > package/nano/nano.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/nano/nano.hash b/package/nano/nano.hash > index 80529437d..69ebc27b7 100644 > --- a/package/nano/nano.hash > +++ b/package/nano/nano.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://www.nano-editor.org/dist/v6/nano-6.0.tar.xz.asc > +# https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz.asc > # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 > -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz > +sha256 2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 nano-6.2.tar.xz > sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING > diff --git a/package/nano/nano.mk b/package/nano/nano.mk > index 30db3249e..e3ecbab56 100644 > --- a/package/nano/nano.mk > +++ b/package/nano/nano.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > NANO_VERSION_MAJOR = 6 > -NANO_VERSION = $(NANO_VERSION_MAJOR).0 > +NANO_VERSION = $(NANO_VERSION_MAJOR).2 > NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) > NANO_SOURCE = nano-$(NANO_VERSION).tar.xz > NANO_LICENSE = GPL-3.0+ From arnout at mind.be Tue Mar 15 21:27:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:46 +0100 Subject: [Buildroot] [git commit] package/boinc: disable fcgi Message-ID: <20220315214147.7C16A8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54cb3b506de44fb8389832a1612b55d179b2cfd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot From arnout at mind.be Tue Mar 15 21:27:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:48 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix dnssec static build Message-ID: <20220315214147.85AC484130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6a4453bd7352d3bb27aef565d9023a1d11209c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop -DHAVE_DNSSEC_STATIC which has been added by commit e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises the following static build failure because dnsmasq will wrongly append "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' Strangely enough, this is the first time this build failure is raised by the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 Fixes: - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dnsmasq/dnsmasq.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4..230e4a8116 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -26,9 +26,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) From arnout at mind.be Tue Mar 15 21:28:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:01 +0100 Subject: [Buildroot] [git commit] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220315214147.AD02784131@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From arnout at mind.be Tue Mar 15 21:27:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:57 +0100 Subject: [Buildroot] [git commit] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220315214147.A40D584130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6a8192081a65fee20b7757ece8880c25c32ee6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a9..d2b03eeb2a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ From arnout at mind.be Tue Mar 15 21:28:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:13 +0100 Subject: [Buildroot] [git commit] package/libgtk3: bump to version 3.24.33 Message-ID: <20220315214147.D647884131@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed721a0b9b3bbb3fca8487b49117f55bbf791180 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb518..23ce1f42bb 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade6..cd0a75eb23 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From arnout at mind.be Tue Mar 15 21:28:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:09 +0100 Subject: [Buildroot] [git commit] package/libglib2: bump to version 2.70.4 Message-ID: <20220315214147.CAEF784130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a8ceb5cb30a9c28447e89c4b5bef67277697935 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- .../0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- .../0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f95228932..b5603c92f4 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', + version : '2.70.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2339,7 +2324,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982e..e212393011 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd31..db77a73203 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08e..f0f0cb55ad 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8bb..18f5b329c7 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From arnout at mind.be Tue Mar 15 21:27:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:54 +0100 Subject: [Buildroot] [git commit] package/xscreensaver: bump to version 6.03 Message-ID: <20220315214147.9ADEB8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbcbd66b0f241184288232972d9cd9d03c9f0ce1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xlib_libXft and xlib_libXi are now mandatory https://www.jwz.org/xscreensaver/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xscreensaver/Config.in | 2 ++ package/xscreensaver/xscreensaver.hash | 2 +- package/xscreensaver/xscreensaver.mk | 18 +++--------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 10b2b7012c..48eefdfa70 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXT help XScreenSaver is the standard screen saver collection shipped diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 26ecd8bbbf..27ef7d8f00 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 46dedc3211..0a91d22d14 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.45 +XSCREENSAVER_VERSION = 6.03 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ libgtk2 \ libxml2 \ xlib_libX11 \ + xlib_libXft \ + xlib_libXi \ xlib_libXt \ $(TARGET_NLS_DEPENDENCIES) \ host-intltool @@ -51,20 +53,6 @@ else XSCREENSAVER_CONF_OPTS += --with-systemd=no endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XSCREENSAVER_CONF_OPTS += --with-xft=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXft -else -XSCREENSAVER_CONF_OPTS += --with-xft=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXi -else -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes XSCREENSAVER_DEPENDENCIES += xlib_libXinerama From arnout at mind.be Tue Mar 15 21:28:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:18 +0100 Subject: [Buildroot] [git commit] package/nano: bump to version 6.2 Message-ID: <20220315214147.E8BCA84130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8c07b68469a7446c16359dd38fdb34bf996527d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 80529437d1..69ebc27b7f 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v6/nano-6.0.tar.xz.asc +# https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz +sha256 2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 nano-6.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 30db3249e7..e3ecbab56f 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From arnout at mind.be Tue Mar 15 21:28:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:16 +0100 Subject: [Buildroot] [git commit] package/moarvm: bump to version 2022.02 Message-ID: <20220315214147.DF6658412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e25d386c0f719cef93553ec60ef697d732ee39a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 01e3ee4aee..58e3ce8ac3 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz +sha256 4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 MoarVM-2022.02.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 99e26c73c9..db336bfe4a 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2021.10 +MOARVM_VERSION = 2022.02 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From arnout at mind.be Tue Mar 15 21:27:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:52 +0100 Subject: [Buildroot] [git commit] qt5: enable JS and WebKit for ARC Message-ID: <20220315214147.9091C84131@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b081717ad6b865b6278940678e432b4a4d07222d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support of ARC architecture in Qt's JS core and Webkit. The change itself is quite straight-forward: 1. Enable JS core for ARC 2. Make sure so-called "large memory model" is used, i.e. relocations with long jumps are being generated for global symbols, as otherwise insanely huge libqt5webkit.so fails to link because some symbols might be more than 32 MiB away from each other. 3. Make the original WebKit build system aware of yet another CPU architecture with explicitly disabled JIT in JS core for ARC. Obviously, this one depends on [1]. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/Config.in | 2 +- package/qt5/qt5base/qt5base.mk | 13 +++ .../0005-Add-support-for-ARC-processors.patch | 93 ++++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index f2b1ff4a19..cbb2e06a21 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE bool default y # Javascript engine is only available on certain architectures - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 010df7ec75..ef02edfc1d 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -201,6 +201,19 @@ endif QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) +ifeq ($(BR2_arc),y) +# In case of -Os (which is default in BR) gcc will use millicode implementation +# from libgcc. That along with performance degradation may lead to issues during +# linkage stage. In case of QtWebkit exactly that happens - millicode functions +# get put way too far from caller functions and so linker fails. +# To solve that problem we explicitly disable millicode call generation for Qt. +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) +# it's good to firce compiler to not assume short or even medium-length calls +# could be used. I.e. always use long jump instaructions. +# Otherwise there's a high risk of hitting link-time failures. +QT5BASE_CFLAGS += -mno-millicode -mlong-calls +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch new file mode 100644 index 0000000000..92f023eab6 --- /dev/null +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch @@ -0,0 +1,93 @@ +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 21 Feb 2022 18:28:00 +0300 +Subject: [PATCH] Add support for ARC processors + +Signed-off-by: Alexey Brodkin +--- + CMakeLists.txt | 4 +++- + Source/JavaScriptCore/CMakeLists.txt | 3 ++- + Source/WTF/wtf/Platform.h | 8 ++++++++ + Source/WTF/wtf/dtoa/utils.h | 2 +- + Source/cmake/OptionsQt.cmake | 4 ++++ + 5 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31a2ea1fd..f0dfbda5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) + else () + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) + endif () +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") ++ set(WTF_CPU_ARC 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 937b3ed00..205dde288 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) + endif () + +-if (WTF_CPU_ARM) ++if (WTF_CPU_ARC) ++elseif (WTF_CPU_ARM) + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5717f3ea1..b327ed693 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -349,6 +349,14 @@ + + #endif /* ARM */ + ++/* CPU(ARC) - ARC */ ++#if defined(__arc__) ++#define WTF_CPU_ARC 1 ++#if defined(__BIG_ENDIAN__) ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++#endif ++ + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 889642cee..8f1e9933e 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +index ec6081de0..e1a5efc1e 100644 +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) + endif () + ++if (WTF_CPU_ARC) ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) ++endif () ++ + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) +-- +2.25.1 + From arnout at mind.be Tue Mar 15 21:28:06 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:06 +0100 Subject: [Buildroot] [git commit] package/libgcrypt: bump to version 1.10.0 Message-ID: <20220315214147.C0E5C8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d96b9ed0738bae270c479bdaf21eebd4c1f9930d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-configure.ac-add-an-option-to-disable-tests.patch | 2 +- package/libgcrypt/libgcrypt.hash | 6 ++---- package/libgcrypt/libgcrypt.mk | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index 4ef02fba65..e32f938634 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 23562d0ed3..2ea4d74c2e 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,5 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 +sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index e5fdfcfc8e..c6c88f6076 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.9.4 +LIBGCRYPT_VERSION = 1.10.0 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From arnout at mind.be Tue Mar 15 21:28:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:04 +0100 Subject: [Buildroot] [git commit] package/azure-iot-sdk-c: bump to version LTS_01_2022_Ref01 Message-ID: <20220315214147.B74BF8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06bb3640c13191f7515f2140c2207f5b7a2cb7ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_01_2022_Ref01 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...hmac-c-fix-mismatching-function-prototype.patch | 35 ---------------------- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch deleted file mode 100644 index 0c262e6c46..0000000000 --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 -From: Francesco Giancane <30423178+fgiancane8 at users.noreply.github.com> -Date: Fri, 2 Jul 2021 20:47:38 +0200 -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) - -The reported function raises a warning when compilers assert the flag -`-Warray-parameter=`, signaling that an array-type argument was promoted -to a pointer-type argument. - -While in practice in most C implementations this is correct, fixing the -warning (and, in this case, indicating the maximum size for the array) -would represent a best-practice for finding out-of-bound accesses or -identifying wrongly-sized arrays passed in the function. - -Signed-off-by: Francesco Giancane -[Retrieved from: -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] -Signed-off-by: Fabrice Fontaine ---- - src/hmac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hmac.c b/src/hmac.c -index 53f2411f8..160af9d2f 100644 ---- a/c-utility/src/hmac.c -+++ b/c-utility/src/hmac.c -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, - * sha Error Code. - * - */ --int hmacResult(HMACContext *ctx, uint8_t *digest) -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) - { - if (!ctx) return shaNull; - diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index 72fa99c44d..5dbb530954 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz +sha256 082e41f7cdf06fec036b8cfa1793f03e81ba527b55ea13c66be0e4cf9f20ff7b azure-iot-sdk-c-LTS_01_2022_Ref01-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e6de8c851b..874646c445 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 +AZURE_IOT_SDK_C_VERSION = LTS_01_2022_Ref01 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From fontaine.fabrice at gmail.com Tue Mar 15 22:03:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 23:03:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbluray: bump to version 1.3.1 Message-ID: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog Signed-off-by: Fabrice Fontaine --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c85866..6e62bb49a1 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38d..a9eb3c67c6 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 15 22:10:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 23:10:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/dav1d: use official tarball Message-ID: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/dav1d/dav1d.hash | 3 ++- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae7..5e838b0951 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8..ecc4cc55c3 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -5,8 +5,8 @@ ################################################################################ DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES -- 2.35.1 From peter at korsgaard.com Tue Mar 15 22:17:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:17:56 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf-xlib: new package In-Reply-To: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:55 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Message-ID: <87bky6vp0r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Deprecated Xlib integration for GdkPixbuf. > gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since > version 2.42.0 and > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c > resulting in the following "hidden" warnings with xscreensaver since > commit a7b51ed3013c919b293deb95299e33363fb9df70: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 15 22:18:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:18:01 +0100 Subject: [Buildroot] [PATCH 2/2] package/xscreensaver: add gdk-pixbuf-xlib dependency In-Reply-To: <20220302174456.1641125-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:56 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> <20220302174456.1641125-2-fontaine.fabrice@gmail.com> Message-ID: <877d8uvp0m.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version > 2.42.0 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the > following "hidden" warnings: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 15 21:52:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:52:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gdk-pixbuf-xlib: new package Message-ID: <20220315220935.C2C7D8414C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d78d72d65cb1f6e7da4af2a2cc6defadb8d7b9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 559df4ef2888efda8a0142a9b61a1206e6ab0fff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1370495a84..fad5c13844 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -821,6 +821,7 @@ F: package/cairo/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index e420f02b37..d45e6d3a86 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1441,6 +1441,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) From peter at korsgaard.com Tue Mar 15 21:53:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:53:02 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xscreensaver: add gdk-pixbuf-xlib dependency Message-ID: <20220315220935.CB7058414D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f203281b346344d363a71a6e7b54da1c285120f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.2 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 35f02050be12b86cdd2220e09c72fd2586346068) Signed-off-by: Peter Korsgaard --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index d773c69913..c18f7cc7fd 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index c3c9ec89c3..7f38434eb5 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -14,6 +14,7 @@ XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ From peter at korsgaard.com Tue Mar 15 21:49:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:49:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdk-pixbuf-xlib: new package Message-ID: <20220315220952.A481B84156@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b71eb2b09041647a0fba2007c6b967535269c33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 559df4ef2888efda8a0142a9b61a1206e6ab0fff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8422fad579..91e28387bc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -848,6 +848,7 @@ F: package/daq3/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index cb94e30be3..4b2db039c5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1477,6 +1477,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) From peter at korsgaard.com Tue Mar 15 21:53:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:53:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xscreensaver: add gdk-pixbuf-xlib dependency Message-ID: <20220315220952.ADCED84157@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a1463d88f3c38d35d58c60c52d0627d9d45f94f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.2 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 35f02050be12b86cdd2220e09c72fd2586346068) Signed-off-by: Peter Korsgaard --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index d773c69913..c18f7cc7fd 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index f73a75bf14..46dedc3211 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -15,6 +15,7 @@ XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ From peter at korsgaard.com Tue Mar 15 22:18:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:18:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: security bump to 1.17.8 Message-ID: <20220315221007.4946084159@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab6016db98ca869b23cab1d8f5b3f0a2a05ee1db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x go1.17.8 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. https://go.dev/doc/devel/release#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 1cd8faa8d3b525fc01c21bc03ddd617062516699) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index fdf342e602..85e6adfb8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz +sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 56a21dfe55..3df16c9a68 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.7 +GO_VERSION = 1.17.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Tue Mar 15 22:20:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:20:05 +0100 Subject: [Buildroot] [git commit] package/go: security bump to 1.17.8 In-Reply-To: <20220304170333.BD28382A39@busybox.osuosl.org> (Peter Korsgaard's message of "Fri, 4 Mar 2022 18:11:36 +0100") References: <20220304170333.BD28382A39@busybox.osuosl.org> Message-ID: <8735jivox6.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=1cd8faa8d3b525fc01c21bc03ddd617062516699 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > go1.17.8 includes a security fix to the regexp/syntax package, as well as bug > fixes to the compiler, runtime, the go command, and the crypto/x509, and net > packages. > https://go.dev/doc/devel/release#go1.17.minor > Signed-off-by: Christian Stewart > Signed-off-by: Peter Korsgaard Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 1.16.15, which contains the same security fixes. -- Bye, Peter Korsgaard From avijitnsec at gmail.com Wed Mar 16 01:04:02 2022 From: avijitnsec at gmail.com (Avijit Das) Date: Tue, 15 Mar 2022 19:04:02 -0600 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: References: Message-ID: Hi, I am building Buildroot for an imx8mm board. The HDMI display is up. I validated the display using the fb-test. I am trying to enable a graphics library, either gtk3 or qt5. *gtk3 * When I am enabling the gtk3 library, if I run the demo application, I am getting the following error. # /usr/bin/gtk3-demo (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: # I have tried setting the display to localhost:0.0, did not work. *QT5* The widget library is not building. There is a compilation error: qkeyeventtransition.o .obj/qmouseeventtransition.o .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so -lpthread -lrt -lpthread -ldl ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 rm -f ../../lib/libQt5Widgets.so.5.15.8 mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 rm -f ../../lib/libQt5Widgets.so rm -f ../../lib/libQt5Widgets.so.5 rm -f ../../lib/libQt5Widgets.so.5.15 mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 make[2]: *** [Makefile:51: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:292: /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 I have attached the config file. Can you please suggest? Thanks, Avijit -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: freescale_imx8mmevk_defconfig Type: application/octet-stream Size: 2514 bytes Desc: not available URL: From james.hilliard1 at gmail.com Wed Mar 16 06:02:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Mar 2022 00:02:19 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220316060219.3448648-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. Signed-off-by: James Hilliard --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 23 +++---------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..ef677855b2 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From peter at korsgaard.com Wed Mar 16 07:03:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:03:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/go: security bump to 1.16.15 Message-ID: <20220316070128.EDA158414A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c72c5f36c798a357e98b7a1cbb9e5a8d73635158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x go1.16.15 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and to the net package. https://go.dev/doc/devel/release#go1.16.minor Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index b4d4e05e3c..7b5eb529bc 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 467898cd3a216de54dcb9014f541efe77e9b79a7154dbc1fd2dd778b0c63fb56 go1.16.14.src.tar.gz +sha256 90a08c689279e35f3865ba510998c33a63255c36089b3ec206c912fc0568c3d3 go1.16.15.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index cc57d0d86d..b4c5886c3a 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.14 +GO_VERSION = 1.16.15 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Wed Mar 16 07:14:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:14:44 +0100 Subject: [Buildroot] [PATCH] package/gdb: bump 11.x version to 11.2 In-Reply-To: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni via buildroot's message of "Sun, 13 Feb 2022 23:01:15 +0100") References: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> Message-ID: <87y21atlln.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > This is a minor corrective release over GDB 11.1, fixing the following issues: > PR sim/28302 (gdb fails to build with glibc 2.34) > PR build/28318 (std::thread support configure check does not use > CXX_DIALECT) > PR gdb/28405 (arm-none-eabi: internal-error: ptid_t > remote_target::select_thread_for_ambiguous_stop_reply(const > target_waitstatus*): Assertion `first_resumed_thread != nullptr' > failed) > PR tui/28483 ([gdb/tui] breakpoint creation not displayed) > PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) > PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) > PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) > PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) > Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was > merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. > Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as > commit df9ebc472a162306dee8ba6e02b99963c2babb7c? > Drop patch 0009-gdbserver-aarch64-support.patch, which was merged > upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:18:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:18:03 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) In-Reply-To: <2c28b619-784f-6cf5-b2e1-6cae707051be@mind.be> (Arnout Vandecappelle's message of "Sat, 5 Mar 2022 15:51:20 +0100") References: <20220214154925.6014-1-ps.report@gmx.net> <2c28b619-784f-6cf5-b2e1-6cae707051be@mind.be> Message-ID: <87tubytlg4.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/02/2022 16:49, Peter Seiderer wrote: >> For details see [1] and [2]. >> [1] >> https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog >> [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes >> Signed-off-by: Peter Seiderer > Bugfix bump, so applied to master, thanks. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:27:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:27:55 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: remove override in conditional In-Reply-To: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:24:39 +0100") References: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> Message-ID: <87pmmmtkzo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:28:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:28:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: fix build without libvirtd In-Reply-To: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:38:51 +0100") References: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> Message-ID: <87lexatkys.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without libvirtd raised since the > addition of the package in commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and > https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: > ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem > encountered: Requested the Interface driver without netcf or udev and > libvirtd support > Fixes: > - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:29:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:29:27 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 In-Reply-To: <20220306120902.132254-1-francois.perrad@gadz.org> (Francois Perrad's message of "Sun, 6 Mar 2022 13:09:02 +0100") References: <20220306120902.132254-1-francois.perrad@gadz.org> Message-ID: <87h77ytkx4.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > - fix CVE-2021-30560 > - remove merged patch > - moved from xmlsoft.org to gnome.org > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:16:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:16:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220316072056.3E5F88418E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04aa0138485c2016033f18a1e466ae2f0759316b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a586f0a283cd69f436bc6d0cff484460b412a1ce) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..748a36e0be 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 40fd518a58..7be721da45 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From peter at korsgaard.com Wed Mar 16 07:26:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:26:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220316072056.49E9B84194@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c6a9bb51fb32f9036edd5522a933c4668eec6ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard (cherry picked from commit 949aee637738341690b3a29a7dc2eb7572c164f1) [Peter: drop 5.15.x / 5.16.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 3f796b252b..da50a2ced5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.90" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.103" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index e22ac924bc..2589f43b1d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fb9867525c..2554d4aace 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Wed Mar 16 07:27:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:27:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: remove override in conditional Message-ID: <20220316072056.536F884196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61796702964b500ec7548d142e2cbeef14dda544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3d7f852ac5afb09f0a9a0b5f441403a98bc0f410) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) From peter at korsgaard.com Wed Mar 16 07:29:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:29:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libxslt: security bump to version 1.1.35 Message-ID: <20220316072056.5EC4E8418E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caddd00d7b7ce4164c1a58811907867bf73a3f90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - fix CVE-2021-30560 - remove merged patch, drop autoreconf - moved from xmlsoft.org to gnome.org - spaces in hash file Signed-off-by: Francois Perrad [yann.morin.1998 at free.fr: - drop autoreconf as no longer patching - also switch home in Config.in ] Signed-off-by: Yann E. MORIN (cherry picked from commit acf5b437cc329a392f26e5367de1f64b3601b605) Signed-off-by: Peter Korsgaard --- ...Fix-xml2-config-check-in-configure-script.patch | 31 ---------------------- package/libxslt/Config.in | 2 +- package/libxslt/libxslt.hash | 6 ++--- package/libxslt/libxslt.mk | 7 +++-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb235..0000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index dfe5b99f04..643bce2a61 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://xmlsoft.org/xslt/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839e..39523a6953 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d2521..df0286e986 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft -# We're patching configure.ac -LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ From peter at korsgaard.com Wed Mar 16 07:27:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:27:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: remove override in conditional Message-ID: <20220316072123.3D712841D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c80e612f5eeeaccf3bdefb8192507da6ae4997f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3d7f852ac5afb09f0a9a0b5f441403a98bc0f410) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) From peter at korsgaard.com Wed Mar 16 07:15:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:15:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220316072123.292DE841D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6001c72e6fc6d6689ba98a18266a168c953dda81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a586f0a283cd69f436bc6d0cff484460b412a1ce) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..748a36e0be 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 40fd518a58..7be721da45 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From peter at korsgaard.com Wed Mar 16 07:25:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:25:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220316072123.34B69841CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec2eea8e7ba5938b703d719269839700eb7cb61b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard (cherry picked from commit 949aee637738341690b3a29a7dc2eb7572c164f1) [Peter: drop 5.16.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 0d7464d1da..75e0a62347 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 116d4af1d6..0d7489e679 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz +sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 89307fdb99..53bfd0a2b3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -374,14 +374,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 - default "5.15.13" if BR2_KERNEL_HEADERS_5_15 + default "5.15.26" if BR2_KERNEL_HEADERS_5_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Wed Mar 16 07:28:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:28:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix build without libvirtd Message-ID: <20220316072123.47ADC841D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=50e83f59bd187c69e182b8034a34d11909f3c526 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 87f1dd7b52deedb5a7f50a43e4b1dd1d23313395) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index e7bfe6964d..5b6a451264 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -38,7 +38,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -195,7 +194,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -234,7 +236,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif From peter at korsgaard.com Wed Mar 16 07:14:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:14:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdb: bump 11.x version to 11.2 Message-ID: <20220316072123.1EE07841CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8434bf32fa54ebb27d8384ee41a38bdb8ab0cf96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is a minor corrective release over GDB 11.1, fixing the following issues: PR sim/28302 (gdb fails to build with glibc 2.34) PR build/28318 (std::thread support configure check does not use CXX_DIALECT) PR gdb/28405 (arm-none-eabi: internal-error: ptid_t remote_target::select_thread_for_ambiguous_stop_reply(const target_waitstatus*): Assertion `first_resumed_thread != nullptr' failed) PR tui/28483 ([gdb/tui] breakpoint creation not displayed) PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as commit df9ebc472a162306dee8ba6e02b99963c2babb7c? Drop patch 0009-gdbserver-aarch64-support.patch, which was merged upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8cfbda109fc41d7567a67666f1f8a541ea1d1f61) Signed-off-by: Peter Korsgaard --- ...0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------- package/gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ------------- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 --------------------- ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...efine-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-nat-fork-inferior-include-linux-ptrace.h.patch | 0 ...Fix-getrandom-compile-for-uclibc-v1.0.35.patch} | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...0008-gdbserver-Makefile.in-fix-NLS-build.patch} | 0 package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 13 files changed, 2 insertions(+), 626 deletions(-) diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch deleted file mode 100644 index d969d98831..0000000000 --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 3 Oct 2021 12:02:53 -0400 -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] - -We map target signals to host signals so we can propagate signals -between the host & simulated worlds. That means we need to know -the symbolic names & values of all signals that might be sent. - -The tools that generate that list use signal.h and include all -symbols that start with "SIG" so as to automatically include any -new symbols that the C library might add. Unfortunately, this -also picks up "SIGSTKSZ" which is not actually a signal itself, -but a signal related setting -- it's the size of the stack when -a signal is handled. - -By itself this doesn't super matter as we will never see a signal -with that same value (since the range of valid signals tend to be -way less than 1024, and the size of the default signal stack will -never be that small). But with recent glibc changes that make this -into a dynamic value instead of a compile-time constant, some users -see build failures when building the sim. - -As suggested by Adam Sampson, update our scripts to ignore this -symbol to simplify everything and avoid the build failure. - -Bug: https://sourceware.org/PR28302 - -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] -Signed-off-by: Peter Seiderer ---- - sim/bfin/linux-targ-map.h | 5 +---- - sim/common/gennltvals.py | 6 ++++-- - sim/common/nltvals.def | 1 - - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h -index e9c8c8f..0340ed5 100644 ---- a/sim/bfin/linux-targ-map.h -+++ b/sim/bfin/linux-targ-map.h -@@ -30,6 +30,7 @@ echo - # XXX: nothing uses this ? - echo '#include ' | \ - bfin-uclinux-gcc -E -dD -P - | \ -+grep -v SIGSTKSZ | \ - sed -r -n \ - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ - -e '$i\ \ { 0, -1, -1 }\n};' \ -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = - #ifdef SIG_SETMASK - # define TARGET_LINUX_SIG_SETMASK 2 - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, --#endif --#ifdef SIGSTKSZ --# define TARGET_LINUX_SIGSTKSZ 8192 -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, - #endif - { 0, -1, -1 } - }; -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py -index b3e558d..bd4d7e9 100755 ---- a/sim/common/gennltvals.py -+++ b/sim/common/gennltvals.py -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - headers: Iterable[str], - pattern: str, -+ filter: str = r'^$', - target: str = None): - """Extract constants from the specified files using a regular expression. - -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - srcfile = ''.join(f'#include <{x}>\n' for x in headers) - syms = set() - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') -+ filter_pattern = re.compile(filter) - for header in headers: - with open(srcdir / header, 'r', encoding='utf-8') as fp: - data = fp.read() - for line in data.splitlines(): - m = define_pattern.match(line) -- if m: -+ if m and not filter_pattern.search(line): - syms.add(m.group(1)) - for sym in sorted(syms): - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') - - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') - - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def -index 8ae8839..8bc6ae5 100644 ---- a/sim/common/nltvals.def -+++ b/sim/common/nltvals.def -@@ -116,7 +116,6 @@ - { "SIGPROF", 27 }, - { "SIGQUIT", 3 }, - { "SIGSEGV", 11 }, -- { "SIGSTKSZ", 8192 }, - { "SIGSTOP", 17 }, - { "SIGSYS", 12 }, - { "SIGTERM", 15 }, --- -2.33.1 - diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch deleted file mode 100644 index 2d4e30ffe1..0000000000 --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch +++ /dev/null @@ -1,194 +0,0 @@ -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Wed, 12 May 2021 12:39:22 -0600 -Subject: [PATCH] Fix build on rhES5 - -The rhES5 build failed due to an upstream import a while back. The -bug here is that, while the 'personality' function exists, -ADDR_NO_RANDOMIZE is only defined in , not -. - -However, does not declare the 'personality' -function, and and cannot -both be included. - -This patch restores one of the removed configure checks and updates -the code to check it. - -We had this as a local patch at AdaCore, because it seemed like there -was no interest upstream. However, now it turns out that this fixes -PR build/28555, so I'm sending it now. - -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] -Signed-off-by: Peter Seiderer ---- - gdb/config.in | 4 ++++ - gdb/configure | 16 ++++++++++++++++ - gdb/nat/linux-personality.c | 4 ++++ - gdbserver/config.in | 4 ++++ - gdbserver/configure | 16 ++++++++++++++++ - gdbsupport/common.m4 | 5 +++++ - gdbsupport/config.in | 4 ++++ - gdbsupport/configure | 16 ++++++++++++++++ - 8 files changed, 69 insertions(+) - -diff --git a/gdb/config.in b/gdb/config.in -index 2c30504..776bee9 100644 ---- a/gdb/config.in -+++ b/gdb/config.in -@@ -96,6 +96,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdb/configure b/gdb/configure -index 5d89635..27e3194 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -13838,6 +13838,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c -index 9ce345b..27999fd 100644 ---- a/gdb/nat/linux-personality.c -+++ b/gdb/nat/linux-personality.c -@@ -22,6 +22,10 @@ - - #include - -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE -+# define ADDR_NO_RANDOMIZE 0x0040000 -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -+ - /* See comment on nat/linux-personality.h. */ - - maybe_disable_address_space_randomization:: -diff --git a/gdbserver/config.in b/gdbserver/config.in -index cf06c56..c9258b3 100644 ---- a/gdbserver/config.in -+++ b/gdbserver/config.in -@@ -31,6 +31,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbserver/configure b/gdbserver/configure -index b227167..d399d71 100755 ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -7131,6 +7131,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 -index 901c454..56a355e 100644 ---- a/gdbsupport/common.m4 -+++ b/gdbsupport/common.m4 -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait]) - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) -+ - AC_CHECK_DECLS([strstr]) - - # ----------------------- # -diff --git a/gdbsupport/config.in b/gdbsupport/config.in -index f46e261..6945a62 100644 ---- a/gdbsupport/config.in -+++ b/gdbsupport/config.in -@@ -28,6 +28,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbsupport/configure b/gdbsupport/configure -index a9dd02c..243a03f 100755 ---- a/gdbsupport/configure -+++ b/gdbsupport/configure -@@ -8144,6 +8144,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 --- -2.33.1 - diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch deleted file mode 100644 index 3718b1b6fd..0000000000 --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch +++ /dev/null @@ -1,320 +0,0 @@ -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 -From: Luis Machado -Date: Fri, 29 Oct 2021 14:54:36 -0300 -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic - -The current register set selection mechanism for AArch64 is static, based -on a pre-populated array of register sets. - -This means that we might potentially probe register sets that are not -available. This is OK if the kernel errors out during ptrace, but probing the -tag_ctl register, for example, does not result in a ptrace error if the kernel -supports the tagged address ABI but not MTE (PR 28355). - -Making the register set selection dynamic, based on feature checks, solves -this and simplifies the code a bit. It allows us to list all of the register -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. - -gdb/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * arch/aarch64.h (struct aarch64_features): New struct. - -gdbserver/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * linux-aarch64-low.cc (is_sve_tdesc): Remove. - (aarch64_target::low_arch_setup): Rework to adjust the register sets. - (aarch64_regsets): Update to list all register sets. - (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. - (aarch64_sve_regsets, aarch64_sve_regsets_info) - (regs_info_aarch64_sve): Remove. - (aarch64_adjust_register_sets): New. - (aarch64_target::get_regs_info): Remove references to removed structs. - (initialize_low_arch): Likewise. - -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 -Signed-off-by: Joachim Wiberg ---- - gdb/arch/aarch64.h | 9 ++ - gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- - 4 files changed, 130 insertions(+), 85 deletions(-) - -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h -index 0eb702c5b5e..95edb664b55 100644 ---- a/gdb/arch/aarch64.h -+++ b/gdb/arch/aarch64.h -@@ -22,6 +22,15 @@ - - #include "gdbsupport/tdesc.h" - -+/* Holds information on what architectural features are available. This is -+ used to select register sets. */ -+struct aarch64_features -+{ -+ bool sve = false; -+ bool pauth = false; -+ bool mte = false; -+}; -+ - /* Create the aarch64 target description. A non zero VQ value indicates both - the presence of SVE and the Vector Quotient - the number of 128bit chunks in - an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc -index daccfef746e..9a8cb4169a7 100644 ---- a/gdbserver/linux-aarch64-low.cc -+++ b/gdbserver/linux-aarch64-low.cc -@@ -196,16 +196,6 @@ is_64bit_tdesc (void) - return register_size (regcache->tdesc, 0) == 8; - } - --/* Return true if the regcache contains the number of SVE registers. */ -- --static bool --is_sve_tdesc (void) --{ -- struct regcache *regcache = get_thread_regcache (current_thread, 0); -- -- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); --} -- - static void - aarch64_fill_gregset (struct regcache *regcache, void *buf) - { -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, - *child->priv->arch_private = *parent->priv->arch_private; - } - --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ --#define AARCH64_HWCAP_PACA (1 << 30) -- --/* Implementation of linux target ops method "low_arch_setup". */ -- --void --aarch64_target::low_arch_setup () --{ -- unsigned int machine; -- int is_elf64; -- int tid; -- -- tid = lwpid_of (current_thread); -- -- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -- -- if (is_elf64) -- { -- uint64_t vq = aarch64_sve_get_vq (tid); -- unsigned long hwcap = linux_get_hwcap (8); -- unsigned long hwcap2 = linux_get_hwcap2 (8); -- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; -- /* MTE is AArch64-only. */ -- bool mte_p = hwcap2 & HWCAP2_MTE; -- -- current_process ()->tdesc -- = aarch64_linux_read_description (vq, pauth_p, mte_p); -- } -- else -- current_process ()->tdesc = aarch32_linux_read_description (); -- -- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); --} -- - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ - - static void -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) - return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); - } - -+/* Array containing all the possible register sets for AArch64/Linux. During -+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for -+ validity and enabled/disabled accordingly. -+ -+ Their sizes are set to 0 here, but they will be adjusted later depending -+ on whether each register set is available or not. */ - static struct regset_info aarch64_regsets[] = - { -+ /* GPR registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -+ 0, GENERAL_REGS, - aarch64_fill_gregset, aarch64_store_gregset }, -+ /* Floating Point (FPU) registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, -- sizeof (struct user_fpsimd_state), FP_REGS, -+ 0, FP_REGS, - aarch64_fill_fpregset, aarch64_store_fpregset - }, -+ /* Scalable Vector Extension (SVE) registers. */ -+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -+ 0, EXTENDED_REGS, -+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -+ }, -+ /* PAC registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -+ 0, OPTIONAL_REGS, -+ nullptr, aarch64_store_pauthregset }, -+ /* Tagged address control / MTE registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -+ 0, OPTIONAL_REGS, -+ aarch64_fill_mteregset, aarch64_store_mteregset }, - NULL_REGSET - }; - -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = - { - aarch64_regsets, /* regsets */ - 0, /* num_regsets */ -- NULL, /* disabled_regsets */ -+ nullptr, /* disabled_regsets */ - }; - - static struct regs_info regs_info_aarch64 = - { -- NULL, /* regset_bitmap */ -- NULL, /* usrregs */ -+ nullptr, /* regset_bitmap */ -+ nullptr, /* usrregs */ - &aarch64_regsets_info, - }; - --static struct regset_info aarch64_sve_regsets[] = -+/* Given FEATURES, adjust the available register sets by setting their -+ sizes. A size of 0 means the register set is disabled and won't be -+ used. */ -+ -+static void -+aarch64_adjust_register_sets (const struct aarch64_features &features) - { -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -- aarch64_fill_gregset, aarch64_store_gregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, -- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -- }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -- NULL_REGSET --}; -+ struct regset_info *regset; - --static struct regsets_info aarch64_sve_regsets_info = -- { -- aarch64_sve_regsets, /* regsets. */ -- 0, /* num_regsets. */ -- NULL, /* disabled_regsets. */ -- }; -+ for (regset = aarch64_regsets; regset->size >= 0; regset++) -+ { -+ switch (regset->nt_type) -+ { -+ case NT_PRSTATUS: -+ /* General purpose registers are always present. */ -+ regset->size = sizeof (struct user_pt_regs); -+ break; -+ case NT_FPREGSET: -+ /* This is unavailable when SVE is present. */ -+ if (!features.sve) -+ regset->size = sizeof (struct user_fpsimd_state); -+ break; -+ case NT_ARM_SVE: -+ if (features.sve) -+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); -+ break; -+ case NT_ARM_PAC_MASK: -+ if (features.pauth) -+ regset->size = AARCH64_PAUTH_REGS_SIZE; -+ break; -+ case NT_ARM_TAGGED_ADDR_CTRL: -+ if (features.mte) -+ regset->size = AARCH64_LINUX_SIZEOF_MTE; -+ break; -+ default: -+ gdb_assert_not_reached ("Unknown register set found."); -+ } -+ } -+} - --static struct regs_info regs_info_aarch64_sve = -- { -- NULL, /* regset_bitmap. */ -- NULL, /* usrregs. */ -- &aarch64_sve_regsets_info, -- }; -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ -+#define AARCH64_HWCAP_PACA (1 << 30) -+ -+/* Implementation of linux target ops method "low_arch_setup". */ -+ -+void -+aarch64_target::low_arch_setup () -+{ -+ unsigned int machine; -+ int is_elf64; -+ int tid; -+ -+ tid = lwpid_of (current_thread); -+ -+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -+ -+ if (is_elf64) -+ { -+ struct aarch64_features features; -+ -+ uint64_t vq = aarch64_sve_get_vq (tid); -+ features.sve = (vq > 0); -+ /* A-profile PAC is 64-bit only. */ -+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; -+ /* A-profile MTE is 64-bit only. */ -+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; -+ -+ current_process ()->tdesc -+ = aarch64_linux_read_description (vq, features.pauth, features.mte); -+ -+ /* Adjust the register sets we should use for this particular set of -+ features. */ -+ aarch64_adjust_register_sets (features); -+ } -+ else -+ current_process ()->tdesc = aarch32_linux_read_description (); -+ -+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); -+} - - /* Implementation of linux target ops method "get_regs_info". */ - -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () - if (!is_64bit_tdesc ()) - return ®s_info_aarch32; - -- if (is_sve_tdesc ()) -- return ®s_info_aarch64_sve; -- -+ /* AArch64 64-bit registers. */ - return ®s_info_aarch64; - } - -@@ -3294,5 +3311,4 @@ initialize_low_arch (void) - initialize_low_arch_aarch32 (); - - initialize_regsets_info (&aarch64_regsets_info); -- initialize_regsets_info (&aarch64_sve_regsets_info); - } --- -2.27.0 - diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..1bb3c41beb 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -89,7 +89,7 @@ config BR2_GDB_VERSION default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.1" if BR2_GDB_VERSION_11 + default "11.2" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index d3e83af0b9..e7933374f1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From peter at korsgaard.com Wed Mar 16 07:28:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:28:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libxslt: security bump to version 1.1.35 Message-ID: <20220316072123.518C1841CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=494611a172aeb503d53592f6b6cd61e6cf174938 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - fix CVE-2021-30560 - remove merged patch, drop autoreconf - moved from xmlsoft.org to gnome.org - spaces in hash file Signed-off-by: Francois Perrad [yann.morin.1998 at free.fr: - drop autoreconf as no longer patching - also switch home in Config.in ] Signed-off-by: Yann E. MORIN (cherry picked from commit acf5b437cc329a392f26e5367de1f64b3601b605) Signed-off-by: Peter Korsgaard --- ...Fix-xml2-config-check-in-configure-script.patch | 31 ---------------------- package/libxslt/Config.in | 2 +- package/libxslt/libxslt.hash | 6 ++--- package/libxslt/libxslt.mk | 7 +++-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb235..0000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index dfe5b99f04..643bce2a61 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://xmlsoft.org/xslt/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839e..39523a6953 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d2521..df0286e986 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft -# We're patching configure.ac -LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ From aperez at igalia.com Wed Mar 16 07:42:38 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 16 Mar 2022 09:42:38 +0200 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC In-Reply-To: <0fc0da93-ce87-7965-be20-f197d0825cbe@mind.be> References: <20220309132835.7251-1-abrodkin@synopsys.com> <0fc0da93-ce87-7965-be20-f197d0825cbe@mind.be> Message-ID: <20220316094238.GC1064341@momiji> Hi Alexey, Arnout, On Tue, 15 Mar 2022 22:47:10 +0100 Arnout Vandecappelle wrote: > > > On 09/03/2022 14:28, Alexey Brodkin via buildroot wrote: > > This patch adds support of ARC architecture in Qt's JS core and Webkit. > > The change itself is quite straight-forward: > > > > 1. Enable JS core for ARC > > 2. Make sure so-called "large memory model" is used, > > i.e. relocations with long jumps are being generated for global > > symbols, as otherwise insanely huge libqt5webkit.so fails to link > > because some symbols might be more than 32 MiB away from each other. > > 3. Make the original WebKit build system aware of yet another CPU > > architecture with explicitly disabled JIT in JS core for ARC. > > > > Obviously, this one depends on [1]. > > > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ > > > > Signed-off-by: Alexey Brodkin > > Cc: Thomas Petazzoni > > Cc: Peter Seiderer > > --- > > package/qt5/Config.in | 2 +- > > package/qt5/qt5base/qt5base.mk | 13 +++ > > .../0005-Add-support-for-ARC-processors.patch | 93 +++++++++++++++++++ > > 3 files changed, 107 insertions(+), 1 deletion(-) > > create mode 100644 package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > > index f2b1ff4a19..cbb2e06a21 100644 > > --- a/package/qt5/Config.in > > +++ b/package/qt5/Config.in > > @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > > bool > > default y > > # Javascript engine is only available on certain architectures > > - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel > > + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc > > # ARM needs BLX, so v5t+ > > depends on !BR2_ARM_CPU_ARMV4 > > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index ef38d03253..b25e0f44b6 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -201,6 +201,19 @@ endif > > QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) > > QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) > > > > +ifeq ($(BR2_arc),y) > > +# In case of -Os (which is default in BR) gcc will use millicode implementation > > +# from libgcc. That along with performance degradation may lead to issues during > > +# linkage stage. In case of QtWebkit exactly that happens - millicode functions > > +# get put way too far from caller functions and so linker fails. > > +# To solve that problem we explicitly disable millicode call generation for Qt. > > +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) > > +# it's good to firce compiler to not assume short or even medium-length calls > > +# could be used. I.e. always use long jump instaructions. > > +# Otherwise there's a high risk of hitting link-time failures. > > +QT5BASE_CFLAGS += -mno-millicode -mlong-calls > > +endif > > + > > ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) > > QT5BASE_CONFIGURE_OPTS += -eglfs > > QT5BASE_DEPENDENCIES += libegl > > diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > new file mode 100644 > > index 0000000000..92f023eab6 > > --- /dev/null > > +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > @@ -0,0 +1,93 @@ > > +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 > > +From: Alexey Brodkin > > +Date: Mon, 21 Feb 2022 18:28:00 +0300 > > +Subject: [PATCH] Add support for ARC processors > > + > > +Signed-off-by: Alexey Brodkin > > Upstream status of this patch? I may have missed it, but as far as I know there has not been any activity in WebKit's Bugzilla regarding ARC support. While I am do now much about ARC, the changes do not look particularly low-level, so feel free to add me in CC in the relevant Bugzilla issues and I can try to help get them reviewed -- make sure to take a look at the contribution guide if you haven't already: https://webkit.org/contributing-code/ Cheers, -Adrian > > +--- > > + CMakeLists.txt | 4 +++- > > + Source/JavaScriptCore/CMakeLists.txt | 3 ++- > > + Source/WTF/wtf/Platform.h | 8 ++++++++ > > + Source/WTF/wtf/dtoa/utils.h | 2 +- > > + Source/cmake/OptionsQt.cmake | 4 ++++ > > + 5 files changed, 18 insertions(+), 3 deletions(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 31a2ea1fd..f0dfbda5b 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) > > + else () > > + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) > > + endif () > > +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > > ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") > > ++ set(WTF_CPU_ARC 1) > > ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > > + set(WTF_CPU_ARM 1) > > + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") > > + set(WTF_CPU_ARM64 1) > > +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt > > +index 937b3ed00..205dde288 100644 > > +--- a/Source/JavaScriptCore/CMakeLists.txt > > ++++ b/Source/JavaScriptCore/CMakeLists.txt > > +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) > > + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) > > + endif () > > + > > +-if (WTF_CPU_ARM) > > ++if (WTF_CPU_ARC) > > ++elseif (WTF_CPU_ARM) > > + elseif (WTF_CPU_ARM64) > > + elseif (WTF_CPU_ALPHA) > > + elseif (WTF_CPU_HPPA) > > +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h > > +index 5717f3ea1..b327ed693 100644 > > +--- a/Source/WTF/wtf/Platform.h > > ++++ b/Source/WTF/wtf/Platform.h > > +@@ -349,6 +349,14 @@ > > + > > + #endif /* ARM */ > > + > > ++/* CPU(ARC) - ARC */ > > ++#if defined(__arc__) > > ++#define WTF_CPU_ARC 1 > > ++#if defined(__BIG_ENDIAN__) > > ++#define WTF_CPU_BIG_ENDIAN 1 > > ++#endif > > ++#endif > > ++ > > + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) > > + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 > > + #endif > > +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h > > +index 889642cee..8f1e9933e 100644 > > +--- a/Source/WTF/wtf/dtoa/utils.h > > ++++ b/Source/WTF/wtf/dtoa/utils.h > > +@@ -49,7 +49,7 @@ > > + defined(__ARMEL__) || \ > > + defined(_MIPS_ARCH_MIPS32R2) > > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > > +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) > > ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) > > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > > + #elif defined(_M_IX86) || defined(__i386__) > > + #if defined(_WIN32) > > +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake > > +index ec6081de0..e1a5efc1e 100644 > > +--- a/Source/cmake/OptionsQt.cmake > > ++++ b/Source/cmake/OptionsQt.cmake > > +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) > > + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > > + endif () > > + > > ++if (WTF_CPU_ARC) > > ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > > ++endif () > > ++ > > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) > > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) > > + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) > > +-- > > +2.25.1 > > + -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From Alexey.Brodkin at synopsys.com Wed Mar 16 08:18:55 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 16 Mar 2022 08:18:55 +0000 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC Message-ID: Hi Arnout, Adrian, > On Tue, 15 Mar 2022 22:47:10 +0100 Arnout Vandecappelle wrote: > > > > > > On 09/03/2022 14:28, Alexey Brodkin via buildroot wrote: > > > This patch adds support of ARC architecture in Qt's JS core and Webkit. > > > The change itself is quite straight-forward: > > > > > > 1. Enable JS core for ARC > > > 2. Make sure so-called "large memory model" is used, > > > i.e. relocations with long jumps are being generated for global > > > symbols, as otherwise insanely huge libqt5webkit.so fails to link > > > because some symbols might be more than 32 MiB away from each other. > > > 3. Make the original WebKit build system aware of yet another CPU > > > architecture with explicitly disabled JIT in JS core for ARC. > > > [snip] > > > +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 > > > +From: Alexey Brodkin > > > +Date: Mon, 21 Feb 2022 18:28:00 +0300 > > > +Subject: [PATCH] Add support for ARC processors > > > + > > > +Signed-off-by: Alexey Brodkin > > > > Upstream status of this patch? > > I may have missed it, but as far as I know there has not been any activity in > WebKit's Bugzilla regarding ARC support. Correct, ARC changes for WebKit were never submitted upstream. And even though I realize how that would benefit us in a long run, given my primarily goal is in Qt's WebKit (which is one on downstream projects for upstream WebKit) I'm not sure how much time it will take for that change to become a part of Qt we build in Buildroot ;) Yet, I'll try to do that soonish now ;) > While I am do now much about ARC, the > changes do not look particularly low-level, so feel free to add me in CC in > the relevant Bugzilla issues and I can try to help get them reviewed -- make > sure to take a look at the contribution guide if you haven't already: > > https://webkit.org/contributing-code/ Thanks for the offer, will keep that in mind! And thanks for taking care, Arnout! -Alexey From theo.lebrun at bootlin.com Wed Mar 16 09:22:00 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Wed, 16 Mar 2022 10:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix default device behaviour Message-ID: <20220316092200.66623-1-theo.lebrun@bootlin.com> This patch has been applied upstream and is required to allow having default devices on non x86_64 platforms with WirePlumber v0.4.8. https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 Signed-off-by: Th?o Lebrun --- .../0001-fix-non-x86_64-architectures.patch | 212 ++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch new file mode 100644 index 0000000000..27b6f034b2 --- /dev/null +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch @@ -0,0 +1,212 @@ +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 9 Feb 2022 07:59:59 -0500 +Subject: [PATCH] spa-json: fix va_list APIs for different architectures + +The va_list type might not always be a pointer in some architectures, so we +cannot guarantee it will be modified after using it for a second time in another +function. This fixes the issue by using macros so args does not get copied, and +always gets modified when using it more than once. +--- + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- + 1 file changed, 80 insertions(+), 76 deletions(-) + +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c +index f14f395d..c5e59a3e 100644 +--- a/lib/wp/spa-json.c ++++ b/lib/wp/spa-json.c +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) + wp_spa_json_builder_new_formatted ("\"%s\"", value)); + } + +-static void +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- wp_spa_json_builder_add_null (self); +- break; +- case 'b': +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); +- break; +- case 'i': +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); +- break; +- case 'f': +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); +- break; +- case 's': +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); +- break; +- case 'J': +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); +- break; +- default: +- return; +- } +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_builder_add_value(self,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ wp_spa_json_builder_add_null (self); \ ++ break; \ ++ case 'b': \ ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ ++ break; \ ++ case 'i': \ ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ ++ break; \ ++ case 'f': \ ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ ++ break; \ ++ case 's': \ ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ ++ break; \ ++ case 'J': \ ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ ++ break; \ ++ default: \ ++ break; \ ++ } \ ++} while(false) + + /*! + * \brief Creates a spa json of type array +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) + return res; + } + +-static gboolean +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- if (!spa_json_is_null (data, len)) +- return FALSE; +- break; +- case 'b': +- if (!wp_spa_json_parse_boolean_internal (data, len, +- va_arg(args, gboolean *))) +- return FALSE; +- break; +- case 'i': +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) +- return FALSE; +- break; +- case 'f': +- if (spa_json_parse_float (data, len, +- (float *)va_arg(args, double *)) < 0) +- return FALSE; +- break; +- case 's': { +- gchar *str = wp_spa_json_parse_string_internal (data, len); +- if (!str) +- return FALSE; +- *va_arg(args, gchar **) = str; +- break; +- } +- case 'J': { +- WpSpaJson *j = wp_spa_json_new (data, len); +- if (!j) +- return FALSE; +- *va_arg(args, WpSpaJson **) = j; +- break; +- } +- default: +- return FALSE; +- } +- return TRUE; +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_parse_value(data,len,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ if (!spa_json_is_null (data, len)) \ ++ return FALSE; \ ++ break; \ ++ case 'b': \ ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ ++ va_arg(args, gboolean *))) \ ++ return FALSE; \ ++ break; \ ++ case 'i': \ ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 'f': \ ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 's': { \ ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ ++ if (!str) \ ++ return FALSE; \ ++ *va_arg(args, gchar **) = str; \ ++ break; \ ++ } \ ++ case 'J': { \ ++ WpSpaJson *j = wp_spa_json_new (data, len); \ ++ if (!j) \ ++ return FALSE; \ ++ *va_arg(args, WpSpaJson **) = j; \ ++ break; \ ++ } \ ++ default: \ ++ return FALSE; \ ++ } \ ++} while(false) + + /*! + * \brief Parses the object property values of a spa json object +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) + value = g_value_get_boxed (&item); + + if (g_strcmp0 (key_str, lookup_key) == 0) { +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) +- return FALSE; ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); + lookup_key = va_arg(args, const gchar *); + if (!lookup_key) + return TRUE; +@@ -1366,9 +1363,12 @@ gboolean + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, + va_list args) + { +- return wp_spa_json_parser_advance (self) && +- wp_spa_json_parse_value (self->curr.cur, +- self->curr.end - self->curr.cur, fmt, args); ++ if (wp_spa_json_parser_advance (self)) { ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ fmt, args); ++ return TRUE; ++ } ++ return FALSE; + } + + /*! +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) + if (!format) + return TRUE; + +- /* parse value */ +- if (!wp_spa_json_parser_get_value (self, format, args)) ++ /* advance */ ++ if (!wp_spa_json_parser_advance (self)) + return FALSE; ++ ++ /* parse value */ ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ format, args); + } while (TRUE); + + return FALSE; +-- +GitLab + -- 2.35.1 From theo.lebrun at bootlin.com Wed Mar 16 09:27:46 2022 From: theo.lebrun at bootlin.com (=?utf-8?q?Th=C3=A9o_Lebrun?=) Date: Wed, 16 Mar 2022 10:27:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: bump version to 0.4.8 In-Reply-To: <80b6dcef-8b08-5ee0-9c82-b10758a5af54@mind.be> References: <20220228161345.378966-1-theo.lebrun@bootlin.com> <80b6dcef-8b08-5ee0-9c82-b10758a5af54@mind.be> Message-ID: On Tue Mar 15, 2022 at 10:11 PM CET, Arnout Vandecappelle wrote: > On 28/02/2022 17:13, Th?o Lebrun via buildroot wrote: > > Changelog: > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst > > > > Signed-off-by: Th?o Lebrun > > Applied to master, thanks. Thanks. Sadly, this latest version is broken and requires a patch to support setting a default device in WirePlumber. I just sent a patch which is the commit that was sent upstream to fix it. It is required until upstream gets a new version (no date announced). Regards, Th?o > > Regards, > Arnout > > > --- > > package/wireplumber/wireplumber.hash | 2 +- > > package/wireplumber/wireplumber.mk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash > > index 561fcc2e5e..206d7d15af 100644 > > --- a/package/wireplumber/wireplumber.hash > > +++ b/package/wireplumber/wireplumber.hash > > @@ -1,3 +1,3 @@ > > # Locally calculated > > -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 > > +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 > > sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE > > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > > index 2dab6042ea..3bf7cece45 100644 > > --- a/package/wireplumber/wireplumber.mk > > +++ b/package/wireplumber/wireplumber.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -WIREPLUMBER_VERSION = 0.4.2 > > +WIREPLUMBER_VERSION = 0.4.8 > > WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 > > WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) > > WIREPLUMBER_LICENSE = MIT From rsassen at comecer.com Wed Mar 16 10:08:40 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 16 Mar 2022 10:08:40 +0000 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations. Signed-off-by: Rutger Sassen --- Changes v1 -> v2: - instead of always copying overlay_map.dtb, make it configurable (suggested by Peter Seiderer) - do not copy README since it a special case, only needed when installing overlays to a non-standard location (suggested by Peter Seiderer) package/rpi-firmware/Config.in | 9 +++++++++ package/rpi-firmware/rpi-firmware.mk | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 8070dc3019..13efa3dc87 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -93,6 +93,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS overlays, to support HATs (Hardware Attached on Top, add-on modules). +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + bool "Install DTB overlay map" + default n + depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + help + Say 'y' here if you need to support multiple hardware targets + and you need target dependent mapping of overlay names to one + of several overlay implementations. + config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG bool "vcdbg" depends on BR2_arm # prebuilt arm binary, rpi-userland diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..800b560070 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS endef endif +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ +endef +endif + # Install prebuilt libraries if RPI_USERLAND not enabled ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) define RPI_FIRMWARE_INSTALL_TARGET_LIB @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(RPI_FIRMWARE_INSTALL_CONFIG) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) endef $(eval $(generic-package)) -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From anssi.hannula at bitwise.fi Wed Mar 16 10:12:23 2022 From: anssi.hannula at bitwise.fi (Anssi Hannula) Date: Wed, 16 Mar 2022 12:12:23 +0200 Subject: [Buildroot] [PATCH] pkg-generic: fix rdepends and phony targets of virtual packages Message-ID: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> Virtual packages are not added to the _RDEPENDENCIES list of packages that they depend on (i.e. their provider). This causes -show-rdepends to not show the virtual package and -show-recursive-rdepends to miss all the packages that transitively depend on via the virtual package. The virtual make targets (e.g. -show-info) are also not marked as phony for virtual packages. To fix those issues, remove most of the special handling of virtual packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as well. This also allows removal of some duplicated code in pkg-generic.mk and a now unneeded special condition in CHECK_ONE_DEPENDENCY. Still keep the virtual package out of PACKAGES since there is e.g. no need to rsync per-package target dir to global target dir. I am not aware of any showstoppers preventing addition to PACKAGES as well, though, so it is probably just an optimization. Signed-off-by: Anssi Hannula --- I encountered this while using -show-recursive-rdepends to determine which packages to dirclean after modification of a (non-virtual) in per-package mode. The current virtual vs. real distinction didn't seem worth the risk of unintentional differences so I dropped it, but I'm not too familiar with the code so I could have missed something. In case I did and this is not a good idea, one less intrusive option would be to split the common-to-virtual-and-real-packages code to be under a new separate conditional block. Makefile | 2 -- package/pkg-generic.mk | 24 +++++------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 4f693d40a9..9e875dd8d8 100644 --- a/Makefile +++ b/Makefile @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) define CHECK_ONE_DEPENDENCY ifeq ($$($(2)_TYPE),target) -ifeq ($$($(2)_IS_VIRTUAL),) ifneq ($$($$($(2)_KCONFIG_VAR)),y) $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ has added it to its _DEPENDENCIES variable without selecting it or \ depending on it from Config.in) endif endif -endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..a0d6198edc 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1064,15 +1064,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the -# package being enabled. We handle three cases: the special Linux -# kernel case, the bootloaders case, and the normal packages case. -# Virtual packages are handled separately (see below). +# package being enabled. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) +else ifeq ($$($(2)_IS_VIRTUAL),YES) +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif @@ -1178,7 +1178,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) +ifneq ($$($(2)_IS_VIRTUAL),YES) PACKAGES += $(1) +endif ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) @@ -1268,22 +1270,6 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif -# Virtual packages are not built but it's useful to allow them to have -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR - -ifneq ($$($(2)_PERMISSIONS),) -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) -endif -ifneq ($$($(2)_DEVICES),) -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) -endif -ifneq ($$($(2)_USERS),) -PACKAGES_USERS += $$($(2)_USERS)$$(sep) -endif -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) - endif # $(2)_KCONFIG_VAR endef # inner-generic-package -- 2.34.1 From fperrad at gmail.com Wed Mar 16 10:57:53 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 16 Mar 2022 11:57:53 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to 3.4.3 Message-ID: <20220316105753.1134088-1-francois.perrad@gadz.org> see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda..e92399871 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda..0bb468ced 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING -- 2.32.0 From rsassen at comecer.com Wed Mar 16 11:09:20 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 16 Mar 2022 11:09:20 +0000 Subject: [Buildroot] package gdk-pixbuf relocatable issue Message-ID: Hello, A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). My configuration: Host: Debian 10 (buster) Buildroot version: 2022-02 Target: Aarch64 (raspberry pi cm3) Package: gdk-pixbuf The problematic snippets from gdk-pixbuf.mk: ============== HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ -Drelocatable=true \ -Dman=false ============== # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. # And since the cache file will contain absolute host directory names we # need to sanitize (strip) them. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE endif ============== Best regards, Rutger Sassen p.s. please ignore the email disclaimer that is automatically added to all my outgoing mail... This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From grant.b.edwards at gmail.com Wed Mar 16 16:22:54 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Wed, 16 Mar 2022 16:22:54 -0000 (UTC) Subject: [Buildroot] Can buildroot use existing host fakeroot? Message-ID: I maintain some firmware that uses buildroot 2016.11.2 (with some local package upgrades). Unfortunately, it seems I can no longer do builds because host-fakeroot won't compile (it's too old for my kernel/libc version of stat?). I tried updating the fakeroot package, but that won't build because it doesn't know how to build host-acl. [My target doesn't even support ACLs, so trying to get that installed and working seems a bit pointless.] My development hosts all have working versions of fakeroot already installed. Is there any way I can just tell buildroot to use the existing fakeroot instead of trying to build its own private copy? -- Grant From grant.b.edwards at gmail.com Wed Mar 16 18:10:01 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Wed, 16 Mar 2022 18:10:01 -0000 (UTC) Subject: [Buildroot] Can buildroot use existing host fakeroot? References: Message-ID: On 2022-03-16, Grant Edwards wrote: > I maintain some firmware that uses buildroot 2016.11.2 (with some > local package upgrades). Unfortunately, it seems I can no longer do > builds because host-fakeroot won't compile (it's too old for my > kernel/libc version of stat?). I've updated fakeroot, acl, and attr packages so that I can build again, but I'm still curious about whether you can tell buildroot to use pre-existing versions of host-side tools like fakeroot. -- Grant From yann.morin.1998 at free.fr Wed Mar 16 18:17:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 19:17:39 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220315091041.015209a9@windsurf> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-3-clement.leger@bootlin.com> <20220314203149.GW283544@scaer> <20220315091041.015209a9@windsurf> Message-ID: <20220316181739.GY283544@scaer> Thomas, Cl?ment, All, On 2022-03-15 09:10 +0100, Thomas Petazzoni spake thusly: > On Mon, 14 Mar 2022 21:31:49 +0100 > "Yann E. MORIN" wrote: > > > I think the host variant should automatically inherit that setting from > > the target variant. > > > > Afterall, it seems reasonable to expect that the download of the host > > and target variants should usually be exactly the same. > > I agree, but I thought this was really too much outside of what Cl?ment > is trying to achieve in this patch series (I helped Cl?ment internally > by reviewing/discussing this patch series, and indeed identified the > fact that those variables should be inherited between target/host). > > But of course if as a maintainer you think this is something that is > really needed as a pre-requisite to merge those patches, we can ask > Cl?ment to work on this :-) I think I even provided the patch in my review... ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Wed Mar 16 18:24:40 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 19:24:40 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix eglconvenience compile (missing QList include) Message-ID: <20220316182440.17393-1-ps.report@gmx.net> - add 0008-eglconvenience-add-missing-QList-include.patch to fix eglconvenience compile (missing QList include) Fixes: qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | ^ Signed-off-by: Peter Seiderer --- ...onvenience-add-missing-QList-include.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 0000000000..c7127291e4 --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + -- 2.35.1 From ps.report at gmx.net Wed Mar 16 18:35:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 19:35:58 +0100 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: References: Message-ID: <20220316193558.11caac5b@gmx.net> Hello Avijit, On Tue, 15 Mar 2022 19:04:02 -0600, Avijit Das wrote: > Hi, > > I am building Buildroot for an imx8mm board. The HDMI display is up. I > validated the display using the fb-test. I am trying to enable a graphics > library, either gtk3 or qt5. > > *gtk3 * > When I am enabling the gtk3 library, if I run the demo application, I am > getting the following error. > > # /usr/bin/gtk3-demo > > (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: > # > > I have tried setting the display to localhost:0.0, did not work. > > *QT5* > The widget library is not building. There is a compilation error: > > qkeyeventtransition.o .obj/qmouseeventtransition.o > .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o > .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o > .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o > .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so > -lpthread -lrt -lpthread -ldl > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 > rm -f ../../lib/libQt5Widgets.so.5.15.8 > mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 > rm -f ../../lib/libQt5Widgets.so > rm -f ../../lib/libQt5Widgets.so.5 > rm -f ../../lib/libQt5Widgets.so.5.15 > mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so > mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 > mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 > make[2]: *** [Makefile:51: sub-src-make_first] Error 2 > make[1]: *** [package/pkg-generic.mk:292: > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] > Error 2 > make: *** [Makefile:84: _all] Error 2 > > I have attached the config file. Can you please suggest? With your defconfig I get the following error (a lot of lines above in the log): qeglconvenience.cpp: In function ?bool q_hasEglExtension(EGLDisplay, const char*)?: qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | This can be (compile) fixed by this (buildroot) patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220316182440.17393-1-ps.report at gmx.net/ Despite of this error I get (with your provided defconfig): [4/5] Compiling C object src/libepoxy.so.0.0.0.p/dispatch_common.c.o FAILED: src/libepoxy.so.0.0.0.p/dispatch_common.c.o .../host/bin/aarch64-buildroot-linux-gnu-gcc -Isrc/libepoxy.so.0.0.0.p -Isrc -I../src -Iinclude -I../include -Iinclude/epoxy -fdiagnostics-color=always -Wall -Winvalid-pch -std=gnu99 -O3 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -fPIC -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-int-conversion -fvisibility=hidden -MD -MQ src/libepoxy.so.0.0.0.p/dispatch_common.c.o -MF src/libepoxy.so.0.0.0.p/dispatch_common.c.o.d -o src/libepoxy.so.0.0.0.p/dispatch_common.c.o -c ../src/dispatch_common.c In file included from include/epoxy/egl_generated.h:11, from ../include/epoxy/egl.h:46, from ../src/dispatch_common.h:59, from ../src/dispatch_common.c:174: .../host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:145:10: fatal error: X11/Xlib.h: No such file or directory 145 | #include | ^~~~~~~~~~~~ compilation terminated. ninja: build stopped: subcommand failed. make[1]: *** [package/pkg-generic.mk:292: /home/seiderer/Work/Buildroot/build_imx8mmevk_qt5_001/build/libepoxy-1.5.9/.stamp_built] Error 1 make: *** [Makefile:23: _all] Error 2 Regards, Peter > > Thanks, > Avijit From james.hilliard1 at gmail.com Wed Mar 16 19:05:45 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Mar 2022 13:05:45 -0600 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.25 In-Reply-To: <20220316190545.3618918-1-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> Message-ID: <20220316190545.3618918-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 1a58ec88e8..1c34aa0a90 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 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz +sha256 3f138e03301beb2afc7b385a62f56db17059137857ab579f269c4e441783e760 iwd-1.25.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 548b508edb..fc10c5f1d4 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.24 +IWD_VERSION = 1.25 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.25.1 From james.hilliard1 at gmail.com Wed Mar 16 19:05:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Mar 2022 13:05:44 -0600 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 Message-ID: <20220316190545.3618918-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 267b44e5f0..9735865eae 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.48 +ELL_VERSION = 0.49 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.25.1 From ps.report at gmx.net Wed Mar 16 19:43:32 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 20:43:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 In-Reply-To: <20220316190545.3618918-1-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> Message-ID: <20220316204332.4cabeba1@gmx.net> Hello James, On Wed, 16 Mar 2022 13:05:44 -0600, James Hilliard wrote: > Signed-off-by: James Hilliard Thanks for the patch/update, one nitpick... An (upstream) change log entry would be nice, see [1] for an example... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/ell?id=c01a8397d9923c38b14a0d083ba1cf3ee3a3049a > --- > 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz > +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 267b44e5f0..9735865eae 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.48 > +ELL_VERSION = 0.49 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ From ps.report at gmx.net Wed Mar 16 19:44:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 20:44:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.25 In-Reply-To: <20220316190545.3618918-2-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> <20220316190545.3618918-2-james.hilliard1@gmail.com> Message-ID: <20220316204446.7d203db4@gmx.net> Hello James, On Wed, 16 Mar 2022 13:05:45 -0600, James Hilliard wrote: > Signed-off-by: James Hilliard Thanks for the patch/update, one nitpick... An (upstream) change log entry would be nice, see [1] for an example... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/iw?id=ad0515252a25e94b85184102a66e93a17ad3c65e > --- > package/iwd/iwd.hash | 2 +- > package/iwd/iwd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash > index 1a58ec88e8..1c34aa0a90 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 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz > +sha256 3f138e03301beb2afc7b385a62f56db17059137857ab579f269c4e441783e760 iwd-1.25.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk > index 548b508edb..fc10c5f1d4 100644 > --- a/package/iwd/iwd.mk > +++ b/package/iwd/iwd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -IWD_VERSION = 1.24 > +IWD_VERSION = 1.25 > IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz > IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless > IWD_LICENSE = LGPL-2.1+ From ps.report at gmx.net Wed Mar 16 19:49:22 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 20:49:22 +0100 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: References: <20220316193558.11caac5b@gmx.net> Message-ID: <20220316204922.47f51090@gmx.net> Hello Avijit, please keep buildroot at busybox.net in CC On Wed, 16 Mar 2022 12:39:04 -0600, Avijit Das wrote: > Hi Peter, > > I have compiled the X11 library when I got this error. > > make xlib_libX11 && make So the gtk3 compile/test was from another defconfig? Did you start the X11 server before running the gtk3-demo? But not much run-time help/advice from my side as I have no suitable hardware for testing myself... Regards, Peter > > Thanks, > Avijit > > On Wed, Mar 16, 2022 at 12:36 PM Peter Seiderer wrote: > > > Hello Avijit, > > > > On Tue, 15 Mar 2022 19:04:02 -0600, Avijit Das > > wrote: > > > > > Hi, > > > > > > I am building Buildroot for an imx8mm board. The HDMI display is up. I > > > validated the display using the fb-test. I am trying to enable a graphics > > > library, either gtk3 or qt5. > > > > > > *gtk3 * > > > When I am enabling the gtk3 library, if I run the demo application, I am > > > getting the following error. > > > > > > # /usr/bin/gtk3-demo > > > > > > (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: > > > # > > > > > > I have tried setting the display to localhost:0.0, did not work. > > > > > > *QT5* > > > The widget library is not building. There is a compilation error: > > > > > > qkeyeventtransition.o .obj/qmouseeventtransition.o > > > .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o > > > .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o > > > .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o > > > .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so > > > -lpthread -lrt -lpthread -ldl > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 > > > rm -f ../../lib/libQt5Widgets.so.5.15.8 > > > mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 > > > rm -f ../../lib/libQt5Widgets.so > > > rm -f ../../lib/libQt5Widgets.so.5 > > > rm -f ../../lib/libQt5Widgets.so.5.15 > > > mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so > > > mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 > > > mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 > > > make[2]: *** [Makefile:51: sub-src-make_first] Error 2 > > > make[1]: *** [package/pkg-generic.mk:292: > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] > > > Error 2 > > > make: *** [Makefile:84: _all] Error 2 > > > > > > I have attached the config file. Can you please suggest? > > > > With your defconfig I get the following error (a lot of lines above in the > > log): > > > > qeglconvenience.cpp: In function ?bool q_hasEglExtension(EGLDisplay, > > const char*)?: > > qeglconvenience.cpp:418:23: error: variable ?QList > > extensions? has initializer but incomplete type > > 418 | QList extensions = > > | ^~~~~~~~~~ > > qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class > > QList? > > 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' > > '); > > | > > > > > > This can be (compile) fixed by this (buildroot) patch: > > > > > > https://patchwork.ozlabs.org/project/buildroot/patch/20220316182440.17393-1-ps.report at gmx.net/ > > > > > > Despite of this error I get (with your provided defconfig): > > > > [4/5] Compiling C object src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > FAILED: src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > .../host/bin/aarch64-buildroot-linux-gnu-gcc -Isrc/libepoxy.so.0.0.0.p > > -Isrc -I../src -Iinclude -I../include -Iinclude/epoxy > > -fdiagnostics-color=always -Wall -Winvalid-pch -std=gnu99 -O3 > > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 > > -fPIC -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes > > -Wmissing-prototypes -Wnested-externs -Wbad-function-cast > > -Wold-style-definition -Wdeclaration-after-statement -Wunused > > -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute > > -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull > > -Werror=init-self -Werror=main -Werror=missing-braces > > -Werror=sequence-point -Werror=return-type -Werror=trigraphs > > -Werror=array-bounds -Werror=write-strings -Werror=address > > -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast > > -fno-strict-aliasing -Wno-int-conversion -fvisibility=hidden -MD -MQ > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -MF > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o.d -o > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -c ../src/dispatch_common.c > > In file included from include/epoxy/egl_generated.h:11, > > from ../include/epoxy/egl.h:46, > > from ../src/dispatch_common.h:59, > > from ../src/dispatch_common.c:174: > > > > .../host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:145:10: > > fatal error: X11/Xlib.h: No such file or directory > > 145 | #include > > | ^~~~~~~~~~~~ > > compilation terminated. > > ninja: build stopped: subcommand failed. > > make[1]: *** [package/pkg-generic.mk:292: > > /home/seiderer/Work/Buildroot/build_imx8mmevk_qt5_001/build/libepoxy-1.5.9/.stamp_built] > > Error 1 > > make: *** [Makefile:23: _all] Error 2 > > > > Regards, > > Peter > > > > > > > > Thanks, > > > Avijit > > > > From avijitnsec at gmail.com Wed Mar 16 19:51:48 2022 From: avijitnsec at gmail.com (Avijit Das) Date: Wed, 16 Mar 2022 13:51:48 -0600 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: <20220316204922.47f51090@gmx.net> References: <20220316193558.11caac5b@gmx.net> <20220316204922.47f51090@gmx.net> Message-ID: Hello Peter, Yes, I have tried X11 and Wayland both. Thanks for trying out. I'll keep trying. Will keep you posted. Thanks, Avijit On Wed, Mar 16, 2022 at 1:49 PM Peter Seiderer wrote: > Hello Avijit, > > please keep buildroot at busybox.net in CC > > On Wed, 16 Mar 2022 12:39:04 -0600, Avijit Das > wrote: > > > Hi Peter, > > > > I have compiled the X11 library when I got this error. > > > > make xlib_libX11 && make > > So the gtk3 compile/test was from another defconfig? > > Did you start the X11 server before running the gtk3-demo? > > But not much run-time help/advice from my side as I have no suitable > hardware > for testing myself... > > Regards, > Peter > > > > > > Thanks, > > Avijit > > > > On Wed, Mar 16, 2022 at 12:36 PM Peter Seiderer > wrote: > > > > > Hello Avijit, > > > > > > On Tue, 15 Mar 2022 19:04:02 -0600, Avijit Das > > > wrote: > > > > > > > Hi, > > > > > > > > I am building Buildroot for an imx8mm board. The HDMI display is up. > I > > > > validated the display using the fb-test. I am trying to enable a > graphics > > > > library, either gtk3 or qt5. > > > > > > > > *gtk3 * > > > > When I am enabling the gtk3 library, if I run the demo application, > I am > > > > getting the following error. > > > > > > > > # /usr/bin/gtk3-demo > > > > > > > > (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: > > > > # > > > > > > > > I have tried setting the display to localhost:0.0, did not work. > > > > > > > > *QT5* > > > > The widget library is not building. There is a compilation error: > > > > > > > > qkeyeventtransition.o .obj/qmouseeventtransition.o > > > > .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o > > > > .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o > > > > .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o > > > > .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic > > > > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so > > > > > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so > > > > > -lpthread -lrt -lpthread -ldl > > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so > > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 > > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 > > > > rm -f ../../lib/libQt5Widgets.so.5.15.8 > > > > mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 > > > > rm -f ../../lib/libQt5Widgets.so > > > > rm -f ../../lib/libQt5Widgets.so.5 > > > > rm -f ../../lib/libQt5Widgets.so.5.15 > > > > mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so > > > > mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 > > > > mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 > > > > make[2]: *** [Makefile:51: sub-src-make_first] Error 2 > > > > make[1]: *** [package/pkg-generic.mk:292: > > > > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] > > > > > Error 2 > > > > make: *** [Makefile:84: _all] Error 2 > > > > > > > > I have attached the config file. Can you please suggest? > > > > > > With your defconfig I get the following error (a lot of lines above in > the > > > log): > > > > > > qeglconvenience.cpp: In function ?bool q_hasEglExtension(EGLDisplay, > > > const char*)?: > > > qeglconvenience.cpp:418:23: error: variable ?QList > > > extensions? has initializer but incomplete type > > > 418 | QList extensions = > > > | ^~~~~~~~~~ > > > qeglconvenience.cpp:420:65: error: invalid use of incomplete type > ?class > > > QList? > > > 420 | (eglQueryString(display, > EGL_EXTENSIONS))).split(' > > > '); > > > | > > > > > > > > > This can be (compile) fixed by this (buildroot) patch: > > > > > > > > > > https://patchwork.ozlabs.org/project/buildroot/patch/20220316182440.17393-1-ps.report at gmx.net/ > > > > > > > > > Despite of this error I get (with your provided defconfig): > > > > > > [4/5] Compiling C object src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > > FAILED: src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > > .../host/bin/aarch64-buildroot-linux-gnu-gcc > -Isrc/libepoxy.so.0.0.0.p > > > -Isrc -I../src -Iinclude -I../include -Iinclude/epoxy > > > -fdiagnostics-color=always -Wall -Winvalid-pch -std=gnu99 -O3 > > > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os > -g0 > > > -fPIC -Wpointer-arith -Wmissing-declarations -Wformat=2 > -Wstrict-prototypes > > > -Wmissing-prototypes -Wnested-externs -Wbad-function-cast > > > -Wold-style-definition -Wdeclaration-after-statement -Wunused > > > -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute > > > -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull > > > -Werror=init-self -Werror=main -Werror=missing-braces > > > -Werror=sequence-point -Werror=return-type -Werror=trigraphs > > > -Werror=array-bounds -Werror=write-strings -Werror=address > > > -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast > > > -fno-strict-aliasing -Wno-int-conversion -fvisibility=hidden -MD -MQ > > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -MF > > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o.d -o > > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -c ../src/dispatch_common.c > > > In file included from include/epoxy/egl_generated.h:11, > > > from ../include/epoxy/egl.h:46, > > > from ../src/dispatch_common.h:59, > > > from ../src/dispatch_common.c:174: > > > > > > > .../host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:145:10: > > > fatal error: X11/Xlib.h: No such file or directory > > > 145 | #include > > > | ^~~~~~~~~~~~ > > > compilation terminated. > > > ninja: build stopped: subcommand failed. > > > make[1]: *** [package/pkg-generic.mk:292: > > > > /home/seiderer/Work/Buildroot/build_imx8mmevk_qt5_001/build/libepoxy-1.5.9/.stamp_built] > > > Error 1 > > > make: *** [Makefile:23: _all] Error 2 > > > > > > Regards, > > > Peter > > > > > > > > > > > Thanks, > > > > Avijit > > > > > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Wed Mar 16 20:37:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 21:37:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgcrypt: fix musl build Message-ID: <20220316203734.3081600-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 1.10.0 in commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d: In file included from ./jitterentropy.h:98, from ./jitterentropy-base.c:32, from ./rndjent.c:88: ./jitterentropy-base-user.h: In function 'jent_get_cachesize': ./jitterentropy-base-user.h:191:8: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] 191 | fd = open(file, O_RDONLY); | ^~~~ | popen ./jitterentropy-base-user.h:191:19: error: 'O_RDONLY' undeclared (first use in this function) 191 | fd = open(file, O_RDONLY); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f6182fca6a4e2ba29a89f770f17df691d7861f8d Signed-off-by: Fabrice Fontaine --- ...entropy-Include-fcntl-h-and-limits-h.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch new file mode 100644 index 0000000000..8f76f24c64 --- /dev/null +++ b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch @@ -0,0 +1,38 @@ +From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 3 Feb 2022 22:46:41 +0000 +Subject: [PATCH] jitterentropy: Include and + +* random/jitterentropy-base-user.h: Include for O_RDONLY +* random/jitterentropy-base-user.h: Include for LONG_MAX + +-- + +Fixes the build with musl libc. + +Signed-off-by: Heiko Becker + +[Retrieved from: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] +Signed-off-by: Fabrice Fontaine +--- + random/jitterentropy-base-user.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h +index 326dfbed..389106ff 100644 +--- a/random/jitterentropy-base-user.h ++++ b/random/jitterentropy-base-user.h +@@ -39,6 +39,9 @@ + * DAMAGE. + */ + ++#include ++#include ++ + #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H + #define GCRYPT_JITTERENTROPY_BASE_USER_H + +-- +2.11.0 + -- 2.35.1 From ps.report at gmx.net Wed Mar 16 20:39:18 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 21:39:18 +0100 Subject: [Buildroot] [PATCH v1] package/wget: bump version to 1.21.3 In-Reply-To: <20220315220531.2bac9c2d@windsurf> References: <20220311065042.8687-1-ps.report@gmx.net> <20220315220531.2bac9c2d@windsurf> Message-ID: <20220316213918.67ea4d94@gmx.net> Hello Thomas, On Tue, 15 Mar 2022 22:05:31 +0100, Thomas Petazzoni wrote: > Hello Peter, > > On Fri, 11 Mar 2022 07:50:42 +0100 > Peter Seiderer wrote: > > > - explicit set some default options (--without-metalink, --enable-opie, > > --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, > > --disable-assert) > > > > - add optional libpsl dependency > > > > - remove legacy --with-libidn option (see [1]), replace with > > new --enable-iri option in case libiconv and libidn2 are available > > > > - use explicit --with-libuuid option > > > > - add optional c-ares dependency > > > > For details see [2]. > > > > [1] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > > [2] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > > > > Signed-off-by: Peter Seiderer > > You're mixing up a minor version bump with a significant rework of the > package, which is unrelated to the version bump. This really needs > separate commit. Also, see below. Started as a minor/patch-level version bump....and did take a look at the configure.ac changes ;-), will split up the patch on next iteration... > > > > +WGET_CONF_OPTS = \ > > + --without-metalink \ > > + --enable-opie \ > > + --enable-digest \ > > + --enable-ntlm \ > > So opie, digest and ntlm enabled is the default? Yes (this is what I wanted to express in the commit log by 'explicit set some default options')... > > > + --disable-debug \ > > + --disable-valgrind-tests \ > > + --disable-assert Same here... > > + > > +ifeq ($(BR2_PACKAGE_LIBPSL),y) > > +WGET_CONF_OPTS += --with-libpsl > > +WGET_DEPENDENCIES += libpsl > > +else > > +WGET_CONF_OPTS += --without-libpsl > > +endif > > + > > ifeq ($(BR2_PACKAGE_GNUTLS),y) > > WGET_CONF_OPTS += --with-ssl=gnutls > > WGET_DEPENDENCIES += gnutls > > @@ -22,19 +38,18 @@ else > > WGET_CONF_OPTS += --without-ssl > > endif > > > > -ifeq ($(BR2_PACKAGE_LIBICONV),y) > > -WGET_DEPENDENCIES += libiconv > > -endif > > - > > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > > -WGET_CONF_OPTS += --with-libidn > > -WGET_DEPENDENCIES += libidn2 > > +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) > > This is very likely wrong. Indeed BR2_PACKAGE_LIBICONV=y is only > possible when the toolchain does *not* have locale support. When the > toolchain has locale support, iconv support is provided by the > toolchain itself. Ups, did misread the following configure.ac part: 780 AS_IF([test "X$iri" != "Xno"],[ 781 if test "X$am_cv_func_iconv" != "Xyes"; then 782 iri=no 783 if test "X$force_iri" = "Xyes"; then 784 AC_MSG_ERROR([Libiconv is required for IRIs support]) 785 else 786 AC_MSG_NOTICE([disabling IRIs because libiconv wasn't found]) 787 fi 788 fi 789 ]) > > Could you revisit this, and also clarify the interaction between > --enable-iri/--disable-iri on one side and > --with-libidn/--without-libidn on the other side? The old 'with-libidn/without-libidn' option is gone, libidn2 is checked via pkg-config, the new option is 'enable-iri/disable-iri' (or auto-detect)... Will update the patch (soon)...., thanks for review! Regards, Peter > > Thanks! > > Thomas From fontaine.fabrice at gmail.com Wed Mar 16 20:39:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 21:39:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Message-ID: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 20:39:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 21:39:22 +0100 Subject: [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies In-Reply-To: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Message-ID: <20220316203922.3081843-2-fontaine.fabrice@gmail.com> libminiupnpc can be statically built with or without binfmt flat since version 1.7 and https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d Signed-off-by: Fabrice Fontaine --- package/libminiupnpc/Config.in | 6 ------ package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ package/transmission/Config.in | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225..51f4b43bbb 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 0633ccd234..52fe9849f2 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif + $(eval $(cmake-package)) diff --git a/package/transmission/Config.in b/package/transmission/Config.in index aaed7ec111..eb51ccf862 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_TRANSMISSION bool "transmission" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on !BR2_BINFMT_FLAT # libminiupnpc, libnatpmp - depends on !BR2_STATIC_LIBS # libminiupnpc, libnatpmp + depends on !BR2_BINFMT_FLAT # libnatpmp + depends on !BR2_STATIC_LIBS # libnatpmp select BR2_PACKAGE_ZLIB select BR2_PACKAGE_DHT select BR2_PACKAGE_OPENSSL -- 2.35.1 From ps.report at gmx.net Wed Mar 16 20:45:38 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 21:45:38 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220316214538.1d7ff89f@gmx.net> Hello Rutger, On Wed, 16 Mar 2022 10:08:40 +0000, "Sassen, Rutger" wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > package/rpi-firmware/Config.in | 9 +++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 16 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index 8070dc3019..13efa3dc87 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). Would have expected +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + bool "Install DTB overlay map" > + default n instead of this 'depends' line > + depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need target dependent mapping of overlay names to one > + of several overlay implementations. > + And the endif here + +endif Maybe good to mention 'overlay_map.dtb' explicit in the help text like? + of several overlay implementations via overlay_map.dtb file. Regards, Peter > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) From fontaine.fabrice at gmail.com Wed Mar 16 21:22:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:15 +0100 Subject: [Buildroot] [PATCH 1/6] package/zynaddsubfx: fix PluginEnable option Message-ID: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Replace False by OFF when setting PluginEnable option Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede..c8d64f5ce8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:16 +0100 Subject: [Buildroot] [PATCH 2/6] package/zynaddsubfx: disable tests In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-2-fontaine.fabrice@gmail.com> Disable tests which are enabled by default since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index c8d64f5ce8..b2eb1921fa 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:17 +0100 Subject: [Buildroot] [PATCH 3/6] package/zynaddsubfx: fix atomic linking In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-3-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: libzynaddsubfx_core.a(Master.cpp.o): in function `.L1880': Master.cpp:(.text+0x7cc0): undefined reference to `__atomic_exchange_1' Fixes: - http://autobuild.buildroot.org/results/91b5959ca0eb136c1609462e71d109ff09cca5e5 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index b2eb1921fa..db0459ce62 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -14,7 +14,7 @@ ZYNADDSUBFX_LICENSE_FILES = COPYING ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:18 +0100 Subject: [Buildroot] [PATCH 4/6] package/zynaddsubfx: fix alsa-lib handling In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-4-fontaine.fabrice@gmail.com> alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:19 +0100 Subject: [Buildroot] [PATCH 5/6] package/zynaddsubfx: add jack{1, 2} optional dependency In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-5-fontaine.fabrice@gmail.com> jack{1,2} is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index aeeb0b6405..461146aae8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -30,4 +30,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF endif +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:20 +0100 Subject: [Buildroot] [PATCH 6/6] package/zynaddsubfx: add portaudio optional dependency In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-6-fontaine.fabrice@gmail.com> portaudio is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 461146aae8..aff9ac4bf4 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -37,4 +37,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:30:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:30:47 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-shark: bump version to 0.7.5 Message-ID: <20220316213047.16103-1-ps.report@gmx.net> Changelog ([1], [2]): - 0.7.5: Eclipse Plugin was removed - 0.7.4: Remove RidgeRun Licence from Eclipse Plugin Add README with warning on Eclipse Plugin future removal [1] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.4 [2] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.5 Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index be26050715..cfd72dd2a6 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 4e7801e920..17df001cef 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.3 +GST1_SHARK_VERSION = v0.7.5 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES -- 2.35.1 From yann.morin.1998 at free.fr Wed Mar 16 21:34:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:34:07 +0100 Subject: [Buildroot] [git commit] package/libopenssl: bump version to 1.1.1n Message-ID: <20220316212531.137C9841F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66868e9fab2806686fd08850a3e56185ef00b127 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From ps.report at gmx.net Wed Mar 16 21:36:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:04 +0100 Subject: [Buildroot] [PATCH v1 02/12] package/gst1-plugins-base: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-3-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cda..748d951966 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.1.tar.xz.sha256sum +sha256 96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 gst-plugins-base-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 08aac850cd..766af88e96 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.0 +GST1_PLUGINS_BASE_VERSION = 1.20.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:03 +0100 Subject: [Buildroot] [PATCH v1 01/12] package/gstreamer1: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f4a74a6125..128bb564d4 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.1.tar.xz.sha256sum +sha256 de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 gstreamer-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf6..995c5b118b 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.20.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:05 +0100 Subject: [Buildroot] [PATCH v1 03/12] package/gst1-plugins-good: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf46..cccd07dd2d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.1.tar.xz.sha256sum +sha256 3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa gst-plugins-good-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6298d578ed..1168feb293 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.20.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:06 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:06 +0100 Subject: [Buildroot] [PATCH v1 04/12] package/gst1-plugins-bad: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-5-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b94..2874d955f4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.1.tar.xz.sha256sum +sha256 09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 gst-plugins-bad-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 24fd9dd312..343a53a3c5 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.20.0 +GST1_PLUGINS_BAD_VERSION = 1.20.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:08 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:08 +0100 Subject: [Buildroot] [PATCH v1 06/12] package/gst1-devtools: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-7-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9c..7173dbe266 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.1.tar.xz.sha256sum +sha256 81f1c7ef105b8bdb63412638952f6320723b3161c96a80f113b020e2de554b2b gst-devtools-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index f72df9cf71..8c430800d2 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.20.0 +GST1_DEVTOOLS_VERSION = 1.20.1 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:11 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:11 +0100 Subject: [Buildroot] [PATCH v1 09/12] package/gst1-rtsp-server: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-10-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 00ff974c6e..1e66ed7246 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.1.tar.xz.sha256sum +sha256 4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509 gst-rtsp-server-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d22dd5e7cc..978f7b4491 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.20.0 +GST1_RTSP_SERVER_VERSION = 1.20.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:02 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:02 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.20.1 Message-ID: <20220316213614.16878-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-March/079724.html [2] https://gstreamer.freedesktop.org/releases/1.20/#1.20.1 Peter Seiderer (12): package/gstreamer1: bump version to 1.20.1 package/gst1-plugins-base: bump version to 1.20.1 package/gst1-plugins-good: bump version to 1.20.1 package/gst1-plugins-bad: bump version to 1.20.1 package/gst1-plugins-ugly: bump version to 1.20.1 package/gst1-devtools: bump version to 1.20.1 package/gst1-libav: bump version to 1.20.1 package/gst1-vaapi: bump version to 1.20.1 package/gst1-rtsp-server: bump version to 1.20.1 package/gstreamer1-editing-services: bump version to 1.20.1 package/gst-omx: bump version to 1.20.1 package/gst1-python: bump version to 1.20.1 package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 24 files changed, 36 insertions(+), 36 deletions(-) -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:07 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:07 +0100 Subject: [Buildroot] [PATCH v1 05/12] package/gst1-plugins-ugly: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-6-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24b..d022ba3180 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.1.tar.xz.sha256sum +sha256 42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 gst-plugins-ugly-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 05b1fab304..be45d183f3 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.20.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:09 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:09 +0100 Subject: [Buildroot] [PATCH v1 07/12] package/gst1-libav: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-8-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14..3f9c849729 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.1.tar.xz.sha256sum +sha256 91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 gst-libav-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4..4e99de45f9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.20.0 +GST1_LIBAV_VERSION = 1.20.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:12 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:12 +0100 Subject: [Buildroot] [PATCH v1 10/12] package/gstreamer1-editing-services: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb..5d77a9bb72 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.1.tar.xz.sha256sum +sha256 6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df gst-editing-services-1.20.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae7..dbdf2abca0 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:14 +0100 Subject: [Buildroot] [PATCH v1 12/12] package/gst1-python: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fd..fe1e2068b1 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.1.tar.xz.sha256sum +sha256 ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 gst-python-1.20.1.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d7..3fd8059bee 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.20.0 +GST1_PYTHON_VERSION = 1.20.1 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:10 +0100 Subject: [Buildroot] [PATCH v1 08/12] package/gst1-vaapi: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e2..26a1f52ba0 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.1.tar.xz.sha256sum +sha256 87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 gstreamer-vaapi-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 19ee625703..e0502914b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.20.0 +GST1_VAAPI_VERSION = 1.20.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:13 +0100 Subject: [Buildroot] [PATCH v1 11/12] package/gst-omx: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f..33c20defbc 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.1.tar.xz.sha256sum +sha256 86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c gst-omx-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff..462c88765b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.20.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.35.1 From yann.morin.1998 at free.fr Wed Mar 16 21:36:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:36:26 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220315205405.9291-1-ps.report@gmx.net> References: <20220315205405.9291-1-ps.report@gmx.net> Message-ID: <20220316213626.GZ283544@scaer> Peter, All, +Peter K.: candidate to be backported, that's a security fix. On 2022-03-15 21:54 +0100, Peter Seiderer spake thusly: > Changes between 1.1.1m and 1.1.1n [15 Mar 2022] > > *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever > for non-prime moduli. > > Internally this function is used when parsing certificates that contain > elliptic curve public keys in compressed form or explicit elliptic curve > parameters with a base point encoded in compressed form. > > It is possible to trigger the infinite loop by crafting a certificate that > has invalid explicit curve parameters. > > Since certificate parsing happens prior to verification of the certificate > signature, any process that parses an externally supplied certificate may > thus be subject to a denial of service attack. The infinite loop can also > be reached when parsing crafted private keys as they can contain explicit > elliptic curve parameters. > > Thus vulnerable situations include: > > - TLS clients consuming server certificates > - TLS servers consuming client certificates > - Hosting providers taking certificates or private keys from customers > - Certificate authorities parsing certification requests from subscribers > - Anything else which parses ASN.1 elliptic curve parameters > > Also any other applications that use the BN_mod_sqrt() where the attacker > can control the parameter values are vulnerable to this DoS issue. > (CVE-2022-0778) > [Tom?? Mr?z] > > *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) > to the list of ciphersuites providing Perfect Forward Secrecy as > required by SECLEVEL >= 3. > > [Dmitry Belyavskiy, Nicola Tuveri] > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libopenssl/libopenssl.hash | 4 ++-- > package/libopenssl/libopenssl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash > index a055cbc270..22bb365bcc 100644 > --- a/package/libopenssl/libopenssl.hash > +++ b/package/libopenssl/libopenssl.hash > @@ -1,5 +1,5 @@ > -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 > -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz > +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 > +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz > > # License files > sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE > diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk > index bd8ef6141a..ae6658ed40 100644 > --- a/package/libopenssl/libopenssl.mk > +++ b/package/libopenssl/libopenssl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOPENSSL_VERSION = 1.1.1m > +LIBOPENSSL_VERSION = 1.1.1n > LIBOPENSSL_SITE = https://www.openssl.org/source > LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz > LIBOPENSSL_LICENSE = OpenSSL or SSLeay > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 21:38:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:38:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgcrypt: fix musl build In-Reply-To: <20220316203734.3081600-1-fontaine.fabrice@gmail.com> References: <20220316203734.3081600-1-fontaine.fabrice@gmail.com> Message-ID: <20220316213824.GA283544@scaer> Fabrice, All, On 2022-03-16 21:37 +0100, Fabrice Fontaine spake thusly: > Fix the following musl build failure raised since bump to version 1.10.0 > in commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d: > > In file included from ./jitterentropy.h:98, > from ./jitterentropy-base.c:32, > from ./rndjent.c:88: > ./jitterentropy-base-user.h: In function 'jent_get_cachesize': > ./jitterentropy-base-user.h:191:8: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] > 191 | fd = open(file, O_RDONLY); > | ^~~~ > | popen > ./jitterentropy-base-user.h:191:19: error: 'O_RDONLY' undeclared (first use in this function) > 191 | fd = open(file, O_RDONLY); > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/f6182fca6a4e2ba29a89f770f17df691d7861f8d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...entropy-Include-fcntl-h-and-limits-h.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch > > diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch > new file mode 100644 > index 0000000000..8f76f24c64 > --- /dev/null > +++ b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch > @@ -0,0 +1,38 @@ > +From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 > +From: Heiko Becker > +Date: Thu, 3 Feb 2022 22:46:41 +0000 > +Subject: [PATCH] jitterentropy: Include and > + > +* random/jitterentropy-base-user.h: Include for O_RDONLY > +* random/jitterentropy-base-user.h: Include for LONG_MAX > + > +-- > + > +Fixes the build with musl libc. > + > +Signed-off-by: Heiko Becker > + > +[Retrieved from: > +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] > +Signed-off-by: Fabrice Fontaine > +--- > + random/jitterentropy-base-user.h | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h > +index 326dfbed..389106ff 100644 > +--- a/random/jitterentropy-base-user.h > ++++ b/random/jitterentropy-base-user.h > +@@ -39,6 +39,9 @@ > + * DAMAGE. > + */ > + > ++#include > ++#include > ++ > + #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H > + #define GCRYPT_JITTERENTROPY_BASE_USER_H > + > +-- > +2.11.0 > + > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 21:37:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:37:45 +0100 Subject: [Buildroot] [git commit] package/libgcrypt: fix musl build Message-ID: <20220316212944.E3AE3841F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b6b4729522090b5f20560e249b5898950d7c298 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since bump to version 1.10.0 in commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d: In file included from ./jitterentropy.h:98, from ./jitterentropy-base.c:32, from ./rndjent.c:88: ./jitterentropy-base-user.h: In function 'jent_get_cachesize': ./jitterentropy-base-user.h:191:8: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] 191 | fd = open(file, O_RDONLY); | ^~~~ | popen ./jitterentropy-base-user.h:191:19: error: 'O_RDONLY' undeclared (first use in this function) 191 | fd = open(file, O_RDONLY); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f6182fca6a4e2ba29a89f770f17df691d7861f8d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...itterentropy-Include-fcntl-h-and-limits-h.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch new file mode 100644 index 0000000000..8f76f24c64 --- /dev/null +++ b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch @@ -0,0 +1,38 @@ +From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 3 Feb 2022 22:46:41 +0000 +Subject: [PATCH] jitterentropy: Include and + +* random/jitterentropy-base-user.h: Include for O_RDONLY +* random/jitterentropy-base-user.h: Include for LONG_MAX + +-- + +Fixes the build with musl libc. + +Signed-off-by: Heiko Becker + +[Retrieved from: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] +Signed-off-by: Fabrice Fontaine +--- + random/jitterentropy-base-user.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h +index 326dfbed..389106ff 100644 +--- a/random/jitterentropy-base-user.h ++++ b/random/jitterentropy-base-user.h +@@ -39,6 +39,9 @@ + * DAMAGE. + */ + ++#include ++#include ++ + #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H + #define GCRYPT_JITTERENTROPY_BASE_USER_H + +-- +2.11.0 + From yann.morin.1998 at free.fr Wed Mar 16 21:41:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:10 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: fix atomic linking Message-ID: <20220316213525.2C73D84249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba7319a06e1b98524fde1384dc570a7f34870881 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: libzynaddsubfx_core.a(Master.cpp.o): in function `.L1880': Master.cpp:(.text+0x7cc0): undefined reference to `__atomic_exchange_1' Fixes: - http://autobuild.buildroot.org/results/91b5959ca0eb136c1609462e71d109ff09cca5e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index b2eb1921fa..db0459ce62 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -14,7 +14,7 @@ ZYNADDSUBFX_LICENSE_FILES = COPYING ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ From yann.morin.1998 at free.fr Wed Mar 16 21:41:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:05 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: fix PluginEnable option Message-ID: <20220316213525.0801D84249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e1a86e95091b69ad043c33aadf7220866a45f29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace False by OFF when setting PluginEnable option Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede..c8d64f5ce8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From yann.morin.1998 at free.fr Wed Mar 16 21:43:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:43:48 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: add jack{1, 2} optional dependency Message-ID: <20220316213525.4E73884249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3bcedaa732b539e4ad32776e867ef9626ffca5b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master jack{1,2} is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index aeeb0b6405..461146aae8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -30,4 +30,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF endif +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 21:41:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:08 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: disable tests Message-ID: <20220316213525.1C29A8424A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=886629bf64d8093fc847ebbbed779a09722843da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable tests which are enabled by default since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index c8d64f5ce8..b2eb1921fa 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From yann.morin.1998 at free.fr Wed Mar 16 21:41:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:12 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: fix alsa-lib handling Message-ID: <20220316213525.3F6568424A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fc2191845799ae2358b752fa29839817d33ad82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 21:43:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:43:50 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: add portaudio optional dependency Message-ID: <20220316213525.5D8128424A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e820feba362a29a310ed3a93c8ad5546ceb8a2ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master portaudio is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 461146aae8..aff9ac4bf4 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -37,4 +37,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 21:44:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:44:41 +0100 Subject: [Buildroot] [PATCH 1/6] package/zynaddsubfx: fix PluginEnable option In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316214441.GB283544@scaer> Fabrice, All, On 2022-03-16 22:22 +0100, Fabrice Fontaine spake thusly: > Replace False by OFF when setting PluginEnable option > > Signed-off-by: Fabrice Fontaine Series of 6 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/zynaddsubfx/zynaddsubfx.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk > index 158b5b4ede..c8d64f5ce8 100644 > --- a/package/zynaddsubfx/zynaddsubfx.mk > +++ b/package/zynaddsubfx/zynaddsubfx.mk > @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ > ZYNADDSUBFX_LICENSE_FILES = COPYING > > # There is no package in buildroot using LV2 plugins: disabling > -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False > +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Mar 16 21:47:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 22:47:21 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220316213626.GZ283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 22:36:26 +0100") References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> Message-ID: <87cziltvrq.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > +Peter K.: candidate to be backported, that's a security fix. Indeed. Why it is not marked as such ("security bump to version 1.1.1n")? -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Wed Mar 16 21:48:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 16 Mar 2022 22:48:46 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d99407..f57041cee4 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and len(data['stable_versions']) > 0: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, -- 2.35.1 From yann.morin.1998 at free.fr Wed Mar 16 22:04:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:04:46 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220316215654.8E8188424D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c72f3f2b43f4607ed94d51a21abe5e3d909efb36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d99407..8cc64a54d1 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From yann.morin.1998 at free.fr Wed Mar 16 22:06:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:06:57 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> References: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> Message-ID: <20220316220657.GC283544@scaer> Thomas, All, On 2022-03-16 22:48 +0100, Thomas Petazzoni spake thusly: > The check_package_get_latest_version_by_distro() function analyzes the > data returned by release-monitoring.org. For two of our > packages (bento4 and qextserialport), release-monitoring.org returns > something that is a bit odd: it returns an entry with a > "stable_versions" field that contains an empty array. Our code was > ready to have or not have a "stable_versions" entry, but when it is > present, we assumed it was not an empty array. These two packages, for > some reason, break this assumption. > > In order to solve this problem, this commit is more careful, and uses > the stable_versions field only if it exists and it has at least one > entry. The code is also reworked as a sequence of "if...elif...else" > to be more readable. > > This fixes the following exception when running pkg-stats on the full > package set: > > Task exception was never retrieved > future: exception=IndexError('list index out of range')> > Traceback (most recent call last): > File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get > if await check_package_get_latest_version_by_distro(session, pkg): > File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro > version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > IndexError: list index out of range > > Signed-off-by: Thomas Petazzoni > --- > support/scripts/pkg-stats | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index c235d99407..f57041cee4 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): > return False > > data = await resp.json() > - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > + if 'stable_versions' in data and len(data['stable_versions']) > 0: PEP8 says that we can just test the sequence to test for emptyness: https://pep8.org/#programming-recommendations (toward the end). Applied to master with that fixed, thanks. Regards, Yann E. MORIN. > + version = data['stable_versions'][0] > + elif 'version' in data: > + version = data['version'] > + else: > + version = None > check_package_latest_version_set_status(pkg, > RM_API_STATUS_FOUND_BY_DISTRO, > version, > -- > 2.35.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:10:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:10:46 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316221046.GD283544@scaer> Peter, All, On 2022-03-16 22:36 +0100, Peter Seiderer spake thusly: > For details see [1] and [2]. > > [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-March/079724.html > [2] https://gstreamer.freedesktop.org/releases/1.20/#1.20.1 > > Peter Seiderer (12): > package/gstreamer1: bump version to 1.20.1 > package/gst1-plugins-base: bump version to 1.20.1 > package/gst1-plugins-good: bump version to 1.20.1 > package/gst1-plugins-bad: bump version to 1.20.1 > package/gst1-plugins-ugly: bump version to 1.20.1 > package/gst1-devtools: bump version to 1.20.1 > package/gst1-libav: bump version to 1.20.1 > package/gst1-vaapi: bump version to 1.20.1 > package/gst1-rtsp-server: bump version to 1.20.1 > package/gstreamer1-editing-services: bump version to 1.20.1 > package/gst-omx: bump version to 1.20.1 > package/gst1-python: bump version to 1.20.1 Whole series applied to master, thanks. Regards, Yann E. MORIN. > package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- > package/gstreamer1/gst-omx/gst-omx.mk | 2 +- > package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- > package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- > package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- > package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- > package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- > package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- > package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- > package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- > package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- > package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- > package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- > package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- > package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- > package/gstreamer1/gst1-python/gst1-python.mk | 2 +- > package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- > package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- > package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- > package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- > .../gstreamer1-editing-services.hash | 4 ++-- > .../gstreamer1-editing-services.mk | 2 +- > package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- > package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- > 24 files changed, 36 insertions(+), 36 deletions(-) > > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:12:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:12:42 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-shark: bump version to 0.7.5 In-Reply-To: <20220316213047.16103-1-ps.report@gmx.net> References: <20220316213047.16103-1-ps.report@gmx.net> Message-ID: <20220316221242.GE283544@scaer> Peter, All, On 2022-03-16 22:30 +0100, Peter Seiderer spake thusly: > Changelog ([1], [2]): > > - 0.7.5: Eclipse Plugin was removed > - 0.7.4: Remove RidgeRun Licence from Eclipse Plugin > Add README with warning on Eclipse Plugin future removal > > [1] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.4 > [2] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.5 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- > package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash > index be26050715..cfd72dd2a6 100644 > --- a/package/gstreamer1/gst1-shark/gst1-shark.hash > +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash > @@ -1,5 +1,5 @@ > # locally computed hash > -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz > +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz > > # Hashes for license files: > sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING > diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk > index 4e7801e920..17df001cef 100644 > --- a/package/gstreamer1/gst1-shark/gst1-shark.mk > +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GST1_SHARK_VERSION = v0.7.3 > +GST1_SHARK_VERSION = v0.7.5 > GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git > GST1_SHARK_SITE_METHOD = git > GST1_SHARK_GIT_SUBMODULES = YES > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:07:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:11 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump version to 1.20.1 Message-ID: <20220316220441.2508E8431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05b0f785cec573092b5292237a03dc756c6b9d5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f4a74a6125..128bb564d4 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.1.tar.xz.sha256sum +sha256 de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 gstreamer-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf6..995c5b118b 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.20.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:15 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.20.1 Message-ID: <20220316220441.3721A8431F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69b7c008fa154b5174d8c67006002f48a686086b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf46..cccd07dd2d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.1.tar.xz.sha256sum +sha256 3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa gst-plugins-good-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6298d578ed..1168feb293 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.20.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Mar 16 22:07:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:20 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.20.1 Message-ID: <20220316220441.4A5848431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd865dc6fcd049cf0c20bdbc5b26ab2acf055ecb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24b..d022ba3180 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.1.tar.xz.sha256sum +sha256 42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 gst-plugins-ugly-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 05b1fab304..be45d183f3 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.20.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Mar 16 22:07:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:25 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.20.1 Message-ID: <20220316220441.5D5D18431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9763aab6a0bd9f53343b3ecd37d00efef777379a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14..3f9c849729 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.1.tar.xz.sha256sum +sha256 91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 gst-libav-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4..4e99de45f9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.20.0 +GST1_LIBAV_VERSION = 1.20.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:41 +0100 Subject: [Buildroot] [git commit] package/gst1-shark: bump version to 0.7.5 Message-ID: <20220316220441.953B88431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09d568a6b4b7c57d7d41bc5540b8f706f78e4375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog ([1], [2]): - 0.7.5: Eclipse Plugin was removed - 0.7.4: Remove RidgeRun Licence from Eclipse Plugin Add README with warning on Eclipse Plugin future removal [1] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.4 [2] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.5 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index be26050715..cfd72dd2a6 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 4e7801e920..17df001cef 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.3 +GST1_SHARK_VERSION = v0.7.5 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:29 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.20.1 Message-ID: <20220316220441.6F1668431F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb3a4e313a8ff70644f0702ac84d2ba877e1ca08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 00ff974c6e..1e66ed7246 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.1.tar.xz.sha256sum +sha256 4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509 gst-rtsp-server-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d22dd5e7cc..978f7b4491 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.20.0 +GST1_RTSP_SERVER_VERSION = 1.20.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:22 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.20.1 Message-ID: <20220316220441.537728431F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a70131455b59487864358eadc9ff34263f6670ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9c..7173dbe266 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.1.tar.xz.sha256sum +sha256 81f1c7ef105b8bdb63412638952f6320723b3161c96a80f113b020e2de554b2b gst-devtools-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index f72df9cf71..8c430800d2 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.20.0 +GST1_DEVTOOLS_VERSION = 1.20.1 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:34 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.20.1 Message-ID: <20220316220441.81E1B8431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f62284487af114fdf2cb4069d62c8b6a7f90268c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f..33c20defbc 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.1.tar.xz.sha256sum +sha256 86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c gst-omx-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff..462c88765b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.20.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From yann.morin.1998 at free.fr Wed Mar 16 22:07:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:13 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.20.1 Message-ID: <20220316220441.2DEF18424C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f0a550b6d8dedc04fbcd94df0c45effbec6ec1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cda..748d951966 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.1.tar.xz.sha256sum +sha256 96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 gst-plugins-base-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 08aac850cd..766af88e96 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.0 +GST1_PLUGINS_BASE_VERSION = 1.20.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:27 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.20.1 Message-ID: <20220316220441.6628E8431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d0a14b039c4c073baae5b0d4f88c3ed4b7d00d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e2..26a1f52ba0 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.1.tar.xz.sha256sum +sha256 87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 gstreamer-vaapi-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 19ee625703..e0502914b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.20.0 +GST1_VAAPI_VERSION = 1.20.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:08:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:08:40 +0100 Subject: [Buildroot] [git commit] package/libressl: security bump to 3.4.3 Message-ID: <20220316220441.9E7458431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b92210ce36588038aa728e48f3826f6b32d471c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda8..e923998713 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda9..0bb468cedb 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Mar 16 22:07:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:18 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.20.1 Message-ID: <20220316220441.40A948431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e3971565263385a4d2947bf74e20386838f3094 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b94..2874d955f4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.1.tar.xz.sha256sum +sha256 09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 gst-plugins-bad-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 24fd9dd312..343a53a3c5 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.20.0 +GST1_PLUGINS_BAD_VERSION = 1.20.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:32 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.20.1 Message-ID: <20220316220441.782238431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eed6566513fd17950a11b06db15477860e42353e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb..5d77a9bb72 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.1.tar.xz.sha256sum +sha256 6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df gst-editing-services-1.20.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae7..dbdf2abca0 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:36 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.20.1 Message-ID: <20220316220441.8B8FF8431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd7ebd2ca426aeacd0e509461d1d94962e65a8bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fd..fe1e2068b1 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.1.tar.xz.sha256sum +sha256 ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 gst-python-1.20.1.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d7..3fd8059bee 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.20.0 +GST1_PYTHON_VERSION = 1.20.1 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:13:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:13:26 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to 3.4.3 In-Reply-To: <20220316105753.1134088-1-francois.perrad@gadz.org> References: <20220316105753.1134088-1-francois.perrad@gadz.org> Message-ID: <20220316221326.GF283544@scaer> Fran?ois, All, On 2022-03-16 11:57 +0100, Francois Perrad spake thusly: > see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 > > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libressl/libressl.hash | 2 +- > package/libressl/libressl.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash > index 990ec8bda..e92399871 100644 > --- a/package/libressl/libressl.hash > +++ b/package/libressl/libressl.hash > @@ -1,4 +1,4 @@ > # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 > -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz > +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz > # Locally computed > sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING > diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk > index 6eee86dda..0bb468ced 100644 > --- a/package/libressl/libressl.mk > +++ b/package/libressl/libressl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBRESSL_VERSION = 3.4.2 > +LIBRESSL_VERSION = 3.4.3 > LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL > LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) > LIBRESSL_LICENSE_FILES = COPYING > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:16:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:16:18 +0100 Subject: [Buildroot] [git commit] package/libminiupnpc: disable sample and tests Message-ID: <20220316220950.A14A584323@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1d0ac062cd65794a39e90b5f7abae354aa69be9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 22:19:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:19:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests In-Reply-To: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Message-ID: <20220316221908.GG283544@scaer> Fabrice, All, On 2022-03-16 21:39 +0100, Fabrice Fontaine spake thusly: > Disable sample and tests (which are built by default since version 2.1: > https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libminiupnpc/libminiupnpc.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk > index 551a6767cf..0633ccd234 100644 > --- a/package/libminiupnpc/libminiupnpc.mk > +++ b/package/libminiupnpc/libminiupnpc.mk > @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project > LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc > LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) > LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) > +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF > > $(eval $(cmake-package)) > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:20:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:20:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies In-Reply-To: <20220316203922.3081843-2-fontaine.fabrice@gmail.com> References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> <20220316203922.3081843-2-fontaine.fabrice@gmail.com> Message-ID: <20220316222007.GH283544@scaer> Fabrice, All, On 2022-03-16 21:39 +0100, Fabrice Fontaine spake thusly: > libminiupnpc can be statically built with or without binfmt flat since > version 1.7 and > https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d > > Signed-off-by: Fabrice Fontaine > --- [--SNIP--] > diff --git a/package/transmission/Config.in b/package/transmission/Config.in > index aaed7ec111..eb51ccf862 100644 > --- a/package/transmission/Config.in > +++ b/package/transmission/Config.in > @@ -2,8 +2,8 @@ config BR2_PACKAGE_TRANSMISSION > bool "transmission" > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU # fork() > - depends on !BR2_BINFMT_FLAT # libminiupnpc, libnatpmp > - depends on !BR2_STATIC_LIBS # libminiupnpc, libnatpmp > + depends on !BR2_BINFMT_FLAT # libnatpmp > + depends on !BR2_STATIC_LIBS # libnatpmp This does not apply to current master; error: patch failed: package/transmission/Config.in:2 error: package/transmission/Config.in: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Applying: package/libminiupnpc: drop dependencies Patch failed at 0001 package/libminiupnpc: drop dependencies When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Care to have a look and respin, please? Regards, Yann E. MORIN. > select BR2_PACKAGE_ZLIB > select BR2_PACKAGE_DHT > select BR2_PACKAGE_OPENSSL > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From hrsourabh011 at gmail.com Wed Mar 16 22:25:04 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 16 Mar 2022 23:25:04 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: <20220315213347.09ddc034@gmx.net> References: <20220315213347.09ddc034@gmx.net> Message-ID: Hello Peter, In my local Buildroot package folder I don't have "0001-build-re-enable-options-for-libwpa_client.so-and-.patch" file. Can you please let me know how to include this file? This is my first time applying patches in Buildroot. I have downloaded patch file(tar.bz2). I assume copying patch file to wpa_supplicant dir and running "make clean && make" will apply this patch. Please correct me if I am wrong. And also I tried below to assign IP address to my board (RPi CM4) wpa_supplicant -B -Dnl80211 -iwlan0 -cwpa_supplicant.conf udhcpc -i wlan0 But this gives: udhcpc: started, v1.35.0 udhcpc: broadcasting discover udhcpc: broadcasting discover udhcpc: broadcasting discover udhcpc: broadcasting discover . . . Is there any other way to assign IP address to the board? Your help will be much appreciated. Thanks in advance On Tue, 15 Mar 2022 at 21:33, Peter Seiderer wrote: > On Tue, 15 Mar 2022 21:00:54 +0100, Arnout Vandecappelle > wrote: > > > On 15/03/2022 14:05, Sourabh Hegde wrote: > > > Helllo Jan, > > > > > > Thanks for the answer. > > > > > > From Buildroot 2021 release "ctrl_interface" is disabled and so I > have > > > > It's disabled unless BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > > > > > commented out below line in etc/wpa_supplicant.conf file > > > > > > # |ctrl_interface=/var/run/wpa_supplicant| > > > > This shouldn't be needed. AFAIK wpa_supplicant ignores the option if > > CTRL_IFACE is not enabled. > > > > > | > > > | > > > |And also in my rootfs, there is no "|/var/run/wpa_supplicant|" file. > > > > The file (actually, named pipe) is created when wpa_supplicants starts > up. > > /var/run is a tmpfs so it can only be created at runtime. > > > > > | > > > | > > > | > > > |I have set below options in menuconfig| > > > | > > > | > > > menuconfig.PNG > > > > > > Then doing make clean & make results in below errors: > > > > > > >>> wpa_supplicant 2.10 Installing to staging directory > > > /usr/bin/install -m 0644 -D > > > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so > > > > > /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so > > > /usr/bin/install: cannot stat > > > > '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': > > > > No such file or directory > > > make[1]: *** [package/pkg-generic.mk:331 : > > > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] > > > > Error 1 > > > make: *** [Makefile:23: _all] Error 2 > > > > > > Can you please let me know what could be the issue and how to resolve > it? > > > > I've tried to build the same configuration (with current git master) > and it > > builds without problems. > > Problem introduced on buildroot git master with wpa_supplicant version > bump [1] and > fixed with [2]... > > Regards, > Peter > > [1] > https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=39381a467cd2cfc15f77d3f9adbf329d2f92e312 > [2] > https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=c4eebf191c781a3ea6b5eb1811cc17ae92ea2fb2 > > > > > Please supply the defconfig and also the full build log (by uploading > to a > > pastebin). > > > > Regards, > > Arnout > > > > > > > > > > Thanks in advance > > > || > > > > > > On Thu, 10 Mar 2022 at 19:03, Jan Havran > > > wrote: > > > > > > Hi Sourabh, > > > > > > after enabling RPi firmware you must load the Wifi driver - since > you are using > > > systemd, it should by handled by udev on start I think. > > > > > > So you probably just need to configure /etc/network/interfaces to > start > > > wpa_supplicant > > > on wlan0 with /etc/wpa_supplicant.conf file, where you can put > your credentials. > > > Or at least that is what I have done, but I am not using systemd. > > > > > > I did something similar some time ago, you can check it here: > > > > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > < > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > > > > > > (note that to make "my" credentials public in that commit was an > intention). > > > > > > P.S.: if you want to have any modifications to be part of your > image with > > > filesystem, > > > you can do it by using rootfs overlays for example: > > > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > > > > > > > Regards, > > > > > > Jan Havran > > > > > > V Thu, Mar 10, 2022 at 05:43:27PM +0100, Sourabh Hegde napsal(a): > > > > Hello All, > > > > > > > > I am trying to connect my Raspberry Pi CM4 to Wifi > automatically after > > > > start-up. I am using Buildroot based Linux distribution. I have > worked with > > > > Yocto before and it provides systemd-networkd and > wpa_supplicant feature to > > > > connect to wifi on boot. I am lloking something similar in > Buildroot but > > > > couldn't find any notes online. > > > > > > > > So far, I think I have enabled the necessary config/driver > using "make > > > > menuconfig" : > > > > [image: wpa_supplicant.png] > > > > [image: firmware.png] > > > > > > > > But now, how can I set-up wpa_supplicant.conf? Any link to > notes or > > > > suggestion would be helpful. > > > > > > > > Can anyone please let me know how to proceed further with it? > > > > > > > > Your help will be much appreciated. > > > > > > > > Thanks in advance. > > > > > > > > P.S: I am using Buildroot 2022.02 release and also using > systemd feature > > > > and let me know if any info is missing here. > > > > > > > > Regards, > > > > > > > > Sourabh > > > > > > > > > > > > > > > > _______________________________________________ > > > > buildroot mailing list > > > > buildroot at buildroot.org > > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Thu Mar 17 07:13:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:13:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: drop custom install rules In-Reply-To: <20220305204446.823802-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Mar 2022 21:44:46 +0100") References: <20220305204446.823802-1-fontaine.fabrice@gmail.com> Message-ID: <878rt9t5kr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop custom install rules which have been added since the addition of > the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are > now resulting in a broken installion > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14636 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:32:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:32:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 2.4.13 In-Reply-To: <87o82i834r.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Mon, 07 Mar 2022 11:32:04 +0100") References: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> <87o82i834r.fsf@dell.be.48ers.dk> Message-ID: <874k3xt4ob.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Fabrice" == Fabrice Fontaine writes: >> https://www.mail-archive.com/haproxy at formilux.org/msg41834.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41698.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41685.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41618.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41512.html >> Signed-off-by: Fabrice Fontaine > Committed given the bugfixes, thanks. Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 2.2.22. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:47:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:47:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.7 In-Reply-To: <20220305173913.229445-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Mar 2022 18:39:13 +0100") References: <20220305173913.229445-1-fontaine.fabrice@gmail.com> Message-ID: <87zglprpfs.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release relaxes the fix to CVE-2022-25236 (introduced with release > 2.4.5) which some of you have been waiting for, due to related > incompatibilities. > https://blog.hartwork.org/posts/expat-2-4-7-released > https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:48:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:48:36 +0100 Subject: [Buildroot] [PATCH 2/2] docs: fix links to AsciiDoc In-Reply-To: <20220228163238.405627-1-theo.lebrun@bootlin.com> (=?utf-8?Q?=22Th=C3=A9o?= Lebrun via buildroot"'s message of "Mon, 28 Feb 2022 17:32:38 +0100") References: <20220228163238.405627-1-theo.lebrun@bootlin.com> Message-ID: <87v8wdrpd7.fsf@dell.be.48ers.dk> >>>>> "Th?o" == Th?o Lebrun via buildroot writes: > Links were aimed at the methods.co.nz domain, which is now returning > 404s. The current situation of AsciiDoc is unclear to me: the Fedora > package points to this website, they own asciidoc.org, Wikipedia points > to this project as well but their Git repo's README includes the > following paragraph: >> AsciiDoc.py is a legacy processor for this syntax, handling an older >> rendition of AsciiDoc. As such, this will not properly handle the >> current AsciiDoc specification. It is suggested that unless you >> specifically require the AsciiDoc.py toolchain, you should find a >> processor that handles the modern AsciiDoc syntax. > --- https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md > "AsciiDoc specification" pointing towards: > https://projects.eclipse.org/projects/asciidoc.asciidoc-lang > Signed-off-by: Th?o Lebrun Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:46:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:46:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: bump to version 2.4.7 Message-ID: <20220317074006.E83F483EAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26c678a3c60c012a0c09deadea5a58b37f563a00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 402d85ef4e3d5161869d5da918ec679a9571c417) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 17 07:12:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:12:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220317074006.D42AD83E73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=434773e57842e0fd5801830b2143a28592f7626b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d1debbb4c7eb205d3ccddaa7849e3121a4929c6c) Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index c664ad83a4..a8f42a25bc 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) From peter at korsgaard.com Thu Mar 17 07:31:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:31:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/haproxy: bump to version 2.2.22 Message-ID: <20220317074006.DD4C283E7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bcc9f2bca146dc2668d22f1833bfb8775a0312c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://www.haproxy.org/download/2.2/src/CHANGELOG Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 92f155581f..23b4db7ef2 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.17.tar.gz.sha256 -sha256 68af4aa3807d9c9f29b976d0ed57fb2e06acf7a185979059584862cc20d85be0 haproxy-2.2.17.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.22.tar.gz.sha256 +sha256 823a12fdab61a4a547770e29ad3418de2d7d4a5542a51fb3277f74a6321eccfc haproxy-2.2.22.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 0b38995810..8dd875ce0b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.2 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).17 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).22 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Thu Mar 17 07:48:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:48:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs: fix links to AsciiDoc Message-ID: <20220317074006.F19BE83E73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe61f3e1db154bd37a44bcc9b050075e1d400a90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th??o Lebrun Signed-off-by: Peter Korsgaard (cherry picked from commit efcb7eeabc22df47ca09e69c99f73e9183ed6cf3) Signed-off-by: Peter Korsgaard --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3b809d5c48..77497d6d7b 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -139,10 +139,10 @@ endif === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts From bugzilla at busybox.net Thu Mar 17 08:08:45 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 17 Mar 2022 08:08:45 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 mbuil at suse.com changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #11 from mbuil at suse.com --- Hey, thanks! A colleague of mine fixed this some months ago. -- You are receiving this mail because: You are on the CC list for the bug. From johannes.agricola at work-microwave.com Thu Mar 17 07:59:10 2022 From: johannes.agricola at work-microwave.com (Johannes Agricola) Date: Thu, 17 Mar 2022 08:59:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: bump to version 4.3.1 Message-ID: <20220317075909.3705760-1-johannes.agricola@work-microwave.com> Signed-off-by: Johannes Agricola --- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 1761a7658a..f92c66018f 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz +sha256 8fdb1454a1b34cd9a6351beaab237a485e6853806101de7e62bd2bc250bb50af libwebsockets-4.3.1.tar.gz sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index c25686d385..152659cee6 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.0.21 +LIBWEBSOCKETS_VERSION = 4.3.1 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE -- 2.25.1 From fontaine.fabrice at gmail.com Thu Mar 17 10:06:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 11:06:09 +0100 Subject: [Buildroot] package gdk-pixbuf relocatable issue In-Reply-To: References: Message-ID: Hello, Le mer. 16 mars 2022 ? 12:09, Sassen, Rutger a ?crit : > > Hello, > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). Thanks for spotting this issue, I think the best approach is to: - set relocatable to true for the target (see https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) Can you confirm that this approach is working? In this case, can you send a patch to the mailing list? > > My configuration: > Host: Debian 10 (buster) > Buildroot version: 2022-02 > Target: Aarch64 (raspberry pi cm3) > Package: gdk-pixbuf > > The problematic snippets from gdk-pixbuf.mk: > > ============== > HOST_GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > -Dintrospection=disabled \ > -Drelocatable=true \ > -Dman=false > ============== > # gdk-pixbuf requires the loaders.cache file populated to work properly > # Rather than doing so at runtime, since the fs can be read-only, do so > # here after building and installing to target. > # And since the cache file will contain absolute host directory names we > # need to sanitize (strip) them. > ifeq ($(BR2_STATIC_LIBS),) > define GDK_PIXBUF_UPDATE_CACHE > GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ > $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > endef > GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE > endif > ============== > > Best regards, > > Rutger Sassen > > p.s. please ignore the email disclaimer that is automatically added to all my outgoing mail... > > > Disclaimer > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. Best Regards, Fabrice From fontaine.fabrice at gmail.com Thu Mar 17 10:17:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 11:17:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: update site link In-Reply-To: <20220317095027.8939-1-bruno.seifert@3brain.com> References: <20220317095027.8939-1-bruno.seifert@3brain.com> Message-ID: Hello, Le jeu. 17 mars 2022 ? 10:51, bruno seifert a ?crit : > > expat is currently in the process of changing the file hosting site from > sourceforge to github. This adjusts the site URL to the new github > location. Old versions are already not available on sourceforge anymore. > > Signed-off-by: bruno seifert > --- > Backport to: all versions > I think the hashes don't need to be changed, but someone who actually > knows stuff should confirm that. Indeed, the hash is the same. > Feel free to adjust the name and syntax. I've just started working a month a go and really don't know what I'm doing. > > Signed-off-by: bruno seifert > --- > package/expat/expat.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/expat/expat.mk b/package/expat/expat.mk > index b29b0e1d26..3dba920083 100644 > --- a/package/expat/expat.mk > +++ b/package/expat/expat.mk > @@ -5,7 +5,8 @@ > ################################################################################ > > EXPAT_VERSION = 2.4.7 > -EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) > +EXPAT_VERSION_TO_URL = $(subst .,_,$(EXPAT_VERSION)) > +EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(EXPAT_VERSION_TO_URL) A single liner would be better: EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) However, I don't understand why we have to update the URL now? Can't we wait for the next expat bump? > EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz > EXPAT_INSTALL_STAGING = YES > EXPAT_DEPENDENCIES = host-pkgconf > -- > 2.25.1 > > > -- > > 3Brain AG > Einsiedlerstrasse 30 > 8820 W?denswil > Switzerland > +41 81 322 70 86 > > www.3brain.com > > > > > > > > > > > > > Best Regards, Fabrice From rsassen at comecer.com Thu Mar 17 11:06:22 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Thu, 17 Mar 2022 11:06:22 +0000 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations. Signed-off-by: Rutger Sassen --- Changes v2 -> v3: - in Config.in use if statement instead of depends (suggested by Peter Seiderer) - mention the filename overlay_map.dtb in the help text (suggested by Peter Seiderer) Changes v1 -> v2: - instead of always copying overlay_map.dtb, make it configurable (suggested by Peter Seiderer) - do not copy README since it a special case, only needed when installing overlays to a non-standard location (suggested by Peter Seiderer) When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations. Signed-off-by: Rutger Sassen --- package/rpi-firmware/Config.in | 12 ++++++++++++ package/rpi-firmware/rpi-firmware.mk | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 8070dc3019..36054353f8 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS overlays, to support HATs (Hardware Attached on Top, add-on modules). +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + bool "Install DTB overlay map" + default n + help + Say 'y' here if you need to support multiple hardware targets + and you need overlay_map.dtb for target dependent mapping of + overlay names to one of several overlay implementations. + +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG bool "vcdbg" depends on BR2_arm # prebuilt arm binary, rpi-userland diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..800b560070 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS endef endif +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ +endef +endif + # Install prebuilt libraries if RPI_USERLAND not enabled ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) define RPI_FIRMWARE_INSTALL_TARGET_LIB @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(RPI_FIRMWARE_INSTALL_CONFIG) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) endef $(eval $(generic-package)) -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Thu Mar 17 07:19:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:19:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/haproxy: bump to version 2.4.13 Message-ID: <20220317120131.A7E9684371@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef91c95dafa91b4b685a13acda616544fafb8c5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://www.mail-archive.com/haproxy at formilux.org/msg41834.html https://www.mail-archive.com/haproxy at formilux.org/msg41698.html https://www.mail-archive.com/haproxy at formilux.org/msg41685.html https://www.mail-archive.com/haproxy at formilux.org/msg41618.html https://www.mail-archive.com/haproxy at formilux.org/msg41512.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0e60d4f11cd56544d6c23a1f7c3c8bbd98edbec3) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index c29857cd9c..e3120b521f 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 -sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 +sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 33a2e92777..83d9cfee37 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Thu Mar 17 07:19:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:19:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/haproxy: bump to version 2.4.8 Message-ID: <20220317120131.9C127841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d9071b4781505489930d1136001ebd56ee93901 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is a bug fix release which addresses quite a number of issues https://www.mail-archive.com/haproxy at formilux.org/msg41404.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f82a83582520fa5bf5a05c9308da91ee20639710) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 2e39fb4aa5..c29857cd9c 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.7.tar.gz.sha256 -sha256 52af97f72f22ffd8a7a995fafc696291d37818feda50a23caef7dc0622421845 haproxy-2.4.7.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 +sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 0434c73348..33a2e92777 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).7 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Thu Mar 17 07:48:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:48:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs: fix links to AsciiDoc Message-ID: <20220317120131.BC14084370@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdfaeebab3b89ca22352ec1706c44c35adf85ff9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th??o Lebrun Signed-off-by: Peter Korsgaard (cherry picked from commit efcb7eeabc22df47ca09e69c99f73e9183ed6cf3) Signed-off-by: Peter Korsgaard --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 7e2b5f909c..e01e3f02a1 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -201,10 +201,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts From peter at korsgaard.com Thu Mar 17 07:46:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:46:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: bump to version 2.4.7 Message-ID: <20220317120131.B3423841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f22eb3abec86226135141c31374e8a19c7bdb2b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 402d85ef4e3d5161869d5da918ec679a9571c417) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 17 07:12:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:12:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220317120131.8E81C84357@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65b769f72725f0c1c8154b31774469fc3047dc1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d1debbb4c7eb205d3ccddaa7849e3121a4929c6c) Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) From peter at korsgaard.com Thu Mar 17 12:11:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:11:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site In-Reply-To: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> (Andrei Gherghescu via buildroot's message of "Thu, 24 Feb 2022 21:36:33 +0000") References: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> Message-ID: <87r170srqz.fsf@dell.be.48ers.dk> >>>>> "Andrei" == Andrei Gherghescu via buildroot writes: > The http://www.directfb.org/ has been down since 2015. > Use the Buildroot backup download site. > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=13731 > Signed-off-by: Andrei Gherghescu Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:12:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:12:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> (TIAN Yuanhao's message of "Mon, 21 Feb 2022 04:06:57 -0800") References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: <87mthosrpk.fsf@dell.be.48ers.dk> >>>>> "TIAN" == TIAN Yuanhao writes: > Dependency on sqlite has been removed since v17.04.0-ce. > See: https://github.com/moby/moby/pull/30208 > Signed-off-by: TIAN Yuanhao Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:13:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:13:59 +0100 Subject: [Buildroot] [PATCH] docs/manual: Document Kconfig requirements for uboot In-Reply-To: <20220307141321.307200-1-dopsi@dopsi.ch> (Simon Doppler's message of "Mon, 7 Mar 2022 15:13:21 +0100") References: <20220307141321.307200-1-dopsi@dopsi.ch> Message-ID: <87ilscsrnc.fsf@dell.be.48ers.dk> >>>>> "Simon" == Simon Doppler writes: > When using uboot's legacy build system, the 'make uboot-menuconfig' > and 'make uboot-savedefconfig' targets are not available as they > are created by 'kconfig-package'. > Signed-off-by: Simon Doppler Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:18:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:18:41 +0100 Subject: [Buildroot] [PATCH] package/gdb: fix when gmp is installed on the host machine In-Reply-To: <20220219154350.1552021-1-john@metanate.com> (John Keeping's message of "Sat, 19 Feb 2022 15:43:50 +0000") References: <20220219154350.1552021-1-john@metanate.com> Message-ID: <87ee30srfi.fsf@dell.be.48ers.dk> >>>>> "John" == John Keeping writes: > gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with > /usr/lib/ which can lead to libgmp from the wrong architecture with the > result that the test fails. Even if a libgmp is found there it is now > the one that should be used. > This is the same macro used for expat and lzma for which there are > already specific CONF_OPTS flags added here. Add the same flag for > libgmp and move the handling down so that it is logically grouped with > the other similar options. > Note that there is no --with(out)-gmp flag to configure, as the > dependency is mandatory, so only the --with-libgmp-prefix option is > specified. > Signed-off-by: John Keeping Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:11:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:11:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/directfb: change upstream site Message-ID: <20220317121041.7F3CE84387@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=926a6bec3d95f570217f012aeb49d876015a2cdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13126 Signed-off-by: Andrei Gherghescu Signed-off-by: Peter Korsgaard (cherry picked from commit 89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c) Signed-off-by: Peter Korsgaard --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 17 12:13:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:13:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220317121041.93F458438C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1da4b588b8cf6db6b2ecc64213131e855e3bb6ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler Signed-off-by: Peter Korsgaard (cherry picked from commit ca9e55ad11271cb26b0bffba336cf5a0d74ba378) Signed-off-by: Peter Korsgaard --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: From peter at korsgaard.com Thu Mar 17 12:12:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:12:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-engine: remove unused sqlite Message-ID: <20220317121041.89CFD84389@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=812e7952b4e117bd7b160d1969bda19d30059d99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard (cherry picked from commit 6105ad3f72fcb98a7d9aba543c6bb7311827c1d4) Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 911cbfe428..1f0efb8fcc 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. From peter at korsgaard.com Thu Mar 17 12:18:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:18:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdb: fix when gmp is installed on the host machine Message-ID: <20220317121041.9F02584387@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=991f09134f3d88ff39a1f8fc5dacc77c3bb894a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with /usr/lib/ which can lead to libgmp from the wrong architecture with the result that the test fails. Even if a libgmp is found there it is now the one that should be used. This is the same macro used for expat and lzma for which there are already specific CONF_OPTS flags added here. Add the same flag for libgmp and move the handling down so that it is logically grouped with the other similar options. Note that there is no --with(out)-gmp flag to configure, as the dependency is mandatory, so only the --with-libgmp-prefix option is specified. Signed-off-by: John Keeping Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9fa5d641ac4951087bb007e091a799101d294527) Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..8fb5f0ef5c 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) HOST_GDB_DEPENDENCIES += host-gmp endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) -GDB_DEPENDENCIES += gmp -endif - # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, # so we disable it (additionally the option --disable-install-libbfd @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ --without-curses endif +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and +# we're building the full gdb for the target, we need gmp as a +# dependency. For now the default gdb version in Buildroot doesn't +# require gmp. +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_CONF_OPTS += \ + --with-libgmp-prefix=$(STAGING_DIR)/usr +GDB_DEPENDENCIES += gmp +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) From peter at korsgaard.com Thu Mar 17 12:11:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:11:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/directfb: change upstream site Message-ID: <20220317121107.46F5984398@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ead853e5b7c8371c65f32bcaf0507ab5cc05af6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13126 Signed-off-by: Andrei Gherghescu Signed-off-by: Peter Korsgaard (cherry picked from commit 89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c) Signed-off-by: Peter Korsgaard --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 17 12:12:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:12:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-engine: remove unused sqlite Message-ID: <20220317121107.501DC8439A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56c9ec58d08cbe88f421c69e7e658e374f92c8cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard (cherry picked from commit 6105ad3f72fcb98a7d9aba543c6bb7311827c1d4) Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 4fa3b5a8c3..e99b2504c5 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. From peter at korsgaard.com Thu Mar 17 12:13:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:13:04 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220317121107.5923E84398@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4d21fda051b78af74e446d32937ff0e9d612b20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler Signed-off-by: Peter Korsgaard (cherry picked from commit ca9e55ad11271cb26b0bffba336cf5a0d74ba378) Signed-off-by: Peter Korsgaard --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: From rsassen at comecer.com Thu Mar 17 13:19:52 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Thu, 17 Mar 2022 13:19:52 +0000 Subject: [Buildroot] package gdk-pixbuf relocatable issue Message-ID: Hello Fabrice, > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-> 2.0/2.10.0/loaders/libpixbufloader-*". > > > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). > > Thanks for spotting this issue, I think the best approach is to: > - set relocatable to true for the target (see > https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) > - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) > > Can you confirm that this approach is working? Unfortunately this is not working. Without the GDK_PIXBUF_UPDATE_CACHE, the target ends up with no loaders.cache at all. It?s also not possible to run gdk-pixbuf-query-loaders in the target directory because the architecture might differ from the host. Best regards, Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Mar 17 13:35:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 14:35:29 +0100 Subject: [Buildroot] package gdk-pixbuf relocatable issue In-Reply-To: References: Message-ID: Le jeu. 17 mars 2022 ? 14:19, Sassen, Rutger a ?crit : > > Hello Fabrice, > > > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > > > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > > > > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-> 2.0/2.10.0/loaders/libpixbufloader-*". > > > > > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). > > > > Thanks for spotting this issue, I think the best approach is to: > > - set relocatable to true for the target (see > > https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) > > - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) > > > > Can you confirm that this approach is working? > > Unfortunately this is not working. Without the GDK_PIXBUF_UPDATE_CACHE, the target ends up with no loaders.cache at all. Indeed, good catch, then we can only drop the SED command. However, can you confirm that setting relocatable to true doesn't fix the issue? >From my understanding, if relocatable is true, gdk-pixbuf should prepend the toplevel dir: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/gdk-pixbuf/gdk-pixbuf-io.c#L352 If this doesn't work (because the toplevel dir is not correct), then the better option would be to update the SED command to prepend /usr/ to all lib paths. > It?s also not possible to run gdk-pixbuf-query-loaders in the target directory because the architecture might differ from the host. > > Best regards, > > Rutger > > > Disclaimer > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. Best Regards, Fabrice From hrsourabh011 at gmail.com Thu Mar 17 14:45:18 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 17 Mar 2022 15:45:18 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? Message-ID: Hello All, I am facing an issue while running OpenSSH demon in Buildroot 2022 release. The output of "systemctl status sshd" results in sshd.service - OpenSSH server daemon Loaded: loaded (/usr/lib/systemd/system/sshd.service; enabled; vendor prese Active: failed (Result: exit-code) since Tue 2022-01-18 13:16:03 UTC; 9min Process: 1703 ExecStartPre=/usr/bin/ssh-keygen -A (code=exited, status=0/SUC Process: 1704 ExecStart=/usr/sbin/sshd -D -e (code=exited, status=1/FAILURE) Main PID: 1704 (code=exited, status=1/FAILURE) CPU: 27ms Jan 18 13:16:02 br2rauc systemd[1]: Starting OpenSSH server daemon... Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc systemd[1]: Started OpenSSH server daemon. Jan 18 13:16:03 br2rauc sshd[1704]: sshd: no hostkeys available -- exiting. Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Main process exited, code=exit Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Failed with result 'exit-code' # ps aux | grep ssh 253 root grep ssh So, there is not sshd deamon running. And also no key files present in /etc/ssh/ I ran "/usr/bin/ssh-keygen -A" manually but this gives: ssh-keygen: generating new host keys: RSA Could not save your private key in /etc/ssh/ssh_host_rsa_key.XXXXUBHAIv: Read-only file system ssh-keygen: generating new host keys: DSA Could not save your private key in /etc/ssh/ssh_host_dsa_key.XXXXq0KiIl: Read-only file system ssh-keygen: generating new host keys: ECDSA Could not save your private key in /etc/ssh/ssh_host_ecdsa_key.XXXXibybTV: Read-only file system ssh-keygen: generating new host keys: ED25519 Could not save your private key in /etc/ssh/ssh_host_ed25519_key.XXXXzI2JnB: Read-only file system Yes, I do have a Read-only file system. But is it not possible to work with a read-only filesystem and ssh? In the menuconfig I have: [image: OpenSSH.PNG] Can anyone please let me know if there is a workaround? Is changing rootfs to r/w is the only solution? Does selecting "System Configuration"-->"remount root filesystem read-write during boot" will do the trick? Your help will be much appreciated. Thanks in advance, -Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenSSH.PNG Type: image/png Size: 47291 bytes Desc: not available URL: From rsassen at comecer.com Thu Mar 17 15:28:38 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Thu, 17 Mar 2022 15:28:38 +0000 Subject: [Buildroot] package gdk-pixbuf relocatable issue Message-ID: > > > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > > > > > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > > > > > > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf- > > 2.0/2.10.0/loaders/libpixbufloader-*". > > > > > > > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). > > > > > > Thanks for spotting this issue, I think the best approach is to: > > > - set relocatable to true for the target (see > > > https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) > > > - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) > > > > > > Can you confirm that this approach is working? > > > > Unfortunately this is not working. Without the GDK_PIXBUF_UPDATE_CACHE, the target ends up with no loaders.cache at all. > Indeed, good catch, then we can only drop the SED command. > However, can you confirm that setting relocatable to true doesn't fix the issue? > From my understanding, if relocatable is true, gdk-pixbuf should > prepend the toplevel dir: > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/gdk-pixbuf/gdk-pixbuf-io.c#L352 It tested it, and it does not work. From my understanding this toplevel dir is one directory up relative to the path of the executable, so if the executable is /foo/bar/my_executable , the toplevel dir will be /foo . > If this doesn't work (because the toplevel dir is not correct), then > the better option would be to update the SED command to prepend /usr/ > to all lib paths. I agree. Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From angelo at amarulasolutions.com Thu Mar 17 15:55:33 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 17 Mar 2022 16:55:33 +0100 Subject: [Buildroot] [PATCH] package/libdill: new package Message-ID: <20220317155533.1906663-1-angelo@amarulasolutions.com> Libdill is a C library that makes writing structured concurrent programs easy. Signed-off-by: Angelo Compagnucci --- DEVELOPERS | 1 + package/Config.in | 1 + package/libdill/Config.in | 8 ++++++++ package/libdill/libdill.hash | 3 +++ package/libdill/libdill.mk | 16 ++++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/libdill/Config.in create mode 100644 package/libdill/libdill.hash create mode 100644 package/libdill/libdill.mk diff --git a/DEVELOPERS b/DEVELOPERS index 70d71186ed..9410944584 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -167,6 +167,7 @@ F: package/i2c-tools/ F: package/jq/ F: package/libapparmor/ F: package/libb64/ +F: package/libdill/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..47f84a08dc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdill/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdill/Config.in b/package/libdill/Config.in new file mode 100644 index 0000000000..17bec04db7 --- /dev/null +++ b/package/libdill/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBDILL + bool "libdill" + select BR2_PACKAGE_OPENSSL + help + Libdill is a C library that makes writing structured concurrent + programs easy. + + http://libdill.org diff --git a/package/libdill/libdill.hash b/package/libdill/libdill.hash new file mode 100644 index 0000000000..4a1fb91a57 --- /dev/null +++ b/package/libdill/libdill.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 6df7527e8f1e91f5106c21c5bfeaa69eee470bec476c74585143e3e439864404 libdill-fa01648cf2a8d06e53c965b45eeacfb3ac57bd04.tar.gz +sha256 3f78d9c42c8919cb6dc63e51de17b9eb40a49d9cdd876ce59e77392721e8c2c6 COPYING diff --git a/package/libdill/libdill.mk b/package/libdill/libdill.mk new file mode 100644 index 0000000000..036c73f33a --- /dev/null +++ b/package/libdill/libdill.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libdill +# +################################################################################ + +LIBDILL_VERSION = fa01648cf2a8d06e53c965b45eeacfb3ac57bd04 +LIBDILL_SITE = $(call github,sustrik,libdill,$(LIBDILL_VERSION)) +LIBDILL_LICENSE = MIT +LIBDILL_LICENSE_FILES = COPYING +LIBDILL_CPE_ID_VENDOR = libdill +LIBDILL_CPE_ID_PRODUCT = libdill +LIBDILL_DEPENDENCIES = openssl +LIBDILL_INSTALL_STAGING = YES + +$(eval $(cmake-package)) -- 2.25.1 From kyle at balena.io Thu Mar 17 16:25:30 2022 From: kyle at balena.io (Kyle Harding) Date: Thu, 17 Mar 2022 12:25:30 -0400 Subject: [Buildroot] [PATCH] package/unbound: use system libevent Message-ID: <20220317162530.427876-1-kyle@balena.io> The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Signed-off-by: Kyle Harding --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 1e6e0d99d7..782ed2b049 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr -- 2.30.2 From foss+buildroot at 0leil.net Thu Mar 17 16:38:21 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 17 Mar 2022 17:38:21 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5base: security bump Message-ID: <20220317163823.2913753-1-foss+buildroot@0leil.net> From: Quentin Schulz This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef02edfc1d..8fd5800822 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -15,6 +15,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at -- 2.35.1 From quentin.schulz at theobroma-systems.com Thu Mar 17 16:40:50 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Thu, 17 Mar 2022 17:40:50 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> <20220310215914.3d26c317@gmx.net> <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> Message-ID: <008dcac4-aa59-0311-9e86-fef7bc80cdca@theobroma-systems.com> Hi all, Please ignore this patch because it is superseded by: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html Thanks, Quentin From foss+buildroot at 0leil.net Thu Mar 17 16:38:23 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 17 Mar 2022 17:38:23 +0100 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <20220317163823.2913753-3-foss+buildroot@0leil.net> From: Quentin Schulz The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- package/qt5/qt5base/qt5base.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 8fd5800822..972d217ef1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,8 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 -- 2.35.1 From foss+buildroot at 0leil.net Thu Mar 17 16:38:22 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 17 Mar 2022 17:38:22 +0100 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5base: remove leftover patch In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <20220317163823.2913753-2-foss+buildroot@0leil.net> From: Quentin Schulz CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert L?hning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - -- 2.35.1 From theo.lebrun at bootlin.com Thu Mar 17 17:03:17 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 17 Mar 2022 18:03:17 +0100 Subject: [Buildroot] [PATCH] package/signal-estimator: add new package Message-ID: <20220317170317.308827-1-theo.lebrun@bootlin.com> Measure characteristics of a looped back signal. https://github.com/gavv/signal-estimator Signed-off-by: Th?o Lebrun --- package/Config.in | 1 + .../0001-fix-nanosecond-type-size.patch | 33 +++++++++++++++++++ package/signal-estimator/Config.in | 14 ++++++++ .../signal-estimator/signal-estimator.hash | 3 ++ package/signal-estimator/signal-estimator.mk | 19 +++++++++++ 5 files changed, 70 insertions(+) create mode 100644 package/signal-estimator/0001-fix-nanosecond-type-size.patch create mode 100644 package/signal-estimator/Config.in create mode 100644 package/signal-estimator/signal-estimator.hash create mode 100644 package/signal-estimator/signal-estimator.mk diff --git a/package/Config.in b/package/Config.in index 7ed075ae19..971b238831 100644 --- a/package/Config.in +++ b/package/Config.in @@ -139,6 +139,7 @@ menu "Debugging, profiling and benchmark" source "package/rt-tests/Config.in" source "package/rwmem/Config.in" source "package/sentry-native/Config.in" + source "package/signal-estimator/Config.in" source "package/spidev_test/Config.in" source "package/strace/Config.in" source "package/stress/Config.in" diff --git a/package/signal-estimator/0001-fix-nanosecond-type-size.patch b/package/signal-estimator/0001-fix-nanosecond-type-size.patch new file mode 100644 index 0000000000..6807fc296b --- /dev/null +++ b/package/signal-estimator/0001-fix-nanosecond-type-size.patch @@ -0,0 +1,33 @@ +From be8443db76c691eb1a8ee07760a801a530752d0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9o=20Lebrun?= +Date: Thu, 17 Mar 2022 11:42:24 +0100 +Subject: [PATCH] fix nanosecond type size +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous type was long, it got replaced by long long to ensure being +capable of storing big enough durations/times. 2**31-1 could only +represent about ~2.15s which was conflicting with the minute constant. + +Signed-off-by: Th?o Lebrun +--- + src/cli/Time.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cli/Time.hpp b/src/cli/Time.hpp +index befd521..638413e 100644 +--- a/src/cli/Time.hpp ++++ b/src/cli/Time.hpp +@@ -8,7 +8,7 @@ + namespace signal_estimator { + + //! Nanoseconds type. +-using nanoseconds_t = long; ++using nanoseconds_t = long long; + + //! One nanosecond represented in nanoseconds. + inline constexpr nanoseconds_t Nanosecond = 1; +-- +2.35.1 + diff --git a/package/signal-estimator/Config.in b/package/signal-estimator/Config.in new file mode 100644 index 0000000000..9a40b66612 --- /dev/null +++ b/package/signal-estimator/Config.in @@ -0,0 +1,14 @@ +comment "signal-estimator needs a toochain w/ C++, threads, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + +config BR2_PACKAGE_SIGNAL_ESTIMATOR + bool "signal-estimator" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + select BR2_PACKAGE_ALSA_LIB + help + Measure characteristics of a looped back signal. + + https://github.com/gavv/signal-estimator diff --git a/package/signal-estimator/signal-estimator.hash b/package/signal-estimator/signal-estimator.hash new file mode 100644 index 0000000000..444f73099e --- /dev/null +++ b/package/signal-estimator/signal-estimator.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 bead8b5eac5a7d4172a9272cc0b618252a747685ee6de2349cb2c235c18627f7 signal-estimator-v0.0.3-br1.tar.gz +sha256 825f572a6a7ca7389e5bddbebe45c839e23a6cf0b63fab6c9e0c6ed018056204 LICENSE diff --git a/package/signal-estimator/signal-estimator.mk b/package/signal-estimator/signal-estimator.mk new file mode 100644 index 0000000000..24120b36da --- /dev/null +++ b/package/signal-estimator/signal-estimator.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# signal-estimator +# +################################################################################ + +SIGNAL_ESTIMATOR_VERSION = v0.0.3 +# Using Git as the package depends on a submodule (an old version of cxxopt). +SIGNAL_ESTIMATOR_SITE_METHOD = git +SIGNAL_ESTIMATOR_SITE = https://github.com/gavv/signal-estimator +SIGNAL_ESTIMATOR_GIT_SUBMODULES = YES +SIGNAL_ESTIMATOR_LICENSE = MIT +SIGNAL_ESTIMATOR_LICENSE_FILES = LICENSE + +SIGNAL_ESTIMATOR_DEPENDENCIES = alsa-lib + +SIGNAL_ESTIMATOR_CONF_OPTS += -DBUILD_GUI=OFF + +$(eval $(cmake-package)) -- 2.35.1 From ps.report at gmx.net Thu Mar 17 18:03:06 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 17 Mar 2022 19:03:06 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220317190306.1e427303@gmx.net> Hello Rutger, On Thu, 17 Mar 2022 11:06:22 +0000, "Sassen, Rutger" wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen Thanks for new patch iteration... Reviewed-by: Peter Seiderer Regards, Peter > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/Config.in | 12 ++++++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 19 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index 8070dc3019..36054353f8 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + bool "Install DTB overlay map" > + default n > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need overlay_map.dtb for target dependent mapping of > + overlay names to one of several overlay implementations. > + > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) From ps.report at gmx.net Thu Mar 17 18:15:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 17 Mar 2022 19:15:10 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <87cziltvrq.fsf@dell.be.48ers.dk> References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> <87cziltvrq.fsf@dell.be.48ers.dk> Message-ID: <20220317191510.1b3b85d5@gmx.net> Hello *, On Wed, 16 Mar 2022 22:47:21 +0100, Peter Korsgaard wrote: > >>>>> "Yann" == Yann E MORIN writes: > > > Peter, All, > > +Peter K.: candidate to be backported, that's a security fix. > > Indeed. Why it is not marked as such ("security bump to version > 1.1.1n")? > Sorry, missed it ;-), did only look at the last version bump ([1]): package/libopenssl: bump version to 1.1.1m not marked as security bump, but according to [2] is one fixing CVE-2021-4160... The security advisory for 1.1.1n is found here [3], fixing CVE-2022-0778... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/libopenssl?id=2b906b975a956bd2b6352b2eec6c3c697317bbbe [2] https://www.openssl.org/news/secadv/20220128.txt [3] https://www.openssl.org/news/secadv/20220315.txt From arnout at mind.be Thu Mar 17 18:42:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 19:42:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix default device behaviour In-Reply-To: <20220316092200.66623-1-theo.lebrun@bootlin.com> References: <20220316092200.66623-1-theo.lebrun@bootlin.com> Message-ID: Hi The?o, On 16/03/2022 10:22, Th?o Lebrun wrote: > This patch has been applied upstream and is required to allow having > default devices on non x86_64 platforms with WirePlumber v0.4.8. > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 It's better to put this link in the patch itself. > > Signed-off-by: Th?o Lebrun > --- > .../0001-fix-non-x86_64-architectures.patch | 212 ++++++++++++++++++ > 1 file changed, 212 insertions(+) > create mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch > > diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > new file mode 100644 > index 0000000000..27b6f034b2 > --- /dev/null > +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > @@ -0,0 +1,212 @@ > +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 > +From: Julian Bouzas > +Date: Wed, 9 Feb 2022 07:59:59 -0500 > +Subject: [PATCH] spa-json: fix va_list APIs for different architectures > + > +The va_list type might not always be a pointer in some architectures, so we > +cannot guarantee it will be modified after using it for a second time in another > +function. This fixes the issue by using macros so args does not get copied, and > +always gets modified when using it more than once. You need to add a Signed-off-by line for yourself, in addition to the one in the commit itself. This is a short way for you to assert that you are entitled to contribute the patch under the package's license. See http://elinux.org/Developer_Certificate_Of_Origin for more details. So it would be: always gets modified when using it more than once. Signed-off-by: The?o ... Upstream: https://... Regards, Arnout > +--- > + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- > + 1 file changed, 80 insertions(+), 76 deletions(-) > + > +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c > +index f14f395d..c5e59a3e 100644 > +--- a/lib/wp/spa-json.c > ++++ b/lib/wp/spa-json.c > +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) > + wp_spa_json_builder_new_formatted ("\"%s\"", value)); > + } > + > +-static void > +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- wp_spa_json_builder_add_null (self); > +- break; > +- case 'b': > +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); > +- break; > +- case 'i': > +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); > +- break; > +- case 'f': > +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); > +- break; > +- case 's': > +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); > +- break; > +- case 'J': > +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); > +- break; > +- default: > +- return; > +- } > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_builder_add_value(self,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ wp_spa_json_builder_add_null (self); \ > ++ break; \ > ++ case 'b': \ > ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ > ++ break; \ > ++ case 'i': \ > ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ > ++ break; \ > ++ case 'f': \ > ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ > ++ break; \ > ++ case 's': \ > ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ > ++ break; \ > ++ case 'J': \ > ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ > ++ break; \ > ++ default: \ > ++ break; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Creates a spa json of type array > +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) > + return res; > + } > + > +-static gboolean > +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- if (!spa_json_is_null (data, len)) > +- return FALSE; > +- break; > +- case 'b': > +- if (!wp_spa_json_parse_boolean_internal (data, len, > +- va_arg(args, gboolean *))) > +- return FALSE; > +- break; > +- case 'i': > +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) > +- return FALSE; > +- break; > +- case 'f': > +- if (spa_json_parse_float (data, len, > +- (float *)va_arg(args, double *)) < 0) > +- return FALSE; > +- break; > +- case 's': { > +- gchar *str = wp_spa_json_parse_string_internal (data, len); > +- if (!str) > +- return FALSE; > +- *va_arg(args, gchar **) = str; > +- break; > +- } > +- case 'J': { > +- WpSpaJson *j = wp_spa_json_new (data, len); > +- if (!j) > +- return FALSE; > +- *va_arg(args, WpSpaJson **) = j; > +- break; > +- } > +- default: > +- return FALSE; > +- } > +- return TRUE; > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_parse_value(data,len,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ if (!spa_json_is_null (data, len)) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'b': \ > ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ > ++ va_arg(args, gboolean *))) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'i': \ > ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'f': \ > ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 's': { \ > ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ > ++ if (!str) \ > ++ return FALSE; \ > ++ *va_arg(args, gchar **) = str; \ > ++ break; \ > ++ } \ > ++ case 'J': { \ > ++ WpSpaJson *j = wp_spa_json_new (data, len); \ > ++ if (!j) \ > ++ return FALSE; \ > ++ *va_arg(args, WpSpaJson **) = j; \ > ++ break; \ > ++ } \ > ++ default: \ > ++ return FALSE; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Parses the object property values of a spa json object > +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) > + value = g_value_get_boxed (&item); > + > + if (g_strcmp0 (key_str, lookup_key) == 0) { > +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) > +- return FALSE; > ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); > + lookup_key = va_arg(args, const gchar *); > + if (!lookup_key) > + return TRUE; > +@@ -1366,9 +1363,12 @@ gboolean > + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, > + va_list args) > + { > +- return wp_spa_json_parser_advance (self) && > +- wp_spa_json_parse_value (self->curr.cur, > +- self->curr.end - self->curr.cur, fmt, args); > ++ if (wp_spa_json_parser_advance (self)) { > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ fmt, args); > ++ return TRUE; > ++ } > ++ return FALSE; > + } > + > + /*! > +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) > + if (!format) > + return TRUE; > + > +- /* parse value */ > +- if (!wp_spa_json_parser_get_value (self, format, args)) > ++ /* advance */ > ++ if (!wp_spa_json_parser_advance (self)) > + return FALSE; > ++ > ++ /* parse value */ > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ format, args); > + } while (TRUE); > + > + return FALSE; > +-- > +GitLab > + From fontaine.fabrice at gmail.com Thu Mar 17 18:56:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 19:56:15 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libminiupnpc: drop dependencies Message-ID: <20220317185615.179351-1-fontaine.fabrice@gmail.com> libminiupnpc can be statically built with or without binfmt flat since version 1.7 and https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Rebase patch on current master package/libminiupnpc/Config.in | 6 ------ package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225..51f4b43bbb 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 0633ccd234..52fe9849f2 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif + $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Thu Mar 17 18:58:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 19:58:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: usbpro needs gcc >= 4.9 Message-ID: <20220317185842.183700-1-fontaine.fabrice@gmail.com> Fix the following build failure with usbpro raised since re-introduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: compiler with C11 support is required to build libusb Fixes: - http://autobuild.buildroot.org/results/e9239403bb13d3468db01a952da8c695c0e5ea30 Signed-off-by: Fabrice Fontaine --- package/ola/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ola/Config.in b/package/ola/Config.in index 36b175138f..e59637b57f 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -164,8 +164,12 @@ config BR2_PACKAGE_OLA_PLUGIN_USBDMX config BR2_PACKAGE_OLA_PLUGIN_USBPRO bool "usbpro" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Build UsbPro plugin for OLA. +comment "usbpro needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + endif -- 2.35.1 From fontaine.fabrice at gmail.com Thu Mar 17 19:00:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 20:00:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgee: needs gcc >= 4.9 Message-ID: <20220317190027.183976-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.20.5 in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: task.c:59:1: error: initializer element is not constant static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; ^ Fixes: - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a Signed-off-by: Fabrice Fontaine --- package/granite/Config.in | 6 ++++-- package/libgee/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d..9519e16d45 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985..cb33ec9ec2 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.35.1 From b.bilas at grinn-global.com Thu Mar 17 19:02:54 2022 From: b.bilas at grinn-global.com (Bartosz Bilas) Date: Thu, 17 Mar 2022 20:02:54 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: Hello, On 17.03.2022 12:06, Sassen, Rutger wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/Config.in | 12 ++++++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 19 insertions(+) > > diff --git a/package/rpi-firmware/Config.in > b/package/rpi-firmware/Config.in > index 8070dc3019..36054353f8 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + bool "Install DTB overlay map" > + default n bool symbols implicitly default to n. Best Bartek > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need overlay_map.dtb for target dependent mapping of > + overlay names to one of several overlay implementations. > + > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk > b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > $(BINARIES_DIR)/rpi-firmware/overlays/ > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) > -- > 2.20.1 > > > *Disclaimer* > > This email communication is CONFIDENTIAL. If you are not the intended > recipient, you may not use, copy or disclose to anyone the message or > any information contained in the message and I ask that you please > notify me by return email and delete this communication immediately. > Thank you. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas at ruschival.de Thu Mar 17 19:23:01 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Thu, 17 Mar 2022 20:23:01 +0100 Subject: [Buildroot] RFC: Patch "Gallium VC4 driver depends on NEON"? Message-ID: <8735jgs7sa.fsf@ruschival.de> Hi Arnout, the Patch "package/mesa3d: Gallium VC4 driver depends on NEON" commit a5cdb54ed78b136c83dd44aebfa27f715cda5ea3 prevents using VC4 and hence OpenGL on Raspberry Pi Zero. >From the referenced autobuild logs I gathered that the build that failed used the bootlin-armv5-uclibc toolchain. Since I wanted to use OpenGL for Qt on a Raspberry Pi Zero I reverted the commit. The package compiled without errors and the system works as expected. Since my build is using a buildroot toolchain arm-buildroot-linux-gnueabihf (gcc 10, glibc) I guess the assembler errors are due to the toolchain. I am not sure how to proceed in this case. Should I investigate further on a more elaborate dependency logic to allow for usage of VC4 on Raspberry Pi Zero that doesn't break autobuild with bootlin-armv5-uclibc? Best regards Thomas From peter at korsgaard.com Thu Mar 17 19:28:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 20:28:40 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220317191510.1b3b85d5@gmx.net> (Peter Seiderer's message of "Thu, 17 Mar 2022 19:15:10 +0100") References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> <87cziltvrq.fsf@dell.be.48ers.dk> <20220317191510.1b3b85d5@gmx.net> Message-ID: <87a6dos7iv.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: Hi, >> Indeed. Why it is not marked as such ("security bump to version >> 1.1.1n")? >> > Sorry, missed it ;-), did only look at the last version bump ([1]): > package/libopenssl: bump version to 1.1.1m > not marked as security bump, but according to [2] is one fixing > CVE-2021-4160... Yes, but that was not known when 1.1.1m was released, E.G. the release is from December (and so is the bump in Buildroot) but the advisory was only made on January 28th: https://www.openssl.org/news/secadv/20220128.txt -- Bye, Peter Korsgaard From arnout at mind.be Thu Mar 17 20:39:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 21:39:14 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <008dcac4-aa59-0311-9e86-fef7bc80cdca@theobroma-systems.com> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> <20220310215914.3d26c317@gmx.net> <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> <008dcac4-aa59-0311-9e86-fef7bc80cdca@theobroma-systems.com> Message-ID: <49a4511f-7111-5065-c04e-513426eab73d@mind.be> On 17/03/2022 17:40, Quentin Schulz wrote: > Hi all, > > Please ignore this patch because it is superseded by: > http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html Instead of replying to the list, it's nicer if you create an account on patchwork [1] and update the patch state to Superseded yourself. Also, in the future please add the version in the subject of the new patch (series) using the -v2 option to git format-patch, and add a patch changelog below the --- line. See [2]. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/list/ [2] https://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog > > Thanks, > Quentin From arnout at mind.be Thu Mar 17 20:53:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 21:53:24 +0100 Subject: [Buildroot] RFC: Patch "Gallium VC4 driver depends on NEON"? In-Reply-To: <8735jgs7sa.fsf@ruschival.de> References: <8735jgs7sa.fsf@ruschival.de> Message-ID: <5feaf128-d85d-9d40-7708-80e2bf5f88a9@mind.be> On 17/03/2022 20:23, Thomas Ruschival wrote: > Hi Arnout, > > the Patch "package/mesa3d: Gallium VC4 driver depends on NEON" > commit a5cdb54ed78b136c83dd44aebfa27f715cda5ea3 prevents using VC4 and > hence OpenGL on Raspberry Pi Zero. > > From the referenced autobuild logs I gathered that the build that failed > used the bootlin-armv5-uclibc toolchain. > > Since I wanted to use OpenGL for Qt on a Raspberry Pi Zero I reverted > the commit. The package compiled without errors and the system works as > expected. Since my build is using a buildroot toolchain > arm-buildroot-linux-gnueabihf (gcc 10, glibc) I guess the assembler > errors are due to the toolchain. > > I am not sure how to proceed in this case. > > Should I investigate further on a more elaborate dependency logic to > allow for usage of VC4 on Raspberry Pi Zero that doesn't break > autobuild with bootlin-armv5-uclibc? The easiest is to test if it still fails with the bootlin toolchain (you can select it from the external toolchains list). If it doesn't, then it's probably something that got fixed by a mesa3d bump. Ideally you should investigate what changed exactly to fix this - I had a quick look, nothing changed in the files using NEON instructions themselves, so it must be that the V3D_BUILD_NEON or PIPE_ARCH_ARM macros are defined differently (they determine whether or not the NEON instructions are used). If it builds now for the bootlin toolchain, please send a revert patch with an explanation why it works - ideally referring to the upstream commit that fixed it. And a reference to the version in which it was fixed, so we know if the revert can be backported to the stable branches. If the build still fails with the bootlin toolchain, then yes ideally find out why it behaves differently with the two toolchains. Again, the NEON instructions are still there in the code, so the difference must be with the V3D_BUILD_NEON or PIPE_ARCH_ARM macros. The only other explanation (I can think of) is a difference in binutils, where your binutils accepts the NEON instructions even on an architecture that doesn't support NEON. Seems pretty unlikely. Regards, Arnout From peter at korsgaard.com Thu Mar 17 20:54:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:54:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory In-Reply-To: <20220222213202.642708-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 22 Feb 2022 22:32:02 +0100") References: <20220222213202.642708-1-ju.o@free.fr> Message-ID: <875yocs3ke.fsf@dell.be.48ers.dk> >>>>> "Julien" == Julien Olivain writes: > When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd > (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start > with a permission error. See output of command: > journalctl --unit=mysqld > Which shows: > systemd[1]: Starting MySQL database server... > install[102]: install: can't create directory '/var/log/mysql': Permission denied > systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE > Since the service file includes the "User=mysql" directive, the > "ExecStartPre=" is executed as this user, which does not have > permission to create a directory in "/var/log". > This commit fixes this issue by adding the "!" prefix, which will > execute the command with full privileges. See the systemd.service manual > page entry for "ExecStart=", table "Special executable prefixes": > https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= > or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 > Moreover, the "mysql_install_db" invocation does not need this special > prefix, as the "/var/lib/mysql" directory on target is already owned > by the "mysql" user. The "chown" command is also useless and is > removed in this commit. > Reported-by: Gilles Talis > Signed-off-by: Julien Olivain Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 20:57:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:57:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/oprofile: drop custom install rules In-Reply-To: <20220307223355.945328-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Mar 2022 23:33:55 +0100") References: <20220307223355.945328-1-fontaine.fabrice@gmail.com> Message-ID: <871qz0s3f5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop custom install rules which have added since commit > 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a > broken installation. Especially, they are trying to "guess" what must > be installed based on BR2_ARCH but oprofile has its own logic. For > example, goldmont microarchitecture files must be installed in i386 > directory even if this architecture is 64 bits: > https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a > This will result in the following runtime failure: > oprofile: could not open unit mask description file > /usr/share/oprofile//i386/goldmont/unit_masks > Unable to find info for event cpu_clk_unhalted > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14641 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 20:59:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:59:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 In-Reply-To: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:00:56 +0100") References: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> Message-ID: <87wngsqoqm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This is a patch release for version 2 & 2.4, fixing a regression > introduced in 2.4.1. > https://github.com/cisco/libsrtp/releases/tag/v2.4.2 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 21:01:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:01:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220317205338.895C9843AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fa2a8d554e6cb0c3db2d86eda57ec4bfd321415 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain Tested-By: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit fd03d4f057bdbd343f78360bd732df1b47d774a0) Signed-off-by: Peter Korsgaard --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql From peter at korsgaard.com Thu Mar 17 21:01:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:01:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libsrtp: bump to version 2.4.2 Message-ID: <20220317205338.9F6C1843B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2e163ad4e83e565d683ccc05cef101c864b99f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is a patch release for version 2 & 2.4, fixing a regression introduced in 2.4.1. https://github.com/cisco/libsrtp/releases/tag/v2.4.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 232868ffd3ef76f060711adf5ea1e5001e21ef9d) Signed-off-by: Peter Korsgaard --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 3de0130f4c..8e51e68ac2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 885f05a33c..f2ba600dd6 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.1 +LIBSRTP_VERSION = 2.4.2 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause From peter at korsgaard.com Thu Mar 17 21:01:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:01:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/oprofile: drop custom install rules Message-ID: <20220317205338.93A88843AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6a980e372cf406e4e3a7c388a1c60a1d63dd345 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop custom install rules which were added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5259807318699646a7bb9cbc24fb137983bc5270) Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) From peter at korsgaard.com Thu Mar 17 20:53:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:53:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220317205358.26099843BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c6ab290d67105e432448563979d81e3c395c80d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain Tested-By: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit fd03d4f057bdbd343f78360bd732df1b47d774a0) Signed-off-by: Peter Korsgaard --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql From peter at korsgaard.com Thu Mar 17 20:57:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:57:05 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/oprofile: drop custom install rules Message-ID: <20220317205358.2EBAC843BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01776e107ff140dfa5ada94821884a7106a714cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop custom install rules which were added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5259807318699646a7bb9cbc24fb137983bc5270) Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) From arnout at mind.be Thu Mar 17 21:04:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:04:59 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? In-Reply-To: References: Message-ID: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> On 17/03/2022 15:45, Sourabh Hegde wrote: > Hello All, > > I am facing an issue while running OpenSSH demon?in Buildroot 2022 release. > > The output of "systemctl status sshd" results in > > sshd.service - OpenSSH server daemon > ? ? ?Loaded: loaded (/usr/lib/systemd/system/sshd.service; enabled; vendor prese > ? ? ?Active: failed (Result: exit-code) since Tue 2022-01-18 13:16:03 UTC; 9min > ? ? Process: 1703 ExecStartPre=/usr/bin/ssh-keygen -A (code=exited, status=0/SUC > ? ? Process: 1704 ExecStart=/usr/sbin/sshd -D -e (code=exited, status=1/FAILURE) > ? ?Main PID: 1704 (code=exited, status=1/FAILURE) > ? ? ? ? CPU: 27ms > > Jan 18 13:16:02 br2rauc systemd[1]: Starting OpenSSH server daemon... > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc systemd[1]: Started OpenSSH server daemon. > Jan 18 13:16:03 br2rauc sshd[1704]: sshd: no hostkeys available -- exiting. > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Main process exited, code=exit > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Failed with result 'exit-code' > > # ps aux | grep ssh > ? 253 root ? ? grep ssh > > So, there is not sshd deamon?running. And also no key files present in /etc/ssh/ > > I ran "/usr/bin/ssh-keygen -A" manually but this gives: > > ssh-keygen: generating new host keys: RSA Could not save your private key in > /etc/ssh/ssh_host_rsa_key.XXXXUBHAIv: Read-only file system > ssh-keygen: generating new host keys: DSA Could not save your private key in > /etc/ssh/ssh_host_dsa_key.XXXXq0KiIl: Read-only file system > ssh-keygen: generating new host keys: ECDSA Could not save your private key in > /etc/ssh/ssh_host_ecdsa_key.XXXXibybTV: Read-only file system > ssh-keygen: generating new host keys: ED25519 Could not save your private key in > /etc/ssh/ssh_host_ed25519_key.XXXXzI2JnB: Read-only file system > > Yes, I do have a Read-only file system. But is it not possible to work with a > read-only filesystem and ssh? Indeed, ssh daemon with readonly rootfs requires special treatment. Someone has gone through the effort for dropbear, but not for openssh. Basically, how it is solved for dropbear is: - build time, create a symlink from /etc/dropbear to /var/run/dropbear (/var/run is a writeable tmpfs). - runtime, in the init script and in the systemd service file, check if /etc/dropbear is a symlink to tmpfs. If yes, try to remove the symlink. If that succeeds, the rootfs is writeable and the keys can be generated there. If the remove failed, the symlink is still there, and the key generation succeeds. If it's not a symlink, the rootfs was modified so either it's writeable, or the keys are already there (or they're not and there's nothing we can do about it). For openssh it will be even more complicated, because /etc/sshd contains the config file as well as the keys. So you probably need to change the config to put the keys in a different place before you can use the same trick. If you manage to solve this, please send a patch to the list for others to enjoy! Oh, and the usual solution is that you have a different partition that is writeable, and make /etc/sshd a symlink to that in the rootfs overlay. But you still have to make sure then that the directory is created if it doesn't exist yet, and you still have the problem of the config file being in the same directory as the keys. Regards, Arnout > > In the menuconfig I have: > > OpenSSH.PNG > > Can anyone please let me know if there is a workaround? Is changing?rootfs to > r/w is the only solution? > > Does selecting "System Configuration"-->"remount root filesystem read-write > during boot" will do the trick? > > Your help will be much appreciated. > > Thanks in advance, > > -Sourabh > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Mar 17 21:08:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:08:37 +0100 Subject: [Buildroot] Can buildroot use existing host fakeroot? In-Reply-To: References: Message-ID: <2af0a832-8418-1837-ce41-aedebb52cbf1@mind.be> On 16/03/2022 19:10, Grant Edwards wrote: > On 2022-03-16, Grant Edwards wrote: > >> I maintain some firmware that uses buildroot 2016.11.2 (with some >> local package upgrades). Unfortunately, it seems I can no longer do >> builds because host-fakeroot won't compile (it's too old for my >> kernel/libc version of stat?). > > I've updated fakeroot, acl, and attr packages so that I can build > again, but I'm still curious about whether you can tell buildroot > to use pre-existing versions of host-side tools like fakeroot. Not as is. If you want to support that, you have to add a fakeroot handler so support/dependencies/, and you have to update all places that use fakeroot to use $(FAKEROOT) instead of $(HOST_DIR)/bin/fakeroot. (Or actually, what we should do is to create a symlink from $(HOST_DIR)/bin to `which fakeroot` in the check-host-fakeroot.sh script. We don't do that for all the other dependencies, but it would be a nice approach I think.) Regards, Arnout From arnout at mind.be Thu Mar 17 21:27:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:27:53 +0100 Subject: [Buildroot] [PATCH] pkg-generic: fix rdepends and phony targets of virtual packages In-Reply-To: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> References: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> Message-ID: <9470ba2b-e40f-322d-b37a-f0daea8f5059@mind.be> On 16/03/2022 11:12, Anssi Hannula wrote: > Virtual packages are not added to the _RDEPENDENCIES list of packages > that they depend on (i.e. their provider). > > This causes -show-rdepends to not show the virtual package > and -show-recursive-rdepends to miss all the packages that > transitively depend on via the virtual package. > > The virtual make targets (e.g. -show-info) are also not marked as > phony for virtual packages. > > To fix those issues, remove most of the special handling of virtual > packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as > well. > > This also allows removal of some duplicated code in pkg-generic.mk and a > now unneeded special condition in CHECK_ONE_DEPENDENCY. > > Still keep the virtual package out of PACKAGES since there is e.g. no > need to rsync per-package target dir to global target dir. I am not > aware of any showstoppers preventing addition to PACKAGES as well, > though, so it is probably just an optimization. > > Signed-off-by: Anssi Hannula > --- > > I encountered this while using -show-recursive-rdepends to > determine which packages to dirclean after modification of a > (non-virtual) in per-package mode. > > The current virtual vs. real distinction didn't seem worth the risk of Well, I guess there *was* a reason that we introduced this distinction way back when, and that all the build targets are skipped for virtual packages. However, I can't remember the reason. Maybe Yann (the instigator of this feature) still remembers? Looking at the history, in particular e.g. commit c5d546450fc1 that converts libgles from generic infrastructure to virtual, it looks like it really *should* be OK to keep the full build targets. And in that case, this patch is a really nice simplification! So, unless Yann objects, I'd say: let's try it and let the autobuilders complain! Regards, Arnout > unintentional differences so I dropped it, but I'm not too familiar with > the code so I could have missed something. > In case I did and this is not a good idea, one less intrusive option > would be to split the common-to-virtual-and-real-packages code to be > under a new separate conditional block. > > > Makefile | 2 -- > package/pkg-generic.mk | 24 +++++------------------- > 2 files changed, 5 insertions(+), 21 deletions(-) > > diff --git a/Makefile b/Makefile > index 4f693d40a9..9e875dd8d8 100644 > --- a/Makefile > +++ b/Makefile > @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) > > define CHECK_ONE_DEPENDENCY > ifeq ($$($(2)_TYPE),target) > -ifeq ($$($(2)_IS_VIRTUAL),) > ifneq ($$($$($(2)_KCONFIG_VAR)),y) > $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ > has added it to its _DEPENDENCIES variable without selecting it or \ > depending on it from Config.in) > endif > endif > -endif > endef > > $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b3a7e1d60e..a0d6198edc 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -1064,15 +1064,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > $$($(2)_TARGET_DIRCLEAN): NAME=$(1) > > # Compute the name of the Kconfig option that correspond to the > -# package being enabled. We handle three cases: the special Linux > -# kernel case, the bootloaders case, and the normal packages case. > -# Virtual packages are handled separately (see below). > +# package being enabled. > ifeq ($(1),linux) > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > $(2)_KCONFIG_VAR = BR2_TARGET_$(2) > else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) > $(2)_KCONFIG_VAR = BR2_$(2) > +else ifeq ($$($(2)_IS_VIRTUAL),YES) > +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) > else > $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) > endif > @@ -1178,7 +1178,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) > $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) > $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) > > +ifneq ($$($(2)_IS_VIRTUAL),YES) > PACKAGES += $(1) > +endif > > ifneq ($$($(2)_PERMISSIONS),) > PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > @@ -1268,22 +1270,6 @@ ifneq ($$($(2)_HELP_CMDS),) > HELP_PACKAGES += $(2) > endif > > -# Virtual packages are not built but it's useful to allow them to have > -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR > - > -ifneq ($$($(2)_PERMISSIONS),) > -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > -endif > -ifneq ($$($(2)_DEVICES),) > -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) > -endif > -ifneq ($$($(2)_USERS),) > -PACKAGES_USERS += $$($(2)_USERS)$$(sep) > -endif > -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) > -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) > - > endif # $(2)_KCONFIG_VAR > endef # inner-generic-package > From arnout at mind.be Thu Mar 17 21:36:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:36:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/moby-buildkit: bump to version 0.10.0 In-Reply-To: <20220311041821.3078930-1-christian@paral.in> References: <20220311041821.3078930-1-christian@paral.in> Message-ID: On 11/03/2022 05:18, Christian Stewart via buildroot wrote: > https://github.com/moby/buildkit/releases/tag/v0.10.0 > > Signed-off-by: Christian Stewart > --- > package/moby-buildkit/moby-buildkit.hash | 4 ++-- > package/moby-buildkit/moby-buildkit.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > index 3015e479f6..e22e97cb3a 100644 > --- a/package/moby-buildkit/moby-buildkit.hash > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > +sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz > +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE If the license hash changes, you *have* to explain why in the commit message (in particular, you have to explain why the license hasn't changed). Also, as reported by check-package: two spaces. However, the license file is actually still the same, this hash shouldn't have changed. So applied to master after restoring the original license hash, thanks. Regards, Arnout > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > index 3f0df351ef..d34ff96252 100644 > --- a/package/moby-buildkit/moby-buildkit.mk > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_VERSION = 0.10.0 > MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > MOBY_BUILDKIT_LICENSE = Apache-2.0 > MOBY_BUILDKIT_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 17 21:38:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:38:07 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/kvm-unit-tests: bump to version 2022-03-08 In-Reply-To: <20220310221908.30588-1-fontaine.fabrice@gmail.com> References: <20220310221908.30588-1-fontaine.fabrice@gmail.com> Message-ID: <61249287-eed1-34a0-3b8f-d5615a23027f@mind.be> On 10/03/2022 23:19, Fabrice Fontaine wrote: > - Switch site: > https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 > - Update first patch > - Drop second patch (binutils < 2.23 is not supported by buildroot > anymore) > - Drop third and fourth patches (already in version) > - This bump will fix the following build failure with powerpc and gcc 11 > thanks to > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 > > /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian > > Fixes: > - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2 (after review of Thomas Huth): > - Drop second patch > > ...emove-Werror-to-avoid-build-failures.patch | 17 +-- > ...vm-unit-tests-test-for-rdseed-rdrand.patch | 110 ------------------ > ...3-Makefile-fix-stack-protector-tests.patch | 36 ------ > ...issue-with-the-linker-from-Fedora-32.patch | 61 ---------- > package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- > package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- > 6 files changed, 14 insertions(+), 218 deletions(-) > delete mode 100644 package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > > diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > index cbfa3a87e6..d07b9b6912 100644 > --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures > Signed-off-by: Thomas Petazzoni > [Matthew: Refactoring of Thomas Petazzoni's original.] > Signed-off-by: Matthew Weber > +[Fabrice: updated for 2022-03-08] > +Signed-off-by: Fabrice Fontaine > --- > Makefile | 1 - > 1 file changed, 1 deletion(-) > @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile > index 7231334..d9ad42b 100644 > --- a/Makefile > +++ b/Makefile > -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > - COMMON_CFLAGS += -g $(autodepend-flags) > - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized > - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter > --COMMON_CFLAGS += -Werror > +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > + > + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common > + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized > +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces > ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces > + > frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") > - fnostack_protector := $(call cc-option, -fno-stack-protector, "") > --- > +- > 2.14.2 > > diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > deleted file mode 100644 > index 1a1a90ce99..0000000000 > --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > +++ /dev/null > @@ -1,110 +0,0 @@ > -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 > -From: Matt Weber > -Date: Fri, 12 Jan 2018 19:07:27 -0600 > -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand > - > -The build fails when the host binutils isn't at least 2.23 > -(2.22.x introduced RDSEED). > - > -Fixes: > -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ > - > -Upstream: > -https://marc.info/?l=kvm&m=151580743523259&w=2 > - > -Signed-off-by: Matthew Weber > ---- > - Makefile | 2 +- > - configure | 18 ++++++++++++++++++ > - x86/vmx_tests.c | 6 ++++++ > - 3 files changed, 25 insertions(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index d9ad42b..799e9b5 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile > - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) > - > --COMMON_CFLAGS += -g $(autodepend-flags) > -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) > - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized > - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter > - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > -diff --git a/configure b/configure > -index dd9d361..21c0219 100755 > ---- a/configure > -+++ b/configure > -@@ -171,6 +171,23 @@ mkdir -p lib > - ln -sf "$asm" lib/asm > - > - > -+cat > rd_test.c < -+#include > -+int main() { > -+ uint16_t seed=0; > -+ unsigned char ok; > -+ asm volatile ("rdseed %0; setc %1" > -+ : "=r" (seed), "=qm" (ok)); > -+ return ok; > -+} > -+EOF > -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then > -+ echo "Checking for rdseed/rdrand... Yes." > -+else > -+ echo "Checking for rdseed/rdrand... No." > -+ extra_cflags="-DNO_RDSEEDRAND" > -+fi > -+ > - # create the config > - cat < config.mak > - SRCDIR=$srcdir > -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name > - PROCESSOR=$processor > - CC=$cross_prefix$cc > - CXX=$cross_prefix$cxx > -+EXTRA_CFLAGS=$extra_cflags > - LD=$cross_prefix$ld > - OBJCOPY=$cross_prefix$objcopy > - OBJDUMP=$cross_prefix$objdump > -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c > -index 4a3e94b..2cbe3eb 100644 > ---- a/x86/vmx_tests.c > -+++ b/x86/vmx_tests.c > -@@ -770,8 +770,10 @@ asm( > - "insn_sldt: sldt %ax;ret\n\t" > - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" > - "insn_str: str %ax;ret\n\t" > -+#ifndef NO_RDSEEDRAND > - "insn_rdrand: rdrand %rax;ret\n\t" > - "insn_rdseed: rdseed %rax;ret\n\t" > -+#endif > - ); > - extern void insn_hlt(); > - extern void insn_invlpg(); > -@@ -796,8 +798,10 @@ extern void insn_lldt(); > - extern void insn_str(); > - extern void insn_cpuid(); > - extern void insn_invd(); > -+#ifndef NO_RDSEEDRAND > - extern void insn_rdrand(); > - extern void insn_rdseed(); > -+#endif > - > - u32 cur_insn; > - u64 cr3; > -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { > - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, > - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, > - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ > -+#ifndef NO_RDSEEDRAND > - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, > - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, > -+#endif > - // Instructions always trap > - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, > - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, > --- > -1.9.1 > - > diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > deleted file mode 100644 > index be819f27c6..0000000000 > --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Mon, 24 Feb 2020 00:04:06 +0100 > -Subject: [PATCH] Makefile: fix stack-protector tests > - > -Rename fnostack_protector into fno_stack_protector and > -fnostack_protector_all into fnostack_protector_all otherwise build will > -fail if -fstack-protector is passed by the toolchain > - > -Fixes: > - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: sent to kvm at vger.kernel.org] > ---- > - Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 767b6c6..754ed65 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror > - > - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") > --fnostack_protector := $(call cc-option, -fno-stack-protector, "") > --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") > -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") > -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") > - wno_frame_address := $(call cc-option, -Wno-frame-address, "") > - fno_pic := $(call cc-option, -fno-pic, "") > - no_pie := $(call cc-option, -no-pie, "") > --- > -2.25.0 > - > diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > deleted file mode 100644 > index 1768c668b7..0000000000 > --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > +++ /dev/null > @@ -1,61 +0,0 @@ > -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 > -From: Thomas Huth > -Date: Wed, 13 May 2020 13:14:46 +0200 > -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 > - > -The linker from Fedora 32 complains: > - > -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not > - covered by LOAD segment > - > -Let's introduce some fake PHDRs to the linker script to get this > -working again. > - > -Message-Id: <20200514192626.9950-7-thuth at redhat.com> > -Signed-off-by: Thomas Huth > -Signed-off-by: Matthew Weber > ---- > - powerpc/flat.lds | 19 ++++++++++++++++--- > - 1 file changed, 16 insertions(+), 3 deletions(-) > - > -diff --git a/powerpc/flat.lds b/powerpc/flat.lds > -index 53221e8..5eed368 100644 > ---- a/powerpc/flat.lds > -+++ b/powerpc/flat.lds > -@@ -1,7 +1,17 @@ > - > -+PHDRS > -+{ > -+ text PT_LOAD FLAGS(5); > -+ data PT_LOAD FLAGS(6); > -+} > -+ > - SECTIONS > - { > -- .text : { *(.init) *(.text) *(.text.*) } > -+ .text : { > -+ *(.init) > -+ *(.text) > -+ *(.text.*) > -+ } :text > - . = ALIGN(64K); > - etext = .; > - .opd : { *(.opd) } > -@@ -19,9 +29,12 @@ SECTIONS > - .data : { > - *(.data) > - *(.data.rel*) > -- } > -+ } :data > - . = ALIGN(16); > -- .rodata : { *(.rodata) *(.rodata.*) } > -+ .rodata : { > -+ *(.rodata) > -+ *(.rodata.*) > -+ } :data > - . = ALIGN(16); > - .bss : { *(.bss) } > - . = ALIGN(256); > --- > -2.17.1 > - > diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash > index ad500d04f2..42c3b4a241 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.hash > +++ b/package/kvm-unit-tests/kvm-unit-tests.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz > +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 > sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index a972602fb9..d610442e03 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 > -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git > -KVM_UNIT_TESTS_SITE_METHOD = git > +KVM_UNIT_TESTS_VERSION = 2022-03-08 > +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 > +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) > KVM_UNIT_TESTS_LICENSE = LGPL-2.0 > KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT > From arnout at mind.be Thu Mar 17 21:38:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:38:25 +0100 Subject: [Buildroot] [PATCH] package/webp: bump to version 1.2.2 In-Reply-To: <20220310114220.920056-1-francois.perrad@gadz.org> References: <20220310114220.920056-1-francois.perrad@gadz.org> Message-ID: On 10/03/2022 12:42, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/webp/webp.hash | 2 +- > package/webp/webp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/webp/webp.hash b/package/webp/webp.hash > index cf7b1dc9d..a95086e81 100644 > --- a/package/webp/webp.hash > +++ b/package/webp/webp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz > +sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz > sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING > diff --git a/package/webp/webp.mk b/package/webp/webp.mk > index f23e1c92e..670a7b801 100644 > --- a/package/webp/webp.mk > +++ b/package/webp/webp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBP_VERSION = 1.2.1 > +WEBP_VERSION = 1.2.2 > WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz > WEBP_SITE = http://downloads.webmproject.org/releases/webp > WEBP_LICENSE = BSD-3-Clause From arnout at mind.be Thu Mar 17 21:38:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:38:41 +0100 Subject: [Buildroot] [PATCH] package/pango: bump to version 1.50.5 In-Reply-To: <20220310114211.920001-1-francois.perrad@gadz.org> References: <20220310114211.920001-1-francois.perrad@gadz.org> Message-ID: <122db5b6-14cf-a4aa-e9e1-ad2d4749c0eb@mind.be> On 10/03/2022 12:42, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/pango/pango.hash | 4 ++-- > package/pango/pango.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/pango/pango.hash b/package/pango/pango.hash > index a6c924a8c..319d9778c 100644 > --- a/package/pango/pango.hash > +++ b/package/pango/pango.hash > @@ -1,5 +1,5 @@ > -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum > -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz > +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum > +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz > > # Locally computed > sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING > diff --git a/package/pango/pango.mk b/package/pango/pango.mk > index 684407228..69ec5bb49 100644 > --- a/package/pango/pango.mk > +++ b/package/pango/pango.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > PANGO_VERSION_MAJOR = 1.50 > -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 > +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 > PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz > PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) > PANGO_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 17 21:30:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:30:55 +0100 Subject: [Buildroot] [git commit] package/pango: bump to version 1.50.5 Message-ID: <20220317213005.80292843FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68b0efbae49a42d0e14d6040e5e7e573d382ff75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c9..319d9778c1 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228f..69ec5bb490 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 17 21:30:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:30:58 +0100 Subject: [Buildroot] [git commit] package/webp: bump to version 1.2.2 Message-ID: <20220317213005.8BC13843FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2eb5838f89cf7f07e3f3cc98558ae12da11236cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index cf7b1dc9de..a95086e81c 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz +sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index f23e1c92e1..670a7b8012 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.1 +WEBP_VERSION = 1.2.2 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause From arnout at mind.be Thu Mar 17 21:36:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:36:01 +0100 Subject: [Buildroot] [git commit] package/moby-buildkit: bump to version 0.10.0 Message-ID: <20220317213005.9E7E4843FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05507efd1a791948a23036eb28eb7be0f4d1f4ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/moby/buildkit/releases/tag/v0.10.0 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/moby-buildkit/moby-buildkit.hash | 2 +- package/moby-buildkit/moby-buildkit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index 3015e479f6..cfd1c0c946 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef..d34ff96252 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_VERSION = 0.10.0 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 17 21:31:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:31:01 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: bump to version 2022-03-08 Message-ID: <20220317213005.94D3B843FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fed7ed02858749641dbf21c645fcf44ce752b396 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch site: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 - Update first patch - Drop second patch (binutils < 2.23 is not supported by buildroot anymore) - Drop third and fourth patches (already in version) - This bump will fix the following build failure with powerpc and gcc 11 thanks to https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian Fixes: - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be Signed-off-by: Fabrice Fontaine Reviewed-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ile-remove-Werror-to-avoid-build-failures.patch | 17 ++-- ...002-kvm-unit-tests-test-for-rdseed-rdrand.patch | 110 --------------------- .../0003-Makefile-fix-stack-protector-tests.patch | 36 ------- ...erpc-issue-with-the-linker-from-Fedora-32.patch | 61 ------------ package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- 6 files changed, 14 insertions(+), 218 deletions(-) diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch index cbfa3a87e6..d07b9b6912 100644 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures Signed-off-by: Thomas Petazzoni [Matthew: Refactoring of Thomas Petazzoni's original.] Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 1 - 1 file changed, 1 deletion(-) @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- +- 2.14.2 diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch deleted file mode 100644 index 1a1a90ce99..0000000000 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 12 Jan 2018 19:07:27 -0600 -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand - -The build fails when the host binutils isn't at least 2.23 -(2.22.x introduced RDSEED). - -Fixes: -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ - -Upstream: -https://marc.info/?l=kvm&m=151580743523259&w=2 - -Signed-off-by: Matthew Weber ---- - Makefile | 2 +- - configure | 18 ++++++++++++++++++ - x86/vmx_tests.c | 6 ++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d9ad42b..799e9b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer -diff --git a/configure b/configure -index dd9d361..21c0219 100755 ---- a/configure -+++ b/configure -@@ -171,6 +171,23 @@ mkdir -p lib - ln -sf "$asm" lib/asm - - -+cat > rd_test.c < -+int main() { -+ uint16_t seed=0; -+ unsigned char ok; -+ asm volatile ("rdseed %0; setc %1" -+ : "=r" (seed), "=qm" (ok)); -+ return ok; -+} -+EOF -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then -+ echo "Checking for rdseed/rdrand... Yes." -+else -+ echo "Checking for rdseed/rdrand... No." -+ extra_cflags="-DNO_RDSEEDRAND" -+fi -+ - # create the config - cat < config.mak - SRCDIR=$srcdir -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name - PROCESSOR=$processor - CC=$cross_prefix$cc - CXX=$cross_prefix$cxx -+EXTRA_CFLAGS=$extra_cflags - LD=$cross_prefix$ld - OBJCOPY=$cross_prefix$objcopy - OBJDUMP=$cross_prefix$objdump -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c -index 4a3e94b..2cbe3eb 100644 ---- a/x86/vmx_tests.c -+++ b/x86/vmx_tests.c -@@ -770,8 +770,10 @@ asm( - "insn_sldt: sldt %ax;ret\n\t" - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" - "insn_str: str %ax;ret\n\t" -+#ifndef NO_RDSEEDRAND - "insn_rdrand: rdrand %rax;ret\n\t" - "insn_rdseed: rdseed %rax;ret\n\t" -+#endif - ); - extern void insn_hlt(); - extern void insn_invlpg(); -@@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); -+#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); -+#endif - - u32 cur_insn; - u64 cr3; -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ -+#ifndef NO_RDSEEDRAND - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, -+#endif - // Instructions always trap - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, --- -1.9.1 - diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c6..0000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm at vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7..0000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth at redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2..42c3b4a241 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb9..d610442e03 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,9 +4,9 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT From fontaine.fabrice at gmail.com Thu Mar 17 21:42:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 22:42:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix CVE-2022-25051 Message-ID: <20220317214203.258736-1-fontaine.fabrice@gmail.com> An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when decoding a crafted file. Signed-off-by: Fabrice Fontaine --- ...low-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 +++++++++++++++++++ package/rtl_433/rtl_433.mk | 3 + 2 files changed, 61 insertions(+) create mode 100644 package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch new file mode 100644 index 0000000000..e2088b29e7 --- /dev/null +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch @@ -0,0 +1,58 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] +Signed-off-by: Fabrice Fontaine +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index a5139ddae6..d1c28adbf5 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +RTL_433_IGNORE_CVES += CVE-2022-25051 + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON -- 2.35.1 From peter at korsgaard.com Thu Mar 17 21:46:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:46:01 +0100 Subject: [Buildroot] [PATCH 1/1] fix links to Technologic Systems web resources In-Reply-To: <20220307211455.9630-1-kris@embeddedTS.com> (Kris Bahnsen via buildroot's message of "Mon, 7 Mar 2022 13:14:55 -0800") References: <20220307211455.9630-1-kris@embeddedTS.com> Message-ID: <87sfrgqmli.fsf@dell.be.48ers.dk> >>>>> "Kris" == Kris Bahnsen via buildroot writes: > Technologic Systems has rebranded as embeddedTS with the current > domain eventually going offline. Update web/doc URLs to correct > resource locations. > Signed-off-by: Kris Bahnsen > --- > RESEND: > - Was not subscribed to Buildroot list with this email Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 21:32:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:32:15 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] fix links to Technologic Systems web resources Message-ID: <20220317213735.A4C63843FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a172b9511d4322c9e4533d03c8c9ee4efe13c3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 0b058e15f5334dac93f42b92ea31525afdc2c27c) Signed-off-by: Peter Korsgaard --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From hrsourabh011 at gmail.com Thu Mar 17 22:00:45 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 17 Mar 2022 23:00:45 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? In-Reply-To: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> References: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> Message-ID: Hello Arnout, Thanks for the answer. I will try to implement the above solution. But I wanted ssh connection to transfer files to board. I tried with "scp" but I get: ssh: connect to host 192.168.x.xxx port 22: Connection refused lost connection Since there is no sshd running, scp won't be an option I think. Is there any other way to copy files to board? On Thu, 17 Mar 2022 at 22:05, Arnout Vandecappelle wrote: > > > On 17/03/2022 15:45, Sourabh Hegde wrote: > > Hello All, > > > > I am facing an issue while running OpenSSH demon in Buildroot 2022 > release. > > > > The output of "systemctl status sshd" results in > > > > sshd.service - OpenSSH server daemon > > Loaded: loaded (/usr/lib/systemd/system/sshd.service; enabled; > vendor prese > > Active: failed (Result: exit-code) since Tue 2022-01-18 13:16:03 > UTC; 9min > > Process: 1703 ExecStartPre=/usr/bin/ssh-keygen -A (code=exited, > status=0/SUC > > Process: 1704 ExecStart=/usr/sbin/sshd -D -e (code=exited, > status=1/FAILURE) > > Main PID: 1704 (code=exited, status=1/FAILURE) > > CPU: 27ms > > > > Jan 18 13:16:02 br2rauc systemd[1]: Starting OpenSSH server daemon... > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc systemd[1]: Started OpenSSH server daemon. > > Jan 18 13:16:03 br2rauc sshd[1704]: sshd: no hostkeys available -- > exiting. > > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Main process exited, > code=exit > > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Failed with result > 'exit-code' > > > > # ps aux | grep ssh > > 253 root grep ssh > > > > So, there is not sshd deamon running. And also no key files present in > /etc/ssh/ > > > > I ran "/usr/bin/ssh-keygen -A" manually but this gives: > > > > ssh-keygen: generating new host keys: RSA Could not save your private > key in > > /etc/ssh/ssh_host_rsa_key.XXXXUBHAIv: Read-only file system > > ssh-keygen: generating new host keys: DSA Could not save your private > key in > > /etc/ssh/ssh_host_dsa_key.XXXXq0KiIl: Read-only file system > > ssh-keygen: generating new host keys: ECDSA Could not save your private > key in > > /etc/ssh/ssh_host_ecdsa_key.XXXXibybTV: Read-only file system > > ssh-keygen: generating new host keys: ED25519 Could not save your > private key in > > /etc/ssh/ssh_host_ed25519_key.XXXXzI2JnB: Read-only file system > > > > Yes, I do have a Read-only file system. But is it not possible to work > with a > > read-only filesystem and ssh? > > Indeed, ssh daemon with readonly rootfs requires special treatment. > Someone > has gone through the effort for dropbear, but not for openssh. > > Basically, how it is solved for dropbear is: > > - build time, create a symlink from /etc/dropbear to /var/run/dropbear > (/var/run > is a writeable tmpfs). > - runtime, in the init script and in the systemd service file, check if > /etc/dropbear is a symlink to tmpfs. If yes, try to remove the symlink. If > that > succeeds, the rootfs is writeable and the keys can be generated there. If > the > remove failed, the symlink is still there, and the key generation > succeeds. If > it's not a symlink, the rootfs was modified so either it's writeable, or > the > keys are already there (or they're not and there's nothing we can do about > it). > > For openssh it will be even more complicated, because /etc/sshd contains > the > config file as well as the keys. So you probably need to change the config > to > put the keys in a different place before you can use the same trick. > > If you manage to solve this, please send a patch to the list for others > to enjoy! > > > Oh, and the usual solution is that you have a different partition that > is > writeable, and make /etc/sshd a symlink to that in the rootfs overlay. But > you > still have to make sure then that the directory is created if it doesn't > exist > yet, and you still have the problem of the config file being in the same > directory as the keys. > > > Regards, > Arnout > > > > > > In the menuconfig I have: > > > > OpenSSH.PNG > > > > Can anyone please let me know if there is a workaround? Is > changing rootfs to > > r/w is the only solution? > > > > Does selecting "System Configuration"-->"remount root filesystem > read-write > > during boot" will do the trick? > > > > Your help will be much appreciated. > > > > Thanks in advance, > > > > -Sourabh > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ju.o at free.fr Thu Mar 17 22:01:21 2022 From: ju.o at free.fr (Julien Olivain) Date: Thu, 17 Mar 2022 23:01:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220317220121.21498-1-ju.o@free.fr> cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 608c2f24ea..085d32acc3 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) -- 2.35.1 From peter at korsgaard.com Thu Mar 17 21:31:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:31:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] fix links to Technologic Systems web resources Message-ID: <20220317222200.D1CE284426@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71eff36e0eb762e4a8b3080a2b9beb2076019758 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 0b058e15f5334dac93f42b92ea31525afdc2c27c) Signed-off-by: Peter Korsgaard --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From peter at korsgaard.com Thu Mar 17 21:31:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:31:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] fix links to Technologic Systems web resources Message-ID: <20220317222208.50FFA84440@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e74c9f35bb428f0ac8cacc1ea64a2976910f2861 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 0b058e15f5334dac93f42b92ea31525afdc2c27c) Signed-off-by: Peter Korsgaard --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From fontaine.fabrice at gmail.com Thu Mar 17 22:39:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 23:39:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add s390x support Message-ID: <20220317223928.508338-1-fontaine.fabrice@gmail.com> s390x is supported since https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a Signed-off-by: Fabrice Fontaine --- package/kvm-unit-tests/Config.in | 1 + package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157..a3d6756fb9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS BR2_cortex_a17 || BR2_cortex_a17_a7 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d610442e03..2d05d08067 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 +else ifeq ($(BR2_s390x),y) +KVM_UNIT_TESTS_ARCH = s390x else ifeq ($(BR2_x86_64),y) KVM_UNIT_TESTS_ARCH = x86_64 endif -- 2.35.1 From thomas.petazzoni at bootlin.com Fri Mar 18 08:17:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 18 Mar 2022 08:17:53 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-17 Message-ID: <20220318081758.E95B184745@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-03-17 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 49 | 7 | 0 | 56 | 2021.11.x | 12 | 1 | 0 | 13 | 2022.02.x | 21 | 7 | 0 | 28 | master | 52 | 25 | 1 | 78 | Classification of failures by reason for master ----------------------------------------------- bind-9.16.26 | 6 unknown | 4 libnetfilter_conntrack-1.0.9 | 3 dhcp-4.4.2-P1 | 1 exempi-2.6.1 | 1 grpc-1.44.0 | 1 host-delve-1.8.0 | 1 libcamera-apps-2d1009e3badc... | 1 libgee-0.20.5 | 1 librtlsdr-ed0317e6a58c09887... | 1 libuwsc | 1 mesa3d-21.3.7 | 1 ola-0.10.8 | 1 rabbitmq-server-3.8.2 | 1 tree-2.0.2 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/ea8862c7caa96ec9d7bc8665a390f64c6c11be27 | ORPH mips64el | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/71ae24ad1a1de18d4fd4a1e3b2e4876269ea72ed | ORPH microblazeel | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/6b6024c3e0e9788975a4b9206bc7312c49e6ff0e | ORPH nios2 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/87808f07a8d0f57947b51a3242ec0533725b25d2 | ORPH riscv64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/84a2418fbf54bbe0a25eddd2d7a0c29fcfd17436 | ORPH sh4 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/742e67a74412df42f2419add7984727e3421c9a2 | ORPH sparc64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/82382f4180ff2145ededfeb4a86cec45084b4439 | ORPH arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/7a3bdef7c8df52b748f8ae69946a1e8d5966e7a6 | arm | grpc-1.44.0 | NOK | http://autobuild.buildroot.net/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/c9b552172660895a46b87d9743cebdf5f040869c | arm | libcamera-apps-2d1009e3badc... | NOK | http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e | arm | libgee-0.20.5 | NOK | http://autobuild.buildroot.net/results/972a02911e5589a3dc21e77760084caaf2251860 | arm | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/8f6debbe240642e9857812b021bbc3650624905c | xtensa | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/1f40162020d8e70cbe669a3896bcc79fca36f562 | powerpc | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/9d0b93d5ca28657dd8818df15f7a1a6c56b67574 | microblazeel | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/0d525628b29781561acd0443e8773a8947d90500 | aarch64 | libuwsc | TIM | http://autobuild.buildroot.net/results/c987b45d617a861b3bfee53e2d572dc236315d76 | i686 | mesa3d-21.3.7 | NOK | http://autobuild.buildroot.net/results/7b24c041e6d2c4f6f99d40dae0c8e2a66933f400 | riscv64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/9b476cf0688932e42e2629b8458b243fe640200d | arm | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/e1f6cd4a4e902d58ebd13a3d70e1213cc0a0d379 | arm | tree-2.0.2 | NOK | http://autobuild.buildroot.net/results/364457e1c2a367b3bb13d28adcc1be045523c855 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/b24d72244a10d318784b4f4a4585c4dbc97d9618 | arm | unknown | NOK | http://autobuild.buildroot.net/results/573782ede2204840742d8ab97c263e4f19ceab0f | arm | unknown | NOK | http://autobuild.buildroot.net/results/1016f1ae1704c8fa0a0eb506c76fff535a4baf46 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/ca80c2ab873216128e4e660cc7e68fb0609df943 | sparc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d40a1414b1084b3b17cc1c9e5966da6431840933 | Classification of failures by reason for 2021.02.x -------------------------------------------------- python-twisted-22.1.0 | 2 docker-cli-20.10.12 | 1 gerbera-1.6.4 | 1 host-sentry-cli-1.57.0 | 1 opencv3-3.4.13 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | docker-cli-20.10.12 | NOK | http://autobuild.buildroot.net/results/b33827724515625fc970b4397badf4a131103036 | arm | gerbera-1.6.4 | NOK | http://autobuild.buildroot.net/results/a40a15c3ddd37a23b1dfc5b8d085e55e869ed026 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/99d58ae6694ee868959ed9acb6ee727bc14dec0e | arm | opencv3-3.4.13 | NOK | http://autobuild.buildroot.net/results/4c2a8d43d16fa04fc2e5b5171d02e36be96a7fe5 | x86_64 | python-twisted-22.1.0 | NOK | http://autobuild.buildroot.net/results/0dee250637a6da29c3df54e9f36d240e94e170bd | nios2 | python-twisted-22.1.0 | NOK | http://autobuild.buildroot.net/results/8507d74f6860b1b510dc1525928f5f21593d36fa | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/76251acba437c86b93e5a4d2b201139831bf3050 | Classification of failures by reason for 2021.11.x -------------------------------------------------- apcupsd-3.14.14 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/dfe5f474ca0bc3c58b1c5ae426cb28055a4f09c1 | Classification of failures by reason for 2022.02.x -------------------------------------------------- bluez5_utils-5.63 | 3 host-delve-1.8.0 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 suricata-6.0.4 | 1 unknown | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6a2800f0d73e584326eaa24a388da082081bcfa8 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3142b2d2a8f89ed63ea2dab14ffd51a8044f1427 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3e5a7a96cd46265990aea4e976a5965a228341de | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/c8dd333970847c74cd24b4eee0f4b30050cac723 | aarch64 | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/851b3efb8b7de97034491320b63a34a896b92602 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/62bfc3c213bf10ba0acce641392956c5260b966f | arm | unknown | NOK | http://autobuild.buildroot.net/results/322c3d7a7609d62dae49d0e2ac37eb2fc17b6bf8 | Gitlab CI results for 2022-03-17 ================================ -- http://autobuild.buildroot.net From ps.report at gmx.net Fri Mar 18 08:24:45 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 09:24:45 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220318082446.18552-1-ps.report@gmx.net> - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..2f3fcf4090 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. -- 2.35.1 From ps.report at gmx.net Fri Mar 18 08:24:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 09:24:46 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/spidev_test: bump to version in Linux 5.8 In-Reply-To: <20220318082446.18552-1-ps.report@gmx.net> References: <20220318082446.18552-1-ps.report@gmx.net> Message-ID: <20220318082446.18552-2-ps.report@gmx.net> - bump to version in Linux 5.8 (depends on SPI_TX_OCTAL/SPI_RX_OCTAL available since Linux 5.0) Changelog (since 4.10): 9006a7b3220e spi: spidev_test: add option to continuously transfer data 35386dfd13b7 spi: spidev_test: Improve decoded text part of hex dump 84a14ae8c44f treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178 020bd6c48ebd spi: spidev_test: Remove break after exit statement 1f3c36328a48 spi: spidev_test: Check input_tx and input_file first after parse options 470a072e1220 spi: spidev_test: Use perror() only if errno is not 0 896fa735084e spi: spidev_test: Add support for Octal mode data transfers 9ec8ade81224 spi: spidev_test: Use %u to format unsigned numbers bd2077915bfe spi: tools: Make default_tx/rx and input_tx static - update Config.in help text - indent hashes by 2 spaces Signed-off-by: Peter Seiderer --- package/spidev_test/Config.in | 4 ++-- package/spidev_test/spidev_test.hash | 5 +++-- package/spidev_test/spidev_test.mk | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 2f3fcf4090..81386adf7a 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 4.10 - is used. + if it's older than 3.15 then 3.0 is used, up to headers 4.20 + version 4.10 is used and otherwise version 5.8. This means you won't have quad-pumped SPI support if your toolchain is too old. diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash index 7bc4a27e45..867920fc78 100644 --- a/package/spidev_test/spidev_test.hash +++ b/package/spidev_test/spidev_test.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 -sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 +sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 87329094ea3010eae9e65ad7ea2d2309e044845942414aa0ca8f1a7095b80178 spidev_test.c?id=v5.8 diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk index bd2fcf6db3..6c5a9495a4 100644 --- a/package/spidev_test/spidev_test.mk +++ b/package/spidev_test/spidev_test.mk @@ -10,7 +10,10 @@ # If you need quad-pumped spi support you need to upgrade your toolchain. # Note that the location of spidev_test.c changes from v4.5 onwards. -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y) +SPIDEV_TEST_VERSION = 5.8 +SPIDEV_TEST_PATH = tools/spi +else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) SPIDEV_TEST_VERSION = 4.10 SPIDEV_TEST_PATH = tools/spi else -- 2.35.1 From peter at korsgaard.com Fri Mar 18 08:31:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:31:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/pppd: fix CPE ID In-Reply-To: <20220309173710.527496-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 18:37:10 +0100") References: <20220309173710.527496-1-fontaine.fabrice@gmail.com> Message-ID: <87o823r7ah.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has > been deprecated in February 2020: > > > cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the > correct CPE identifier for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 18 08:31:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:31:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads In-Reply-To: <20220309173503.527227-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 18:35:03 +0100") References: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Message-ID: <87k0crr79q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without threads raised since bump to > version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: > kx.c: In function '_gnutls_nss_keylog_write': > kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? > 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { > | ^~~~~~~~~~~~ > | keylog_once > Fixes: > - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 18 08:42:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:42:47 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220310140350.1955655-1-john@metanate.com> (John Keeping's message of "Thu, 10 Mar 2022 14:03:50 +0000") References: <20220310140350.1955655-1-john@metanate.com> Message-ID: <87czijr6rc.fsf@dell.be.48ers.dk> >>>>> "John" == John Keeping writes: > sshd is broken on 32-bit systems because ppoll_time64 is used by the > application although it is not allowed by the seccomp filter. > Apply the upstream patch to fix this. > Signed-off-by: John Keeping Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 18 08:28:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:28:39 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pppd: fix CPE ID Message-ID: <20220318083729.59B3B84406@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40ede2956aa949040b69d27ea31992bb02dd55e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9051a6322187129ba65249b5ee2228e045a4fa8c) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 098c6a8e6f..efc72276fa 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp # 0001-pppd-Fix-bounds-check.patch From peter at korsgaard.com Fri Mar 18 08:27:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:27:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pppd: fix CPE ID Message-ID: <20220318083735.2B67884486@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb2ae01ba8600e5cc81ebccf271d1664f32d14f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9051a6322187129ba65249b5ee2228e045a4fa8c) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 08560090b5..6de501a5b7 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol # 0001-pppd-Fix-bounds-check.patch PPPD_IGNORE_CVES += CVE-2020-8597 From peter at korsgaard.com Fri Mar 18 08:39:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:39:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openssh: add upstream patch to add seccomp ppoll_time64 support Message-ID: <20220318083759.53A2C8448E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=316abbf862a41d12986632ca6144945774e517f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x sshd is broken on 32-bit systems because ppoll_time64 is used by the application although it is not allowed by the seccomp filter. Apply the upstream patch to fix this. Signed-off-by: John Keeping Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 10c1d887d6082d8806b38b86097c212c4c3ec8f9) Signed-off-by: Peter Korsgaard --- ...001-Allow-ppoll_time64-in-seccomp-sandbox.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch new file mode 100644 index 0000000000..16eb6eaba2 --- /dev/null +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch @@ -0,0 +1,32 @@ +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Sat, 26 Feb 2022 14:06:14 +1100 +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. + +Should fix sandbox violations on (some? at least i386 and armhf) 32bit +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at +debian.org via bz#3396. + +[Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] +Signed-off-by: John Keeping +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif +-- +2.35.1 + From peter at korsgaard.com Fri Mar 18 08:26:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:26:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pppd: fix CPE ID Message-ID: <20220318083759.435998448B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba6b4cd392cb3834b04979a2e4dc6d5f5a067d6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9051a6322187129ba65249b5ee2228e045a4fa8c) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce..d9d6244f10 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y From peter at korsgaard.com Fri Mar 18 08:30:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:30:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gnutls: fix build without threads Message-ID: <20220318083759.4B7C08448C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfd2b118706876a7a0faf9c364b464f64bbf1544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2f4f57b62b371252425bde4440cedcac45fcaebd) Signed-off-by: Peter Korsgaard --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From peter at korsgaard.com Fri Mar 18 08:51:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:51:43 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ell: bump version to 0.48 Message-ID: <20220318084334.71C138449F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb41375c2fcb7b56cce1b186b72c3eb4fd33833 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Changelog (since 0.47, from [1]): ver 0.48: Fix issue with memory leaking from ICMPv6 RA. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c01a8397d9923c38b14a0d083ba1cf3ee3a3049a) Signed-off-by: Peter Korsgaard --- 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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f..267b44e5f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.48 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From peter at korsgaard.com Fri Mar 18 08:51:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:51:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/iwd: bump version to 1.24 Message-ID: <20220318084334.7AAAC844A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=079e1510bbe534d3ef75cfe7e4f5b01c0f5af166 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - remove 001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch (upstream applied [1]) - Changelog (since 1.21, from [2]): ver 1.24: Fix issue with handshake and missing rekeying support. Fix issue with BSS ranking and zero signal strength. Fix issue with setting OWE IE length correctly. ver 1.23: Fix issue with handling handshake offloading. Fix issue with at_console and D-Bus policy. ver 1.22: Fix issue with handling periodic scanning. Fix issue with handling scanning completion. Fix issue with handling scanning for OWE auto-connect. Add support for additional DPP features. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92e0fe71de85d0d7647aefbcab843e66f9bcca99) Signed-off-by: Peter Korsgaard --- ...licit-declaration-of-function-explicit_bz.patch | 41 ---------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch deleted file mode 100644 index 3e808deb88..0000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero - warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add missing src/missing.h include for explicit_bzero, fixes uclibc - compile/linking - -Fixes: - - src/dpp.c:166:2: warning: implicit declaration of function ???explicit_bzero??? [-Wimplicit-function-declaration] - 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); - | ^~~~~~~~~~~~~~ - -[backport from upstream] -Signed-off-by: Peter Seiderer -[yann.morin.1998 at free.fr: actual backport now upstreamn applied] -Signed-off-by: Yann E. MORIN ---- - src/dpp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dpp.c b/src/dpp.c -index 84e89f6c..8091ded1 100644 ---- a/src/dpp.c -+++ b/src/dpp.c -@@ -30,6 +30,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/dbus.h" - #include "src/netdev.h" - #include "src/module.h" --- -2.34.1 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 8e34d2983f..1a58ec88e8 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc..548b508edb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 1.24 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From peter at korsgaard.com Fri Mar 18 08:52:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:52:16 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.48 In-Reply-To: <66a1b135-aeca-d245-f209-ce52a8e507c4@mind.be> (Arnout Vandecappelle's message of "Thu, 10 Mar 2022 22:23:55 +0100") References: <20220214211051.22421-1-ps.report@gmx.net> <66a1b135-aeca-d245-f209-ce52a8e507c4@mind.be> Message-ID: <878rt7r6bj.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/02/2022 22:10, Peter Seiderer wrote: >> - Changelog (since 0.47, from [1]): >> ver 0.48: >> Fix issue with memory leaking from ICMPv6 RA. >> [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog >> Signed-off-by: Peter Seiderer > Both applied to master, thanks. And to 2022.02.x, thanks. -- Bye, Peter Korsgaard From yairba at protonmail.com Fri Mar 18 09:03:37 2022 From: yairba at protonmail.com (Yair Ben-Avraham) Date: Fri, 18 Mar 2022 09:03:37 +0000 Subject: [Buildroot] [PATCH 1/1] package/tpm2-tss: bump version to 3.2.0 Message-ID: Signed-off-by: Yair Ben-Avraham --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f97..db6b3b7ad0 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377..568ac35c8f 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE -- 2.30.2 From heiko.thiery at gmail.com Fri Mar 18 11:01:01 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 18 Mar 2022 12:01:01 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? In-Reply-To: References: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> Message-ID: Hi, Am Do., 17. M?rz 2022 um 23:01 Uhr schrieb Sourabh Hegde : > > Hello Arnout, > > Thanks for the answer. I will try to implement the above solution. > > But I wanted ssh connection to transfer files to board. I tried with "scp" but I get: > > ssh: connect to host 192.168.x.xxx port 22: Connection refused > lost connection > > Since there is no sshd running, scp won't be an option I think. > > Is there any other way to copy files to board? why don't you use scp the other way around and copy the file from another computer, e.g. your work computer to your board? scp : Another solution would be using netcat: https://nakkaya.com/2009/04/15/using-netcat-for-file-transfers/ [snip] -- Heiko From ps.report at gmx.net Fri Mar 18 13:10:57 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 14:10:57 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/libcamera-apps: X11 support needs libdrm Message-ID: <20220318131058.32240-1-ps.report@gmx.net> - X11 support needs libdrm (optional libdrm dependency already present in libcamera-apps.mk) Fixes: http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer --- package/libcamera-apps/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d23..492a99cf55 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 -- 2.35.1 From ps.report at gmx.net Fri Mar 18 13:10:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 14:10:58 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/libcamera-apps: add '-fpermissive' (fixes X11 preview compile) In-Reply-To: <20220318131058.32240-1-ps.report@gmx.net> References: <20220318131058.32240-1-ps.report@gmx.net> Message-ID: <20220318131058.32240-2-ps.report@gmx.net> - add patch to add '-fpermissive' compiler command line option to fix egl_preview.cpp compile Fixes: .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); | ^~~~~~~ | | | Window {aka long unsigned int} Signed-off-by: Peter Seiderer --- ...missive-compiler-command-line-option.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch diff --git a/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch new file mode 100644 index 0000000000..0bfc7e1ad4 --- /dev/null +++ b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch @@ -0,0 +1,37 @@ +From b04777e6b386ed0c6b1036d4c1178b4b8a1c88d5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 18 Mar 2022 12:39:27 +0100 +Subject: [PATCH] cmake: add -fpermissive compiler command line option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes (with bootlin arm toolchain): + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); + | ^~~~~~~ + | | + | Window {aka long unsigned int} + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ca1e39..eddda1f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) + set (CMAKE_CXX_STANDARD 17) +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -fpermissive) + add_definitions(-D_FILE_OFFSET_BITS=64) + + if (CMAKE_COMPILER_IS_GNUCXX) +-- +2.35.1 + -- 2.35.1 From clement.leger at bootlin.com Fri Mar 18 13:24:21 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:21 +0100 Subject: [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-3-clement.leger@bootlin.com> Enable host package and add needed variables. Host POST_PROCESS and DOWNLOAD_DEPENDENCIES variables are inherited from target ones. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..872ede9b89 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:25 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:25 +0100 Subject: [Buildroot] [PATCH v5 6/8] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-7-clement.leger@bootlin.com> Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:24 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:24 +0100 Subject: [Buildroot] [PATCH v5 5/8] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-6-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:26 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:26 +0100 Subject: [Buildroot] [PATCH v5 7/8] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-8-clement.leger@bootlin.com> Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:20 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:20 +0100 Subject: [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-2-clement.leger@bootlin.com> From: "Yann E. MORIN" It seems reasonable to expect that the download of the host and target variants should usually be exactly the same and thus reuse the target package values for the host package. This commits add support to inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and _DOwNLOAD_POST_PROCESS variables from target ones. These variables can still be overriden if necessary for the host package. Signed-off-by: Yann E. MORIN Signed-off-by: Cl?ment L?ger --- package/pkg-generic.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:19 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:19 +0100 Subject: [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220318132427.48737-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which needs to be aligned with optee-os version. ---- Changes in v5: - Add Yann patch for host variable inheritance - Move BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option - Remove host inherited variables from python-cryptography package Changes in v4: - Add missing variables for python host package - Found a missing DTC dependency while testing build in docker container - Fix BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY title - Change the logic to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY - optee-os now depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS Changes in v3: - Fix authorship for commits that were copied from Etienne ones. - Fix package URL for optee-os - Added Acked-by Etienne Carriere Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (7): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 Yann E. MORIN (1): package/pkg-generic: host variant inherits target download settings boot/optee-os/Config.in | 14 +++++++++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 8 ++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- package/pkg-generic.mk | 24 +++++++++++++++++++ .../python-cryptography.mk | 12 ++++++++++ 13 files changed, 69 insertions(+), 17 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:23 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:23 +0100 Subject: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-5-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_LATEST to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 02b5d7c86f..811937e025 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -19,7 +19,8 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -51,7 +52,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b9b0e5b43f 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:27 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:27 +0100 Subject: [Buildroot] [PATCH v5 8/8] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-9-clement.leger@bootlin.com> Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:22 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:22 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-4-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 9 +++++++++ boot/optee-os/optee-os.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index ea16550b72..02b5d7c86f 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_OPTEE_OS bool "optee_os" depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help OP-TEE OS provides the secure world boot image and the trust application development kit of the OP-TEE project. OP-TEE OS @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 9f76d8450e..5313a1badc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,13 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc -- 2.34.1 From grant.b.edwards at gmail.com Fri Mar 18 14:38:21 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Fri, 18 Mar 2022 14:38:21 -0000 (UTC) Subject: [Buildroot] openssl-1.1.1n build failure (with older buildroot) Message-ID: I tried upgrading my openssl package from 1.1.1d to 1.1.1n, and the newer version won't build. My base buildroot version is rather old at 2016.11.2, but many of the packages are fairly recent. The configure step appears to be failing because no OS/compiler was specified (see output below). I assume this is because my buildroot is old. I'm hoping that a simple hack on the libopenssl.mk file will allow me to add the missing os/compiler info. Can somebody point me towards a clue? Upgrading to a newer version of buildroot is only an option if I can keep all of existing package versions (is that feasible)? Thanks... ======================================================================== openssl-1.1.1n.tar.gz: OK (sha256: 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a) >>> libopenssl 1.1.1n Extracting gzip -d -c /home/nextgen/buildroot/downloads/openssl-1.1.1n.tar.gz | tar --strip-components=1 -C /home/nextgen/buildroot/output/build/libopenssl-1.1.1n -xf - >>> libopenssl 1.1.1n Patching Applying 0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch using patch: patching file Configurations/unix-Makefile.tmpl Applying 0002-Reproducible-build-do-not-leak-compiler-path.patch using patch: patching file crypto/build.info Applying 0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch using patch: patching file crypto/mem_sec.c Hunk #1 succeeded at 491 (offset 6 lines). Applying 0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch using patch: patching file Configure Hunk #1 succeeded at 1424 (offset 7 lines). Applying 0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch using patch: patching file crypto/perlasm/ppc-xlate.pl Applying 0006-Add-support-for-io_pgetevents_time64-syscall.patch using patch: patching file engines/e_afalg.c Applying 0007-Fixup-support-for-io_pgetevents_time64-syscall.patch using patch: patching file engines/e_afalg.c Hunk #1 succeeded at 121 (offset -3 lines). >>> libopenssl 1.1.1n Configuring (cd /home/nextgen/buildroot/output/build/libopenssl-1.1.1n; ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no PATH="/home/nextgen/buildroot/output/host/bin:/home/nextgen/buildroot/output/host/sbin:/home/nextgen/buildroot/output/host/usr/bin:/home/nextgen/buildroot/output/host/usr/sbin:/home/grante/bin:/home/grante/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/13/bin:/sbin:/opt/ecos:/opt/ecos/gnutools/arm-elf/bin:/opt/ecos/gnutools/arm-eabi/bin" AR="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ar" AS="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" LD="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueab i-ld" NM="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-nm" CC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" GCC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" CPP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-cpp" CXX="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-g++" FC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" F77="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" RANLIB="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ranlib" READELF="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-readelf" STRIP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-strip" OBJCOPY="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objcopy" OBJDUMP="/hom e/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objdump" AR_FOR_BUILD="/usr/bin/ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/bin/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUILD="-I/home/nextgen/buildroot/output/host/usr/include" CFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" CXXFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" LDFLAGS_FOR_BUILD="-L/home/nextgen/buildroot/output/host/lib -L/home/nextgen/buildroot/output/host/usr/lib -Wl,-rpath,/home/nextgen/buildroot/output/host/usr/lib" FCFLAGS_FOR_BUILD="" DEFAULT_ASSEMBLER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" DEFAULT_LINKER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - Os " CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os " LDFLAGS="" FCFLAGS=" -Os " FFLAGS=" -Os " PKG_CONFIG="/home/nextgen/buildroot/output/host/usr/bin/pkg-config" STAGING_DIR="/home/nextgen/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot" INTLTOOL_PERL=/usr/bin/perl ./Configure --prefix=/usr --openssldir=/etc/ssl threads shared no-rc5 enable-camellia enable-mdc2 no-tests no-fuzz-libfuzzer no-fuzz-afl no-chacha no-rc5 no-rc2 no-rc4 no-md2 no-md4 no-mdc2 no-blake2 no-idea no-seed no-des no-rmd160 no-whirlpool no-bf no-ssl no-ssl2 no-ssl3 no-weak-ssl-ciphers no-psk no-cast no-unit-test no-crypto-mdebug-backtrace no-crypto-mdebug no-autoerrinit no-dynamic-engine no-comp zlib-dynamic ) Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] pick os/compiler from: BS2000-OSD BSD-generic32 BSD-generic64 BSD-ia64 BSD-riscv64 BSD-sparc64 BSD-sparcv8 BSD-x86 BSD-x86-elf BSD-x86_64 Cygwin Cygwin-i386 Cygwin-i486 Cygwin-i586 Cygwin-i686 Cygwin-x86 Cygwin-x86_64 DJGPP MPE/iX-gcc UEFI UWIN VC-CE VC-WIN32 VC-WIN32-ARM VC-WIN32-ONECORE VC-WIN64-ARM VC-WIN64A VC-WIN64A-ONECORE VC-WIN64A-masm VC-WIN64I aix-cc aix-gcc aix64-cc aix64-gcc android-arm android-arm64 android-armeabi android-mips android-mips64 android-x86 android-x86_64 android64 android64-aarch64 android64-mips64 android64-x86_64 bsdi-elf-gcc cc darwin-i386-cc darwin-ppc-cc darwin64-arm64-cc darwin64-ppc-cc darwin64-x86_64-cc gcc haiku-x86 haiku-x86_64 hpux-ia64-cc hpux-ia64-gcc hpux-parisc-cc hpux-parisc-gcc hpux-parisc1_1-cc hpux-parisc1_1-gcc hpux64-ia64-cc hpux64-ia64-gcc hpux64-parisc2-cc hpux64-parisc2-gcc hurd-x86 ios-cross ios-xcrun ios64-cross ios64-xcrun iossimulator-xcrun iphoneos-cross irix-mips3-cc irix-mips3-gcc irix64-mips4-cc irix64-mips4-gcc linux-aarch64 linux-alpha-gcc linux-aout linux-arm64ilp32 linux-armv4 linux-c64xplus linux-elf linux-generic32 linux-generic64 linux-ia64 linux-mips32 linux-mips64 linux-ppc linux-ppc64 linux-ppc64le linux-sparcv8 linux-sparcv9 linux-x32 linux-x86 linux-x86-clang linux-x86_64 linux-x86_64-clang linux32-s390x linux64-mips64 linux64-riscv64 linux64-s390x linux64-sparcv9 mingw mingw64 nextstep nextstep3.3 sco5-cc sco5-gcc solaris-sparcv7-cc solaris-sparcv7-gcc solaris-sparcv8-cc solaris-sparcv8-gcc solaris-sparcv9-cc solaris-sparcv9-gcc solaris-x86-gcc solaris64-sparcv9-cc solaris64-sparcv9-gcc solaris64-x86_64-cc solaris64-x86_64-gcc tru64-alpha-cc tru64-alpha-gcc uClinux-dist uClinux-dist64 unixware-2.0 unixware-2.1 unixware-7 unixware-7-gcc vms-alpha vms-alpha-p32 vms-alpha-p64 vms-ia64 vms-ia64-p32 vms-ia64-p64 vos-gcc vxworks-mips vxworks-ppc405 vxworks-ppc60x vxworks-ppc750 vxworks-ppc750-debug vxworks-ppc860 vxworks-ppcgen vxworks-simlinux NOTE: If in doubt, on Unix-ish systems use './config'. Configuring OpenSSL version 1.1.1n (0x101010efL) for Using os-specific seed configuration make: *** [package/pkg-generic.mk:209: /home/nextgen/buildroot/output/build/libopenssl-1.1.1n/.stamp_configured] Error 1 make: Leaving directory '/home/nextgen/buildroot/buildroot-2016.11.2' ***** finished build FAIL at Fri Mar 18 09:22:16 AM CDT 2022 ***** ***** elapsed time 0:04:53 ***** From ps.report at gmx.net Fri Mar 18 15:18:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 16:18:30 +0100 Subject: [Buildroot] openssl-1.1.1n build failure (with older buildroot) In-Reply-To: References: Message-ID: <20220318161830.49f60486@gmx.net> Hello Edwards, On Fri, 18 Mar 2022 14:38:21 -0000 (UTC), Grant Edwards wrote: > I tried upgrading my openssl package from 1.1.1d to 1.1.1n, and the > newer version won't build. My base buildroot version is rather old at > 2016.11.2, but many of the packages are fairly recent. The configure > step appears to be failing because no OS/compiler was specified (see > output below). I assume this is because my buildroot is old. I'm > hoping that a simple hack on the libopenssl.mk file will allow me to > add the missing os/compiler info. > > Can somebody point me towards a clue? > > Upgrading to a newer version of buildroot is only an option if I can > keep all of existing package versions (is that feasible)? > > Thanks... > > > > ======================================================================== > > openssl-1.1.1n.tar.gz: OK (sha256: 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a) > > >>> libopenssl 1.1.1n Extracting > gzip -d -c /home/nextgen/buildroot/downloads/openssl-1.1.1n.tar.gz | tar --strip-components=1 -C /home/nextgen/buildroot/output/build/libopenssl-1.1.1n -xf - > > >>> libopenssl 1.1.1n Patching > > Applying 0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch using patch: > patching file Configurations/unix-Makefile.tmpl > > Applying 0002-Reproducible-build-do-not-leak-compiler-path.patch using patch: > patching file crypto/build.info > > Applying 0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch using patch: > patching file crypto/mem_sec.c > Hunk #1 succeeded at 491 (offset 6 lines). > > Applying 0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch using patch: > patching file Configure > Hunk #1 succeeded at 1424 (offset 7 lines). > > Applying 0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch using patch: > patching file crypto/perlasm/ppc-xlate.pl > > Applying 0006-Add-support-for-io_pgetevents_time64-syscall.patch using patch: > patching file engines/e_afalg.c > > Applying 0007-Fixup-support-for-io_pgetevents_time64-syscall.patch using patch: > patching file engines/e_afalg.c > Hunk #1 succeeded at 121 (offset -3 lines). > > >>> libopenssl 1.1.1n Configuring > (cd /home/nextgen/buildroot/output/build/libopenssl-1.1.1n; ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no PATH="/home/nextgen/buildroot/output/host/bin:/home/nextgen/buildroot/output/host/sbin:/home/nextgen/buildroot/output/host/usr/bin:/home/nextgen/buildroot/output/host/usr/sbin:/home/grante/bin:/home/grante/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/13/bin:/sbin:/opt/ecos:/opt/ecos/gnutools/arm-elf/bin:/opt/ecos/gnutools/arm-eabi/bin" AR="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ar" AS="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" LD="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueab > i-ld" NM="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-nm" CC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" GCC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" CPP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-cpp" CXX="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-g++" FC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" F77="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" RANLIB="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ranlib" READELF="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-readelf" STRIP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-strip" OBJCOPY="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objcopy" OBJDUMP="/hom > e/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objdump" AR_FOR_BUILD="/usr/bin/ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/bin/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUILD="-I/home/nextgen/buildroot/output/host/usr/include" CFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" CXXFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" LDFLAGS_FOR_BUILD="-L/home/nextgen/buildroot/output/host/lib -L/home/nextgen/buildroot/output/host/usr/lib -Wl,-rpath,/home/nextgen/buildroot/output/host/usr/lib" FCFLAGS_FOR_BUILD="" DEFAULT_ASSEMBLER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" DEFAULT_LINKER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - > Os " CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os " LDFLAGS="" FCFLAGS=" -Os " FFLAGS=" -Os " PKG_CONFIG="/home/nextgen/buildroot/output/host/usr/bin/pkg-config" STAGING_DIR="/home/nextgen/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot" INTLTOOL_PERL=/usr/bin/perl ./Configure --prefix=/usr --openssldir=/etc/ssl threads shared no-rc5 enable-camellia enable-mdc2 no-tests no-fuzz-libfuzzer no-fuzz-afl no-chacha no-rc5 no-rc2 no-rc4 no-md2 no-md4 no-mdc2 no-blake2 no-idea no-seed no-des no-rmd160 no-whirlpool no-bf no-ssl no-ssl2 no-ssl3 no-weak-ssl-ciphers no-psk no-cast no-unit-test no-crypto-mdebug-backtrace no-crypto-mdebug no-autoerrinit no-dynamic-engine no-comp zlib-dynamic ) > Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] > > pick os/compiler from: > BS2000-OSD BSD-generic32 BSD-generic64 BSD-ia64 BSD-riscv64 BSD-sparc64 > BSD-sparcv8 BSD-x86 BSD-x86-elf BSD-x86_64 Cygwin Cygwin-i386 Cygwin-i486 > Cygwin-i586 Cygwin-i686 Cygwin-x86 Cygwin-x86_64 DJGPP MPE/iX-gcc UEFI UWIN > VC-CE VC-WIN32 VC-WIN32-ARM VC-WIN32-ONECORE VC-WIN64-ARM VC-WIN64A > VC-WIN64A-ONECORE VC-WIN64A-masm VC-WIN64I aix-cc aix-gcc aix64-cc aix64-gcc > android-arm android-arm64 android-armeabi android-mips android-mips64 > android-x86 android-x86_64 android64 android64-aarch64 android64-mips64 > android64-x86_64 bsdi-elf-gcc cc darwin-i386-cc darwin-ppc-cc > darwin64-arm64-cc darwin64-ppc-cc darwin64-x86_64-cc gcc haiku-x86 > haiku-x86_64 hpux-ia64-cc hpux-ia64-gcc hpux-parisc-cc hpux-parisc-gcc > hpux-parisc1_1-cc hpux-parisc1_1-gcc hpux64-ia64-cc hpux64-ia64-gcc > hpux64-parisc2-cc hpux64-parisc2-gcc hurd-x86 ios-cross ios-xcrun ios64-cross > ios64-xcrun iossimulator-xcrun iphoneos-cross irix-mips3-cc irix-mips3-gcc > irix64-mips4-cc irix64-mips4-gcc linux-aarch64 linux-alpha-gcc linux-aout > linux-arm64ilp32 linux-armv4 linux-c64xplus linux-elf linux-generic32 > linux-generic64 linux-ia64 linux-mips32 linux-mips64 linux-ppc linux-ppc64 > linux-ppc64le linux-sparcv8 linux-sparcv9 linux-x32 linux-x86 linux-x86-clang > linux-x86_64 linux-x86_64-clang linux32-s390x linux64-mips64 linux64-riscv64 > linux64-s390x linux64-sparcv9 mingw mingw64 nextstep nextstep3.3 sco5-cc > sco5-gcc solaris-sparcv7-cc solaris-sparcv7-gcc solaris-sparcv8-cc > solaris-sparcv8-gcc solaris-sparcv9-cc solaris-sparcv9-gcc solaris-x86-gcc > solaris64-sparcv9-cc solaris64-sparcv9-gcc solaris64-x86_64-cc > solaris64-x86_64-gcc tru64-alpha-cc tru64-alpha-gcc uClinux-dist > uClinux-dist64 unixware-2.0 unixware-2.1 unixware-7 unixware-7-gcc vms-alpha > vms-alpha-p32 vms-alpha-p64 vms-ia64 vms-ia64-p32 vms-ia64-p64 vos-gcc > vxworks-mips vxworks-ppc405 vxworks-ppc60x vxworks-ppc750 vxworks-ppc750-debug > vxworks-ppc860 vxworks-ppcgen vxworks-simlinux > > NOTE: If in doubt, on Unix-ish systems use './config'. > Configuring OpenSSL version 1.1.1n (0x101010efL) for > Using os-specific seed configuration > make: *** [package/pkg-generic.mk:209: /home/nextgen/buildroot/output/build/libopenssl-1.1.1n/.stamp_configured] Error 1 > make: Leaving directory '/home/nextgen/buildroot/buildroot-2016.11.2' > ***** finished build FAIL at Fri Mar 18 09:22:16 AM CDT 2022 ***** > ***** elapsed time 0:04:53 ***** Seems your BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH/LIBOPENSSL_TARGET_ARCH variable is empty, the Configure line should look (something) like the following: [...] ./Configure linux-armv4 --prefix=/usr [...] Yours: [...] ./Configure --prefix=/usr [...] See [1] for a starting point of the handling in buildroot git mainline... Regards, Peter [1] https://git.buildroot.net/buildroot/tree/package/libopenssl/libopenssl.mk#n73 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From joerg.krause at embedded.rocks Fri Mar 18 17:33:47 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Fri, 18 Mar 2022 17:33:47 +0000 Subject: [Buildroot] [PATCH 1/1] package/luv: bump to version 1.43.0-0 Message-ID: <20220318173347.68409-1-joerg.krause@embedded.rocks> Signed-off-by: J?rg Krause --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 2fb2b5c4fc..4cdb91729f 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 2dc9af3b7a..36fcdc742e 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.42.0-1 +LUV_VERSION = 1.43.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt -- 2.35.1 From joerg.krause at embedded.rocks Fri Mar 18 17:34:27 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Fri, 18 Mar 2022 17:34:27 +0000 Subject: [Buildroot] [PATCH 1/1] package/luvi: bump to version 2.13.0 Message-ID: <20220318173427.68776-1-joerg.krause@embedded.rocks> Signed-off-by: J?rg Krause --- package/luvi/luvi.hash | 2 +- package/luvi/luvi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index fcc81430db..9621ef4d03 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5daa3c1793..5266281ffc 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.12.0 +LUVI_VERSION = 2.13.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 17:35:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 18:35:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libscrypt: fix CFLAGS Message-ID: <20220318173507.10160-1-fontaine.fabrice@gmail.com> Don't pass TARGET_CONFIGURE_OPTS in LIBSCRYPT_MAKE_OPTS to avoid overriding CFLAGS (and so loossing -fPIC). This will fix the following build failure raised since bump to version 1.22 in commit 4542c6714d3951070c31739d24e4bd42b446fbae: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.36.1 assertion fail elf32-microblaze.c:1534 /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: sha256.o: probably compiled without -fPIC? /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value Fixes: - http://autobuild.buildroot.org/results/ba4234ad305badb5ce815080ddcad6727e8d51c4 Signed-off-by: Fabrice Fontaine --- package/libscrypt/libscrypt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index d28bd4e900..193c963f76 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -11,7 +11,7 @@ LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES LIBSCRYPT_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) \ CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ PREFIX=/usr -- 2.35.1 From joerg.krause at embedded.rocks Fri Mar 18 17:51:56 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Fri, 18 Mar 2022 17:51:56 +0000 Subject: [Buildroot] [PATCH 1/1] package/pugixml: bump to version 1.12.1 Message-ID: <20220318175156.186854-1-joerg.krause@embedded.rocks> The license file has updated the copyright year to 2022, therefore update the hash of the license file as well. Signed-off-by: J?rg Krause --- package/pugixml/pugixml.hash | 4 ++-- package/pugixml/pugixml.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 5c629ac66f..190dfb6a6e 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md +sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef..9137f04630 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.11.4 +PUGIXML_VERSION = 1.12.1 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 18:07:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 19:07:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body Message-ID: <20220318180713.19051-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.50.5 in commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75: ../utils/viewer-cairo.c: In function 'cairo_vector_view_create': ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] ; ^ Fixes: - http://autobuild.buildroot.org/results/dee/dee3d631474f83b345f22eb26c59a305c32258f8/build-end.log Signed-off-by: Fabrice Fontaine --- ...1-meson.build-drop-Werror-empty-body.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/pango/0001-meson.build-drop-Werror-empty-body.patch diff --git a/package/pango/0001-meson.build-drop-Werror-empty-body.patch b/package/pango/0001-meson.build-drop-Werror-empty-body.patch new file mode 100644 index 0000000000..98b6828a63 --- /dev/null +++ b/package/pango/0001-meson.build-drop-Werror-empty-body.patch @@ -0,0 +1,47 @@ +From 1d0f3a8abcb2bb8931d02c136ae957ee2d60094e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 18 Mar 2022 18:55:56 +0100 +Subject: [PATCH] meson.build: drop -Werror=empty-body + +Drop -Werror=empty-body to avoid the following build failure raised +since version 1.50.5 and +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e: + +../utils/viewer-cairo.c: In function 'cairo_vector_view_create': +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] + ; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/pango/-/merge_requests/604] +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 0f79bff7..c48fe01f 100644 +--- a/meson.build ++++ b/meson.build +@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Wunused', + '-Werror=address', + '-Werror=array-bounds', +- '-Werror=empty-body', + '-Werror=implicit', + '-Werror=implicit-fallthrough', + '-Werror=init-self', +@@ -135,7 +134,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Werror=write-strings', + '-Werror=address', + '-Werror=int-to-pointer-cast', +- '-Werror=empty-body', + '-Werror=write-strings', + '-Werror=unused-but-set-variable', + '-Wundef', # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=792481 +-- +2.35.1 + -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 19:33:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 20:33:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build Message-ID: <20220318193310.752282-1-fontaine.fabrice@gmail.com> introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 3bf7cece45..327138391d 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 19:40:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 20:40:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/wavpack: fix CVE-2021-44269 Message-ID: <20220318194058.760799-1-fontaine.fabrice@gmail.com> An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine --- ...e-DSD-file-types-for-invalid-lengths.patch | 42 +++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) create mode 100644 package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:42 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:42 +0100 Subject: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-3-ps.report@gmx.net> - add optional libpsl dependency Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 7fda36f1f5..d0556e323c 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -21,6 +21,13 @@ WGET_CONF_OPTS = \ --disable-valgrind-tests \ --disable-assert +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:40 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:40 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/wget: explicit set some default options Message-ID: <20220318202044.10413-1-ps.report@gmx.net> - explicit set some default options (--without-metalink, --enable-opie, --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, --disable-assert) Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..d100a59eae 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,6 +12,15 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +WGET_CONF_OPTS = \ + --without-metalink \ + --enable-opie \ + --enable-digest \ + --enable-ntlm \ + --disable-debug \ + --disable-valgrind-tests \ + --disable-assert + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:41 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:41 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-2-ps.report@gmx.net> - use explicit --with/without-libuuid option Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d100a59eae..7fda36f1f5 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -43,7 +43,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:43 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:43 +0100 Subject: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-4-ps.report@gmx.net> - add optional c-ares dependency Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d0556e323c..69ca8f261c 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -63,6 +63,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:44 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:44 +0100 Subject: [Buildroot] [PATCH v2 5/5] package/wget: bump version to 1.21.3 In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-5-ps.report@gmx.net> - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch - fix iri option enable dependency --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 69ca8f261c..079afbee48 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -38,15 +38,13 @@ else WGET_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WGET_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 +WGET_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:50:22 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:50:22 +0100 Subject: [Buildroot] [PATCH v2 5/5] package/wget: bump version to 1.21.3 In-Reply-To: <20220318202044.10413-5-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-5-ps.report@gmx.net> Message-ID: <20220318215022.31a913e5@gmx.net> Hello *, On Fri, 18 Mar 2022 21:20:44 +0100, Peter Seiderer wrote: > - bump version to 1.21.3 (for details see [1]) > > - remove legacy --with-libidn option (see [2]), replace with > --enable-iri option in case locale support and libidn2 are available > > [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch > - fix iri option enable dependency > --- > package/wget/wget.hash | 4 ++-- > package/wget/wget.mk | 14 ++++++-------- > 2 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/package/wget/wget.hash b/package/wget/wget.hash > index 7f89bedb88..22674650a2 100644 > --- a/package/wget/wget.hash > +++ b/package/wget/wget.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig > +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig > # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 > -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz > +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz > # Locally calculated > sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 69ca8f261c..079afbee48 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WGET_VERSION = 1.21.2 > +WGET_VERSION = 1.21.3 > WGET_SOURCE = wget-$(WGET_VERSION).tar.lz > WGET_SITE = $(BR2_GNU_MIRROR)/wget > WGET_DEPENDENCIES = host-pkgconf > @@ -38,15 +38,13 @@ else > WGET_CONF_OPTS += --without-ssl > endif > > -ifeq ($(BR2_PACKAGE_LIBICONV),y) > -WGET_DEPENDENCIES += libiconv > -endif The above code one should be kept as there is at least one other location in the source using iconv (protexted by '#ifdef HAVE_ICONV', see src/url.c)... > - > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > -WGET_CONF_OPTS += --with-libidn > +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive > +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) > +WGET_CONF_OPTS += --enable-iri > WGET_DEPENDENCIES += libidn2 > +WGET_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) And so the above line can be removed... Will send an updated patch set... Regards, Peter > else > -WGET_CONF_OPTS += --without-libidn > +WGET_CONF_OPTS += --disable-iri > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From yann.morin.1998 at free.fr Fri Mar 18 21:25:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:25:53 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/wget: explicit set some default options In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318212553.GI283544@scaer> Peter, All, On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - explicit set some default options (--without-metalink, --enable-opie, > --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, > --disable-assert) Repeating the title and the code in the commit message is not very helpful. What would be more intertesting, is to explain why you did need to set those options, and just those, among all the others that are available, like attr, iri... (I think that is basically what Thomas asked for in his review of your v1). I see that your series will also introduces some optional support (libpsl, c-ares), but if just this first patch is applied, then that also leaves those options unset, so this first patch should really add defaults to all options. Regards, Yann E. MORIN. > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index f30fa39917..d100a59eae 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -12,6 +12,15 @@ WGET_LICENSE = GPL-3.0+ > WGET_LICENSE_FILES = COPYING > WGET_CPE_ID_VENDOR = gnu > > +WGET_CONF_OPTS = \ > + --without-metalink \ > + --enable-opie \ > + --enable-digest \ > + --enable-ntlm \ > + --disable-debug \ > + --disable-valgrind-tests \ > + --disable-assert > + > ifeq ($(BR2_PACKAGE_GNUTLS),y) > WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:26:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:26:53 +0100 Subject: [Buildroot] [git commit] package/wget: use explicit --with/without-libuuid option Message-ID: <20220318211911.2C1E9844B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0fc0a811ba198288a3aef8413466d9a61d1dfd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This has been like tht for ages (probably an implicit dependency check in older versions), but now wget has explicit flags, so let's use them. Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: expand commit log] Signed-off-by: Yann E. MORIN --- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..58e04e3040 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -34,7 +34,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) From yann.morin.1998 at free.fr Fri Mar 18 21:27:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:27:59 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option In-Reply-To: <20220318202044.10413-2-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-2-ps.report@gmx.net> Message-ID: <20220318212759.GJ283544@scaer> On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - use explicit --with/without-libuuid option Repeating the commit title in the commit log is not very helpul... Applied to master with that fixed, thanks. Regards, Yann E. MORIN. > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index d100a59eae..7fda36f1f5 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -43,7 +43,10 @@ WGET_CONF_OPTS += --without-libidn > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) > +WGET_CONF_OPTS += --with-libuuid > WGET_DEPENDENCIES += util-linux > +else > +WGET_CONF_OPTS += --without-libuuid > endif > > ifeq ($(BR2_PACKAGE_ZLIB),y) > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:30:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:30:25 +0100 Subject: [Buildroot] [git commit] package/wget: add optional libpsl dependency Message-ID: <20220318212252.F12C8844BD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0554aa59d7a27193f5b39f96ae0dbe6987723c1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 58e04e3040..795c2a2ccd 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,6 +12,13 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls From yann.morin.1998 at free.fr Fri Mar 18 21:30:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:30:27 +0100 Subject: [Buildroot] [git commit] package/wget: add optional c-ares dependency Message-ID: <20220318212253.08CCC844BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f2eb453321d227a9965a459c33a8fcbca4b2b4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 795c2a2ccd..8a73c33699 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -54,6 +54,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 From yann.morin.1998 at free.fr Fri Mar 18 21:33:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:33:44 +0100 Subject: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency In-Reply-To: <20220318202044.10413-4-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-4-ps.report@gmx.net> Message-ID: <20220318213344.GK283544@scaer> Peter, All, On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - add optional c-ares dependency Again, not very usefull... But there isn't much to say in this commit, the title is far sufficient, so an empty commit log is OK. (Who would have guessed I would ever say that? Who'd have bet? ;-) ) > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index d0556e323c..69ca8f261c 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -63,6 +63,13 @@ else > WGET_CONF_OPTS += --without-zlib > endif > > +ifeq ($(BR2_PACKAGE_C_ARES),y) > +WGET_CONF_OPTS += --with-cares > +WGET_DEPENDENCIES += c-ares > +else > +WGET_CONF_OPTS += --without-cares > +endif > + > ifeq ($(BR2_PACKAGE_PCRE2),y) > WGET_CONF_OPTS += --disable-pcre --enable-pcre2 > WGET_DEPENDENCIES += pcre2 > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:34:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:34:20 +0100 Subject: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency In-Reply-To: <20220318202044.10413-3-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-3-ps.report@gmx.net> Message-ID: <20220318213420.GL283544@scaer> On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - add optional libpsl dependency > > Signed-off-by: Peter Seiderer Applied to master, commit elided, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 7fda36f1f5..d0556e323c 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -21,6 +21,13 @@ WGET_CONF_OPTS = \ > --disable-valgrind-tests \ > --disable-assert > > +ifeq ($(BR2_PACKAGE_LIBPSL),y) > +WGET_CONF_OPTS += --with-libpsl > +WGET_DEPENDENCIES += libpsl > +else > +WGET_CONF_OPTS += --without-libpsl > +endif > + > ifeq ($(BR2_PACKAGE_GNUTLS),y) > WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:38:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:38:07 +0100 Subject: [Buildroot] [git commit] package/wavpack: fix CVE-2021-44269 Message-ID: <20220318212930.37A06844C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From yann.morin.1998 at free.fr Fri Mar 18 21:38:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:38:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/wavpack: fix CVE-2021-44269 In-Reply-To: <20220318194058.760799-1-fontaine.fabrice@gmail.com> References: <20220318194058.760799-1-fontaine.fabrice@gmail.com> Message-ID: <20220318213830.GM283544@scaer> Fabrice, All, On 2022-03-18 20:40 +0100, Fabrice Fontaine spake thusly: > An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV > files. This issue triggered in function WavpackPackSamples of file > src/pack_utils.c, tainted variable cnt is too large, that makes pointer > sptr read beyond heap bound. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...e-DSD-file-types-for-invalid-lengths.patch | 42 +++++++++++++++++++ > package/wavpack/wavpack.mk | 3 ++ > 2 files changed, 45 insertions(+) > create mode 100644 package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > > diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > new file mode 100644 > index 0000000000..76c1e81674 > --- /dev/null > +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > @@ -0,0 +1,42 @@ > +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 > +From: David Bryant > +Date: Tue, 23 Nov 2021 13:14:35 -0800 > +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths > + > +[Retrieved from: > +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] > +Signed-off-by: Fabrice Fontaine > +--- > + cli/dsdiff.c | 6 ++++++ > + cli/dsf.c | 1 + > + 2 files changed, 7 insertions(+) > + > +diff --git a/cli/dsdiff.c b/cli/dsdiff.c > +index d7adb6a..5bdcae3 100644 > +--- a/cli/dsdiff.c > ++++ b/cli/dsdiff.c > +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa > + } > + > + total_samples = dff_chunk_header.ckDataSize / config->num_channels; > ++ > ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { > ++ error_line ("%s is not a valid .DFF file!", infilename); > ++ return WAVPACK_SOFT_ERROR; > ++ } > ++ > + break; > + } > + else { // just copy unknown chunks to output file > +diff --git a/cli/dsf.c b/cli/dsf.c > +index e1d7973..dddd488 100644 > +--- a/cli/dsf.c > ++++ b/cli/dsf.c > +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC > + > + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || > + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || > ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || > + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || > + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || > + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { > diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk > index 485ab9b2ae..2e0438ac80 100644 > --- a/package/wavpack/wavpack.mk > +++ b/package/wavpack/wavpack.mk > @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause > WAVPACK_LICENSE_FILES = COPYING > WAVPACK_CPE_ID_VENDOR = wavpack > > +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > +WAVPACK_IGNORE_CVES += CVE-2021-44269 > + > ifeq ($(BR2_PACKAGE_LIBICONV),y) > WAVPACK_CONF_OPTS += LIBS=-liconv > endif > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:50:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: <20220318193310.752282-1-fontaine.fabrice@gmail.com> References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> Message-ID: <20220318215025.GN283544@scaer> Fabrice, All, On 2022-03-18 20:33 +0100, Fabrice Fontaine spake thusly: > introspection needs host-doxygen and host-python-lxml since the addition > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 As per that diff, it seems doxygen is only needed when actually building the documentation: https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa doxygen_p = find_program('doxygen', required: get_option('doc')) But we are alredy passing -Ddoc=disabled, so why is it still trying to build the documentation? That's because the option is only a hint to not care when doxygen is missing, but if doxygen is present, then the documentation is still built. -Ddoc=disabled should really disable building the documentation, e.g. in ./meson.build: if get_option('doc') subdir('doc') endif or, at the top of ./doc/meson.build: if not get_option('doc') subdir_done() fi I think the former is better, as they already have conditional subdir() in the top-level meson.build. Regards, Yann E. MORIN. > ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml > > Fixes: > - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 > > Signed-off-by: Fabrice Fontaine > --- > package/wireplumber/wireplumber.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > index 3bf7cece45..327138391d 100644 > --- a/package/wireplumber/wireplumber.mk > +++ b/package/wireplumber/wireplumber.mk > @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ > -Dsystem-lua-version= > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -WIREPLUMBER_DEPENDENCIES += gobject-introspection > +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection > WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled > else > WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:59:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:59:10 +0100 Subject: [Buildroot] [git commit] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220318215039.1A9CF814C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e41f883b800846435cd13081fa86abbc4e330d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 608c2f24ea..085d32acc3 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From yann.morin.1998 at free.fr Fri Mar 18 21:59:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:59:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: add OPENBLAS_CPE_ID_VENDOR In-Reply-To: <20220317220121.21498-1-ju.o@free.fr> References: <20220317220121.21498-1-ju.o@free.fr> Message-ID: <20220318215937.GO283544@scaer> Julien, All, On 2022-03-17 23:01 +0100, Julien Olivain spake thusly: > cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/openblas/openblas.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk > index 608c2f24ea..085d32acc3 100644 > --- a/package/openblas/openblas.mk > +++ b/package/openblas/openblas.mk > @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS > OPENBLAS_LICENSE = BSD-3-Clause > OPENBLAS_LICENSE_FILES = LICENSE > OPENBLAS_INSTALL_STAGING = YES > +OPENBLAS_CPE_ID_VENDOR = openblas_project > > # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) > OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Fri Mar 18 21:58:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 22:58:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: <20220318215025.GN283544@scaer> References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> <20220318215025.GN283544@scaer> Message-ID: Yann, Le ven. 18 mars 2022 ? 22:50, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-03-18 20:33 +0100, Fabrice Fontaine spake thusly: > > introspection needs host-doxygen and host-python-lxml since the addition > > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 > > As per that diff, it seems doxygen is only needed when actually building > the documentation: > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa As written in the commit title, wireplumber "build gobject introspection from xml files generated by Doxygen" > > doxygen_p = find_program('doxygen', required: get_option('doc')) Indeed, this is what is done in this commit. But the next one (i.e. https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374) adds the following: if get_option('doc').enabled() or get_option('introspection').enabled() doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: true) elif get_option('doc').auto() or get_option('introspection').auto() doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: false) else doxygen_p = disabler() > > But we are alredy passing -Ddoc=disabled, so why is it still trying to > build the documentation? It's not building the "full" documentation (which depends on sphinx, etc.), only the file that is needed for gobject-introspection. > > That's because the option is only a hint to not care when doxygen is > missing, but if doxygen is present, then the documentation is still > built. > > -Ddoc=disabled should really disable building the documentation, e.g. > in ./meson.build: > > if get_option('doc') > subdir('doc') > endif > > or, at the top of ./doc/meson.build: > > if not get_option('doc') > subdir_done() > fi > > I think the former is better, as they already have conditional subdir() > in the top-level meson.build. > > Regards, > Yann E. MORIN. > > > ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml > > > > Fixes: > > - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/wireplumber/wireplumber.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > > index 3bf7cece45..327138391d 100644 > > --- a/package/wireplumber/wireplumber.mk > > +++ b/package/wireplumber/wireplumber.mk > > @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ > > -Dsystem-lua-version= > > > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > > -WIREPLUMBER_DEPENDENCIES += gobject-introspection > > +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection > > WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled > > else > > WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled > > -- > > 2.35.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From yann.morin.1998 at free.fr Fri Mar 18 22:10:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:10:31 +0100 Subject: [Buildroot] [git commit] package/wireplumber: fix introspection build Message-ID: <20220318220330.839DD82287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e1de2ef067575ee33b55cfe02ffed09f7e3fe6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Doxygen is required to build just the bare minimal (not the full documentation) since https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374 Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 3bf7cece45..327138391d 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled From yann.morin.1998 at free.fr Fri Mar 18 22:12:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:12:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> <20220318215025.GN283544@scaer> Message-ID: <20220318221221.GP283544@scaer> Fabrice, All, On 2022-03-18 22:58 +0100, Fabrice Fontaine spake thusly: > Le ven. 18 mars 2022 ? 22:50, Yann E. MORIN a ?crit : > > On 2022-03-18 20:33 +0100, Fabrice Fontaine spake thusly: > > > introspection needs host-doxygen and host-python-lxml since the addition > > > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 > > > > As per that diff, it seems doxygen is only needed when actually building > > the documentation: > > > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa > As written in the commit title, wireplumber "build gobject > introspection from xml files generated by Doxygen" Yes, but still, by itself, it does not make sense to do that if documentation is not built. I.e.: no doc => no files generated by doxygen => no introspection on those files. (but see below). > > doxygen_p = find_program('doxygen', required: get_option('doc')) > > Indeed, this is what is done in this commit. > But the next one (i.e. > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374) > adds the following: > > if get_option('doc').enabled() or get_option('introspection').enabled() > doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: true) > elif get_option('doc').auto() or get_option('introspection').auto() > doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: false) > else > doxygen_p = disabler() That commiyt should have also been mentioned, or at least the following... > > But we are alredy passing -Ddoc=disabled, so why is it still trying to > > build the documentation? > It's not building the "full" documentation (which depends on sphinx, > etc.), only the file that is needed for gobject-introspection. ... here shjould have been mentioned. Applied to master with those explanations added, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:13:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:13:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix CVE-2022-25051 In-Reply-To: <20220317214203.258736-1-fontaine.fabrice@gmail.com> References: <20220317214203.258736-1-fontaine.fabrice@gmail.com> Message-ID: <20220318221331.GQ283544@scaer> Fabrice, All, On 2022-03-17 22:42 +0100, Fabrice Fontaine spake thusly: > An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when > decoding a crafted file. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...low-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 +++++++++++++++++++ > package/rtl_433/rtl_433.mk | 3 + > 2 files changed, 61 insertions(+) > create mode 100644 package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > > diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > new file mode 100644 > index 0000000000..e2088b29e7 > --- /dev/null > +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > @@ -0,0 +1,58 @@ > +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 > +From: "Christian W. Zuckschwerdt" > +Date: Mon, 24 Jan 2022 15:53:20 +0100 > +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported > + by aug5t7 > + > +[Retrieved from: > +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] > +Signed-off-by: Fabrice Fontaine > +--- > + src/devices/cmr113.c | 4 ++-- > + src/devices/somfy_iohc.c | 9 +++++---- > + 2 files changed, 7 insertions(+), 6 deletions(-) > + > +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c > +index c85dfac56..19ec5d421 100644 > +--- a/src/devices/cmr113.c > ++++ b/src/devices/cmr113.c > +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: > + > + */ > + > +-#define COMPARE_BITS 83 > +-#define COMPARE_BYTES (COMPARE_BITS/8) > ++#define COMPARE_BITS 83 > ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) > + > + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) > + { > +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c > +index 906cae53e..2c88067b5 100644 > +--- a/src/devices/somfy_iohc.c > ++++ b/src/devices/somfy_iohc.c > +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) > + if (bitbuffer->num_rows != 1) > + return DECODE_ABORT_EARLY; > + > +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; > +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) > ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; > ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) > + return DECODE_ABORT_EARLY; > + > +- int num_bits = bitbuffer->bits_per_row[0] - offset; > ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; > ++ num_bits = MIN(num_bits, sizeof (b) * 8); > + > + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); > + if (len < 19) > +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) > + // calculate and verify checksum > + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 > + return DECODE_FAIL_MIC; > +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); > ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); > + > + int msg_type = (b[0]); > + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian > diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk > index a5139ddae6..d1c28adbf5 100644 > --- a/package/rtl_433/rtl_433.mk > +++ b/package/rtl_433/rtl_433.mk > @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ > -DBUILD_TESTING_ANALYZER=OFF \ > -DENABLE_SOAPYSDR=OFF > > +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > +RTL_433_IGNORE_CVES += CVE-2022-25051 > + > ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) > RTL_433_DEPENDENCIES += librtlsdr > RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:12:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:12:54 +0100 Subject: [Buildroot] [git commit] package/rtl_433: fix CVE-2022-25051 Message-ID: <20220318220449.AF7B4826E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0368e0abd00529bd6af0f22c2b52abc3f53a5779 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when decoding a crafted file. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ++++++++++++++++++++++ package/rtl_433/rtl_433.mk | 3 ++ 2 files changed, 61 insertions(+) diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch new file mode 100644 index 0000000000..e2088b29e7 --- /dev/null +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch @@ -0,0 +1,58 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] +Signed-off-by: Fabrice Fontaine +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index a5139ddae6..d1c28adbf5 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +RTL_433_IGNORE_CVES += CVE-2022-25051 + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON From yann.morin.1998 at free.fr Fri Mar 18 22:16:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:16:47 +0100 Subject: [Buildroot] [git commit] package/minidlna: fix CVE-2022-26505 Message-ID: <20220318220805.7811E8283B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7520b7ea1d4276fa762fa3be971155fcf2b2d01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From yann.morin.1998 at free.fr Fri Mar 18 22:17:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:17:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/minidlna: fix CVE-2022-26505 In-Reply-To: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> References: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> Message-ID: <20220318221730.GR283544@scaer> Fabrice, All, On 2022-03-13 12:41 +0100, Fabrice Fontaine spake thusly: > A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 > allows a remote web server to exfiltrate media files. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...rotect-against-DNS-rebinding-attacks.patch | 66 +++++++++++++++++++ > package/minidlna/minidlna.mk | 3 + > 2 files changed, 69 insertions(+) > create mode 100644 package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > > diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > new file mode 100644 > index 0000000000..6d601f53b9 > --- /dev/null > +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > @@ -0,0 +1,66 @@ > +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 > +From: Justin Maggard > +Date: Wed, 9 Feb 2022 18:32:50 -0800 > +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks > + > +Validate HTTP requests to protect against DNS rebinding. > + > +[Retrieved from: > +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] > +Signed-off-by: Fabrice Fontaine > +--- > + upnphttp.c | 17 +++++++++++++++++ > + upnphttp.h | 2 ++ > + 2 files changed, 19 insertions(+) > + > +diff --git a/upnphttp.c b/upnphttp.c > +index c8b5e99..62db89a 100644 > +--- a/upnphttp.c > ++++ b/upnphttp.c > +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) > + p = colon + 1; > + while(isspace(*p)) > + p++; > ++ n = 0; > ++ while(p[n] >= ' ') > ++ n++; > ++ h->req_Host = p; > ++ h->req_HostLen = n; > + for(n = 0; n < n_lan_addr; n++) > + { > + for(i = 0; lan_addr[n].str[i]; i++) > +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) > + } > + > + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); > ++ if(h->req_Host && h->req_HostLen > 0) { > ++ const char *ptr = h->req_Host; > ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); > ++ for(i = 0; i < h->req_HostLen; i++) { > ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { > ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); > ++ Send404(h);/* 403 */ > ++ return; > ++ } > ++ ptr++; > ++ } > ++ } > + if(strcmp("POST", HttpCommand) == 0) > + { > + h->req_command = EPost; > +diff --git a/upnphttp.h b/upnphttp.h > +index e28a943..57eb2bb 100644 > +--- a/upnphttp.h > ++++ b/upnphttp.h > +@@ -89,6 +89,8 @@ struct upnphttp { > + struct client_cache_s * req_client; > + const char * req_soapAction; > + int req_soapActionLen; > ++ const char * req_Host; /* Host: header */ > ++ int req_HostLen; > + const char * req_Callback; /* For SUBSCRIBE */ > + int req_CallbackLen; > + const char * req_NT; > +-- > +2.34.1 > + > diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk > index adea200f4f..01ee8d0028 100644 > --- a/package/minidlna/minidlna.mk > +++ b/package/minidlna/minidlna.mk > @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project > MINIDLNA_CPE_ID_PRODUCT = readymedia > MINIDLNA_SELINUX_MODULES = minidlna > > +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > +MINIDLNA_IGNORE_CVES += CVE-2022-26505 > + > MINIDLNA_DEPENDENCIES = \ > $(TARGET_NLS_DEPENDENCIES) \ > ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:32:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:32:21 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220318132427.48737-4-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-4-clement.leger@bootlin.com> Message-ID: <20220318223221.GS283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Newer version of optee-os (>= 3.16) uses python-cryptography instead of > python-pycryptodomex in python scripts. Add support to build these > newer versions by adding a new > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will > select host-python-cryptography dependency when building optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 9 +++++++++ > boot/optee-os/optee-os.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index ea16550b72..02b5d7c86f 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -1,6 +1,7 @@ > config BR2_TARGET_OPTEE_OS > bool "optee_os" > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS That's wrong: 3.15.0 still does not need host-python-cryptography. Furthermore, even after we bump to 3.16.0, since we can choose an arbitrary git tree at an arbitrary commit, it is still possible to point to a version of optee-os that does not require it either. So, that dependency only really belongs... > help > OP-TEE OS provides the secure world boot image and the trust > application development kit of the OP-TEE project. OP-TEE OS > @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > Select this option if your OP-TEE OS platform configuration > requires the Device Tree compiler to be available. > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "OP-TEE OS needs host-python-cryptography" ... here. Applied to master with this fixed, mraou. Regards, Yann E. MORIN. > + help > + OP-TEE OS version below 3.16 used python-pycryptodomex > + package in python scripts. Newer version uses > + python-cryptography. Select this option if optee-os needs > + python-cryptography to be built. > + > config BR2_TARGET_OPTEE_OS_CORE > bool "Build core" > default y > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 9f76d8450e..5313a1badc 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -21,7 +21,13 @@ else > OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) > endif > > -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools > + > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) > +OPTEE_OS_DEPENDENCIES += host-python-cryptography > +else > +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex > +endif > > ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > OPTEE_OS_DEPENDENCIES += host-dtc > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:32:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:32:35 +0100 Subject: [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package In-Reply-To: <20220318132427.48737-3-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-3-clement.leger@bootlin.com> Message-ID: <20220318223235.GT283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Enable host package and add needed variables. Host POST_PROCESS and > DOWNLOAD_DEPENDENCIES variables are inherited from target ones. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-cryptography/python-cryptography.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index a524f729c8..872ede9b89 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > host-python-cffi \ > host-rustc \ > openssl > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + host-openssl > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > # We need to vendor the Cargo crates at download time > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:33:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:33:15 +0100 Subject: [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings In-Reply-To: <20220318132427.48737-2-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-2-clement.leger@bootlin.com> Message-ID: <20220318223315.GU283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > From: "Yann E. MORIN" > > It seems reasonable to expect that the download of the host and target > variants should usually be exactly the same and thus reuse the target > package values for the host package. This commits add support to > inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and > _DOwNLOAD_POST_PROCESS variables from target ones. These variables can > still be overriden if necessary for the host package. > > Signed-off-by: Yann E. MORIN > Signed-off-by: Cl?ment L?ger As Thomas also hinted he agreed on the principle: applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-generic.mk | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b3a7e1d60e..79fcf603d3 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR > endif > endif > > +ifndef $(2)_DL_SUBDIR > + ifdef $(3)_DL_SUBDIR > + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) > + endif > +endif > + > +ifndef $(2)_DOWNLOAD_DEPENDENCIES > + ifdef $(3)_DOWNLOAD_DEPENDENCIES > + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) > + endif > +endif > + > +ifndef $(2)_DL_ENV > + ifdef $(3)_DL_ENV > + $(2)_DL_ENV = $$($(3)_DL_ENV) > + endif > +endif > + > +ifndef $(2)_DOWNLOAD_POST_PROCESS > + ifdef $(3)_DOWNLOAD_POST_PROCESS > + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) > + endif > +endif > + > ifndef $(2)_STRIP_COMPONENTS > ifdef $(3)_STRIP_COMPONENTS > $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:40:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:40:31 +0100 Subject: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-5-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-5-clement.leger@bootlin.com> Message-ID: <20220318224031.GV283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set > BR2_TARGET_OPTEE_OS_LATEST to select > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY since > python-cryptography is now needed to build optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 5 +++-- > boot/optee-os/optee-os.hash | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 02b5d7c86f..811937e025 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -19,7 +19,8 @@ choice > Select the version of OP-TEE OS you want to use > > config BR2_TARGET_OPTEE_OS_LATEST > - bool "3.15.0" > + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "3.16.0" 3.16.0 now needs the dependency on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS, so if that is not met, there will only be the custom git as a fallback. This is not so nice that the latest has to, well, be the latest, and that we don;t keep 3.15.0 around for those that can't have a host rustc compiler. But then, who are we kidding? Builds on non-x86 are pretty rare yet; even if some people might be on PPC or AArch64, they still are to be no much more than two-handful (1023). Also, check-package whines; $ make check-package boot/optee-os/Config.in:22: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) And a hidden one: boot/optee-os/optee-os.hash:4: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Applied to master with those fixed, thanks. Regards, Yann E. MORIN. > help > Use the latest release tag from the OP-TEE OS official Git > repository. > @@ -51,7 +52,7 @@ endif > > config BR2_TARGET_OPTEE_OS_VERSION > string > - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST > default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ > if BR2_TARGET_OPTEE_OS_CUSTOM_GIT > > diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash > index 3c32e25b36..b9b0e5b43f 100644 > --- a/boot/optee-os/optee-os.hash > +++ b/boot/optee-os/optee-os.hash > @@ -1,4 +1,4 @@ > -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz > -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz > +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz > +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz > # Locally computed > sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:21:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:21:44 +0100 Subject: [Buildroot] [git commit] package/pkg-generic: host variant inherits target download settings Message-ID: <20220318223159.059C983944@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa7712b092950c92f994e2ee30c120a64e5451b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It seems reasonable to expect that the download of the host and target variants should usually be exactly the same and thus reuse the target package values for the host package. This commits add support to inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and _DOwNLOAD_POST_PROCESS variables from target ones. These variables can still be overriden if necessary for the host package. Signed-off-by: Yann E. MORIN Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) From yann.morin.1998 at free.fr Fri Mar 18 22:22:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:22:51 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: enable host package Message-ID: <20220318223159.0E69A83A69@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1b25c32a2b46fb74bec3818248379513b7d788b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable host package and add needed variables. Host POST_PROCESS and DOWNLOAD_DEPENDENCIES variables are inherited from target ones. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..872ede9b89 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Fri Mar 18 22:26:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:26:34 +0100 Subject: [Buildroot] [git commit] boot/optee-os: add support to build with python-cryptography Message-ID: <20220318223159.167AB83AA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=752f478affb5eba6364f44abccdb77ad60e5f000 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger [yann.morin.1998 at free.fr: - move the _ARCH_DEPENDS option from the main symbol to thus new symbol ] Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 9 +++++++++ boot/optee-os/optee-os.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index ea16550b72..b998228121 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -61,6 +61,15 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 9f76d8450e..5313a1badc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,13 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc From yann.morin.1998 at free.fr Fri Mar 18 22:39:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:39:45 +0100 Subject: [Buildroot] [git commit] boot/optee-os: bump to version 3.16.0 Message-ID: <20220318223159.1F3FF83944@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5d441b7f2ee822112bd73643370b902ee22f9de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_LATEST to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 6 ++++-- boot/optee-os/optee-os.hash | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index b998228121..18e1efee55 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,9 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +52,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..d3a2637a4e 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed -sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE +sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:44:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:44:00 +0100 Subject: [Buildroot] [git commit] package/optee-examples: bump to version 3.16.0 Message-ID: <20220318223653.60A2D83E3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6631e1f70897c4e83feeeb33396034f0daadba86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-examples/optee-examples.hash | 6 +++--- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..9228fb39d2 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed -sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE +sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:44:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:44:39 +0100 Subject: [Buildroot] [git commit] package/optee-client: bump to version 3.16.0 Message-ID: <20220318223653.6B55C83E7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91f8e51217d295d6249d8a3945406ea5546129e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.hash | 6 +++--- package/optee-client/optee-client.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..ff90f6d2a8 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed -sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:43:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:43:31 +0100 Subject: [Buildroot] [git commit] package/optee-test: bump to version 3.16.0 Message-ID: <20220318223653.55CAC83D37@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc6cbab1d3f050df66945711a8c5d22c473defa8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-test/optee-test.hash | 6 +++--- package/optee-test/optee-test.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..c42e922d90 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed -sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md +sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Fri Mar 18 22:45:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:45:21 +0100 Subject: [Buildroot] [git commit] package/optee-benchmark: bump to version 3.16.0 Message-ID: <20220318223653.7C0E183D37@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00c51867756180883e197b676723feb14c7934a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-benchmark/optee-benchmark.hash | 6 +++--- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..2e75b4ff8e 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed -sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE +sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:46:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:46:22 +0100 Subject: [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318224622.GW283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > and optee-test which needs to be aligned with optee-os version. [--SNIP--] > Cl?ment L?ger (7): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > package/optee-test: bump to version 3.16.0 > package/optee-examples: bump to version 3.16.0 > package/optee-client: bump to version 3.16.0 > package/optee-benchmark: bump to version 3.16.0 Whole series applied to master, thanks. Regards, Yann E. MORIN. > Yann E. MORIN (1): > package/pkg-generic: host variant inherits target download settings > > boot/optee-os/Config.in | 14 +++++++++-- > boot/optee-os/optee-os.hash | 4 ++-- > boot/optee-os/optee-os.mk | 8 ++++++- > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > package/optee-benchmark/optee-benchmark.mk | 2 +- > package/optee-client/optee-client.hash | 4 ++-- > package/optee-client/optee-client.mk | 2 +- > package/optee-examples/optee-examples.hash | 4 ++-- > package/optee-examples/optee-examples.mk | 2 +- > package/optee-test/optee-test.hash | 4 ++-- > package/optee-test/optee-test.mk | 2 +- > package/pkg-generic.mk | 24 +++++++++++++++++++ > .../python-cryptography.mk | 12 ++++++++++ > 13 files changed, 69 insertions(+), 17 deletions(-) > > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From br015 at umbiko.net Sat Mar 19 06:11:15 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Sat, 19 Mar 2022 07:11:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: update to version 0.23.6 Message-ID: <20220319061115.1641-1-br015@umbiko.net> Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part of this release Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS Signed-off-by: Andreas Ziegler --- ...2-lib-alsa-Error-add-missing-include.patch | 25 ------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 package/mpd/0002-lib-alsa-Error-add-missing-include.patch diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54..0000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf..b09140abf5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..12da36098f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Mar 19 09:17:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 19 Mar 2022 10:17:49 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220318223221.GS283544@scaer> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-4-clement.leger@bootlin.com> <20220318223221.GS283544@scaer> Message-ID: <20220319101749.265ebceb@windsurf> On Fri, 18 Mar 2022 23:32:21 +0100 "Yann E. MORIN" wrote: > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > > index ea16550b72..02b5d7c86f 100644 > > --- a/boot/optee-os/Config.in > > +++ b/boot/optee-os/Config.in > > @@ -1,6 +1,7 @@ > > config BR2_TARGET_OPTEE_OS > > bool "optee_os" > > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > > That's wrong: 3.15.0 still does not need host-python-cryptography. > > Furthermore, even after we bump to 3.16.0, since we can choose an > arbitrary git tree at an arbitrary commit, it is still possible to > point to a version of optee-os that does not require it either. > > So, that dependency only really belongs... > > > help > > OP-TEE OS provides the secure world boot image and the trust > > application development kit of the OP-TEE project. OP-TEE OS > > @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > > Select this option if your OP-TEE OS platform configuration > > requires the Device Tree compiler to be available. > > > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > > + bool "OP-TEE OS needs host-python-cryptography" > > ... here. Yes and no. Because as soon as the BR2_TARGET_OPTEE_OS_LATEST gets bumped to 3.16.0, then our default selection for OP-TEE (unless you chose a custom Git version) will require python-cryptography. So to keep things simple, I asked Cl?ment to add this dependency to the whole package. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Mar 19 09:46:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 10:46:51 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220319101749.265ebceb@windsurf> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-4-clement.leger@bootlin.com> <20220318223221.GS283544@scaer> <20220319101749.265ebceb@windsurf> Message-ID: <20220319094651.GA1566358@scaer> Thomas, All, On 2022-03-19 10:17 +0100, Thomas Petazzoni spake thusly: > On Fri, 18 Mar 2022 23:32:21 +0100 > "Yann E. MORIN" wrote: > > > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > > > index ea16550b72..02b5d7c86f 100644 > > > --- a/boot/optee-os/Config.in > > > +++ b/boot/optee-os/Config.in > > > @@ -1,6 +1,7 @@ > > > config BR2_TARGET_OPTEE_OS > > > bool "optee_os" > > > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > > > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > > > > That's wrong: 3.15.0 still does not need host-python-cryptography. > > > > Furthermore, even after we bump to 3.16.0, since we can choose an > > arbitrary git tree at an arbitrary commit, it is still possible to > > point to a version of optee-os that does not require it either. > > > > So, that dependency only really belongs... > > > > > help > > > OP-TEE OS provides the secure world boot image and the trust > > > application development kit of the OP-TEE project. OP-TEE OS > > > @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > > > Select this option if your OP-TEE OS platform configuration > > > requires the Device Tree compiler to be available. > > > > > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > > > + bool "OP-TEE OS needs host-python-cryptography" > > > > ... here. > > Yes and no. Because as soon as the BR2_TARGET_OPTEE_OS_LATEST gets > bumped to 3.16.0, then our default selection for OP-TEE (unless you > chose a custom Git version) will require python-cryptography. So to > keep things simple, I asked Cl?ment to add this dependency to the > whole package. But that's the point: you can still choose a custom git tree that points to an earlier, pre-3.16.0 tree, which will still be buildable without pytho-cryptography. But yes, you got a point: I forgot to guard the default clause in the choice, with the same dependency. I'll submit a patch. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 19 09:49:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 10:49:39 +0100 Subject: [Buildroot] [PATCH] boot/optee-os: fix version choice Message-ID: <20220319094939.1588302-1-yann.morin.1998@free.fr> Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to propagate the rustc arch dependency from the new version, to the default clause of the choice. This leaves only the custom git tree as a posible source for building OP-TEE OS in case the host can't have a rustc compiler. Signed-off-by: Yann E. MORIN Reported-by: Thomas Petazzoni Cc: Cl?ment L?ger Cc: Etienne Carriere --- boot/optee-os/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 18e1efee55..30b6f62434 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS choice prompt "OP-TEE OS version" - default BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of OP-TEE OS you want to use -- 2.25.1 From romain.naour at gmail.com Sat Mar 19 14:30:16 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Mar 2022 15:30:16 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <08edbbcf-8be3-4554-0d54-0dd349caa2ff@mind.be> References: <20220224154513.220976-1-romain.naour@gmail.com> <20220224154513.220976-2-romain.naour@gmail.com> <08edbbcf-8be3-4554-0d54-0dd349caa2ff@mind.be> Message-ID: <5902b319-5984-c453-09d3-e0db284f8048@gmail.com> Hello Arnout, Le 12/03/2022 ? 21:34, Arnout Vandecappelle a ?crit?: > > > On 24/02/2022 16:45, Romain Naour wrote: >> The test TestRust is currently broken with ripgrep package with >> the following error: >> >> error[E0514]: found crate `core` compiled by an incompatible version of rustc >> ?? | >> ?? = help: please recompile that crate using this compiler (rustc 1.58.1) >> (consider running `cargo clean` first) >> ?? = note: the following crate versions were found: >> ?????????? crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): >> TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib >> >> >> error[E0514]: found crate `std` compiled by an incompatible version of rustc >> >> The problem is not really a cross-compilation issue (we are building >> for an armv7 target on x86_64 host) but a problem with rust-std libraries >> (rlib). >> >> We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same >> version as the prebuilt rustc used to bootstrap the build: >> >> TestRust/host/bin/rustc --version >> rustc 1.58.1 >> >> TestRustBin/host/bin/rustc --version >> rustc 1.58.1 (db9d1b20b 2022-01-20) >> >> Indeed we are using host-rust-bin to bootstrap the host-rust compiler >> package built by Buildroot. The problem is that the >> libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) >> and is not removed before installing host-rust built by Buildroot. >> >> We actually spent a lot of time to build host-rust with rust-std >> and forget to install this important library HOST_DIR. >> >> Looking at the host-rust build directory we can notice two installer >> script "install.sh" (the same scripts used to install host-rust-bin): >> >> TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh >> >> TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh >> >> >> The "tarball" directory is generated by the "python x.py dist" during >> the install step, we have to keep it. >> >> Replace "python x.py install" by theses two install scripts. >> Installing rust-std with the install.sh script replace the rust-std >> libraries installed by host-rust-bin. > > ?Excellent description, thanks. It's almost Yann-level :-) Why "almost"? you meant Yann-level but without typos (kidding) :) Thank you for your comment, It's highly appreciated. > >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 >> >> Signed-off-by: Romain Naour >> Cc: Eric Le Bihan >> --- >> ? package/rust/rust.mk | 23 ++++++++++++++++++++++- >> ? 1 file changed, 22 insertions(+), 1 deletion(-) >> >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk >> index 46487fe4b7..4a6b04dc8c 100644 >> --- a/package/rust/rust.mk >> +++ b/package/rust/rust.mk >> @@ -67,9 +67,30 @@ define HOST_RUST_BUILD_CMDS >> ????? cd $(@D); $(HOST_MAKE_ENV) >> $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build >> ? endef >> ? +HOST_RUST_INSTALL_COMMON_OPTS = \ >> +??? --prefix=$(HOST_DIR) \ >> +??? --disable-ldconfig >> + >> +HOST_RUST_INSTALL_OPTS = \ > > ?This variable is used only once, which makes it not very useful. I instead > added the --components directly in HOST_RUST_INSTALL_RUSTC. I also renamend the > INSTALL_COMMON_OPTS to INSTALL_OPTS since there's only one variable now. > >> +??? $(HOST_RUST_INSTALL_COMMON_OPTS) \ >> +??? --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) >> + >> +define HOST_RUST_INSTALL_RUSTC >> +??? (cd >> $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); >> \ > > ?The parenthesis are not necessary - make already starts a sub-shell for every > line, there's no need to add another shell level. We still have them in a lot of > .mk files, but we try to avoid adding them. Ok > > > ?Applied to master with those two changes, thanks. Thanks! Best regards, Romain > > ?Regards, > ?Arnout > >> +??????? ./install.sh $(HOST_RUST_INSTALL_OPTS)) >> +endef >> + >> +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) >> +define HOST_RUST_INSTALL_LIBSTD_TARGET >> +??? (cd >> $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); >> \ >> +??????? ./install.sh $(HOST_RUST_INSTALL_COMMON_OPTS)) >> +endef >> +endif >> + >> ? define HOST_RUST_INSTALL_CMDS >> ????? cd $(@D); $(HOST_MAKE_ENV) >> $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist >> -??? cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) >> x.py install >> +??? $(HOST_RUST_INSTALL_RUSTC) >> +??? $(HOST_RUST_INSTALL_LIBSTD_TARGET) >> ? endef >> ? ? $(eval $(host-generic-package)) From romain.naour at gmail.com Sat Mar 19 14:33:57 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Mar 2022 15:33:57 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <3897f71d-5622-b118-09a7-b23da8eb87c7@mind.be> References: <20220224154513.220976-1-romain.naour@gmail.com> <3897f71d-5622-b118-09a7-b23da8eb87c7@mind.be> Message-ID: <81bdd0ce-f8e6-4ad0-409f-5ba40a568bbe@gmail.com> Le 15/03/2022 ? 22:13, Arnout Vandecappelle a ?crit?: > > On 24/02/2022 16:45, Romain Naour wrote: >> TestRust and TestRustBin has been introduced at the time when there was >> no cargo package infrastructure or any package using rust compiler >> (Buildroot 2018.02). >> >> Since then the ripgrep package has been introduced, initially using >> the generic package infrastructure and converted later to the cargo >> package infrastructure. >> >> Due a recent change in rust/cargo removing the cargo config file [1] >> the test TestRust and TestRustBin now fail to compile since they build >> an hello-world crate outside of the cargo package infrastructure >> without the correct environment for cross-compiling. >> >> Replace the 'hello-world' crate by ripgrep package and check if it >> can run properly in Qemu. >> >> Fixes tests.package.test_rust.TestRustBin: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 >> >> But doesn't fixes tests.package.test_rust.TestRust due another bug: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 >> >> [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 >> >> Signed-off-by: Romain Naour >> Cc: Eric Le Bihan > > ?This introduced a few flake8 errors, which I fixed now. In the future: run > flake8! (I also always forget :-)) This is completely unexpected, sorry for that. Best regards, Romain > > > ?Regards, > ?Arnout > From fontaine.fabrice at gmail.com Sat Mar 19 16:21:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Mar 2022 17:21:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add gl dependency Message-ID: <20220319162109.1088457-1-fontaine.fabrice@gmail.com> Fix the following build failure without gl raised since bump to version 6.03 in commit cbcbd66b0f241184288232972d9cd9d03c9f0ce1: Note: The OpenGL 3D library is not being used. Those demos which use 3D will not be built or installed. That is most of them. make: *** [package/pkg-generic.mk:282: /home/peko/autobuild/instance-0/output-1/build/xscreensaver-6.03/.stamp_configured] Error 1 A patch was sent to Jamie Zawinski to fix this failure and he replied: "Why would you do that? I pretty much consider that an unsupported configuration, since that's more than half of the savers at this point." I told him that some embedded devices don't have gl and he replied: "Such as? Just about every modern "embedded device" I'm aware of is more performant than the desktop computers on which I developed many of those GL hacks..." So just add a dependency on gl. Fixes: - http://autobuild.buildroot.org/results/b76743a48d75b5b7539712318fa0b2937a157f88 Signed-off-by: Fabrice Fontaine --- package/xscreensaver/Config.in | 7 ++++--- package/xscreensaver/xscreensaver.mk | 9 ++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 48eefdfa70..ba259274d1 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 @@ -9,7 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_GDK_PIXBUF_XLIB - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG @@ -28,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 0a91d22d14..0f21fc0e9f 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -17,6 +17,8 @@ XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ gdk-pixbuf-xlib \ jpeg \ + libgl \ + libglu \ libgtk2 \ libxml2 \ xlib_libX11 \ @@ -32,13 +34,6 @@ XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ --libdir=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -XSCREENSAVER_CONF_OPTS += --with-gl=yes -XSCREENSAVER_DEPENDENCIES += libgl libglu -else -XSCREENSAVER_CONF_OPTS += --with-gl=no -endif - ifeq ($(BR2_PACKAGE_LIBPNG),y) XSCREENSAVER_CONF_OPTS += --with-png=yes XSCREENSAVER_DEPENDENCIES += libpng -- 2.35.1 From yann.morin.1998 at free.fr Sat Mar 19 17:54:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 18:54:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add gl dependency In-Reply-To: <20220319162109.1088457-1-fontaine.fabrice@gmail.com> References: <20220319162109.1088457-1-fontaine.fabrice@gmail.com> Message-ID: <20220319175456.GB1566358@scaer> Fabrice, All, On 2022-03-19 17:21 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure without gl raised since bump to version > 6.03 in commit cbcbd66b0f241184288232972d9cd9d03c9f0ce1: > > Note: The OpenGL 3D library is not being used. > > Those demos which use 3D will not be built or installed. > That is most of them. > > make: *** [package/pkg-generic.mk:282: /home/peko/autobuild/instance-0/output-1/build/xscreensaver-6.03/.stamp_configured] Error 1 > > A patch was sent to Jamie Zawinski to fix this failure and he replied: > > "Why would you do that? I pretty much consider that an unsupported > configuration, since that's more than half of the savers at this point." > > I told him that some embedded devices don't have gl and he replied: > > "Such as? Just about every modern "embedded device" I'm aware of is more > performant than the desktop computers on which I developed many of those > GL hacks..." > > So just add a dependency on gl. > > Fixes: > - http://autobuild.buildroot.org/results/b76743a48d75b5b7539712318fa0b2937a157f88 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/xscreensaver/Config.in | 7 ++++--- > package/xscreensaver/xscreensaver.mk | 9 ++------- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in > index 48eefdfa70..ba259274d1 100644 > --- a/package/xscreensaver/Config.in > +++ b/package/xscreensaver/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_XSCREENSAVER > bool "xscreensaver" > depends on BR2_PACKAGE_XORG7 > + depends on BR2_PACKAGE_HAS_LIBGL # libglu > depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango > depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 > depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 > @@ -9,7 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz > select BR2_PACKAGE_GDK_PIXBUF > select BR2_PACKAGE_GDK_PIXBUF_XLIB > - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL > + select BR2_PACKAGE_LIBGLU > select BR2_PACKAGE_LIBGTK2 > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_JPEG > @@ -28,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER > > http://www.jwz.org/xscreensaver/ > > -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" > +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" > depends on BR2_PACKAGE_XORG7 > depends on BR2_USE_MMU > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > - !BR2_USE_WCHAR > + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL > diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk > index 0a91d22d14..0f21fc0e9f 100644 > --- a/package/xscreensaver/xscreensaver.mk > +++ b/package/xscreensaver/xscreensaver.mk > @@ -17,6 +17,8 @@ XSCREENSAVER_DEPENDENCIES = \ > gdk-pixbuf \ > gdk-pixbuf-xlib \ > jpeg \ > + libgl \ > + libglu \ > libgtk2 \ > libxml2 \ > xlib_libX11 \ > @@ -32,13 +34,6 @@ XSCREENSAVER_CONF_OPTS = \ > --includedir=$(STAGING_DIR)/usr/include \ > --libdir=$(STAGING_DIR)/usr/lib > > -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > -XSCREENSAVER_CONF_OPTS += --with-gl=yes > -XSCREENSAVER_DEPENDENCIES += libgl libglu > -else > -XSCREENSAVER_CONF_OPTS += --with-gl=no > -endif > - > ifeq ($(BR2_PACKAGE_LIBPNG),y) > XSCREENSAVER_CONF_OPTS += --with-png=yes > XSCREENSAVER_DEPENDENCIES += libpng > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 19 17:54:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 18:54:20 +0100 Subject: [Buildroot] [git commit] package/xscreensaver: add gl dependency Message-ID: <20220319174615.43AD982B4F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bb495e8caa3f15bab8ddb059f07d6ad56634f42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without gl raised since bump to version 6.03 in commit cbcbd66b0f241184288232972d9cd9d03c9f0ce1: Note: The OpenGL 3D library is not being used. Those demos which use 3D will not be built or installed. That is most of them. make: *** [package/pkg-generic.mk:282: /home/peko/autobuild/instance-0/output-1/build/xscreensaver-6.03/.stamp_configured] Error 1 A patch was sent to Jamie Zawinski to fix this failure and he replied: "Why would you do that? I pretty much consider that an unsupported configuration, since that's more than half of the savers at this point." I told him that some embedded devices don't have gl and he replied: "Such as? Just about every modern "embedded device" I'm aware of is more performant than the desktop computers on which I developed many of those GL hacks..." So just add a dependency on gl. Fixes: - http://autobuild.buildroot.org/results/b76743a48d75b5b7539712318fa0b2937a157f88 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: keep --with-gl=yes] Signed-off-by: Yann E. MORIN --- package/xscreensaver/Config.in | 7 ++++--- package/xscreensaver/xscreensaver.mk | 12 ++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 48eefdfa70..ba259274d1 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 @@ -9,7 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_GDK_PIXBUF_XLIB - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG @@ -28,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 0a91d22d14..6cc7e8febe 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -17,6 +17,8 @@ XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ gdk-pixbuf-xlib \ jpeg \ + libgl \ + libglu \ libgtk2 \ libxml2 \ xlib_libX11 \ @@ -30,14 +32,8 @@ XSCREENSAVER_DEPENDENCIES = \ # compiler/linker XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ - --libdir=$(STAGING_DIR)/usr/lib - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -XSCREENSAVER_CONF_OPTS += --with-gl=yes -XSCREENSAVER_DEPENDENCIES += libgl libglu -else -XSCREENSAVER_CONF_OPTS += --with-gl=no -endif + --libdir=$(STAGING_DIR)/usr/lib \ + --with-gl=yes ifeq ($(BR2_PACKAGE_LIBPNG),y) XSCREENSAVER_CONF_OPTS += --with-png=yes From peter at korsgaard.com Sat Mar 19 19:01:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:01:03 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> (Mathieu Mirmont via buildroot's message of "Thu, 10 Mar 2022 11:18:26 +0100") References: <20220310101826.GA2353@parad0x.org> Message-ID: <87zgllpy1c.fsf@dell.be.48ers.dk> >>>>> "Mathieu" == Mathieu Mirmont via buildroot writes: > Different shells can have different behaviours when it comes to > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > to a different fnmatch/glob implementation that results in this new > behaviour: > Using bash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.[^.]* > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. > The current FAKEROOT script uses this shell glob pattern which now > fails on recent Debian testing systems: > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' > It seems safer to use `find | xargs rm` here instead of relying on > shell globbing patterns. > Signed-off-by: Mathieu Mirmont Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.12 In-Reply-To: (Arnout Vandecappelle's message of "Sat, 12 Mar 2022 17:58:25 +0100") References: <20220218105924.738666-1-fontaine.fabrice@gmail.com> Message-ID: <87v8w9pxux.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 18/02/2022 11:59, Fabrice Fontaine wrote: >> https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released >> Signed-off-by: Fabrice Fontaine > Applied to master, thanks. Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:11:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:11:30 +0100 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 In-Reply-To: <20220222113336.2608916-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 22 Feb 2022 12:33:36 +0100") References: <20220222113336.2608916-1-angelo@amarulasolutions.com> Message-ID: <87r16xpxjx.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Looking at the changelog, 9.0.1 seems to be a security fix release fixing two CVEs: https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst Please mark such version bumps as security related so I don't miss them. Committed with that fixed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:04:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lxc: bump to version 4.0.12 Message-ID: <20220319190521.CBA0682EAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f720577998f15f229221063088e0a7a1839f413d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f7b4ddd54d9d5dbeaa3646de3863f160c1504200) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..94c6b9ffee 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Sat Mar 19 19:04:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lxc: bump to version 4.0.12 Message-ID: <20220319190526.9509D83794@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aae7c1ec1e278582f6984e27054ddb70dadd96fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f7b4ddd54d9d5dbeaa3646de3863f160c1504200) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..94c6b9ffee 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Sat Mar 19 19:04:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/lxc: bump to version 4.0.12 Message-ID: <20220319190531.A131583D2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a8139a361a7aabd4ae2a2e54b46e2c1be677c8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f7b4ddd54d9d5dbeaa3646de3863f160c1504200) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7..9311dc8775 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Sat Mar 19 18:57:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 19:57:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] fs/common.mk: use find instead of shell glob patterns Message-ID: <20220319190531.975B183CB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=063ee76d294cf1bdc79f9b90a75ab6f70ed32d9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Different shells can have different behaviours when it comes to globbing patterns. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that results in this new behaviour: Using bash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.[^.]* Using dash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.. The current FAKEROOT script uses this shell glob pattern which now fails on recent Debian testing systems: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' Additionally, the glob will miss files which have at least two leading dots, like ..foo ...bar or ......buz (highly improbable, but still). It seems safer to use `find | xargs rm` here instead of relying on shell globbing patterns. Signed-off-by: Mathieu Mirmont Signed-off-by: Yann E. MORIN (cherry picked from commit 38c4f6b807e9b519922172089915559fb8642046) Signed-off-by: Peter Korsgaard --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..37eafac4f7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) From peter at korsgaard.com Sat Mar 19 19:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:09:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-pillow: security bump to version 9.0.1 Message-ID: <20220319190531.AA66283CB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c602fcfd2422705fec134281d99f3db8c9dc84e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes the following security issues: - CVE-2022-24303: In show_file, use os.remove to remove temporary images - CVE-2022-22817: Restrict builtins within lambdas for ImageMath.eval Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 07b070be39f9c51592c85fb76cd7af00539abc19) [Peter: mention security fixes] Signed-off-by: Peter Korsgaard --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e6014..88a5d7cada 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz # Locally computed sha256 checksums sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882..901876e0ee 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Mar 19 19:33:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:33:41 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 In-Reply-To: <48945229-3116-363f-f61f-89d495695cc1@mind.be> (Arnout Vandecappelle's message of "Sat, 12 Mar 2022 20:43:40 +0100") References: <20220222220255.22327-1-petr.vorel@gmail.com> <48945229-3116-363f-f61f-89d495695cc1@mind.be> Message-ID: <87mthlpwiy.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 22/02/2022 23:02, Petr Vorel wrote: >> BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. >> Changes: >> * libuv (new dependency) >> * openssl is now mandatory >> * zlib must be detected with PKG_CONFIG_PATH (specifying zlib >> installation path is not supported) >> * bind9-config and isc-config.sh removed >> * updated COPYRIGHT hash >> Signed-off-by: Petr Vorel > Applied to master, thanks. > I guess we'll get complaints if it doesn't work :-) Committed to 2022.02.x given the immediate EOL of 9.11. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:32:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:32:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bind: bump to version 9.16.26 Message-ID: <20220319192628.05ECF83D35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=696eb52d74206beaa55f67bf32dcc89c887cc9ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. Changes: * libuv (new dependency) * openssl is now mandatory * zlib must be detected with PKG_CONFIG_PATH (specifying zlib installation path is not supported) * bind9-config and isc-config.sh removed * updated COPYRIGHT hash Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8adeaec8afacbc680edebae91524f6144926ac92) Signed-off-by: Peter Korsgaard --- package/bind/Config.in | 12 +++++++++++- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 15 +++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb304..9887403ed9 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND https://www.isc.org/bind/ +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677..401e389e49 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a3..5b4c60b14c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,12 +4,12 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.26 +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ - --with-libjson=no \ + --with-json-c=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ --disable-backtrace +BIND_DEPENDENCIES = libuv + ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib +BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -66,7 +69,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr \ @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes else BIND_CONF_OPTS += --with-gost=no endif -else -BIND_CONF_OPTS += --with-openssl=no -endif # Used by dnssec-keymgr ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) From fontaine.fabrice at gmail.com Sat Mar 19 19:34:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Mar 2022 20:34:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: bump to version 1.1.1 Message-ID: <20220319193422.1148509-1-fontaine.fabrice@gmail.com> - This bump fixes unauthorized access via D-Bus (CVE-2019-25058): https://github.com/advisories/GHSA-p5wh-m4gj-x2mr but dbus is disabled on buildroot - musl is supported since https://github.com/USBGuard/usbguard/commit/b04e8deacac4f3f4a82a10b219c2d555e1b2aa24 - C++17 is now mandatory: https://github.com/USBGuard/usbguard/commit/8c86264986685bf646c65228abce2432e08e3c4c - Update hash of license file (use license file from gnu.org: https://github.com/USBGuard/usbguard/commit/3292511ab164ce0bdf6d58f0369ce3993dded9ad) https://github.com/USBGuard/usbguard/blob/usbguard-1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine --- package/usbguard/Config.in | 8 +++----- package/usbguard/usbguard.hash | 6 ++++-- package/usbguard/usbguard.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index e97d0e729c..4c3dc7f2c2 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,9 +3,8 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on !BR2_STATIC_LIBS # libqb, protobuf - depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD https://usbguard.github.io/ -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS comment "usbguard needs a toolchain not affected by GCC bug 64735" diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash index fd77acc75a..a69240b3f9 100644 --- a/package/usbguard/usbguard.hash +++ b/package/usbguard/usbguard.hash @@ -1,3 +1,5 @@ +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.1/usbguard-1.1.1.tar.gz.sum +sha256 460ebfb4ffc5609739a202a3a1d9fda1c30de033b634845b8baa136352bfb432 usbguard-1.1.1.tar.gz + # Locally calculated -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 54a4031056..614b7d655d 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBGUARD_VERSION = 1.0.0 +USBGUARD_VERSION = 1.1.1 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE -- 2.35.1 From juanrgar at gmail.com Sat Mar 19 21:45:35 2022 From: juanrgar at gmail.com (Juan Garcia Blanco) Date: Sat, 19 Mar 2022 22:45:35 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: fix check for CWD in env vars Message-ID: <20220319214536.2417-1-juanrgar@gmail.com> The previous pattern incorrectly matches against path lists that don't contain CWD, but end with ':', e.g., exported like VAR=<...>:$VAR where $VAR is empty. Now the pattern explicitly checks for $PWD in the path list. Signed-off-by: Juan Garcia Blanco --- support/dependencies/dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index c604a9efcc..d1fe94c9b9 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -16,7 +16,7 @@ fi # Sanity check for CWD in LD_LIBRARY_PATH case ":${LD_LIBRARY_PATH:-unset}:" in -(*::*|*:.:*) +(*:$PWD:*|*:.:*) echo echo "You seem to have the current working directory in your" echo "LD_LIBRARY_PATH environment variable. This doesn't work." @@ -32,7 +32,7 @@ esac # An empty PATH is technically possible, but in practice we would not # even arrive here if that was the case. case ":${PATH:-unset}:" in -(*::*|*:.:*) +(*:$PWD:*|*:.:*) echo echo "You seem to have the current working directory in your" echo "PATH environment variable. This doesn't work." -- 2.25.1 From bugzilla at busybox.net Sat Mar 19 21:50:13 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 19 Mar 2022 21:50:13 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Sat Mar 19 21:50:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 22:50:58 +0100 Subject: [Buildroot] [PATCH v2] package/openssh: fix '-fzero-call-used-regs' option support detection In-Reply-To: <20220311065511.14015-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 11 Mar 2022 07:55:11 +0100") References: <20220311065511.14015-1-ps.report@gmx.net> Message-ID: <87ils9pq65.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option > support detection > - add autoreconf as the patch touches m4/openssh.m4 > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=14651 > bitmap.c: In function ?reserve?: > bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target > 98 | } > | ^ > [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - rebased and renumbered patch from 0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > to 0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 21:49:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 22:49:54 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220319214213.073DF83EE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23fb7bbc00e22e90cf65997f4aae4a28c1ba4f6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ???reserve???: bitmap.c:98:1: sorry, unimplemented: ???-fzero-call-used-regs??? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66fd92a4ce0599ee8c59b9ba95bf0f2c6ec74c43) Signed-off-by: Peter Korsgaard --- ...ection-of-fzero-call-used-regs-all-suppor.patch | 38 ++++++++++++++++++++++ package/openssh/openssh.mk | 4 +++ 2 files changed, 42 insertions(+) diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From james.hilliard1 at gmail.com Sat Mar 19 23:47:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 19 Mar 2022 17:47:14 -0600 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 In-Reply-To: <87r16xpxjx.fsf@dell.be.48ers.dk> References: <20220222113336.2608916-1-angelo@amarulasolutions.com> <87r16xpxjx.fsf@dell.be.48ers.dk> Message-ID: On Sat, Mar 19, 2022 at 1:11 PM Peter Korsgaard wrote: > > >>>>> "Angelo" == Angelo Compagnucci writes: > > > Signed-off-by: Angelo Compagnucci > > Looking at the changelog, 9.0.1 seems to be a security fix release > fixing two CVEs: > > https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst > > Please mark such version bumps as security related so I don't miss them. > > Committed with that fixed to 2022.02.x, thanks. FYI there might be a regression, 9.0.1 is broken on master at least, this should fix it: https://patchwork.ozlabs.org/project/buildroot/patch/20220316060219.3448648-1-james.hilliard1 at gmail.com/ > > -- > Bye, Peter Korsgaard > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Sun Mar 20 08:21:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 08:21:56 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-19 Message-ID: <20220320082201.6612060B1F@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-03-19 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 50 | 10 | 0 | 60 | 2021.11.x | 21 | 3 | 0 | 24 | 2022.02.x | 15 | 6 | 0 | 21 | master | 49 | 37 | 2 | 88 | Classification of failures by reason for master ----------------------------------------------- bind-9.16.26 | 10 pango-1.50.5 | 6 ola-0.10.8 | 4 libnetfilter_conntrack-1.0.9 | 2 libscrypt-1.22 | 2 libuwsc | 2 ruby-3.1.0 | 2 wavemon-0.9.4 | 2 bird-2.0.8 | 1 frr-8.1 | 1 host-pango-1.50.5 | 1 libiio-0.23 | 1 librtlsdr-ed0317e6a58c09887... | 1 nodejs-14.18.3 | 1 protozero-1.7.1 | 1 qt5webkit-5.212.0-alpha4 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i686 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/f73421f8494b7336ab065d14a649027e5ec81b97 | ORPH x86_64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/b03de9fc644fdd43e1a288fea4caf9e9e45c0f18 | ORPH sparc64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/5049b91b1449bfcf15786da78f177a3025907a3e | ORPH x86_64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/37aa63069cb8b40a195d784d62e69da72408abb2 | ORPH aarch64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/4059a9b5150d076a5263bdbae2ded5a46e15bea0 | ORPH nios2 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/99ab62b09f07b0c6d20a6cacb67c515eb3460c5f | ORPH microblazeel | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/88783438b5033ce799d57ac8bd1c1be30d51fc72 | ORPH sparc64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/9a6afa236590ef26487dec83428224851f46acaf | ORPH arm | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/a1187b65d05985052f20fdcfc02d651d63f7746b | ORPH aarch64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/43acf642540997c3500d417398f1062cda62ada6 | ORPH mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/ee48850228f0a47b477edceee26c23fbdd318479 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1180cfe0aca4f74fe9a8e925da7d2c8283f57967 | arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/9ac311ca0df3a12fd44b112e9e2db50b7ae43780 | ORPH arm | libiio-0.23 | NOK | http://autobuild.buildroot.net/results/3efe03f86d27dcfa49f9f2e94c9872396196305a | microblazeel | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/f060093f15ee5fe21a31a632e9539ed46c95f8ef | powerpc | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/a807364c9fd6b6a3c71ec867be4594bb0bf984ab | arm | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/457fae9a8b60905e11e2a2d10b4961c7266a07e9 | xtensa | libscrypt-1.22 | NOK | http://autobuild.buildroot.net/results/c5c18abc977300c83c267562b572007bc60f3a6c | microblazeel | libscrypt-1.22 | NOK | http://autobuild.buildroot.net/results/3d9ccb572a9edc947edf1c9a593f460cd9501dba | riscv64 | libuwsc | TIM | http://autobuild.buildroot.net/results/b3c846038c86c6680b6b640628a3a29169177326 | riscv32 | libuwsc | TIM | http://autobuild.buildroot.net/results/d0fb3e1414561f6ab5ab991c17078bf127d46118 | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/ec2ca9be9303b2b2a8e4da1462e627875e36d9b2 | riscv64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/e83022b76666f62ea4da2e536c46b8d519a1becc | aarch64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/23db74786717b20363019bf3d8f13b5a5e7c8896 | x86_64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/bba3d0ccc115d5be96c0b58167ef28e0aec1a473 | sparc | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/5f1c16bbecc6766867449f9ad3aeca1b20e33261 | riscv64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/1a671295d8a5e383eb086d5898f689263c17221b | ORPH powerpc | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/59d7e29cbc545c4c8f85ea332f5aace4b3c22580 | ORPH mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/8835d9372a43a51711432bfeb4e3d7dcb71fe5bd | ORPH aarch64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/35b5f26bbefa89be0d2a4c3d8c21f372998016ee | ORPH sparc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/243156f3572981fab67cf41515482023c12da677 | ORPH arc | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/345aa406e6cbf394197b0ae539716206497d271c | ORPH mips64el | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/f5d8f23072ac36fcc43045ad5a1956e93cb5da74 | i686 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/d5f025aa42499d2f59ba66a883a0a31eca9ffe4a | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/9cd3ae68e0fd4457f6a525d21739e868407aad73 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/3ed37eaf9ee59a7c85d2aca76c2b62e129e8dfa5 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/8fa2da87e4de76240f888c021ec007aa9250f7ea | sparc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/2786645f766ea2f92479dfc31615ae84e2a21e14 | mipsel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a9c974998ee80ab2f580e72c5ac3f64d541d6cbd | Classification of failures by reason for 2021.02.x -------------------------------------------------- unknown | 3 host-sentry-cli-1.57.0 | 2 apcupsd-3.14.14 | 1 asterisk-16.21.1 | 1 proftpd-1.3.6e | 1 python-twisted-22.1.0 | 1 rabbitmq-server-3.8.2 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/59944118a546782032134636cfb8081b4164f471 | x86_64 | asterisk-16.21.1 | NOK | http://autobuild.buildroot.net/results/7ced5faa5f8c6edf7b4d080a0cda56e4b41b0ea6 | powerpc64le | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/f0f845029558e0b9022bac51caefb84235b7ad51 | x86_64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/447cf3c73d08a843c9e0b9b91d66a5d2afe88d1c | sparc | proftpd-1.3.6e | NOK | http://autobuild.buildroot.net/results/aeac1f9c897ed70486620c4610143d1d01d6a711 | arm | python-twisted-22.1.0 | NOK | http://autobuild.buildroot.net/results/c4e1144344865be25ca54b8d0e24c4aa14373891 | aarch64 | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/395c9dd86f079b613e48633e44f741b319aa8d17 | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/f6aa641f37482d6f036b29e5fb3aa12413a31423 | arc | unknown | NOK | http://autobuild.buildroot.net/results/b3bc33268530b8ddd5c8b7bc71bd712fec4710c8 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/17995038f396104c0285c28d323fa544a3ba8351 | Classification of failures by reason for 2021.11.x -------------------------------------------------- apcupsd-3.14.14 | 1 suricata-6.0.4 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/8ede1a96e8dbb37771319c103d1ed786b0016eba | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/0737d9f39dac2675ec977cf56d168e8e674b84d9 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/54f84971e6b5a7c5423d9e4b8ba0aa40ca44a4f0 | Classification of failures by reason for 2022.02.x -------------------------------------------------- bird-2.0.8 | 1 mongodb-4.2.18 | 1 mpd-0.23.5 | 1 poppler-21.12.0 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/4b25ced9ecea36a296231c5cab1cf7a5c00cbd00 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/e96b9773b518efdad1d1ae9638dff3df1d8d646a | sh4 | mpd-0.23.5 | NOK | http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 | xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/ee689e79e7c0199bb3590fc6a4173e538493f8fc | or1k | unknown | NOK | http://autobuild.buildroot.net/results/8a917c11ab370274d564315db4e728ec45de8ed6 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4d2d30553fea30c5020558b672aa1db5a4885cd0 | -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sun Mar 20 08:46:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 09:46:42 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: fix check for CWD in env vars In-Reply-To: <20220319214536.2417-1-juanrgar@gmail.com> References: <20220319214536.2417-1-juanrgar@gmail.com> Message-ID: <20220320084642.GC1566358@scaer> Juan, All, Thanks for following up on our earlier discussion on IRC. On 2022-03-19 22:45 +0100, Juan Garcia Blanco spake thusly: > The previous pattern incorrectly matches against path lists that don't > contain CWD, but end with ':', e.g., exported like VAR=<...>:$VAR where > $VAR is empty. > > Now the pattern explicitly checks for $PWD in the path list. > > Signed-off-by: Juan Garcia Blanco > --- > support/dependencies/dependencies.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh > index c604a9efcc..d1fe94c9b9 100755 > --- a/support/dependencies/dependencies.sh > +++ b/support/dependencies/dependencies.sh > @@ -16,7 +16,7 @@ fi > > # Sanity check for CWD in LD_LIBRARY_PATH > case ":${LD_LIBRARY_PATH:-unset}:" in > -(*::*|*:.:*) > +(*:$PWD:*|*:.:*) Nope, that is not correct. This checks that indeed PWD *at time of check* is not in LD_LIBRARY_PATH (the following applies equally to PATH and LD_LIBRARY_PATH) However, what we want to check for, is that PWD *at time of use* is not in LD_LIBRARY_PATH. Consider a package build system that would do something like (cross-gcc is linked to libgmp.so): cd src cross-gcc -shared -o libgmp.so my-gmp.c cross-gcc -o foo foo.c When gcc is called, PWD is no longer the same as it was when Buildroot checked for it, so when running cross-gcc, the dynamic linker will try to load libgmp.so from the current direc tory, and as it exists, it will load the incorrect libgmp.so. And this is exactly what we want to avoid and what we want to check for. For PATH, an empty entry is explicitly documented [0] as the same as '.', but for LD_LIBRARY_PATH, it is not explicitly documented what an empty entry would do, so when I wrote the code above, I erred on the safe side and also considered an empty entry to be equivalent to '.' for LD_LIBRARY_PATH too. So we really, really need to keep a check for an empty entry. However, as we discussed on IRC, the checks really have an issue, in that they do not test for a '.' or an empty entrey at the beginnning or the end of PATH or LD_LIBRARY_PATH. So both test patterns must be changed to: *::*|:*|*:|*:.:*|.:*|*:. Could you send an updated patch, please? [0] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03 A zero-length prefix is a legacy feature that indicates the current working directory. It appears as two adjacent characters ( "::" ), as an initial preceding the rest of the list, or as a trailing following the rest of the list. Regards, Yann E. MORIN. > echo > echo "You seem to have the current working directory in your" > echo "LD_LIBRARY_PATH environment variable. This doesn't work." > @@ -32,7 +32,7 @@ esac > # An empty PATH is technically possible, but in practice we would not > # even arrive here if that was the case. > case ":${PATH:-unset}:" in > -(*::*|*:.:*) > +(*:$PWD:*|*:.:*) > echo > echo "You seem to have the current working directory in your" > echo "PATH environment variable. This doesn't work." > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Mar 20 09:51:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:51:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: drop shared library dependency from openssl In-Reply-To: <20220312181249.7288-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 12 Mar 2022 19:12:49 +0100") References: <20220312181249.7288-1-fontaine.fabrice@gmail.com> Message-ID: <87ee2xossq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > openssl handling needs shared library support since commit > 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed > since version 2 and > https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 09:49:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:49:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220320094741.B4466841F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7355863f64dccba8860ad4e94ca86286e232746d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 6852a13559..643371834b 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -246,7 +246,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 5cbd97957a..212d1b1749 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -25,8 +25,7 @@ endif # host-pkgconf to make sure pkg-config is installed. LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --enable-openssl else From peter at korsgaard.com Sun Mar 20 09:49:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:49:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220320094746.27BE284349@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=330d79828dcd97b955c6dec2740955a15332817f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) From peter at korsgaard.com Sun Mar 20 09:48:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:48:22 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220320094752.45C22843FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52bdcde13c736091e7876d4f31fb9b6ed2d3635a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) From thomas.petazzoni at bootlin.com Sun Mar 20 10:35:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 11:35:53 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220316215654.8E8188424D@busybox.osuosl.org> References: <20220316215654.8E8188424D@busybox.osuosl.org> Message-ID: <20220320113553.43bf3c6f@windsurf> Hello Peter, Could you cherry-pick this commit into the currently maintained stable branches? Thanks a lot! Thomas Petazzoni On Wed, 16 Mar 2022 23:04:46 +0100 Yann E. MORIN wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=c72f3f2b43f4607ed94d51a21abe5e3d909efb36 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > The check_package_get_latest_version_by_distro() function analyzes the > data returned by release-monitoring.org. For two of our > packages (bento4 and qextserialport), release-monitoring.org returns > something that is a bit odd: it returns an entry with a > "stable_versions" field that contains an empty array. Our code was > ready to have or not have a "stable_versions" entry, but when it is > present, we assumed it was not an empty array. These two packages, for > some reason, break this assumption. > > In order to solve this problem, this commit is more careful, and uses > the stable_versions field only if it exists and it has at least one > entry. The code is also reworked as a sequence of "if...elif...else" > to be more readable. > > This fixes the following exception when running pkg-stats on the full > package set: > > Task exception was never retrieved > future: exception=IndexError('list index out of range')> > Traceback (most recent call last): > File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get > if await check_package_get_latest_version_by_distro(session, pkg): > File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro > version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > IndexError: list index out of range > > Signed-off-by: Thomas Petazzoni > [yann.morin.1998 at free.fr: non-sequence tests as True] > Signed-off-by: Yann E. MORIN > --- > support/scripts/pkg-stats | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index c235d99407..8cc64a54d1 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): > return False > > data = await resp.json() > - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > + if 'stable_versions' in data and data['stable_versions']: > + version = data['stable_versions'][0] > + elif 'version' in data: > + version = data['version'] > + else: > + version = None > check_package_latest_version_set_status(pkg, > RM_API_STATUS_FOUND_BY_DISTRO, > version, > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From br015 at umbiko.net Sun Mar 20 11:41:38 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Sun, 20 Mar 2022 12:41:38 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd In-Reply-To: <20211227074056.13882-1-br015@umbiko.net> References: <20211227074056.13882-1-br015@umbiko.net> Message-ID: <20220320114138.433796-1-br015@umbiko.net> The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - extract link creation from commit 0e8d35f Changes v2 -> v3: - update failure list ...-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..50380861bc --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,78 @@ +Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389. + +Signed-off-by: Andreas Ziegler + +--- +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") -- 2.34.1 From bernd.kuhls at t-online.de Sun Mar 20 11:54:01 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 12:54:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64 Message-ID: <20220320115401.3214796-1-bernd.kuhls@t-online.de> Removed all patches after being applied upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a Signed-off-by: Bernd Kuhls --- .../bluez5_utils-headers.mk | 2 +- ...-tools-mesh-cfgtest-include-limits.h.patch | 33 - ...til-Rename-btd_malloc-to-util_malloc.patch | 67 - .../0003-shared-util-Add-util_memdup.patch | 57 - ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 ----------------- ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ---- ...rc-shared-util.h-include-sys-types.h.patch | 39 - package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +- 9 files changed, 3 insertions(+), 1924 deletions(-) delete mode 100644 package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch delete mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch delete mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch delete mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch delete mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch delete mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 5bfc652355..2f3a290ea8 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.63 +BLUEZ5_UTILS_HEADERS_VERSION = 5.64 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch deleted file mode 100644 index 7f1197357f..0000000000 --- a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5158827fded7cb4daf550a5956aff0c74f6c38fc Mon Sep 17 00:00:00 2001 -From: Michael Nosthoff -Date: Thu, 22 Jul 2021 21:36:13 +0200 -Subject: [PATCH] tools/mesh-cfgtest: include limits.h - -mesh-cfgtest.c uses PATH_MAX so it should include limits.h. - -fixes compilation error when enabling mesh support with musl-based -toolchains observed in buildroot autobuilders. - -http://autobuild.buildroot.net/results/20cc47f54de0b0d4bdf108c3715c590ae8ab476f/ -http://autobuild.buildroot.net/results/003968b25906579dbcf5a95d1e43fec0ab504ef5/ - -Signed-off-by: Michael Nosthoff ---- - tools/mesh-cfgtest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c -index fa0474faa..116ab7f16 100644 ---- a/tools/mesh-cfgtest.c -+++ b/tools/mesh-cfgtest.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.32.0 - diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch deleted file mode 100644 index f8d74528d8..0000000000 --- a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Wed, 5 Jan 2022 15:53:35 -0800 -Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc - -util functions are not limited to daemon only which is normally the case -when using btd prefix. - -(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) -Signed-off-by: Thomas Devoogdt ---- - profiles/audio/avdtp.c | 2 +- - src/shared/util.c | 2 +- - src/shared/util.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c -index d3dfbf96d..f2b461330 100644 ---- a/profiles/audio/avdtp.c -+++ b/profiles/audio/avdtp.c -@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, - break; - } - -- cpy = btd_malloc(sizeof(*cpy) + cap->length); -+ cpy = util_malloc(sizeof(*cpy) + cap->length); - memcpy(cpy, cap, sizeof(*cap) + cap->length); - - size -= sizeof(*cap) + cap->length; -diff --git a/src/shared/util.c b/src/shared/util.c -index 81b20d86f..93110047b 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -25,7 +25,7 @@ - - #include "src/shared/util.h" - --void *btd_malloc(size_t size) -+void *util_malloc(size_t size) - { - if (__builtin_expect(!!size, 1)) { - void *ptr; -diff --git a/src/shared/util.h b/src/shared/util.h -index ac70117ca..11d09979d 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -75,7 +75,7 @@ do { \ - size_t __n = (size_t) (count); \ - size_t __s = sizeof(type); \ - void *__p; \ -- __p = btd_malloc(__n * __s); \ -+ __p = util_malloc(__n * __s); \ - memset(__p, 0, __n * __s); \ - __p; \ - })) -@@ -86,7 +86,7 @@ do { \ - char *strdelimit(char *str, char *del, char c); - int strsuffix(const char *str, const char *suffix); - --void *btd_malloc(size_t size); -+void *util_malloc(size_t size); - - typedef void (*util_debug_func_t)(const char *str, void *user_data); - --- -2.17.1 - diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch deleted file mode 100644 index d5c31a2614..0000000000 --- a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 6 Jan 2022 11:45:12 -0800 -Subject: [PATCH] shared/util: Add util_memdup - -This adds util_memdup which is intended to replace g_memdup since -replacing that with g_memdup2 requires bumping the glib version. - -(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) -Signed-off-by: Thomas Devoogdt ---- - src/shared/util.c | 16 ++++++++++++++++ - src/shared/util.h | 1 + - 2 files changed, 17 insertions(+) - -diff --git a/src/shared/util.c b/src/shared/util.c -index 93110047b..6e1c83057 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -41,6 +41,22 @@ void *util_malloc(size_t size) - return NULL; - } - -+void *util_memdup(const void *src, size_t size) -+{ -+ void *cpy; -+ -+ if (!src || !size) -+ return NULL; -+ -+ cpy = util_malloc(size); -+ if (!cpy) -+ return NULL; -+ -+ memcpy(cpy, src, size); -+ -+ return cpy; -+} -+ - void util_debug_va(util_debug_func_t function, void *user_data, - const char *format, va_list va) - { -diff --git a/src/shared/util.h b/src/shared/util.h -index 11d09979d..8ef6132c4 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); - int strsuffix(const char *str, const char *suffix); - - void *util_malloc(size_t size); -+void *util_memdup(const void *src, size_t size); - - typedef void (*util_debug_func_t)(const char *str, void *user_data); - --- -2.17.1 - diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch deleted file mode 100644 index 9e1047c957..0000000000 --- a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch +++ /dev/null @@ -1,1411 +0,0 @@ -From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 6 Jan 2022 12:50:33 -0800 -Subject: [PATCH] build: Replace use of g_memdup with util_memdup -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This replaces the uses of g_memdup with util_memdup since the former has -been deprecated: - - warning: ?g_memdup? is deprecated: Use 'g_memdup2' instead - [-Wdeprecated-declarations] - -g_memdup2 requires bumping glib version which would likely have its -own problems thus why util_memdup was introduced. - -(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) -Signed-off-by: Thomas Devoogdt ---- - Makefile.am | 10 ++--- - Makefile.obexd | 1 + - Makefile.tools | 11 ++++-- - android/a2dp.c | 9 +++-- - android/avctp.c | 5 ++- - android/avrcp-lib.c | 2 +- - android/gatt.c | 5 ++- - android/hidhost.c | 3 +- - android/tester-main.c | 77 +++++++++++++++++++++----------------- - attrib/gatt.c | 12 +++--- - client/gatt.c | 2 +- - gobex/gobex-header.c | 7 ++-- - gobex/gobex-packet.c | 5 ++- - obexd/src/obex.c | 5 ++- - plugins/neard.c | 9 +++-- - plugins/policy.c | 7 ++-- - profiles/audio/avctp.c | 9 +++-- - profiles/audio/avrcp.c | 10 ++--- - profiles/battery/bas.c | 4 +- - profiles/battery/battery.c | 4 +- - profiles/deviceinfo/dis.c | 4 +- - profiles/input/hog-lib.c | 12 +++--- - profiles/scanparam/scpp.c | 4 +- - src/eir.c | 8 ++-- - tools/gatt-service.c | 15 ++++---- - tools/mesh-gatt/gatt.c | 5 ++- - unit/test-avctp.c | 4 +- - unit/test-avdtp.c | 6 +-- - unit/test-avrcp.c | 10 ++--- - unit/test-gatt.c | 4 +- - unit/test-hfp.c | 11 +++--- - unit/test-hog.c | 26 ++++++------- - unit/test-sdp.c | 10 +++-- - unit/test-uhid.c | 2 +- - 34 files changed, 172 insertions(+), 146 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 308f13c50..9b5e140b8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ - - unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex.c --unit_test_gobex_LDADD = $(GLIB_LIBS) -+unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-packet.c --unit_test_gobex_packet_LDADD = $(GLIB_LIBS) -+unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-header.c --unit_test_gobex_header_LDADD = $(GLIB_LIBS) -+unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-transfer.c --unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) -+unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-apparam.c --unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) -+unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) - endif - - unit_tests += unit/test-lib -diff --git a/Makefile.obexd b/Makefile.obexd -index 37a133455..5d1a4ff65 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ - obexd/src/map_ap.h - obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ - gdbus/libgdbus-internal.la \ -+ src/libshared-glib.la \ - $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ - $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl - -diff --git a/Makefile.tools b/Makefile.tools -index c7bdff83f..35b0021ea 100644 ---- a/Makefile.tools -+++ b/Makefile.tools -@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c - tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) - - tools_gatt_service_SOURCES = tools/gatt-service.c --tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la -+tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ -+ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) - - profiles_iap_iapd_SOURCES = profiles/iap/main.c - profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) -@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ - tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ - tools/obex-client-tool.c - tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ -- $(GLIB_LIBS) -lreadline -+ src/libshared-glib.la $(GLIB_LIBS) -lreadline - - tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ - tools/obex-server-tool.c --tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) -+tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ -+ src/libshared-glib.la $(GLIB_LIBS) - - tools_bluetooth_player_SOURCES = tools/bluetooth-player.c - tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ -@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ - - tools_obexctl_SOURCES = tools/obexctl.c - tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ -- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline -+ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ -+ -lreadline - - tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c - tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ -diff --git a/android/a2dp.c b/android/a2dp.c -index 029107cf5..ee607a32d 100644 ---- a/android/a2dp.c -+++ b/android/a2dp.c -@@ -26,6 +26,7 @@ - #include "lib/sdp_lib.h" - #include "profiles/audio/a2dp-codecs.h" - #include "src/shared/queue.h" -+#include "src/shared/util.h" - #include "src/log.h" - #include "hal-msg.h" - #include "ipc-common.h" -@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, - - p = g_new0(struct a2dp_preset, 1); - p->len = conf_len; -- p->data = g_memdup(conf, p->len); -+ p->data = util_memdup(conf, p->len); - - return p; - } -@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, - - p = g_new0(struct a2dp_preset, 1); - p->len = conf_len; -- p->data = g_memdup(conf, p->len); -+ p->data = util_memdup(conf, p->len); - - return p; - } -@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, - - preset = g_new0(struct a2dp_preset, 1); - preset->len = cap->length - sizeof(*codec); -- preset->data = g_memdup(codec->data, preset->len); -+ preset->data = util_memdup(codec->data, preset->len); - - if (check_config(endpoint, preset) < 0) { - preset_free(preset); -@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, - - preset = g_new0(struct a2dp_preset, 1); - preset->len = p->len; -- preset->data = g_memdup(p->data, preset->len); -+ preset->data = util_memdup(p->data, preset->len); - l = g_slist_append(l, preset); - - len -= preset->len; -diff --git a/android/avctp.c b/android/avctp.c -index 14ebbc391..37b4cec4f 100644 ---- a/android/avctp.c -+++ b/android/avctp.c -@@ -31,6 +31,7 @@ - #include - - #include "lib/sdp.h" -+#include "src/shared/util.h" - #include "src/log.h" - #include "avctp.h" - -@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, - - for (i = 0; i < iov_cnt; i++) { - pdu[i].iov_len = iov[i].iov_len; -- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); -+ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); - } - - req = g_new0(struct avctp_control_req, 1); -@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, - - for (i = 0; i < iov_cnt; i++) { - pdu[i].iov_len = iov[i].iov_len; -- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); -+ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); - } - - req = g_new0(struct avctp_browsing_req, 1); -diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c -index 2007d09d2..b342692cb 100644 ---- a/android/avrcp-lib.c -+++ b/android/avrcp-lib.c -@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, - return NULL; - } - -- folders[count] = g_memdup(¶ms[i], len); -+ folders[count] = util_memdup(¶ms[i], len); - i += len; - } - -diff --git a/android/gatt.c b/android/gatt.c -index a8a0c488b..e8ba5aabb 100644 ---- a/android/gatt.c -+++ b/android/gatt.c -@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, - } - - bt_uuid_to_uuid128(&uuid, &u128); -- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); -+ new_uuid = util_memdup(&u128.value.u128, -+ sizeof(u128.value.u128)); - - uuids = g_slist_prepend(uuids, new_uuid); - } -@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, - - queue_push_tail(dev->pending_requests, data); - -- data->value = g_memdup(value, vlen); -+ data->value = util_memdup(value, vlen); - data->length = vlen; - - if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], -diff --git a/android/hidhost.c b/android/hidhost.c -index 016382e17..b4e5c527f 100644 ---- a/android/hidhost.c -+++ b/android/hidhost.c -@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) - goto fail; - - dev->rd_size = data->unitSize; -- dev->rd_data = g_memdup(data->val.str, data->unitSize); -+ dev->rd_data = util_memdup(data->val.str, -+ data->unitSize); - } - } - -diff --git a/android/tester-main.c b/android/tester-main.c -index ff5ecdf83..317c1de06 100644 ---- a/android/tester-main.c -+++ b/android/tester-main.c -@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, - for (i = 0; i < num_properties; i++) { - props[i].type = properties[i].type; - props[i].len = properties[i].len; -- props[i].val = g_memdup(properties[i].val, properties[i].len); -+ props[i].val = util_memdup(properties[i].val, -+ properties[i].len); - } - - return props; -@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, - for (i = 0; i < num_properties; i++) { - props[i].type = properties[i]->type; - props[i].len = properties[i]->len; -- props[i].val = g_memdup(properties[i]->val, properties[i]->len); -+ props[i].val = util_memdup(properties[i]->val, -+ properties[i]->len); - } - - return props; -@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, - - prop->type = type; - prop->len = len; -- prop->val = g_memdup(val, len); -+ prop->val = util_memdup(val, len); - - return prop; - } -@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) - - step->callback = CB_GATTC_SEARCH_RESULT; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); - - schedule_callback_verification(step); - } -@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); - step->callback_result.char_prop = char_prop; - -@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); -- step->callback_result.descriptor = g_memdup(descr_id, -+ step->callback_result.descriptor = util_memdup(descr_id, - sizeof(*descr_id)); - - schedule_callback_verification(step); -@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_INCLUDED_SERVICE; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.included = g_memdup(incl_srvc_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.included = util_memdup(incl_srvc_id, - sizeof(*srvc_id)); - - schedule_callback_verification(step); -@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_READ_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.read_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_READ_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.read_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_WRITE_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.write_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_WRITE_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.write_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, - step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); - step->callback_result.notification_registered = registered; - -@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) - - step->callback = CB_GATTC_NOTIFY; - step->callback_result.conn_id = conn_id; -- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.notify_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, -+ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, - sizeof(inc_srvc_handle)); - - schedule_callback_verification(step); -@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); -- step->callback_result.char_handle = g_memdup(&char_handle, -+ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); -+ step->callback_result.char_handle = util_memdup(&char_handle, - sizeof(char_handle)); - - schedule_callback_verification(step); -@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); -- step->callback_result.desc_handle = g_memdup(&desc_handle, -+ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); -+ step->callback_result.desc_handle = util_memdup(&desc_handle, - sizeof(desc_handle)); - - schedule_callback_verification(step); -@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, - - step->callback_result.conn_id = conn_id; - step->callback_result.trans_id = trans_id; -- step->callback_result.attr_handle = g_memdup(&attr_handle, -+ step->callback_result.attr_handle = util_memdup(&attr_handle, - sizeof(attr_handle)); - step->callback_result.offset = offset; - step->callback_result.is_long = is_long; -@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, - - step->callback_result.conn_id = conn_id; - step->callback_result.trans_id = trans_id; -- step->callback_result.attr_handle = g_memdup(&attr_handle, -+ step->callback_result.attr_handle = util_memdup(&attr_handle, - sizeof(attr_handle)); - step->callback_result.offset = offset; - step->callback_result.length = length; - step->callback_result.need_rsp = need_rsp; - step->callback_result.is_prep = is_prep; -- step->callback_result.value = g_memdup(&value, length); -+ step->callback_result.value = util_memdup(&value, length); - - /* Utilize property verification mechanism for bdaddr */ - props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); -@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, - inst[i].id = instances[i].id; - inst[i].scn = instances[i].scn; - inst[i].msg_types = instances[i].msg_types; -- inst[i].p_name = g_memdup(instances[i].p_name, -+ inst[i].p_name = util_memdup(instances[i].p_name, - strlen(instances[i].p_name)); - } - -diff --git a/attrib/gatt.c b/attrib/gatt.c -index 46b2ca381..b496dd1eb 100644 ---- a/attrib/gatt.c -+++ b/attrib/gatt.c -@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) - - g_slist_free_full(dc->characteristics, g_free); - g_attrib_unref(dc->attrib); -- g_free(dc->uuid); -+ free(dc->uuid); - g_free(dc); - } - -@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) - - g_slist_free_full(dd->descriptors, g_free); - g_attrib_unref(dd->attrib); -- g_free(dd->uuid); -+ free(dd->uuid); - g_free(dd); - } - -@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, - dc->user_data = user_data; - dc->end = end; - dc->start = start; -- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); -+ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); - - dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, - discover_char_ref(dc), discover_char_unref); -@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, - if (long_write->offset == long_write->vlen) { - execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, - long_write->func, long_write->user_data); -- g_free(long_write->value); -+ free(long_write->value); - g_free(long_write); - - return; -@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, - long_write->func = func; - long_write->user_data = user_data; - long_write->handle = handle; -- long_write->value = g_memdup(value, vlen); -+ long_write->value = util_memdup(value, vlen); - long_write->vlen = vlen; - - return prepare_write(long_write); -@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, - dd->user_data = user_data; - dd->start = start; - dd->end = end; -- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); -+ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); - - dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, - discover_desc_ref(dd), discover_desc_unref); -diff --git a/client/gatt.c b/client/gatt.c -index 11f70dc4f..13872c794 100644 ---- a/client/gatt.c -+++ b/client/gatt.c -@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) - - *val_len = i; - -- return g_memdup(value, i); -+ return util_memdup(value, i); - } - - void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) -diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c -index 011d33d1a..002ba8861 100644 ---- a/gobex/gobex-header.c -+++ b/gobex/gobex-header.c -@@ -15,6 +15,7 @@ - - #include "gobex-header.h" - #include "gobex-debug.h" -+#include "src/shared/util.h" - - /* Header types */ - #define G_OBEX_HDR_ENC_UNICODE (0 << 6) -@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, - - switch (data_policy) { - case G_OBEX_DATA_COPY: -- header->v.data = g_memdup(ptr, header->vlen); -+ header->v.data = util_memdup(ptr, header->vlen); - break; - case G_OBEX_DATA_REF: - header->extdata = TRUE; -@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) - break; - case G_OBEX_HDR_ENC_BYTES: - if (!header->extdata) -- g_free(header->v.data); -+ free(header->v.data); - break; - case G_OBEX_HDR_ENC_UINT8: - case G_OBEX_HDR_ENC_UINT32: -@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) - header->id = id; - header->vlen = len; - header->hlen = len + 3; -- header->v.data = g_memdup(data, len); -+ header->v.data = util_memdup(data, len); - - return header; - } -diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c -index 11937a5a5..8ae78b0f6 100644 ---- a/gobex/gobex-packet.c -+++ b/gobex/gobex-packet.c -@@ -17,6 +17,7 @@ - #include "gobex-defs.h" - #include "gobex-packet.h" - #include "gobex-debug.h" -+#include "src/shared/util.h" - - #define FINAL_BIT 0x80 - -@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, - - switch (data_policy) { - case G_OBEX_DATA_COPY: -- pkt->data.buf = g_memdup(data, len); -+ pkt->data.buf = util_memdup(data, len); - break; - case G_OBEX_DATA_REF: - pkt->data.buf_ref = data; -@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) - switch (pkt->data_policy) { - case G_OBEX_DATA_INHERIT: - case G_OBEX_DATA_COPY: -- g_free(pkt->data.buf); -+ free(pkt->data.buf); - break; - case G_OBEX_DATA_REF: - break; -diff --git a/obexd/src/obex.c b/obexd/src/obex.c -index 9f992ec18..3a68fd66c 100644 ---- a/obexd/src/obex.c -+++ b/obexd/src/obex.c -@@ -40,6 +40,7 @@ - #include "mimetype.h" - #include "service.h" - #include "transport.h" -+#include "src/shared/util.h" - - typedef struct { - uint8_t version; -@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) - os->path = NULL; - } - if (os->apparam) { -- g_free(os->apparam); -+ free(os->apparam); - os->apparam = NULL; - os->apparam_len = 0; - } -@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) - if (!g_obex_header_get_bytes(hdr, &apparam, &len)) - return; - -- os->apparam = g_memdup(apparam, len); -+ os->apparam = util_memdup(apparam, len); - os->apparam_len = len; - DBG("APPARAM"); - } -diff --git a/plugins/neard.c b/plugins/neard.c -index e07b51106..a75527148 100644 ---- a/plugins/neard.c -+++ b/plugins/neard.c -@@ -30,6 +30,7 @@ - #include "src/eir.h" - #include "src/agent.h" - #include "src/btd.h" -+#include "src/shared/util.h" - - #define NEARD_NAME "org.neard" - #define NEARD_PATH "/" -@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) - g_free(params->name); - g_free(params->hash); - g_free(params->randomizer); -- g_free(params->pin); -+ free(params->pin); - } - - static DBusMessage *error_reply(DBusMessage *msg, int error) -@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, - remote->name = g_strndup((char *)n->name, n->name_len); - - if (marker == 0x01) { -- remote->pin = g_memdup(n->authentication, 4); -+ remote->pin = util_memdup(n->authentication, 4); - remote->pin_len = 4; - } else if (marker == 0x02) { -- remote->pin = g_memdup(n->authentication, 16); -+ remote->pin = util_memdup(n->authentication, 16); - remote->pin_len = 16; - } - -@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, - if (n->name_len > 0) - remote->name = g_strndup((char *)n->name, n->name_len); - -- remote->pin = g_memdup(n->authentication, 4); -+ remote->pin = util_memdup(n->authentication, 4); - remote->pin_len = 4; - - return 0; -diff --git a/plugins/policy.c b/plugins/policy.c -index 051db82e1..48f5db7d3 100644 ---- a/plugins/policy.c -+++ b/plugins/policy.c -@@ -32,6 +32,7 @@ - #include "src/profile.h" - #include "src/btd.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #define CONTROL_CONNECT_TIMEOUT 2 - #define SOURCE_RETRY_TIMEOUT 2 -@@ -855,7 +856,7 @@ static int policy_init(void) - reconnect_attempts = default_attempts; - reconnect_intervals_len = sizeof(default_intervals) / - sizeof(*reconnect_intervals); -- reconnect_intervals = g_memdup(default_intervals, -+ reconnect_intervals = util_memdup(default_intervals, - sizeof(default_intervals)); - goto done; - } -@@ -886,7 +887,7 @@ static int policy_init(void) - g_clear_error(&gerr); - reconnect_intervals_len = sizeof(default_intervals) / - sizeof(*reconnect_intervals); -- reconnect_intervals = g_memdup(default_intervals, -+ reconnect_intervals = util_memdup(default_intervals, - sizeof(default_intervals)); - } - -@@ -919,7 +920,7 @@ static void policy_exit(void) - if (reconnect_uuids) - g_strfreev(reconnect_uuids); - -- g_free(reconnect_intervals); -+ free(reconnect_intervals); - - g_slist_free_full(reconnects, reconnect_destroy); - -diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c -index 64d1a8504..6f64f162b 100644 ---- a/profiles/audio/avctp.c -+++ b/profiles/audio/avctp.c -@@ -40,6 +40,7 @@ - #include "src/log.h" - #include "src/error.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #include "avctp.h" - #include "avrcp.h" -@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) - NULL, 0, req->user_data); - - done: -- g_free(req->operands); -+ free(req->operands); - g_free(req); - } - -@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) - req->func(session, NULL, 0, req->user_data); - - done: -- g_free(req->operands); -+ free(req->operands); - g_free(req); - } - -@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, - req->subunit = subunit; - req->op = opcode; - req->func = func; -- req->operands = g_memdup(operands, operand_count); -+ req->operands = util_memdup(operands, operand_count); - req->operand_count = operand_count; - req->user_data = user_data; - -@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, - - req = g_new0(struct avctp_browsing_req, 1); - req->func = func; -- req->operands = g_memdup(operands, operand_count); -+ req->operands = util_memdup(operands, operand_count); - req->operand_count = operand_count; - req->user_data = user_data; - -diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c -index 7c280203c..d4e19ffc0 100644 ---- a/profiles/audio/avrcp.c -+++ b/profiles/audio/avrcp.c -@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, - * Save a copy of requested settings because we can override them - * while responding - */ -- settings = g_memdup(&pdu->params[1], pdu->params[0]); -+ settings = util_memdup(&pdu->params[1], pdu->params[0]); - len = 0; - - /* -@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, - pdu->params[++len] = val; - } - -- g_free(settings); -+ free(settings); - - if (len) { - pdu->params[0] = len / 2; -@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, - break; - } - -- folders[count] = g_memdup(&pdu->params[i], len); -+ folders[count] = util_memdup(&pdu->params[i], len); - i += len; - } - -@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, - { - struct media_player *mp = player->user_data; - -- player->features = g_memdup(features, 16); -+ player->features = util_memdup(features, 16); - - if (features[7] & 0x08) { - media_player_set_browsable(mp, true); -@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) - g_slist_free(player->sessions); - g_free(player->path); - g_free(player->change_path); -- g_free(player->features); -+ free(player->features); - g_free(player); - } - -diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c -index 3c6173b61..16ff22e19 100644 ---- a/profiles/battery/bas.c -+++ b/profiles/battery/bas.c -@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) - { - bt_bas_detach(bas); - -- g_free(bas->primary); -+ free(bas->primary); - queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); - free(bas); - } -@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) - bas->gatt_op = queue_new(); - - if (primary) -- bas->primary = g_memdup(primary, sizeof(*bas->primary)); -+ bas->primary = util_memdup(primary, sizeof(*bas->primary)); - - return bt_bas_ref(bas); - } -diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c -index 176d127f6..02d024d92 100644 ---- a/profiles/battery/battery.c -+++ b/profiles/battery/battery.c -@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) - gatt_db_unref(batt->db); - bt_gatt_client_unref(batt->client); - btd_device_unref(batt->device); -- g_free (batt->initial_value); -+ free(batt->initial_value); - if (batt->battery) - btd_battery_unregister(batt->battery); - g_free(batt); -@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, - if (!length) - return; - -- batt->initial_value = g_memdup(value, length); -+ batt->initial_value = util_memdup(value, length); - - /* request notify */ - batt->batt_level_cb_id = -diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c -index 87fa63306..f660179ed 100644 ---- a/profiles/deviceinfo/dis.c -+++ b/profiles/deviceinfo/dis.c -@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) - { - bt_dis_detach(dis); - -- g_free(dis->primary); -+ free(dis->primary); - queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); - g_free(dis); - } -@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) - dis->gatt_op = queue_new(); - - if (primary) -- dis->primary = g_memdup(primary, sizeof(*dis->primary)); -+ dis->primary = util_memdup(primary, sizeof(*dis->primary)); - - return bt_dis_ref(dis); - } -diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c -index 3bbe42370..d37caa1f1 100644 ---- a/profiles/input/hog-lib.c -+++ b/profiles/input/hog-lib.c -@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, - } - - if (report->value) -- g_free(report->value); -+ free(report->value); - -- report->value = g_memdup(pdu, len); -+ report->value = util_memdup(pdu, len); - report->len = len; - } - -@@ -1217,7 +1217,7 @@ static void report_free(void *data) - { - struct report *report = data; - -- g_free(report->value); -+ free(report->value); - g_free(report); - } - -@@ -1241,7 +1241,7 @@ static void hog_free(void *data) - bt_uhid_unref(hog->uhid); - g_slist_free_full(hog->reports, report_free); - g_free(hog->name); -- g_free(hog->primary); -+ free(hog->primary); - queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); - if (hog->gatt_db) - gatt_db_unref(hog->gatt_db); -@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) - struct bt_hog *instance; - - if (!hog->primary) { -- hog->primary = g_memdup(primary, sizeof(*primary)); -+ hog->primary = util_memdup(primary, sizeof(*primary)); - discover_char(hog, hog->attrib, primary->range.start, - primary->range.end, NULL, - char_discovered_cb, hog); -@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) - if (!instance) - return; - -- instance->primary = g_memdup(primary, sizeof(*primary)); -+ instance->primary = util_memdup(primary, sizeof(*primary)); - find_included(instance, hog->attrib, primary->range.start, - primary->range.end, find_included_cb, instance); - -diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c -index da38a6aaa..4be8b26cc 100644 ---- a/profiles/scanparam/scpp.c -+++ b/profiles/scanparam/scpp.c -@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) - { - bt_scpp_detach(scan); - -- g_free(scan->primary); -+ free(scan->primary); - queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ - g_free(scan); - } -@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) - scan->gatt_op = queue_new(); - - if (primary) -- scan->primary = g_memdup(primary, sizeof(*scan->primary)); -+ scan->primary = util_memdup(primary, sizeof(*scan->primary)); - - return bt_scpp_ref(scan); - } -diff --git a/src/eir.c b/src/eir.c -index 0f5d14fcd..2f9ee036f 100644 ---- a/src/eir.c -+++ b/src/eir.c -@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) - eir->services = NULL; - g_free(eir->name); - eir->name = NULL; -- g_free(eir->hash); -+ free(eir->hash); - eir->hash = NULL; -- g_free(eir->randomizer); -+ free(eir->randomizer); - eir->randomizer = NULL; - g_slist_free_full(eir->msd_list, g_free); - eir->msd_list = NULL; -@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) - case EIR_SSP_HASH: - if (data_len < 16) - break; -- eir->hash = g_memdup(data, 16); -+ eir->hash = util_memdup(data, 16); - break; - - case EIR_SSP_RANDOMIZER: - if (data_len < 16) - break; -- eir->randomizer = g_memdup(data, 16); -+ eir->randomizer = util_memdup(data, 16); - break; - - case EIR_DEVICE_ID: -diff --git a/tools/gatt-service.c b/tools/gatt-service.c -index 631c4f249..ed6b06f1e 100644 ---- a/tools/gatt-service.c -+++ b/tools/gatt-service.c -@@ -26,6 +26,7 @@ - #include "gdbus/gdbus.h" - - #include "src/error.h" -+#include "src/shared/util.h" - - #define GATT_MGR_IFACE "org.bluez.GattManager1" - #define GATT_SERVICE_IFACE "org.bluez.GattService1" -@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, - - static void desc_write(struct descriptor *desc, const uint8_t *value, int len) - { -- g_free(desc->value); -- desc->value = g_memdup(value, len); -+ free(desc->value); -+ desc->value = util_memdup(value, len); - desc->vlen = len; - - g_dbus_emit_property_changed(connection, desc->path, -@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, - - static void chr_write(struct characteristic *chr, const uint8_t *value, int len) - { -- g_free(chr->value); -- chr->value = g_memdup(value, len); -+ free(chr->value); -+ chr->value = util_memdup(value, len); - chr->vlen = len; - - g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, -@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) - - g_free(chr->uuid); - g_free(chr->service); -- g_free(chr->value); -+ free(chr->value); - g_free(chr->path); - g_free(chr); - } -@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) - struct descriptor *desc = user_data; - - g_free(desc->uuid); -- g_free(desc->value); -+ free(desc->value); - g_free(desc->path); - g_free(desc); - } -@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, - - chr = g_new0(struct characteristic, 1); - chr->uuid = g_strdup(chr_uuid); -- chr->value = g_memdup(value, vlen); -+ chr->value = util_memdup(value, vlen); - chr->vlen = vlen; - chr->props = props; - chr->service = g_strdup(service_path); -diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c -index c8a8123fb..ab9743cd1 100644 ---- a/tools/mesh-gatt/gatt.c -+++ b/tools/mesh-gatt/gatt.c -@@ -24,6 +24,7 @@ - - #include "src/shared/io.h" - #include "src/shared/shell.h" -+#include "src/shared/util.h" - #include "gdbus/gdbus.h" - #include "lib/bluetooth.h" - #include "lib/uuid.h" -@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) - { - struct write_data *data = user_data; - -- g_free(data->gatt_data); -+ free(data->gatt_data); - free(data); - } - -@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, - /* TODO: should keep in queue in case we need to cancel write? */ - - data->gatt_len = len; -- data->gatt_data = g_memdup(buf, len); -+ data->gatt_data = util_memdup(buf, len); - data->gatt_data[0] &= GATT_TYPE_MASK; - data->iov.iov_base = data->gatt_data; - data->iov.iov_len = len; -diff --git a/unit/test-avctp.c b/unit/test-avctp.c -index fa7db59c8..25fd3abc2 100644 ---- a/unit/test-avctp.c -+++ b/unit/test-avctp.c -@@ -53,7 +53,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -64,7 +64,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c -index 4e8a68c6b..2e49def43 100644 ---- a/unit/test-avdtp.c -+++ b/unit/test-avdtp.c -@@ -48,7 +48,7 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -56,7 +56,7 @@ struct test_data { - { \ - .valid = true, \ - .fragmented = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -67,7 +67,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c -index 34a70377d..b637a8a1b 100644 ---- a/unit/test-avrcp.c -+++ b/unit/test-avrcp.c -@@ -61,7 +61,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -69,7 +69,7 @@ struct context { - { \ - .valid = true, \ - .browse = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -77,7 +77,7 @@ struct context { - { \ - .valid = true, \ - .fragmented = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -85,7 +85,7 @@ struct context { - { \ - .valid = true, \ - .continuing = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -96,7 +96,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-gatt.c b/unit/test-gatt.c -index 6a47268e6..f92d860c4 100644 ---- a/unit/test-gatt.c -+++ b/unit/test-gatt.c -@@ -73,7 +73,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -94,7 +94,7 @@ struct context { - data.uuid = bt_uuid; \ - data.step = test_step; \ - data.source_db = db; \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-hfp.c b/unit/test-hfp.c -index f504724d7..b4af99d53 100644 ---- a/unit/test-hfp.c -+++ b/unit/test-hfp.c -@@ -17,6 +17,7 @@ - #include - #include "src/shared/hfp.h" - #include "src/shared/tester.h" -+#include "src/shared/util.h" - - struct context { - guint watch_id; -@@ -50,7 +51,7 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -62,7 +63,7 @@ struct test_data { - #define type_pdu(cmd_type, args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - .type = cmd_type, \ - } -@@ -70,7 +71,7 @@ struct test_data { - #define frg_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - .fragmented = true, \ - } -@@ -82,7 +83,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - data.result_func = result_function; \ - tester_add(name, &data, NULL, function, NULL); \ - data.test_handler = test_handler; \ -@@ -96,7 +97,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - data.hf_result_func = result_func; \ - data.response_func = response_function; \ - tester_add(name, &data, NULL, function, NULL); \ -diff --git a/unit/test-hog.c b/unit/test-hog.c -index 116a5cb07..067497de4 100644 ---- a/unit/test-hog.c -+++ b/unit/test-hog.c -@@ -59,24 +59,24 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - --#define false_pdu() \ --{ \ -- .valid = false, \ -+#define false_pdu() \ -+{ \ -+ .valid = false, \ - } - --#define define_test(name, function, args...) \ -- do { \ -- const struct test_pdu pdus[] = { \ -- args, { } \ -- }; \ -- static struct test_data data; \ -- data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -- tester_add(name, &data, NULL, function, NULL); \ -+#define define_test(name, function, args...) \ -+ do { \ -+ const struct test_pdu pdus[] = { \ -+ args, { } \ -+ }; \ -+ static struct test_data data; \ -+ data.test_name = g_strdup(name); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ -+ tester_add(name, &data, NULL, function, NULL); \ - } while (0) - - static gboolean context_quit(gpointer user_data) -diff --git a/unit/test-sdp.c b/unit/test-sdp.c -index 8f95fcb71..5c04a71eb 100644 ---- a/unit/test-sdp.c -+++ b/unit/test-sdp.c -@@ -47,14 +47,16 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ -+ .raw_data = util_memdup(raw_data(args), \ -+ sizeof(raw_data(args))), \ - .raw_size = sizeof(raw_data(args)), \ - } - - #define raw_pdu_cont(cont, args...) \ - { \ - .valid = true, \ -- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ -+ .raw_data = util_memdup(raw_data(args), \ -+ sizeof(raw_data(args))), \ - .raw_size = sizeof(raw_data(args)), \ - .cont_len = cont, \ - } -@@ -66,7 +68,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.mtu = _mtu; \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, test_sdp, NULL); \ - } while (0) - -@@ -92,7 +94,7 @@ struct test_data_de { - #define define_test_de_attr(name, input, exp) \ - do { \ - static struct test_data_de data; \ -- data.input_data = g_memdup(input, sizeof(input)); \ -+ data.input_data = util_memdup(input, sizeof(input)); \ - data.input_size = sizeof(input); \ - data.expected = exp; \ - tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ -diff --git a/unit/test-uhid.c b/unit/test-uhid.c -index 001d39a3d..8a8eef855 100644 ---- a/unit/test-uhid.c -+++ b/unit/test-uhid.c -@@ -61,7 +61,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - --- -2.17.1 - diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch deleted file mode 100644 index 13033da7b2..0000000000 --- a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch +++ /dev/null @@ -1,312 +0,0 @@ -From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Feb 2022 21:17:39 +0100 -Subject: build: Fix errors with glibc < 2.25 - -getrandom and sys/random.h are only available since glibc 2.25: -https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html -resulting in the following build failures since version 5.63 and -https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: - -plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory - #include - ^ - -To fix this build failure, add util_getrandom and a fallback (borrowed -from pipewire and licensed under MIT): -https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c - -Fixes: - - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 - -[Retrieved from: -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 +++- - emulator/le.c | 3 +-- - emulator/phy.c | 3 +-- - peripheral/main.c | 4 ++-- - plugins/autopair.c | 4 ++-- - profiles/health/hdp.c | 4 ++-- - profiles/health/mcap.c | 6 +++--- - src/shared/util.c | 25 +++++++++++++++++++++++++ - src/shared/util.h | 2 ++ - tools/btgatt-server.c | 3 +-- - 10 files changed, 42 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 07d068a4d..441bd5f29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], - - AC_CHECK_FUNCS(explicit_bzero) - -+AC_CHECK_FUNCS(getrandom) -+ - AC_CHECK_FUNCS(rawmemchr) - - AC_CHECK_FUNC(signalfd, dummy=yes, -@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, - AC_CHECK_LIB(dl, dlopen, dummy=yes, - AC_MSG_ERROR(dynamic linking loader is required)) - --AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) -+AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) - - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, - AC_MSG_ERROR(GLib >= 2.28 is required)) -diff --git a/emulator/le.c b/emulator/le.c -index f8f313f2c..7656a657c 100644 ---- a/emulator/le.c -+++ b/emulator/le.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include - - #include "lib/bluetooth.h" -@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) - /* The advertising delay is a pseudo-random value with a range - * of 0 ms to 10 ms generated for each advertising event. - */ -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - /* If it fails to get the random number, use a static value */ - val = 5; - } -diff --git a/emulator/phy.c b/emulator/phy.c -index 44cace438..7de85fb05 100644 ---- a/emulator/phy.c -+++ b/emulator/phy.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) - mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); - - if (!get_random_bytes(&phy->id, sizeof(phy->id))) { -- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { -+ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { - mainloop_remove_fd(phy->rx_fd); - close(phy->tx_fd); - close(phy->rx_fd); -diff --git a/peripheral/main.c b/peripheral/main.c -index 91adb45fc..b82d7caf6 100644 ---- a/peripheral/main.c -+++ b/peripheral/main.c -@@ -25,13 +25,13 @@ - #include - #include - #include --#include - - #ifndef WAIT_ANY - #define WAIT_ANY (-1) - #endif - - #include "src/shared/mainloop.h" -+#include "src/shared/util.h" - #include "peripheral/efivars.h" - #include "peripheral/attach.h" - #include "peripheral/gap.h" -@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) - addr, 6) < 0) { - printf("Generating new persistent static address\n"); - -- if (getrandom(addr, sizeof(addr), 0) < 0) { -+ if (util_getrandom(addr, sizeof(addr), 0) < 0) { - perror("Failed to get random static address"); - return EXIT_FAILURE; - } -diff --git a/plugins/autopair.c b/plugins/autopair.c -index a75ecebe4..0b09e893f 100644 ---- a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - - #include - -@@ -29,6 +28,7 @@ - #include "src/device.h" - #include "src/log.h" - #include "src/storage.h" -+#include "src/shared/util.h" - - /* - * Plugin to handle automatic pairing of devices with reduced user -@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - if (attempt >= 4) - return 0; - -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - error("Failed to get a random pincode"); - return 0; - } -diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c -index 9d9d1e824..b6590cd3a 100644 ---- a/profiles/health/hdp.c -+++ b/profiles/health/hdp.c -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - - #include - -@@ -33,6 +32,7 @@ - #include "src/device.h" - #include "src/sdpd.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - #include "btio/btio.h" - - #include "hdp_types.h" -@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) - if (!buf) - return NULL; - -- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { -+ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { - g_free(buf); - return NULL; - } -diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c -index aad0a08a3..5d2bac3d9 100644 ---- a/profiles/health/mcap.c -+++ b/profiles/health/mcap.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - - #include - -@@ -28,6 +27,7 @@ - #include "btio/btio.h" - #include "src/log.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #include "mcap.h" - -@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, - mcl->state = MCL_IDLE; - bacpy(&mcl->addr, addr); - set_default_cb(mcl); -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - mcap_instance_unref(mcl->mi); - g_free(mcl); - return FALSE; -@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, - mcl->mi = mcap_instance_ref(mi); - bacpy(&mcl->addr, &dst); - set_default_cb(mcl); -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - mcap_instance_unref(mcl->mi); - g_free(mcl); - goto drop; -diff --git a/src/shared/util.c b/src/shared/util.c -index 6e1c83057..33196bf8b 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -13,6 +13,7 @@ - #endif - - #define _GNU_SOURCE -+#include - #include - #include - #include -@@ -23,6 +24,10 @@ - #include - #include - -+#ifdef HAVE_SYS_RANDOM_H -+#include -+#endif -+ - #include "src/shared/util.h" - - void *util_malloc(size_t size) -@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) - return DT_UNKNOWN; - } - -+/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ -+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) -+{ -+#ifdef HAVE_GETRANDOM -+ return getrandom(buf, buflen, flags); -+#else -+ int fd; -+ ssize_t bytes; -+ -+ fd = open("/dev/urandom", O_CLOEXEC); -+ if (fd < 0) -+ return -1; -+ -+ bytes = read(fd, buf, buflen); -+ close(fd); -+ -+ return bytes; -+#endif -+} -+ - /* Helpers for bitfield operations */ - - /* Find unique id in range from 1 to max but no bigger than 64. */ -diff --git a/src/shared/util.h b/src/shared/util.h -index 8ef6132c4..c01eccf8a 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, - - unsigned char util_get_dt(const char *parent, const char *name); - -+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); -+ - uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); - void util_clear_uid(uint64_t *bitmap, uint8_t id); - -diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c -index 15d49a464..4a5d2b720 100644 ---- a/tools/btgatt-server.c -+++ b/tools/btgatt-server.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - - #include "lib/bluetooth.h" - #include "lib/hci.h" -@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) - uint32_t cur_ee; - uint32_t val; - -- if (getrandom(&val, sizeof(val), 0) < 0) -+ if (util_getrandom(&val, sizeof(val), 0) < 0) - return false; - - pdu[0] = 0x06; --- -cgit - diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch deleted file mode 100644 index 8a5bd64d43..0000000000 --- a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 24 Feb 2022 18:19:33 +0100 -Subject: [PATCH] src/shared/util.h: include sys/types.h - -Include sys/types.h to avoid the following build failure on musl raised -since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: - -In file included from src/shared/queue.c:15: -./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); - | ^~~~~~~ - | size_t - -Fixes: - - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] ---- - src/shared/util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/util.h b/src/shared/util.h -index c01eccf8a..554481e1e 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - #define BIT(n) (1 << (n)) --- -2.34.1 - diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index a8f5399fa6..0324dd2d77 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz +sha256 ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 bluez-5.64.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 3d76cfb7dc..8e2c657899 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.63 +BLUEZ5_UTILS_VERSION = 5.64 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -13,8 +13,6 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez -# We're patching Makefile.am and configure.ac -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 11:59:56 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 12:59:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/openvpn: security bump version to 2.5.6 Message-ID: <20220320115956.3242683-1-bernd.kuhls@t-online.de> Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:04:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:04:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 14.2 Message-ID: <20220320120428.3294529-1-bernd.kuhls@t-online.de> Release notes: https://www.postgresql.org/docs/release/14.2/ Updated license hash due to copyright year bump: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e Signed-off-by: Bernd Kuhls --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c2017a1226..2ba3b07563 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2.sha256 +sha256 2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a postgresql-14.2.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c..c389246f80 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 14.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:17:08 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:17:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.6 Message-ID: <20220320121708.3679262-1-bernd.kuhls@t-online.de> Release notes: https://www.samba.org/samba/history/samba-4.15.6.html Added new answer to samba4-cache.txt needed due to upstream commit: https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc Signed-off-by: Bernd Kuhls --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e..d95776a03e 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37..20e5f00b21 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.6.tar.asc +sha256 0575b999a9048445820428dc540ba8a9527ce596fa66af02ea2ba1ea9578bcb4 samba-4.15.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742..688aaac3eb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.15.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:18:36 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:18:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-waipu: bump version to 19.2.0-Matrix Message-ID: <20220320121836.3682323-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 9411453bf0..d40a068cb5 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab4995ed32910ced6004da800ca05fe5bf2d1882277e835eb64343806cfe217d kodi-pvr-waipu-19.1.1-Matrix.tar.gz +sha256 4c5ad45ba869c8064a0d64d7fc5c0a2e0c9f47f51184823872d6cd888ab7b2a0 kodi-pvr-waipu-19.2.0-Matrix.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index ffe9e31e5a..61c5bd67ae 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 19.1.1-Matrix +KODI_PVR_WAIPU_VERSION = 19.2.0-Matrix KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:28:00 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.17 Message-ID: <20220320122800.430173-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 Signed-off-by: Bernd Kuhls --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb..3d73e60f90 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5 php-8.0.17.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94..6454d6fe87 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.0.17 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:33:54 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:33:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.29 Message-ID: <20220320123354.443457-1-bernd.kuhls@t-online.de> Updated license hash due to OpenBSD-related upstream commit: https://sourceforge.net/p/fetchmail/git/ci/c4419bdd2557321b268f6e105d511923b9a35936/ Signed-off-by: Bernd Kuhls --- package/fetchmail/fetchmail.hash | 6 +++--- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3d4c3da3dc..5ff129b9a8 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37388106/ -sha256 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf fetchmail-6.4.24.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37628013/ +sha256 397df984082abae51edec6831700d68636f0e117cfaffcbdd3eed66d04b97321 fetchmail-6.4.29.tar.xz # Locally computed: -sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING +sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 7d6be71954..b97f01a423 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).24 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).29 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:38:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:38:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libks: bump version to 1.8.0 Message-ID: <20220320123816.556069-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/libks/libks.hash | 2 +- package/libks/libks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index 5acbcd1ea6..d4ad7ebbbc 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz +sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index adf0107b30..4aca5c5c4c 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.7.0 +LIBKS_VERSION = 1.8.0 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:42:39 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:42:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.8 Message-ID: <20220320124239.655081-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 736dedc25e..760c5368e5 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.7 +MESA3D_HEADERS_VERSION = 21.3.8 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b680411051..5b74e14fef 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html -sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz -sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html +sha256 e70d273bdc53a4e931871bb5550ba3900e6a3deab2fff64184107c33e92d9da7 mesa-21.3.8.tar.xz +sha512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d0b12932c4..9f375edc1f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.7 +MESA3D_VERSION = 21.3.8 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:48:46 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:48:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/sqlite: bump to version 3.38.1 Message-ID: <20220320124846.664904-1-bernd.kuhls@t-online.de> Release notes: https://sqlite.org/releaselog/3_38_1.html Signed-off-by: Bernd Kuhls --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index deb8d4c14c..1b3dc35ccb 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz +sha256 8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4 sqlite-autoconf-3380100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b702139f6c..a0c90b7f62 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.2 -SQLITE_TAR_VERSION = 3370200 +SQLITE_VERSION = 3.38.1 +SQLITE_TAR_VERSION = 3380100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain -- 2.30.2 From angelo at amarulasolutions.com Sun Mar 20 13:14:51 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Sun, 20 Mar 2022 14:14:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: <20220316060219.3448648-1-james.hilliard1@gmail.com> References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Wed, Mar 16, 2022 at 7:02 AM James Hilliard wrote: > Currently pillow doesn't correctly search pkg-config system paths > for some libraries which can prevent some libraries from being > properly detected/enabled in pillow. > > Signed-off-by: James Hilliard > Tested-by: Angelo Compagnucci > --- > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ > package/python-pillow/python-pillow.mk | 23 +++---------- > 2 files changed, 37 insertions(+), 19 deletions(-) > create mode 100644 > package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > diff --git > a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > new file mode 100644 > index 0000000000..9f979b048f > --- /dev/null > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > @@ -0,0 +1,33 @@ > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > +Subject: [PATCH] Search pkg-config system libs/cflags. > + > +We need to search the system paths as well from pkg-config for > +some packages to be found properly. > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/python-pillow/Pillow/pull/6138] > +--- > + setup.py | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index 3468b260..59d65ce2 100755 > +--- a/setup.py > ++++ b/setup.py > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > + def _pkg_config(name): > + try: > + command = os.environ.get("PKG_CONFIG", "pkg-config") > +- command_libs = [command, "--libs-only-L", name] > +- command_cflags = [command, "--cflags-only-I", name] > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", > name] > ++ command_cflags = [command, "--cflags-only-I", > "--keep-system-cflags", name] > + if not DEBUG: > + command_libs.append("--silence-errors") > + command_cflags.append("--silence-errors") > +-- > +2.35.1 > + > diff --git a/package/python-pillow/python-pillow.mk > b/package/python-pillow/python-pillow.mk > index 901876e0ee..ef677855b2 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > PYTHON_PILLOW_CPE_ID_VENDOR = python > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" > + > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > @@ -68,22 +71,4 @@ else > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > endif > > -define PYTHON_PILLOW_BUILD_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) > $(PYTHON_PILLOW_BUILD_OPTS) > -endef > - > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > -endef > - > $(eval $(python-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sun Mar 20 15:16:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:16:49 +0100 Subject: [Buildroot] [PATCH 2021.02.x] DEVELOPERS: drop libqrtr-glib from Yegor Yefremov Message-ID: <20220320151649.767880-1-thomas.petazzoni@bootlin.com> Commit 73ce754531b5e45bd42b56c58718fbacc754406f in master added the libqrtr-glib package to Yegor Yefremov. This commit was backported as fad154253deb5b5399ea52a19ed6608dcd00ee4d in the LTS 2021.02.x branch, but this branch does not have the libqrtr-glib package, as it was added after 2021.02. Due to this, the DEVELOPERS file is bogus in 2021.02.x, which causes the following warning when running pkg-stats: WARNING: 'package/libqrtr-glib/' doesn't match any file This commit fixes this by dropping the bogus line from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index fad5c13844..3397565457 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2755,7 +2755,6 @@ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ F: package/libqmi/ -F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ -- 2.35.1 From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:42 +0100 Subject: [Buildroot] [git commit] package/fetchmail: bump version to 6.4.29 Message-ID: <20220320152913.CF8198452C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba6fd52195f2e3d0b04baae40cfe084226824d31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash due to OpenBSD-related upstream commit: https://sourceforge.net/p/fetchmail/git/ci/c4419bdd2557321b268f6e105d511923b9a35936/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fetchmail/fetchmail.hash | 6 +++--- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3d4c3da3dc..5ff129b9a8 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37388106/ -sha256 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf fetchmail-6.4.24.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37628013/ +sha256 397df984082abae51edec6831700d68636f0e117cfaffcbdd3eed66d04b97321 fetchmail-6.4.29.tar.xz # Locally computed: -sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING +sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 7d6be71954..b97f01a423 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).24 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).29 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:39 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-waipu: bump version to 19.2.0-Matrix Message-ID: <20220320152913.BDACC84529@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27c0f4532aed6dc4dcf6ddec697a5341d184e163 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 9411453bf0..d40a068cb5 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab4995ed32910ced6004da800ca05fe5bf2d1882277e835eb64343806cfe217d kodi-pvr-waipu-19.1.1-Matrix.tar.gz +sha256 4c5ad45ba869c8064a0d64d7fc5c0a2e0c9f47f51184823872d6cd888ab7b2a0 kodi-pvr-waipu-19.2.0-Matrix.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index ffe9e31e5a..61c5bd67ae 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 19.1.1-Matrix +KODI_PVR_WAIPU_VERSION = 19.2.0-Matrix KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:35 +0100 Subject: [Buildroot] [git commit] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64 Message-ID: <20220320152913.9828684529@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0d806dea6bc03ba1464152142baa8b6fd0f2a61 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed all patches after being applied upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- .../0001-tools-mesh-cfgtest-include-limits.h.patch | 33 - ...red-util-Rename-btd_malloc-to-util_malloc.patch | 67 - .../0003-shared-util-Add-util_memdup.patch | 57 - ...-Replace-use-of-g_memdup-with-util_memdup.patch | 1411 -------------------- .../0005-build-Fix-errors-with-glibc-2-25.patch | 312 ----- ...006-src-shared-util.h-include-sys-types.h.patch | 39 - package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +- 9 files changed, 3 insertions(+), 1924 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:44 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.8 Message-ID: <20220320152913.E136A8452E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=996f43f734282c6e92d751acae757612fbce66fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 736dedc25e..760c5368e5 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.7 +MESA3D_HEADERS_VERSION = 21.3.8 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b680411051..5b74e14fef 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html -sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz -sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html +sha256 e70d273bdc53a4e931871bb5550ba3900e6a3deab2fff64184107c33e92d9da7 mesa-21.3.8.tar.xz +sha512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d0b12932c4..9f375edc1f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.7 +MESA3D_VERSION = 21.3.8 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:36 +0100 Subject: [Buildroot] [git commit] package/openvpn: security bump version to 2.5.6 Message-ID: <20220320152913.A163E82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9c448a016f07951a41e5c0938e3dbd8630a704b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:43 +0100 Subject: [Buildroot] [git commit] package/libks: bump version to 1.8.0 Message-ID: <20220320152913.D830684529@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=065750ee0c2a5e0dc217d82d17d7103ab5f22351 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libks/libks.hash | 2 +- package/libks/libks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index 5acbcd1ea6..d4ad7ebbbc 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz +sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index adf0107b30..4aca5c5c4c 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.7.0 +LIBKS_VERSION = 1.8.0 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:41 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.0.17 Message-ID: <20220320152913.C66328452C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff867be0302b0abbb629a751eabf45c7a7b218fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb..3d73e60f90 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5 php-8.0.17.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94..6454d6fe87 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.0.17 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:38 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.15.6 Message-ID: <20220320152913.B3A3E8452F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3eea7df286004430844bc9bd1d9b6c449b877d96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.15.6.html Added new answer to samba4-cache.txt needed due to upstream commit: https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e..d95776a03e 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37..20e5f00b21 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.6.tar.asc +sha256 0575b999a9048445820428dc540ba8a9527ce596fa66af02ea2ba1ea9578bcb4 samba-4.15.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742..688aaac3eb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.15.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:37 +0100 Subject: [Buildroot] [git commit] package/postgresql: bump version to 14.2 Message-ID: <20220320152913.A9CA98452E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e8c436902bfac25074677858853f23d40bca8c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.postgresql.org/docs/release/14.2/ Updated license hash due to copyright year bump: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c2017a1226..2ba3b07563 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2.sha256 +sha256 2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a postgresql-14.2.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c..c389246f80 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 14.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:45 +0100 Subject: [Buildroot] [git commit] package/sqlite: bump to version 3.38.1 Message-ID: <20220320152913.E9CF98452C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9af74adcaf572fab40f788127d2e9cda191d91c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://sqlite.org/releaselog/3_38_1.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index deb8d4c14c..1b3dc35ccb 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz +sha256 8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4 sqlite-autoconf-3380100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b702139f6c..a0c90b7f62 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.2 -SQLITE_TAR_VERSION = 3370200 +SQLITE_VERSION = 3.38.1 +SQLITE_TAR_VERSION = 3380100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From fontaine.fabrice at gmail.com Sun Mar 20 15:47:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 16:47:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads Message-ID: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads and openvpn raised since commit 0199dc161769e5f28e9aebc634230ece08ff5008: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' Fixes: - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e Signed-off-by: Fabrice Fontaine --- ...h-core.c-fix-build-without-slotevent.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch new file mode 100644 index 0000000000..5b2829c5ca --- /dev/null +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch @@ -0,0 +1,37 @@ +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Mar 2022 08:50:15 +0100 +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent + +Fix the following build failure with --disable-slotevent: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' + +Fixes: + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] +--- + lib/pkcs11h-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c +index d7bb4cd..0bf11e8 100644 +--- a/lib/pkcs11h-core.c ++++ b/lib/pkcs11h-core.c +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( + + switch (property) { + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: ++#if defined(ENABLE_PKCS11H_SLOTEVENT) + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { + goto cleanup; + } ++#endif + break; + } + cleanup: +-- +2.35.1 + -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:20:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:20:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: hid and hog needs headers >= 3.18 Message-ID: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> Fix the following build failure with hid and hog raised since their addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd because UHID_GET_REPORT is only available since kernel 3.18 and https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: profiles/input/device.c: In function 'uhid_send_get_report_reply': profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' if (size > sizeof(ev.u.get_report_reply.data)) ^ profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' size = sizeof(ev.u.get_report_reply.data); ^ profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) ev.type = UHID_GET_REPORT_REPLY; ^ Fixes: - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 Signed-off-by: Fabrice Fontaine --- package/bluez5_utils/Config.in | 16 ++++++++++++++++ package/brltty/Config.in | 2 +- package/cwiid/Config.in | 6 +++--- package/kodi/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced..49bb719102 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e20..3527df6161 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac9405..7e8cdc3086 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on !BR2_USE_MMU diff --git a/package/kodi/Config.in b/package/kodi/Config.in index c8e1e5d0ed..4c6e01745c 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf058..319415754a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:39:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:39:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:58:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:58:01 +0100 Subject: [Buildroot] [PATCH 1/2] package/snmppp: bump to version 3.4.9 Message-ID: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> Update hash of src/v3.cpp, update in year and "Frank Fock" added: - _## SNMP++ v3.3 + _## SNMP++ v3.4 - _## Copyright (c) 2001-2013 Jochen Katz, Frank Fock + _## Copyright (c) 2001-2021 Jochen Katz, Frank Fock - _## Hewlett-Packard and Jochen Katz make no representations about the - _## suitability of this software for any purpose. It is provided + _## Hewlett-Packard, Frank Fock, and Jochen Katz make no representations + _## about the suitability of this software for any purpose. It is provided https://www.agentpp.com/download/changes_snmp++v3.txt Signed-off-by: Fabrice Fontaine --- package/snmppp/snmppp.hash | 4 ++-- package/snmppp/snmppp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 2dcf836fc7..db3a4b5f4f 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz -sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp +sha256 7c0aaf4ea21db082453f880cc2062a86dcbbf0ee6c8d47c72beb8e0c77c26b6c snmp++-3.4.9.tar.gz +sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 601e28e207..bc05cad583 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.2 +SNMPPP_VERSION = 3.4.9 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:58:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:58:02 +0100 Subject: [Buildroot] [PATCH 2/2] package/agentpp: bump to version 4.5.3 In-Reply-To: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> References: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> Message-ID: <20220320165802.1584746-2-fontaine.fabrice@gmail.com> Drop patch (not needed anymore): "Fixed: Allow compilation without _SNMPv3 defined." https://agentpp.com/download/changes_agent++.txt Signed-off-by: Fabrice Fontaine --- ...01-Fix-build-when-SNMPv3-is-disabled.patch | 102 ------------------ package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch diff --git a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch b/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch deleted file mode 100644 index f16c2b4b77..0000000000 --- a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 14 Jul 2020 10:30:10 +0200 -Subject: [PATCH] Fix build when SNMPv3 is disabled - -agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it -is missing one and it has a few ones in excess. Fix them. - -Upstream is aware, says "will fix in later version", but thinks to make v3 -mandatory. See discussion at -https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 - -Upstream status: none, upstream is not welcoming contributions. - -Signed-off-by: Luca Ceresoli ---- - include/agent_pp/notification_log_mib.h | 4 ++-- - include/agent_pp/notification_originator.h | 2 ++ - include/agent_pp/snmp_community_mib.h | 4 ++-- - src/notification_originator.cpp | 2 ++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h -index ddac05e515d9..8fd8cfec32ca 100644 ---- a/include/agent_pp/notification_log_mib.h -+++ b/include/agent_pp/notification_log_mib.h -@@ -22,7 +22,7 @@ - - //--AgentGen BEGIN=_BEGIN - #include --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - #include - //--AgentGen END - -@@ -688,6 +688,6 @@ protected: - */ - - --#endif -+// #endif // _SNMPv3 - - -diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h -index 95e8b4e1836d..6f50cd52625b 100644 ---- a/include/agent_pp/notification_originator.h -+++ b/include/agent_pp/notification_originator.h -@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { - */ - virtual nlmLogEntry* get_nlm_log_entry(); - -+#ifdef _SNMPv3 - virtual v3MP* get_v3mp(); -+#endif - - protected: - -diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h -index 7d5c4558f36d..d9eb2b4a87ec 100644 ---- a/include/agent_pp/snmp_community_mib.h -+++ b/include/agent_pp/snmp_community_mib.h -@@ -49,7 +49,7 @@ namespace Agentpp { - #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" - #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" - --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - - /** - * snmpCommunityName -@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup - static void add_public(); - static void add_public(Mib* mib); - }; --#endif -+// #endif // _SNMPv3 - - #ifdef AGENTPP_NAMESPACE - } -diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp -index d7d566869998..39ddbe08cdeb 100644 ---- a/src/notification_originator.cpp -+++ b/src/notification_originator.cpp -@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { - return nlmLogEntry::instance; - } - -+#ifdef _SNMPv3 - v3MP* NotificationOriginator::get_v3mp() { - if (mib) { - return mib->get_request_list()->get_v3mp(); -@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { - return v3MP::I; - } - } -+#endif - - - bool NotificationOriginator::check_access(ListCursor& cur, --- -2.27.0 - diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 11b23c8ee2..f8399963e5 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 bcfc014cc7ce37afdd6eefb71b59f1eabf23984525905546aa363c2a2c498c79 agent++-4.5.3.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 8982d9e564..f30e75ef9c 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.3.1 +AGENTPP_VERSION = 4.5.3 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 -- 2.35.1 From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64 In-Reply-To: <20220320115401.3214796-1-bernd.kuhls@t-online.de> References: <20220320115401.3214796-1-bernd.kuhls@t-online.de> Message-ID: <20220320180334.131f2728@windsurf> On Sun, 20 Mar 2022 12:54:01 +0100 Bernd Kuhls wrote: > Removed all patches after being applied upstream: > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a > > Signed-off-by: Bernd Kuhls > --- > .../bluez5_utils-headers.mk | 2 +- > ...-tools-mesh-cfgtest-include-limits.h.patch | 33 - > ...til-Rename-btd_malloc-to-util_malloc.patch | 67 - > .../0003-shared-util-Add-util_memdup.patch | 57 - > ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 ----------------- > ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ---- > ...rc-shared-util.h-include-sys-types.h.patch | 39 - > package/bluez5_utils/bluez5_utils.hash | 2 +- > package/bluez5_utils/bluez5_utils.mk | 4 +- > 9 files changed, 3 insertions(+), 1924 deletions(-) > delete mode 100644 package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch > delete mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch > delete mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch > delete mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch > delete mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > delete mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 In-Reply-To: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> References: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Message-ID: <20220320180641.47f18a53@windsurf> On Sun, 20 Mar 2022 17:39:30 +0100 Fabrice Fontaine wrote: > Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may > allow privilege escalation during extension installation. The > installation process uses commands such as CREATE x IF NOT EXIST that > allow an unprivileged user to precreate objects. These objects will be > used by the installer (which executes as Superuser), leading to > privilege escalation. In order to be able to take advantage of this, an > unprivileged user would need to be able to create objects in a database > and then get a Superuser to install TimescaleDB into their database. (In > the fixed versions, the installation aborts when it finds that an object > already exists.) > > "This release contains bug fixes since the 2.5.1 release. > This release is high priority for upgrade. We strongly recommend that > you upgrade as soon as possible." > > https://github.com/timescale/timescaledb/releases/tag/2.5.2 > > Signed-off-by: Fabrice Fontaine > --- > package/timescaledb/timescaledb.hash | 2 +- > package/timescaledb/timescaledb.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:04:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:04:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.8 In-Reply-To: <20220320124239.655081-1-bernd.kuhls@t-online.de> References: <20220320124239.655081-1-bernd.kuhls@t-online.de> Message-ID: <20220320180401.7821503b@windsurf> On Sun, 20 Mar 2022 13:42:39 +0100 Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html > > Signed-off-by: Bernd Kuhls > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > package/mesa3d/mesa3d.hash | 6 +++--- > package/mesa3d/mesa3d.mk | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/openvpn: security bump version to 2.5.6 In-Reply-To: <20220320115956.3242683-1-bernd.kuhls@t-online.de> References: <20220320115956.3242683-1-bernd.kuhls@t-online.de> Message-ID: <20220320180340.24bcdbd3@windsurf> On Sun, 20 Mar 2022 12:59:56 +0100 Bernd Kuhls wrote: > Switched _SITE to https and _SOURCE to .gz because upstream does not > provide a .xz tarball anymore. > > Fixes CVE 2022-0547, changelog: > https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst > > Signed-off-by: Bernd Kuhls > --- > package/openvpn/openvpn.hash | 2 +- > package/openvpn/openvpn.mk | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.17 In-Reply-To: <20220320122800.430173-1-bernd.kuhls@t-online.de> References: <20220320122800.430173-1-bernd.kuhls@t-online.de> Message-ID: <20220320180351.0642ac99@windsurf> On Sun, 20 Mar 2022 13:28:00 +0100 Bernd Kuhls wrote: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 > > Signed-off-by: Bernd Kuhls > --- > package/php/php.hash | 2 +- > package/php/php.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/snmppp: bump to version 3.4.9 In-Reply-To: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> References: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> Message-ID: <20220320180644.1946a2e0@windsurf> On Sun, 20 Mar 2022 17:58:01 +0100 Fabrice Fontaine wrote: > Update hash of src/v3.cpp, update in year and "Frank Fock" added: > > - _## SNMP++ v3.3 > + _## SNMP++ v3.4 > - _## Copyright (c) 2001-2013 Jochen Katz, Frank Fock > + _## Copyright (c) 2001-2021 Jochen Katz, Frank Fock > - _## Hewlett-Packard and Jochen Katz make no representations about the > - _## suitability of this software for any purpose. It is provided > + _## Hewlett-Packard, Frank Fock, and Jochen Katz make no representations > + _## about the suitability of this software for any purpose. It is provided > > https://www.agentpp.com/download/changes_snmp++v3.txt > > Signed-off-by: Fabrice Fontaine > --- > package/snmppp/snmppp.hash | 4 ++-- > package/snmppp/snmppp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libks: bump version to 1.8.0 In-Reply-To: <20220320123816.556069-1-bernd.kuhls@t-online.de> References: <20220320123816.556069-1-bernd.kuhls@t-online.de> Message-ID: <20220320180357.361e12f5@windsurf> On Sun, 20 Mar 2022 13:38:16 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/libks/libks.hash | 2 +- > package/libks/libks.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:47 +0100 Subject: [Buildroot] [PATCH 2/2] package/agentpp: bump to version 4.5.3 In-Reply-To: <20220320165802.1584746-2-fontaine.fabrice@gmail.com> References: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> <20220320165802.1584746-2-fontaine.fabrice@gmail.com> Message-ID: <20220320180647.79245748@windsurf> On Sun, 20 Mar 2022 17:58:02 +0100 Fabrice Fontaine wrote: > Drop patch (not needed anymore): > "Fixed: Allow compilation without _SNMPv3 defined." > > https://agentpp.com/download/changes_agent++.txt > > Signed-off-by: Fabrice Fontaine > --- > ...01-Fix-build-when-SNMPv3-is-disabled.patch | 102 ------------------ > package/agentpp/agentpp.hash | 2 +- > package/agentpp/agentpp.mk | 2 +- > 3 files changed, 2 insertions(+), 104 deletions(-) > delete mode 100644 package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.29 In-Reply-To: <20220320123354.443457-1-bernd.kuhls@t-online.de> References: <20220320123354.443457-1-bernd.kuhls@t-online.de> Message-ID: <20220320180353.65a64989@windsurf> On Sun, 20 Mar 2022 13:33:54 +0100 Bernd Kuhls wrote: > Updated license hash due to OpenBSD-related upstream commit: > https://sourceforge.net/p/fetchmail/git/ci/c4419bdd2557321b268f6e105d511923b9a35936/ > > Signed-off-by: Bernd Kuhls > --- > package/fetchmail/fetchmail.hash | 6 +++--- > package/fetchmail/fetchmail.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-waipu: bump version to 19.2.0-Matrix In-Reply-To: <20220320121836.3682323-1-bernd.kuhls@t-online.de> References: <20220320121836.3682323-1-bernd.kuhls@t-online.de> Message-ID: <20220320180348.2e5ae37a@windsurf> On Sun, 20 Mar 2022 13:18:36 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- > package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.6 In-Reply-To: <20220320121708.3679262-1-bernd.kuhls@t-online.de> References: <20220320121708.3679262-1-bernd.kuhls@t-online.de> Message-ID: <20220320180346.34c2f8a4@windsurf> On Sun, 20 Mar 2022 13:17:08 +0100 Bernd Kuhls wrote: > Release notes: https://www.samba.org/samba/history/samba-4.15.6.html > > Added new answer to samba4-cache.txt needed due to upstream commit: > https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc > > Signed-off-by: Bernd Kuhls > --- > package/samba4/samba4-cache.txt | 1 + > package/samba4/samba4.hash | 4 ++-- > package/samba4/samba4.mk | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:04:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:04:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/sqlite: bump to version 3.38.1 In-Reply-To: <20220320124846.664904-1-bernd.kuhls@t-online.de> References: <20220320124846.664904-1-bernd.kuhls@t-online.de> Message-ID: <20220320180404.4e2f3ceb@windsurf> On Sun, 20 Mar 2022 13:48:46 +0100 Bernd Kuhls wrote: > Release notes: https://sqlite.org/releaselog/3_38_1.html > > Signed-off-by: Bernd Kuhls > --- > package/sqlite/sqlite.hash | 2 +- > package/sqlite/sqlite.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 14.2 In-Reply-To: <20220320120428.3294529-1-bernd.kuhls@t-online.de> References: <20220320120428.3294529-1-bernd.kuhls@t-online.de> Message-ID: <20220320180342.1596770d@windsurf> On Sun, 20 Mar 2022 13:04:28 +0100 Bernd Kuhls wrote: > Release notes: https://www.postgresql.org/docs/release/14.2/ > > Updated license hash due to copyright year bump: > https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e > > Signed-off-by: Bernd Kuhls > --- > package/postgresql/postgresql.hash | 6 +++--- > package/postgresql/postgresql.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:35 +0100 Subject: [Buildroot] [git commit] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220320165813.8F2A884550@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:38 +0100 Subject: [Buildroot] [git commit] package/agentpp: bump to version 4.5.3 Message-ID: <20220320165813.A1C4084552@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=343d7940a4bbdd89933a29f9470cead6ff481a28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed anymore): "Fixed: Allow compilation without _SNMPv3 defined." https://agentpp.com/download/changes_agent++.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Fix-build-when-SNMPv3-is-disabled.patch | 102 --------------------- package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 3 files changed, 2 insertions(+), 104 deletions(-) diff --git a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch b/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch deleted file mode 100644 index f16c2b4b77..0000000000 --- a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 14 Jul 2020 10:30:10 +0200 -Subject: [PATCH] Fix build when SNMPv3 is disabled - -agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it -is missing one and it has a few ones in excess. Fix them. - -Upstream is aware, says "will fix in later version", but thinks to make v3 -mandatory. See discussion at -https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 - -Upstream status: none, upstream is not welcoming contributions. - -Signed-off-by: Luca Ceresoli ---- - include/agent_pp/notification_log_mib.h | 4 ++-- - include/agent_pp/notification_originator.h | 2 ++ - include/agent_pp/snmp_community_mib.h | 4 ++-- - src/notification_originator.cpp | 2 ++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h -index ddac05e515d9..8fd8cfec32ca 100644 ---- a/include/agent_pp/notification_log_mib.h -+++ b/include/agent_pp/notification_log_mib.h -@@ -22,7 +22,7 @@ - - //--AgentGen BEGIN=_BEGIN - #include --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - #include - //--AgentGen END - -@@ -688,6 +688,6 @@ protected: - */ - - --#endif -+// #endif // _SNMPv3 - - -diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h -index 95e8b4e1836d..6f50cd52625b 100644 ---- a/include/agent_pp/notification_originator.h -+++ b/include/agent_pp/notification_originator.h -@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { - */ - virtual nlmLogEntry* get_nlm_log_entry(); - -+#ifdef _SNMPv3 - virtual v3MP* get_v3mp(); -+#endif - - protected: - -diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h -index 7d5c4558f36d..d9eb2b4a87ec 100644 ---- a/include/agent_pp/snmp_community_mib.h -+++ b/include/agent_pp/snmp_community_mib.h -@@ -49,7 +49,7 @@ namespace Agentpp { - #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" - #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" - --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - - /** - * snmpCommunityName -@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup - static void add_public(); - static void add_public(Mib* mib); - }; --#endif -+// #endif // _SNMPv3 - - #ifdef AGENTPP_NAMESPACE - } -diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp -index d7d566869998..39ddbe08cdeb 100644 ---- a/src/notification_originator.cpp -+++ b/src/notification_originator.cpp -@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { - return nlmLogEntry::instance; - } - -+#ifdef _SNMPv3 - v3MP* NotificationOriginator::get_v3mp() { - if (mib) { - return mib->get_request_list()->get_v3mp(); -@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { - return v3MP::I; - } - } -+#endif - - - bool NotificationOriginator::check_access(ListCursor& cur, --- -2.27.0 - diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 11b23c8ee2..f8399963e5 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 bcfc014cc7ce37afdd6eefb71b59f1eabf23984525905546aa363c2a2c498c79 agent++-4.5.3.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 8982d9e564..f30e75ef9c 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.3.1 +AGENTPP_VERSION = 4.5.3 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:37 +0100 Subject: [Buildroot] [git commit] package/snmppp: bump to version 3.4.9 Message-ID: <20220320165813.9890284551@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6db3b6d48cae3c3a9ad7c3977b373d4a60d6e787 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of src/v3.cpp, update in year and "Frank Fock" added: - _## SNMP++ v3.3 + _## SNMP++ v3.4 - _## Copyright (c) 2001-2013 Jochen Katz, Frank Fock + _## Copyright (c) 2001-2021 Jochen Katz, Frank Fock - _## Hewlett-Packard and Jochen Katz make no representations about the - _## suitability of this software for any purpose. It is provided + _## Hewlett-Packard, Frank Fock, and Jochen Katz make no representations + _## about the suitability of this software for any purpose. It is provided https://www.agentpp.com/download/changes_snmp++v3.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/snmppp/snmppp.hash | 4 ++-- package/snmppp/snmppp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 2dcf836fc7..db3a4b5f4f 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz -sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp +sha256 7c0aaf4ea21db082453f880cc2062a86dcbbf0ee6c8d47c72beb8e0c77c26b6c snmp++-3.4.9.tar.gz +sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 601e28e207..bc05cad583 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.2 +SNMPPP_VERSION = 3.4.9 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From thomas.petazzoni at bootlin.com Sun Mar 20 17:08:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:08:52 +0100 Subject: [Buildroot] [git commit] configs/octavo_osd32mp1_brk: new defconfig Message-ID: <20220320170115.B9D98845A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0380696669621b48b4d9c770af3faf2d922ed57f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support to Octavo Systems BRK board. We use the TF-A, U-Boot and Linux versions from ST, Device Trees from Octavo as well as a U-Boot patch from Octavo. Reference: https://octavosystems.com/octavo_products/osd32mp1-brk/ The device tree blobs come from Octavo System: https://github.com/octavosystems/OSD32MP1-BRK-device-tree.git The uboot patches come from Octavo System: https://github.com/octavosystems/BRK_Developer_Package_patches/tree/master/u-boot-v2020.01-stm32mp Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 + board/octavo/osd32mp1-brk/genimage.cfg | 23 + .../linux-dts/stm32mp157c-osd32mp1-brk.dts | 1167 ++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 + .../uboot/0001-osd32mp1-BRK-board-added.patch | 2349 ++++++++++++++++++++ board/octavo/osd32mp1-brk/readme.txt | 35 + .../octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr.dtsi | 119 + .../tfa-dts/stm32mp157c-osd32mp1-brk.dts | 581 +++++ configs/octavo_osd32mp1_brk_defconfig | 60 + 9 files changed, 4342 insertions(+) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Mar 20 17:08:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] configs/octavo_osd32mp1_red: new defconfig Message-ID: <20220320170115.CDCD9845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=672807b815c315f1f67f465af1b6165acd01949b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support for the Octavo Systems RED board. We use the TF-A, U-Boot and Linux versions from ST, Device Trees from Octavo, as well as a U-Boot patch from Octavo. Reference: https://octavosystems.com/octavo_products/osd32mp1-red/ The device tree blobs come from Octavo System: https://github.com/octavosystems/OSD32MP1-RED-Device-tree.git The uboot patches come from Octavo System: https://github.com/octavosystems/osd32mp1-build-tools/tree/395ebd1f4832353c2bc66bbf3346b07d5243e44d/patches/u-boot-2018.11 Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/octavo/osd32mp1-red/genimage.cfg | 23 + .../octavo/osd32mp1-red/linux-dts/osd32mp1-red.dts | 1469 ++++++++++++++ .../linux-dts/stm32mp157c-osd32mp1-red.dtsi | 2077 ++++++++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 + ...0001-Add-OSD32MP1-RED-Device-Tree-support.patch | 1730 ++++++++++++++++ ...32mp15_trusted_defconfig-disable-environm.patch | 32 + board/octavo/osd32mp1-red/readme.txt | 37 + board/octavo/osd32mp1-red/tfa-dts/osd32mp1-red.dts | 615 ++++++ .../stm32mp15-osd32mp1-ddr3-1x4Gb-1066-binG.dtsi | 119 ++ configs/octavo_osd32mp1_red_defconfig | 60 + 11 files changed, 6168 insertions(+) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Mar 20 17:11:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:11:20 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/octavo_osd32mp1_brk: new defconfig In-Reply-To: <20211130103919.19428-1-kory.maincent@bootlin.com> References: <20211130103919.19428-1-kory.maincent@bootlin.com> Message-ID: <20220320181120.250e1916@windsurf> On Tue, 30 Nov 2021 11:39:18 +0100 Kory Maincent wrote: > This patch adds support to Octavo Systems Brk board. > > Very similar to the other stm32mp157-based boards. We use the TF-A, U-boot > and Linux version from ST used by the Octavo constructor. > > Reference: > https://octavosystems.com/octavo_products/osd32mp1-brk/ > > The device tree blobs come from Octavo System: > https://github.com/octavosystems/OSD32MP1-BRK-device-tree.git > > The uboot patches come from Octavo System: > https://github.com/octavosystems/BRK_Developer_Package_patches/tree/master/u-boot-v2020.01-stm32mp > > The kernel defconfig has been extracted from the prebuilt image. > > Device tree and patch are licensed under BSD 2-Clause. > > Signed-off-by: Kory Maincent > --- Both patches applied to the master branch, after rewording a bit the commit log. It seems like since your patch, Octavo has related an updated BSP, perhaps it is worth having a look and do an update? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Mar 20 17:12:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 18:12:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/json-glib: bump to version 1.6.6 Message-ID: <20220320171259.1591428-1-fontaine.fabrice@gmail.com> - Update introspection option: https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 - Disable docs (enabled by default since https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) - Disable tests (added by: https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) - Update indentation in hash file (two spaces) https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS Signed-off-by: Fabrice Fontaine --- package/json-glib/json-glib.hash | 6 +++--- package/json-glib/json-glib.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index b68794db37..680d404a4b 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz # Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index accdb4f888..52ca47e906 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,13 +4,14 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 +JSON_GLIB_VERSION_MAJOR = 1.6 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ JSON_GLIB_LICENSE_FILES = COPYING JSON_GLIB_INSTALL_STAGING = YES +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false JSON_GLIB_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection else -JSON_GLIB_CONF_OPTS += -Dintrospection=false +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 17:23:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 18:23:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/raptor: fix CVE-2020-25713 Message-ID: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine --- ...are-namespace-declarations-correctly.patch | 33 +++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config -- 2.35.1 From peter at korsgaard.com Sun Mar 20 17:34:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:34:28 +0100 Subject: [Buildroot] [PATCH] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <20220224001455.206249-1-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 01:14:55 +0100") References: <20220224001455.206249-1-romain.naour@gmail.com> Message-ID: <87a6dkply3.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > TestRust and TestRustBin has been introduced at the time when there was > no cargo package infrastructure or any package using rust compiler > (Buildroot 2018.02). > Since then the ripgrep package has been introduced, initially using > the generic package infrastructure and converted later to the cargo > package infrastructure. > Due a recent change in rust/cargo removing the cargo config file [1] > the test TestRust and TestRustBin now fail to compile since they build > an hello-world crate outside of the cargo package infrastructure > without the correct environment for cross-compiling. > Replace the 'hello-world' crate by ripgrep package and check if it > can run properly in Qemu. > Fixes tests.package.test_rust.TestRustBin: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 > But doesn't fixes tests.package.test_rust.TestRust due another bug: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 > Signed-off-by: Romain Naour Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:35:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:35:23 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <20220224154513.220976-2-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 16:45:13 +0100") References: <20220224154513.220976-1-romain.naour@gmail.com> <20220224154513.220976-2-romain.naour@gmail.com> Message-ID: <875yo8plwk.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > The test TestRust is currently broken with ripgrep package with > the following error: > error[E0514]: found crate `core` compiled by an incompatible version of rustc > | > = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) > = note: the following crate versions were found: > crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib > error[E0514]: found crate `std` compiled by an incompatible version of rustc > The problem is not really a cross-compilation issue (we are building > for an armv7 target on x86_64 host) but a problem with rust-std libraries > (rlib). > We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same > version as the prebuilt rustc used to bootstrap the build: > TestRust/host/bin/rustc --version > rustc 1.58.1 > TestRustBin/host/bin/rustc --version > rustc 1.58.1 (db9d1b20b 2022-01-20) > Indeed we are using host-rust-bin to bootstrap the host-rust compiler > package built by Buildroot. The problem is that the > libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) > and is not removed before installing host-rust built by Buildroot. > We actually spent a lot of time to build host-rust with rust-std > and forget to install this important library HOST_DIR. > Looking at the host-rust build directory we can notice two installer > script "install.sh" (the same scripts used to install host-rust-bin): > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh > The "tarball" directory is generated by the "python x.py dist" during > the install step, we have to keep it. > Replace "python x.py install" by theses two install scripts. > Installing rust-std with the install.sh script replace the rust-std > libraries installed by host-rust-bin. > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > Signed-off-by: Romain Naour > Cc: Eric Le Bihan Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:46:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:46:27 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220224162517.222437-1-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 17:25:16 +0100") References: <20220224162517.222437-1-romain.naour@gmail.com> Message-ID: <871qywple4.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Commit [1] added eeze dependency using "depends on" to several efl > options (drm, libmount) instead of selecting eeze and propagate the > udev reverse dependency. > [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 > Signed-off-by: Romain Naour > --- > v2: simplify the commit log > Remove the "eeze" between parenthesis Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:46:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:46:39 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/efl: handle input option In-Reply-To: <20220224162517.222437-2-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 17:25:17 +0100") References: <20220224162517.222437-1-romain.naour@gmail.com> <20220224162517.222437-2-romain.naour@gmail.com> Message-ID: <87wngoo6tc.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > From: Fabrice Fontaine > Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input > option on target which was added (and enabled by default) by > https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be > resulting in the following build failure when eeze is disabled: > ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". > Fixes: > - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e > Signed-off-by: Fabrice Fontaine > [Romain: > Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the > upstream name. > use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM > remove duplicate libxkbcommon in EFL_DEPENDENCIES] > Signed-off-by: Romain Naour Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:47:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:47:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix musl build In-Reply-To: <20220224173615.486414-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 24 Feb 2022 18:36:15 +0100") References: <20220224173615.486414-1-fontaine.fabrice@gmail.com> Message-ID: <87sfrco6s1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following musl build failure raised since commit > 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: > In file included from src/shared/queue.c:15: > ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? > 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > | ^~~~~~~ > | size_t > Fixes: > - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:45:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:45:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bluez5_utils: fix musl build Message-ID: <20220320173905.F030A845D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fc940a4ca008f8c51395a0d210c0d8b7828b44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following musl build failure raised since commit 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: In file included from src/shared/queue.c:15: ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); | ^~~~~~~ | size_t Fixes: - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 96ebed1eed6dcd55d8024cbc6fe8bec646d739c6) Signed-off-by: Peter Korsgaard --- ...006-src-shared-util.h-include-sys-types.h.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch new file mode 100644 index 0000000000..8a5bd64d43 --- /dev/null +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch @@ -0,0 +1,39 @@ +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Feb 2022 18:19:33 +0100 +Subject: [PATCH] src/shared/util.h: include sys/types.h + +Include sys/types.h to avoid the following build failure on musl raised +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: + +In file included from src/shared/queue.c:15: +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); + | ^~~~~~~ + | size_t + +Fixes: + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] +--- + src/shared/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.h b/src/shared/util.h +index c01eccf8a..554481e1e 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + #define BIT(n) (1 << (n)) +-- +2.34.1 + From peter at korsgaard.com Sun Mar 20 17:45:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:45:44 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/efl: rework eeze handling in Kconfig Message-ID: <20220320173905.D79B8845D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49fcf4beeb212c38046353eaa6bd23965b982fc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit [1] added eeze dependency using "depends on" to several efl options (drm, libmount) instead of selecting eeze and propagate the udev reverse dependency. [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c7229db872acd6db83ccb7e4bb22cb4cfd06be75) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..4c78bef7c8 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +174,16 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm, efl-eeze depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,9 +216,10 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON @@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" From peter at korsgaard.com Sun Mar 20 17:30:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:30:05 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220320173905.C3162845D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac1fa68623d89f4a66b8a91d358d755c3dfb6c41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour Cc: Eric Le Bihan Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0d1f211950fe7cdf1bbb52397cdb86519d4a404) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_rust.py | 48 +++--------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") From peter at korsgaard.com Sun Mar 20 17:31:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:31:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rust: install rustc and rust-std built by Buildroot Message-ID: <20220320173905.CD590845D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34effd4a4729f87bd5607834dfc3954f08b5e592 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The test TestRust is currently broken with ripgrep package with the following error: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 target on x86_64 host) but a problem with rust-std libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc used to bootstrap the build: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) and is not removed before installing host-rust built by Buildroot. We actually spent a lot of time to build host-rust with rust-std and forget to install this important library HOST_DIR. Looking at the host-rust build directory we can notice two installer script "install.sh" (the same scripts used to install host-rust-bin): TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh The "tarball" directory is generated by the "python x.py dist" during the install step, we have to keep it. Replace "python x.py install" by theses two install scripts. Installing rust-std with the install.sh script replace the rust-std libraries installed by host-rust-bin. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 Signed-off-by: Romain Naour Cc: Eric Le Bihan [Arnout: remove redundant parenthesis; only use a variable for the common install opts] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 15682493918ead960d326bf24763e9b5d8d331d9) Signed-off-by: Peter Korsgaard --- package/rust/rust.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b7..3c560882ca 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -67,9 +67,26 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +define HOST_RUST_INSTALL_RUSTC + cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) From peter at korsgaard.com Sun Mar 20 17:45:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:45:50 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/efl: handle input option Message-ID: <20220320173905.E363D845D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30e5d4ebc19a7a970e17ecc0e12397a13b34e89a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input option on target which was added (and enabled by default) by https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be resulting in the following build failure when eeze is disabled: ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". Fixes: - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e Signed-off-by: Fabrice Fontaine [Romain: Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the upstream name. use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM remove duplicate libxkbcommon in EFL_DEPENDENCIES] Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 70ad44ffd00786cf25145445afa374cbb295f722) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 11 ++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 4c78bef7c8..c4f82b92e3 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -216,13 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcb..d4a16475e5 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true @@ -192,7 +199,7 @@ endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) EFL_CONF_OPTS += -Ddrm=true -EFL_DEPENDENCIES += libdrm libegl libinput mesa3d +EFL_DEPENDENCIES += libdrm libegl mesa3d else EFL_CONF_OPTS += -Ddrm=false endif @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. From peter at korsgaard.com Sun Mar 20 17:49:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:49:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS In-Reply-To: <20220224175119.487040-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 24 Feb 2022 18:51:19 +0100") References: <20220224175119.487040-1-fontaine.fabrice@gmail.com> Message-ID: <87o820o6o6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > bpftool uses its own local copy of libbpf so add > BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure > on ARM: > btf.c: In function 'btf_type_by_id': > btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] > if (type_id < btf->start_id) > ^ > bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > Fixes: > - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:49:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:49:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Message-ID: <20220320174059.B9293845D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44db0dba5976bc1b5ff979589e51c8d023af4195 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x bpftool uses its own local copy of libbpf so add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure on ARM: btf.c: In function 'btf_type_by_id': btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (type_id < btf->start_id) ^ bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fixes: - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c750dd4e5d03430148841d2d897e90dbe19ce172) Signed-off-by: Peter Korsgaard --- package/bpftool/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343..a1ef3843e6 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + config BR2_PACKAGE_BPFTOOL bool "bpftool" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ From peter at korsgaard.com Sun Mar 20 18:14:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:14:07 +0100 Subject: [Buildroot] [PATCH] package/rust: set musl-root for musl toolchains In-Reply-To: <20220225083037.229109-1-romain.naour@gmail.com> (Romain Naour's message of "Fri, 25 Feb 2022 09:30:37 +0100") References: <20220225083037.229109-1-romain.naour@gmail.com> Message-ID: <87k0coo5jk.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Without musl-root in config.toml the build stop with the following error: > thread 'main' panicked at 'couldn't find libc.a in musl libdir: > output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', > src/bootstrap/sanity.rs:192:25 > musl-root is needed to provide the path to libc.a and libunwind.a because > rust link them statically into the standard library and liblibc [1]. > For other libc, musl-root is not used and ignored [2]. > [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd > [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 > Signed-off-by: Romain Naour > --- > Runtime tested with TestRust with ripgrep and bat packages. Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:15:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:15:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build with libexecinfo In-Reply-To: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 25 Feb 2022 19:52:04 +0100") References: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnco5hx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' > Fixes: > - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:13:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:13:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rust: set musl-root for musl toolchains Message-ID: <20220320180628.5EB3B845E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46c073662bc24bb7c5b9fd1a27ae1945d0439528 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Without musl-root in config.toml the build stop with the following error: thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 musl-root is needed to provide the path to libc.a and libunwind.a because rust link them statically into the standard library and liblibc [1]. For other libc, musl-root is not used and ignored [2]. [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a41b0f31dea3e62b006ac815bf628600676b328f) Signed-off-by: Peter Korsgaard --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 3c560882ca..cd8c87b68d 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ From peter at korsgaard.com Sun Mar 20 18:14:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:14:23 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rpi-userland: fix build with libexecinfo Message-ID: <20220320180628.65E9C845D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd0c2292f2a46bfcc61e73c2d4567f50b547b787 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bc4cc27705de50356d7e9945e41bd989fdc56fe8) Signed-off-by: Peter Korsgaard --- ...006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 ++++++++++++++++++++++ package/rpi-userland/rpi-userland.mk | 5 ++ 2 files changed, 63 insertions(+) diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch new file mode 100644 index 0000000000..bf2a9eb6ea --- /dev/null +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch @@ -0,0 +1,58 @@ +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to +pass additional flags such as -lexecinfo on musl and uclibc-ng + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- + makefiles/cmake/arm-linux.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index e7206cc..16c64db 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt +index e6bd373..2f72eb2 100644 +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake +index 957846a..e172282 100644 +--- a/makefiles/cmake/arm-linux.cmake ++++ b/makefiles/cmake/arm-linux.cmake +@@ -93,7 +93,7 @@ if(ANDROID) + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") + + link_directories(${ANDROID_LIBS}) +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") +-- +2.34.1 + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..3564ec0703 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From peter at korsgaard.com Sun Mar 20 18:23:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:23:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/zabbix: fix shared netsnmp build In-Reply-To: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 00:05:18 +0100") References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Message-ID: <87bky0o541.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following shared build failure with netsnmp raised since the > addition of the package in commit > 42382a171277ead59e365f5920e757f01c04ac77: > configure: error: "libnetsnmp.a static library was not found in > /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" > Fixes: > - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:23:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:23:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/zabbix: netsnmp needs mib In-Reply-To: <20220225230519.1584174-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 00:05:19 +0100") References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> <20220225230519.1584174-2-fontaine.fabrice@gmail.com> Message-ID: <877d8oo53p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > netsnmp support needs mib to avoid the following build failure raised > since the addition of the package in commit > 42382a171277ead59e365f5920e757f01c04ac77: > checks_snmp.c: In function ?zbx_snmp_get_octet_string?: > checks_snmp.c:694:35: error: invalid use of undefined type ?struct tree? > 694 | hint = (NULL != subtree ? subtree->hint : NULL); > | ^~ > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:24:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:24:44 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-2-clement.leger@bootlin.com> (=?utf-8?Q?=22Cl=C3=A9ment=09L=C3=A9ger?= via buildroot"'s message of "Mon, 14 Mar 2022 16:31:04 +0100") References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-2-clement.leger@bootlin.com> Message-ID: <8735jco51v.fsf@dell.be.48ers.dk> >>>>> "Cl?ment" == Cl?ment L?ger via buildroot writes: > Some platforms (stm32, sam) needs DTC to build the platform > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration > option to select host-dtc package when building. > Signed-off-by: Cl?ment L?ger Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:27:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:27:22 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/valijson: drop boost dependency In-Reply-To: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Feb 2022 11:35:27 +0100") References: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> Message-ID: <87y214mqd1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > boost is not mandatory since the deactivation of tests when bumping to > version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and > https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:28:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:28:55 +0100 Subject: [Buildroot] [PATCH] package/shairport-sync: install dbus policy file to target In-Reply-To: <20220228022840.2140908-1-t123yh.xyz@gmail.com> (Yunhao Tian's message of "Mon, 28 Feb 2022 10:28:40 +0800") References: <20220228022840.2140908-1-t123yh.xyz@gmail.com> Message-ID: <87tubsmqag.fsf@dell.be.48ers.dk> >>>>> "Yunhao" == Yunhao Tian writes: > This adds two extra commands to install dbus policy config > to target if dbus option is enabled. > Signed-off-by: Yunhao Tian Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:30:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:30:10 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.38 In-Reply-To: <20220311065928.14849-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 11 Mar 2022 07:59:28 +0100") References: <20220311065928.14849-1-ps.report@gmx.net> Message-ID: <87pmmgmq8d.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1]. > [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html > Signed-off-by: Peter Seiderer Committed to 2022.02.x given the bugfixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:30:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:30:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/ts4900-fpga: bump version to 20170510 In-Reply-To: <20220310185921.8852-1-kris@embeddedTS.com> (Kris Bahnsen via buildroot's message of "Thu, 10 Mar 2022 10:59:21 -0800") References: <20220310185921.8852-1-kris@embeddedTS.com> Message-ID: <87lex4mq73.fsf@dell.be.48ers.dk> >>>>> "Kris" == Kris Bahnsen via buildroot writes: > Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte > transmits. > Signed-off-by: Kris Bahnsen Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:31:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:31:56 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix kernel image format for aarch64 BE In-Reply-To: <20220228162632.2777188-1-remi.duraffort@linaro.org> (=?utf-8?Q?=22R=C3=A9mi?= Duraffort"'s message of "Mon, 28 Feb 2022 17:26:32 +0100") References: <20220228162632.2777188-1-remi.duraffort@linaro.org> Message-ID: <87h77smq5f.fsf@dell.be.48ers.dk> >>>>> "R?mi" == R?mi Duraffort writes: > Signed-off-by: R?mi Duraffort Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:39:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:39:26 +0100 Subject: [Buildroot] [git commit] package/gcr: depends on !gnupg In-Reply-To: <20220315211222.E6D258408A@busybox.osuosl.org> (Arnout Vandecappelle's message of "Tue, 15 Mar 2022 22:10:00 +0100") References: <20220315211222.E6D258408A@busybox.osuosl.org> Message-ID: <87czigmpsx.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5783a418f4b30931068b81f850fc06cd8d3d9732 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Since gcr selects gnupg2, it's incompatible with gnupg. Add this > dependency and corresponding comment. > While we're at it, also hide the existing comment when > !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:42:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:42:24 +0100 Subject: [Buildroot] [git commit] support/testing: test_rust.py: fix flake8 errors In-Reply-To: <20220315211223.1F9208408A@busybox.osuosl.org> (Arnout Vandecappelle's message of "Tue, 15 Mar 2022 22:10:01 +0100") References: <20220315211223.1F9208408A@busybox.osuosl.org> Message-ID: <878rt4mpnz.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=12588a667a6e4d3c852a82a9d89c58bcf43eea1e > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fix flake8 errors introduced in commit f0d1f21195 > Fixes: > support/testing/tests/package/test_rust.py:2:1: F401 'tempfile' imported but unused > support/testing/tests/package/test_rust.py:3:1: F401 'subprocess' imported but unused > support/testing/tests/package/test_rust.py:4:1: F401 'shutil' imported but unused > support/testing/tests/package/test_rust.py:18:1: E302 expected 2 blank lines, found 1 Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:46:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:46:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/boinc: disable fcgi In-Reply-To: <20220308211205.3682-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 22:12:05 +0100") References: <20220308211205.3682-1-fontaine.fabrice@gmail.com> Message-ID: <874k3smpht.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libfcgi raises the following build failure with glibc 2.34 and gcc > 11.2.0: > In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, > from boinc_fcgi.h:19, > from coproc.cpp:22: > /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous > 582 | __attribute_malloc__ __attr_dealloc_fclose; > | ^~~~~~~~~~~~~~~~~~~~~ > RawTherapee has the same kind of issue: > - https://github.com/Beep6581/RawTherapee/issues/6324 > - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 > Fixes: > - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:38:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:38:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcr: depends on !gnupg Message-ID: <20220320183723.7F8C6845FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c05744eca4a2453fe4403c97cee3229152f50e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5783a418f4b30931068b81f850fc06cd8d3d9732) Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Sun Mar 20 18:45:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:45:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/boinc: disable fcgi Message-ID: <20220320183723.8A92484332@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f23eeb8e986693ede48feae84908b2025c048816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 54cb3b506de44fb8389832a1612b55d179b2cfd4) Signed-off-by: Peter Korsgaard --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot From peter at korsgaard.com Sun Mar 20 18:39:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:39:05 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gcr: depends on !gnupg Message-ID: <20220320183729.9963C84605@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=816861524a079658040d6e059743697affdeafce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5783a418f4b30931068b81f850fc06cd8d3d9732) Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Sun Mar 20 18:21:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:21:20 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zabbix: netsnmp needs mib Message-ID: <20220320183734.6FFE38461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3c27619bfb917e5b2e893871d2a25f434c8efc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x netsnmp support needs mib to avoid the following build failure raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: checks_snmp.c: In function ???zbx_snmp_get_octet_string???: checks_snmp.c:694:35: error: invalid use of undefined type ???struct tree??? 694 | hint = (NULL != subtree ? subtree->hint : NULL); | ^~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 77f9d2d6a6fc4a6485acd7b5f1970b638764c1fa) Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index a8ecbb42db..adc54028ad 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -55,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else From peter at korsgaard.com Sun Mar 20 18:28:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:28:37 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/shairport-sync: install dbus policy file to target Message-ID: <20220320183734.8E56E8461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38aa995347d264fdc171101a6ebe60835e65c2bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This adds two extra commands to install dbus policy config to target if dbus option is enabled. Signed-off-by: Yunhao Tian Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d74963400633ec9056646fdc50a91a046489a719) Signed-off-by: Peter Korsgaard --- package/shairport-sync/shairport-sync.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e5..4430014ec9 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -82,6 +90,7 @@ define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV From peter at korsgaard.com Sun Mar 20 18:30:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:30:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ts4900-fpga: bump version to 20170510 Message-ID: <20220320183734.A19BB8461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dab7fc53b6df5333ecf7ba170e0507833f24075 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte transmits. Signed-off-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni (cherry picked from commit 503948f452d0cb46cbc7990ecaeabd60f2b3dfd7) Signed-off-by: Peter Korsgaard --- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 9ffff643af..1d3c62bfd1 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index a3e42c0812..73e7a28e31 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,7 +4,7 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. From peter at korsgaard.com Sun Mar 20 18:38:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:38:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gcr: depends on !gnupg Message-ID: <20220320183734.B36CB8461F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf0c9830c0eef17116081d04ccc10a1aa0850553 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5783a418f4b30931068b81f850fc06cd8d3d9732) Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Sun Mar 20 18:24:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:24:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/optee-os: add option to select DTC dependency Message-ID: <20220320183734.7921A8461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1feb0309f967fbbed17e96f99ddf555ec0e2054d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Some platforms (stm32, sam) needs DTC to build the platform device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration option to select host-dtc package when building. Signed-off-by: Cl??ment L??ger Acked-by: Etienne Carriere [yann.morin.1998 at free.fr: move option] Signed-off-by: Yann E. MORIN (cherry picked from commit 67be54cd943a466aab6bf53df2aa9e712da43556) Signed-off-by: Peter Korsgaard --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..ea16550b72 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -54,6 +54,13 @@ config BR2_TARGET_OPTEE_OS_VERSION default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..9f76d8450e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -23,6 +23,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif + # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit # trusted applications. Since buildroot currently references From peter at korsgaard.com Sun Mar 20 18:26:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:26:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/valijson: drop boost dependency Message-ID: <20220320183734.84A098461F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a2efbee7a901691e80462b8aba683a68074e4d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x boost is not mandatory since the deactivation of tests when bumping to version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b9391c7dd21dee3eff04e665bf6a92ef6fc5f234) Signed-off-by: Peter Korsgaard --- package/valijson/Config.in | 8 ++------ package/valijson/valijson.mk | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b3703..07706cd963 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26..71c5b05f2b 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) From peter at korsgaard.com Sun Mar 20 18:17:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:17:50 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zabbix: fix shared netsnmp build Message-ID: <20220320183734.65AF48461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61dfa6a4ef4780e3e74d6a28d67ede17d3f4fd78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following shared build failure with netsnmp raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 532e5063f54434cce4afec2ad5371fbf02488b67) Signed-off-by: Peter Korsgaard --- ...01-m4-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 ++++++++++++++++++++++ package/zabbix/zabbix.mk | 2 + 2 files changed, 46 insertions(+) diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 0000000000..ffb1f54ba2 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd..a8ecbb42db 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ From peter at korsgaard.com Sun Mar 20 18:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:43:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/boinc: disable fcgi Message-ID: <20220320183734.C509E8461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb7b9e5a7294fb8a970aaec653b49e6226c4a7a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 54cb3b506de44fb8389832a1612b55d179b2cfd4) Signed-off-by: Peter Korsgaard --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot From peter at korsgaard.com Sun Mar 20 18:31:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:31:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] linux: make Image{, .gz} format available for aarch64 BE Message-ID: <20220320183734.AA1E48461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcbce93cfce0a84d32de323b6962c9846b58c887 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Just like aarch64, aarch64 BE supports the Image and Image.gz format. Signed-off-by: R??mi Duraffort Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d1579589e0a7d1870aa0ad587acd78f799f31257) Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 36744c5337..043e7c6574 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" From peter at korsgaard.com Sun Mar 20 18:42:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:42:14 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/testing: test_rust.py: fix flake8 errors Message-ID: <20220320183734.BBFE68461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae50728e7665662c17a4bb2a9ad3c98bc463e227 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix flake8 errors introduced in commit f0d1f21195 Fixes: support/testing/tests/package/test_rust.py:2:1: F401 'tempfile' imported but unused support/testing/tests/package/test_rust.py:3:1: F401 'subprocess' imported but unused support/testing/tests/package/test_rust.py:4:1: F401 'shutil' imported but unused support/testing/tests/package/test_rust.py:18:1: E302 expected 2 blank lines, found 1 (cherry picked from commit 12588a667a6e4d3c852a82a9d89c58bcf43eea1e) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_rust.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index a1abd20c09..fb9dd2d916 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,7 +1,4 @@ import os -import tempfile -import subprocess -import shutil import infra.basetest @@ -15,6 +12,7 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() + class TestRustBin(TestRustBase): config = \ """ From peter at korsgaard.com Sun Mar 20 18:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:29:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/mtools: bump version to 4.0.38 Message-ID: <20220320183734.984F48461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39534938739db48acf27ab14aed0ba059ae617d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 88de5d08226b490ea2784fbfd0580dd3430b5699) Signed-off-by: Peter Korsgaard --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486f..a162bfdc95 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231..c875814bc7 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From joerg.krause at embedded.rocks Sun Mar 20 18:51:44 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Sun, 20 Mar 2022 18:51:44 +0000 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 Message-ID: <20220320185144.10894-1-joerg.krause@embedded.rocks> Drop patch wich is included in the new version. Also recreate config.xml by building and running Gerbera using: ``` ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml ``` Note, that Gerbera sets the `` parameter to the runtime user's home by default when generating the script. This is not appropriate when running Gerbera on an embedded Linux system as we usually do not have multiple users or even users at all. Therefore, we set the home directory to /var/lib/gerbera`. Signed-off-by: J?rg Krause --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------- package/gerbera/config.xml | 58 ++++++++++++++++++---- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 4 files changed, 51 insertions(+), 55 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index 30d70e21f7..e6261f25d0 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ Gerbera - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 /var/lib/gerbera /usr/share/gerbera/web - 1800 + 180 gerbera.db + + + upnp:class derivedfrom "object.item" and last_updated > "@last7" + + + upnp:class derivedfrom "object.item" and last_modified > "@last7" + + * @@ -45,12 +53,15 @@ - - - + + + + + + @@ -98,14 +109,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -133,3 +172,4 @@ + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md -- 2.35.1 From yann.morin.1998 at free.fr Sun Mar 20 21:11:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 22:11:38 +0100 Subject: [Buildroot] [git commit] package/raptor: fix CVE-2020-25713 Message-ID: <20220320210328.ED9BC8462A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fca33462b8ed4ed7c54d5d0640ddb64723b3dae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From yann.morin.1998 at free.fr Sun Mar 20 21:12:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 22:12:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/raptor: fix CVE-2020-25713 In-Reply-To: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> References: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> Message-ID: <20220320211217.GG1566358@scaer> Fabrice, All On 2022-03-20 18:23 +0100, Fabrice Fontaine spake thusly: > A malformed input file can lead to a segfault due to an out of bounds > array access in raptor_xml_writer_start_element_common. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...are-namespace-declarations-correctly.patch | 33 +++++++++++++++++++ > package/raptor/raptor.mk | 3 ++ > 2 files changed, 36 insertions(+) > create mode 100644 package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch > > diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch > new file mode 100644 > index 0000000000..a48a583cb1 > --- /dev/null > +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch > @@ -0,0 +1,33 @@ > +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 > +From: Dave Beckett > +Date: Sat, 18 Sep 2021 17:40:00 -0700 > +Subject: [PATCH] XML Writer : compare namespace declarations correctly > + > +Apply patch from > +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 > +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 > +which overwrote heap during XML writing in parse type literal > +content. This was detected with clang asan. > + > +Thanks to Michael Stahl / mst2 for the fix. > + > +[Retrieved from: > +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] > +Signed-off-by: Fabrice Fontaine > +--- > + src/raptor_xml_writer.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c > +index 56993dc3..4426d38c 100644 > +--- a/src/raptor_xml_writer.c > ++++ b/src/raptor_xml_writer.c > +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, > + > + /* check it wasn't an earlier declaration too */ > + for(j = 0; j < nspace_declarations_count; j++) > +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { > ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { > + declare_me = 0; > + break; > + } > diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk > index 6d21fad58e..69ac121300 100644 > --- a/package/raptor/raptor.mk > +++ b/package/raptor/raptor.mk > @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES > # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch > RAPTOR_IGNORE_CVES += CVE-2017-18926 > > +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch > +RAPTOR_IGNORE_CVES += CVE-2020-25713 > + > RAPTOR_CONF_OPTS =\ > --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ > --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 20 21:18:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 22:18:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/jack1: libsamplerate is optional, not mandatory Message-ID: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> libsamplerate is only needed to build the NetJack backend and internal client Signed-off-by: Fabrice Fontaine --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f10332..625afdf8c1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba0..39183826a4 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate +endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 21:18:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 22:18:15 +0100 Subject: [Buildroot] [PATCH 2/2] package/jack1: libsndfile is optional, not mandatory In-Reply-To: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> Message-ID: <20220320211815.1798812-2-fontaine.fabrice@gmail.com> libsndfile is only needed to build jackrec example client Signed-off-by: Fabrice Fontaine --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 625afdf8c1..5b3116e2f1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 39183826a4..6dca56001f 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,12 +11,16 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK1_DEPENDENCIES += libsndfile +endif + ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline endif -- 2.35.1 From peter at korsgaard.com Sun Mar 20 21:22:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:22:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix dnssec static build In-Reply-To: <20220308231733.176991-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 00:17:33 +0100") References: <20220308231733.176991-1-fontaine.fabrice@gmail.com> Message-ID: <87zglkl3oa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop -DHAVE_DNSSEC_STATIC which has been added by commit > e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises > the following static build failure because dnsmasq will wrongly append > "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": > /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc > -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o > network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o > helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o > outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o > blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o > crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o > -Wl,-Bstatic > -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib > -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp > -Wl,-Bdynamic > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: > attempted static link of dynamic object > `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' > Strangely enough, this is the first time this build failure is raised by > the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: > https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 > Fixes: > - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:24:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:24:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220320211605.0D4EA8462D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=572e7c73cb1411579d167fb8a20083eac8f8c417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c6a8192081a65fee20b7757ece8880c25c32ee6a) Signed-off-by: Peter Korsgaard --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a9..d2b03eeb2a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ From peter at korsgaard.com Sun Mar 20 21:25:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: add USBGUARD_CPE_ID_VENDOR In-Reply-To: <20220309213459.677932-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 22:34:59 +0100") References: <20220309213459.677932-1-fontaine.fabrice@gmail.com> Message-ID: <87v8w8l3k9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:26:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:26:05 +0100 Subject: [Buildroot] [PATCH] docs/manual: Remove link to emdebian and replace with debian port page In-Reply-To: <20220309215531.638593-1-yannick.brosseau@gmail.com> (Yannick Brosseau's message of "Wed, 9 Mar 2022 16:55:31 -0500") References: <20220309215531.638593-1-yannick.brosseau@gmail.com> Message-ID: <87r16wl3iq.fsf@dell.be.48ers.dk> >>>>> "Yannick" == Yannick Brosseau writes: > In the list of full distribution, the FAQ contains a link to Emdebian. > This project stopped receiving updates in 2014 and the main web page does not exist anymore. > This replace the entry with a link to the Debian ports page. > Signed-off-by: Yannick Brosseau Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:19:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:19:33 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/dnsmasq: fix dnssec static build Message-ID: <20220320211733.8CB0784633@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80ca8b0a4bcc0373ffdf8c0fd4633e5c8aeaa27c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Drop -DHAVE_DNSSEC_STATIC which has been added by commit e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises the following static build failure because dnsmasq will wrongly append "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' Strangely enough, this is the first time this build failure is raised by the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 Fixes: - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b6a4453bd7352d3bb27aef565d9023a1d11209c9) Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4..230e4a8116 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -26,9 +26,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) From peter at korsgaard.com Sun Mar 20 21:24:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:24:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220320211733.95DD484639@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b2625c038650ca986aba5b5979d5212552b92e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c6a8192081a65fee20b7757ece8880c25c32ee6a) Signed-off-by: Peter Korsgaard --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a9..d2b03eeb2a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ From peter at korsgaard.com Sun Mar 20 21:25:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:45 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220320211733.9E11E8463A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21278889daf2b899b1b416f259ca6ae839abf060 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0) Signed-off-by: Peter Korsgaard --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From peter at korsgaard.com Sun Mar 20 21:25:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220320211737.99F458463E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b85b18887554f37002124108cd890c8dca58f76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0) Signed-off-by: Peter Korsgaard --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From peter at korsgaard.com Sun Mar 20 21:25:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220320212105.A095384680@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4667ddcc8608b363c04433c166e2c38d6416acc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0) Signed-off-by: Peter Korsgaard --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From peter at korsgaard.com Sun Mar 20 21:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:35:01 +0100 Subject: [Buildroot] [PATCH] package/libglib2: bump to version 2.70.4 In-Reply-To: <20220310114122.919781-1-francois.perrad@gadz.org> (Francois Perrad's message of "Thu, 10 Mar 2022 12:41:22 +0100") References: <20220310114122.919781-1-francois.perrad@gadz.org> Message-ID: <87mthkl33u.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:35:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:35:46 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.33 In-Reply-To: <20220310114141.919836-1-francois.perrad@gadz.org> (Francois Perrad's message of "Thu, 10 Mar 2022 12:41:41 +0100") References: <20220310114141.919836-1-francois.perrad@gadz.org> Message-ID: <87ils8l32l.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:37:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:37:55 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220316213626.GZ283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 22:36:26 +0100") References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> Message-ID: <87ee2wl2z0.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > +Peter K.: candidate to be backported, that's a security fix. Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. > On 2022-03-15 21:54 +0100, Peter Seiderer spake thusly: >> Changes between 1.1.1m and 1.1.1n [15 Mar 2022] >> >> *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever >> for non-prime moduli. >> >> Internally this function is used when parsing certificates that contain >> elliptic curve public keys in compressed form or explicit elliptic curve >> parameters with a base point encoded in compressed form. >> >> It is possible to trigger the infinite loop by crafting a certificate that >> has invalid explicit curve parameters. >> >> Since certificate parsing happens prior to verification of the certificate >> signature, any process that parses an externally supplied certificate may >> thus be subject to a denial of service attack. The infinite loop can also >> be reached when parsing crafted private keys as they can contain explicit >> elliptic curve parameters. >> >> Thus vulnerable situations include: >> >> - TLS clients consuming server certificates >> - TLS servers consuming client certificates >> - Hosting providers taking certificates or private keys from customers >> - Certificate authorities parsing certification requests from subscribers >> - Anything else which parses ASN.1 elliptic curve parameters >> >> Also any other applications that use the BN_mod_sqrt() where the attacker >> can control the parameter values are vulnerable to this DoS issue. >> (CVE-2022-0778) >> [Tom?? Mr?z] >> >> *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) >> to the list of ciphersuites providing Perfect Forward Secrecy as >> required by SECLEVEL >= 3. >> >> [Dmitry Belyavskiy, Nicola Tuveri] >> >> Signed-off-by: Peter Seiderer > Applied to master, thanks. > Regards, > Yann E. MORIN. >> --- >> package/libopenssl/libopenssl.hash | 4 ++-- >> package/libopenssl/libopenssl.mk | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash >> index a055cbc270..22bb365bcc 100644 >> --- a/package/libopenssl/libopenssl.hash >> +++ b/package/libopenssl/libopenssl.hash >> @@ -1,5 +1,5 @@ >> -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 >> -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz >> +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 >> +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz >> >> # License files >> sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE >> diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk >> index bd8ef6141a..ae6658ed40 100644 >> --- a/package/libopenssl/libopenssl.mk >> +++ b/package/libopenssl/libopenssl.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -LIBOPENSSL_VERSION = 1.1.1m >> +LIBOPENSSL_VERSION = 1.1.1n >> LIBOPENSSL_SITE = https://www.openssl.org/source >> LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz >> LIBOPENSSL_LICENSE = OpenSSL or SSLeay >> -- >> 2.35.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:37:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:37:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libopenssl: security bump version to 1.1.1n Message-ID: <20220320212912.909F484685@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4750711e879647cb40b0b1af4f0606494748dd4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66868e9fab2806686fd08850a3e56185ef00b127) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index e713afef7f..2a2870b85e 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sun Mar 20 21:37:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:37:09 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libopenssl: security bump version to 1.1.1n Message-ID: <20220320212918.2221F84688@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf9a6bc55c04533849dc33ac625ada5965781e5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66868e9fab2806686fd08850a3e56185ef00b127) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sun Mar 20 21:35:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:35:37 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgtk3: bump to version 3.24.33 Message-ID: <20220320212923.B57F88468E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=414b4c5d86813393ae7816e918066dff9a98f569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ed721a0b9b3bbb3fca8487b49117f55bbf791180) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb518..23ce1f42bb 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade6..cd0a75eb23 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sun Mar 20 21:36:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:36:51 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libopenssl: security bump version to 1.1.1n Message-ID: <20220320212923.C1B2B8468D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1fe19616196930cb803f52760c55340607c894e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66868e9fab2806686fd08850a3e56185ef00b127) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sun Mar 20 21:34:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:34:43 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libglib2: bump to version 2.70.4 Message-ID: <20220320212923.AA6968468D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f91778be4df5b0caebfeee2a421eae64af2689f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2a8ceb5cb30a9c28447e89c4b5bef67277697935) Signed-off-by: Peter Korsgaard --- package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- .../0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- .../0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f95228932..b5603c92f4 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', + version : '2.70.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2339,7 +2324,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982e..e212393011 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd31..db77a73203 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08e..f0f0cb55ad 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8bb..18f5b329c7 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sun Mar 20 21:42:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:42:11 +0100 Subject: [Buildroot] [PATCH 1/6] package/zynaddsubfx: fix PluginEnable option In-Reply-To: <20220316214441.GB283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 22:44:41 +0100") References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> <20220316214441.GB283544@scaer> Message-ID: <87a6dkl2rw.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Fabrice, All, > On 2022-03-16 22:22 +0100, Fabrice Fontaine spake thusly: >> Replace False by OFF when setting PluginEnable option >> >> Signed-off-by: Fabrice Fontaine > Series of 6 patches applied to master, thanks. And to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:41:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: fix atomic linking Message-ID: <20220320213324.E07E2846A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcfccfddf169c6382ef162066a769dc8b28428d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: libzynaddsubfx_core.a(Master.cpp.o): in function `.L1880': Master.cpp:(.text+0x7cc0): undefined reference to `__atomic_exchange_1' Fixes: - http://autobuild.buildroot.org/results/91b5959ca0eb136c1609462e71d109ff09cca5e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ba7319a06e1b98524fde1384dc570a7f34870881) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index b2eb1921fa..db0459ce62 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -14,7 +14,7 @@ ZYNADDSUBFX_LICENSE_FILES = COPYING ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ From peter at korsgaard.com Sun Mar 20 21:40:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:40:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: fix PluginEnable option Message-ID: <20220320213324.C8235846A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35dcc9ca2265b8587026b0a96ee892e95dc71f2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Replace False by OFF when setting PluginEnable option Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2e1a86e95091b69ad043c33aadf7220866a45f29) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede..c8d64f5ce8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Sun Mar 20 21:41:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: disable tests Message-ID: <20220320213324.D48C2846A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f63050ec64a87da67c0d20c2b800a6b6f5bdcdc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable tests which are enabled by default since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 886629bf64d8093fc847ebbbed779a09722843da) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index c8d64f5ce8..b2eb1921fa 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Sun Mar 20 21:41:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:20 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: add jack{1, 2} optional dependency Message-ID: <20220320213325.0960F846A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af8839589acb2b3399e36a925e37a48d7b170382 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x jack{1,2} is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3bcedaa732b539e4ad32776e867ef9626ffca5b7) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index aeeb0b6405..461146aae8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -30,4 +30,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF endif +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + $(eval $(cmake-package)) From peter at korsgaard.com Sun Mar 20 21:41:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:11 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: fix alsa-lib handling Message-ID: <20220320213324.F12C1846A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76de77202d01d280a2b0f4c6c98e8b8887e73675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fc2191845799ae2358b752fa29839817d33ad82) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package)) From peter at korsgaard.com Sun Mar 20 21:41:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: add portaudio optional dependency Message-ID: <20220320213325.14BD8846A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84a9bdb30e7510cb6426d02f39109c53fd1dc420 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x portaudio is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e820feba362a29a310ed3a93c8ad5546ceb8a2ee) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 461146aae8..aff9ac4bf4 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -37,4 +37,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) From paguilar at paguilar.org Sun Mar 20 22:14:44 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 20 Mar 2022 23:14:44 +0100 Subject: [Buildroot] [PATCH 1/2] packages/guile: bump to version 3.0.8 Message-ID: <20220320221445.10259-1-paguilar@paguilar.org> Signed-off-by: Pedro Aguilar --- package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/guile/guile.hash b/package/guile/guile.hash index c2719fa7f2..e9ae5b6e51 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz +sha256 daa7060a56f2804e9b74c8d7e7fe8beed12b43aab2789a38585183fcc17b8a13 guile-3.0.8.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 859d7ec96f..9478e75b41 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 3.0.7 +GUILE_VERSION = 3.0.8 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES -- 2.25.1 From peter at korsgaard.com Sun Mar 20 22:38:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:38:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220320222954.4B370846AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d17874dfbeff4017b0fb59510dcd51fa895a0ff3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN (cherry picked from commit c72f3f2b43f4607ed94d51a21abe5e3d909efb36) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index f6da090d22..2a3d8a78a8 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -475,7 +475,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From peter at korsgaard.com Sun Mar 20 22:38:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:38:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220320222958.E270B846CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbd4355aecf49b329ea7ab71c3a0d1d4466fad02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN (cherry picked from commit c72f3f2b43f4607ed94d51a21abe5e3d909efb36) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index abd36a3dd5..a27d6a269f 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From peter at korsgaard.com Sun Mar 20 22:38:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:38:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220320223004.8314B846D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6788e82f45d38cff560c33392f4b556e9d79e476 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN (cherry picked from commit c72f3f2b43f4607ed94d51a21abe5e3d909efb36) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d99407..8cc64a54d1 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From yann.morin.1998 at free.fr Sun Mar 20 22:39:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 23:39:26 +0100 Subject: [Buildroot] [PATCH] pkg-generic: fix rdepends and phony targets of virtual packages In-Reply-To: <9470ba2b-e40f-322d-b37a-f0daea8f5059@mind.be> References: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> <9470ba2b-e40f-322d-b37a-f0daea8f5059@mind.be> Message-ID: <20220320223926.GH1566358@scaer> Arnout, Anssi, All, On 2022-03-17 22:27 +0100, Arnout Vandecappelle spake thusly: > On 16/03/2022 11:12, Anssi Hannula wrote: > >Virtual packages are not added to the _RDEPENDENCIES list of packages > >that they depend on (i.e. their provider). > > > >This causes -show-rdepends to not show the virtual package > >and -show-recursive-rdepends to miss all the packages that > >transitively depend on via the virtual package. > > > >The virtual make targets (e.g. -show-info) are also not marked as > >phony for virtual packages. > > > >To fix those issues, remove most of the special handling of virtual > >packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as > >well. Very elegant solution. > >This also allows removal of some duplicated code in pkg-generic.mk and a > >now unneeded special condition in CHECK_ONE_DEPENDENCY. > > > >Still keep the virtual package out of PACKAGES since there is e.g. no > >need to rsync per-package target dir to global target dir. I am not > >aware of any showstoppers preventing addition to PACKAGES as well, > >though, so it is probably just an optimization. > > > >Signed-off-by: Anssi Hannula > >--- > > > >I encountered this while using -show-recursive-rdepends to > >determine which packages to dirclean after modification of a > >(non-virtual) in per-package mode. > > > >The current virtual vs. real distinction didn't seem worth the risk of > > Well, I guess there *was* a reason that we introduced this distinction way > back when, and that all the build targets are skipped for virtual packages. > However, I can't remember the reason. Maybe Yann (the instigator of this > feature) still remembers? Not really. I did some archeology in the commit logs, but found no explicit reason... > Looking at the history, in particular e.g. commit c5d546450fc1 that > converts libgles from generic infrastructure to virtual, it looks like it > really *should* be OK to keep the full build targets. And in that case, this > patch is a really nice simplification! > > So, unless Yann objects, I'd say: let's try it and let the autobuilders complain! I've smoke-tested it with a few of my favourite rules with a simple configuration with a virtual package: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_PYC=y BR2_PACKAGE_WAYLAND=y $ make source $ make legal-info $ make show-info $ make show-vars All went OK. Applied to master, thanks. Regards, Yann E. MORIN. > Regards, > Arnout > > >unintentional differences so I dropped it, but I'm not too familiar with > >the code so I could have missed something. > >In case I did and this is not a good idea, one less intrusive option > >would be to split the common-to-virtual-and-real-packages code to be > >under a new separate conditional block. > > > > > > Makefile | 2 -- > > package/pkg-generic.mk | 24 +++++------------------- > > 2 files changed, 5 insertions(+), 21 deletions(-) > > > >diff --git a/Makefile b/Makefile > >index 4f693d40a9..9e875dd8d8 100644 > >--- a/Makefile > >+++ b/Makefile > >@@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) > > define CHECK_ONE_DEPENDENCY > > ifeq ($$($(2)_TYPE),target) > >-ifeq ($$($(2)_IS_VIRTUAL),) > > ifneq ($$($$($(2)_KCONFIG_VAR)),y) > > $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ > > has added it to its _DEPENDENCIES variable without selecting it or \ > > depending on it from Config.in) > > endif > > endif > >-endif > > endef > > $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ > >diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > >index b3a7e1d60e..a0d6198edc 100644 > >--- a/package/pkg-generic.mk > >+++ b/package/pkg-generic.mk > >@@ -1064,15 +1064,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > > $$($(2)_TARGET_DIRCLEAN): NAME=$(1) > > # Compute the name of the Kconfig option that correspond to the > >-# package being enabled. We handle three cases: the special Linux > >-# kernel case, the bootloaders case, and the normal packages case. > >-# Virtual packages are handled separately (see below). > >+# package being enabled. > > ifeq ($(1),linux) > > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > > $(2)_KCONFIG_VAR = BR2_TARGET_$(2) > > else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) > > $(2)_KCONFIG_VAR = BR2_$(2) > >+else ifeq ($$($(2)_IS_VIRTUAL),YES) > >+$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) > > else > > $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) > > endif > >@@ -1178,7 +1178,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) > > $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) > > $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) > >+ifneq ($$($(2)_IS_VIRTUAL),YES) > > PACKAGES += $(1) > >+endif > > ifneq ($$($(2)_PERMISSIONS),) > > PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > >@@ -1268,22 +1270,6 @@ ifneq ($$($(2)_HELP_CMDS),) > > HELP_PACKAGES += $(2) > > endif > >-# Virtual packages are not built but it's useful to allow them to have > >-# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > >-else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR > >- > >-ifneq ($$($(2)_PERMISSIONS),) > >-PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > >-endif > >-ifneq ($$($(2)_DEVICES),) > >-PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) > >-endif > >-ifneq ($$($(2)_USERS),) > >-PACKAGES_USERS += $$($(2)_USERS)$$(sep) > >-endif > >-TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) > >-ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) > >- > > endif # $(2)_KCONFIG_VAR > > endef # inner-generic-package -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 20 21:55:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 22:55:17 +0100 Subject: [Buildroot] [git commit] pkg-generic: fix rdepends and phony targets of virtual packages Message-ID: <20220320223043.867B6846DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=842ba7eceffb97e9795807e890b0557ab6d542aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Virtual packages are not added to the _RDEPENDENCIES list of packages that they depend on (i.e. their provider). This causes -show-rdepends to not show the virtual package and -show-recursive-rdepends to miss all the packages that transitively depend on via the virtual package. The virtual make targets (e.g. -show-info) are also not marked as phony for virtual packages. To fix those issues, remove most of the special handling of virtual packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as well. This also allows removal of some duplicated code in pkg-generic.mk and a now unneeded special condition in CHECK_ONE_DEPENDENCY. Still keep the virtual package out of PACKAGES since there is e.g. no need to rsync per-package target dir to global target dir. I am not aware of any showstoppers preventing addition to PACKAGES as well, though, so it is probably just an optimization. Signed-off-by: Anssi Hannula Signed-off-by: Yann E. MORIN --- Makefile | 2 -- package/pkg-generic.mk | 24 +++++------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 6756945819..3bbbdfbe01 100644 --- a/Makefile +++ b/Makefile @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) define CHECK_ONE_DEPENDENCY ifeq ($$($(2)_TYPE),target) -ifeq ($$($(2)_IS_VIRTUAL),) ifneq ($$($$($(2)_KCONFIG_VAR)),y) $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ has added it to its _DEPENDENCIES variable without selecting it or \ depending on it from Config.in) endif endif -endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 79fcf603d3..1222526ba1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1088,15 +1088,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the -# package being enabled. We handle three cases: the special Linux -# kernel case, the bootloaders case, and the normal packages case. -# Virtual packages are handled separately (see below). +# package being enabled. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) +else ifeq ($$($(2)_IS_VIRTUAL),YES) +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif @@ -1202,7 +1202,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) +ifneq ($$($(2)_IS_VIRTUAL),YES) PACKAGES += $(1) +endif ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) @@ -1292,22 +1294,6 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif -# Virtual packages are not built but it's useful to allow them to have -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR - -ifneq ($$($(2)_PERMISSIONS),) -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) -endif -ifneq ($$($(2)_DEVICES),) -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) -endif -ifneq ($$($(2)_USERS),) -PACKAGES_USERS += $$($(2)_USERS)$$(sep) -endif -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) - endif # $(2)_KCONFIG_VAR endef # inner-generic-package From peter at korsgaard.com Sun Mar 20 22:39:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:39:31 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni via buildroot's message of "Wed, 16 Mar 2022 22:48:46 +0100") References: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> Message-ID: <875yo8l04c.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > The check_package_get_latest_version_by_distro() function analyzes the > data returned by release-monitoring.org. For two of our > packages (bento4 and qextserialport), release-monitoring.org returns > something that is a bit odd: it returns an entry with a > "stable_versions" field that contains an empty array. Our code was > ready to have or not have a "stable_versions" entry, but when it is > present, we assumed it was not an empty array. These two packages, for > some reason, break this assumption. > In order to solve this problem, this commit is more careful, and uses > the stable_versions field only if it exists and it has at least one > entry. The code is also reworked as a sequence of "if...elif...else" > to be more readable. > This fixes the following exception when running pkg-stats on the full > package set: > Task exception was never retrieved > future: exception=IndexError('list index out of range')> > Traceback (most recent call last): > File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get > if await check_package_get_latest_version_by_distro(session, pkg): > File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro > version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > IndexError: list index out of range > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sun Mar 20 22:52:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 23:52:24 +0100 Subject: [Buildroot] [git commit] support/scripts/graph-build-time: add support for timeline graphing Message-ID: <20220320230556.2F0A6846E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e8b01afd5d8d8af8f4ce334073df9b15497cf36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit adds support for a new type of graph, showing the timeline of a build. It shows, with one line per package, when each of this package steps started/ended, and therefore allows to see the sequencing of the package builds. For a fully serialized build like we have today, this is not super useful (except to show that everything is serialized), but it becomes much more useful in the context of top-level parallel build. We chose to order the graph by the time-of-configure, as it is the closest to the actual cascade-style of a true dependency graph, which is tiny bit more complex to achieve properly. The actual result still looks pretty good. The graph-build make target is extended to also generate this new timeline graph. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - sort by start-of-configure time - re-use existing colorsets (default or alternate) - fix python2isms - fix check-package ] Signed-off-by: Yann E. MORIN --- Makefile | 3 ++ support/scripts/graph-build-time | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3bbbdfbe01..05b790d770 100644 --- a/Makefile +++ b/Makefile @@ -871,6 +871,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a50..1edc3b3c00 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) From paguilar at paguilar.org Sun Mar 20 22:14:45 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 20 Mar 2022 23:14:45 +0100 Subject: [Buildroot] [PATCH 2/2] packages/guile: remove patches not needed in 3.0.8 In-Reply-To: <20220320221445.10259-1-paguilar@paguilar.org> References: <20220320221445.10259-1-paguilar@paguilar.org> Message-ID: <20220320221445.10259-2-paguilar@paguilar.org> These patches are already part of Guile's source code in version 3.0.8. Let's remove them to avoid errors while patching the package. 0003-module-system-base-target.scm-support-riscv32.patch 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch Signed-off-by: Pedro Aguilar --- ...stem-base-target.scm-support-riscv32.patch | 33 - ...38a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 ---------------- 2 files changed, 13963 deletions(-) delete mode 100644 package/guile/0003-module-system-base-target.scm-support-riscv32.patch delete mode 100644 package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch diff --git a/package/guile/0003-module-system-base-target.scm-support-riscv32.patch b/package/guile/0003-module-system-base-target.scm-support-riscv32.patch deleted file mode 100644 index a988d2d995..0000000000 --- a/package/guile/0003-module-system-base-target.scm-support-riscv32.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 6 Aug 2021 19:49:37 +0200 -Subject: [PATCH] module/system/base/target.scm: support riscv32 - -Fix the following build failure on riscv32: - -system/base/target.scm:132:16: In procedure triplet-pointer-size: -unknown CPU word size "riscv32" - -Fixes: - - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8 - -Signed-off-by: Fabrice Fontaine ---- - module/system/base/target.scm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/system/base/target.scm b/module/system/base/target.scm -index 2088cd866..dba46664d 100644 ---- a/module/system/base/target.scm -+++ b/module/system/base/target.scm -@@ -116,6 +116,7 @@ - - ((string-match "^x86_64-.*-gnux32" triplet) 4) ; x32 - -+ ((string-match "32$" cpu) 4) - ((string-match "64$" cpu) 8) - ((string-match "64_?[lbe][lbe]$" cpu) 8) - ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4) --- -2.30.2 - diff --git a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch deleted file mode 100644 index f471dbc5c0..0000000000 --- a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch +++ /dev/null @@ -1,13930 +0,0 @@ -From b4a80f4239b19fea4d2cc3e9d197f24b809f0624 Mon Sep 17 00:00:00 2001 -From: Daniel Llorens -Date: Mon, 16 Aug 2021 13:23:27 +0200 -Subject: Update gnulib to 8f4538a53d64054ae2fc8b86c0f87c418c6176e6 - -Includes gnulib:0c907f7da13232908f05c415b8cec56024071906 to fix #49930 -https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html. - -[Retrieved from: -https://git.savannah.gnu.org/cgit/guile.git/commit/?id=b4a80f4239b19fea4d2cc3e9d197f24b809f0624] -Signed-off-by: Fabrice Fontaine ---- - build-aux/announce-gen | 49 +- - build-aux/gendocs.sh | 6 +- - build-aux/git-version-gen | 8 +- - build-aux/gnupload | 17 +- - build-aux/useless-if-before-free | 18 +- - lib/Makefile.am | 986 ++++++++++++++++++++------------------- - lib/_Noreturn.h | 2 +- - lib/accept.c | 10 +- - lib/accept4.c | 14 +- - lib/alignof.h | 12 +- - lib/alloca.c | 4 +- - lib/alloca.in.h | 20 +- - lib/arpa_inet.in.h | 12 +- - lib/asnprintf.c | 14 +- - lib/assure.h | 10 +- - lib/attribute.h | 16 +- - lib/basename-lgpl.c | 10 +- - lib/basename-lgpl.h | 26 +- - lib/binary-io.c | 10 +- - lib/binary-io.h | 10 +- - lib/bind.c | 10 +- - lib/btowc.c | 10 +- - lib/byteswap.in.h | 10 +- - lib/c-ctype.c | 18 + - lib/c-ctype.h | 24 +- - lib/c-strcase.h | 12 +- - lib/c-strcasecmp.c | 12 +- - lib/c-strcaseeq.h | 14 +- - lib/c-strncasecmp.c | 12 +- - lib/canonicalize-lgpl.c | 3 +- - lib/cdefs.h | 43 +- - lib/ceil.c | 10 +- - lib/cloexec.c | 14 +- - lib/cloexec.h | 14 +- - lib/close.c | 10 +- - lib/connect.c | 10 +- - lib/copysign.c | 10 +- - lib/dirent.in.h | 111 +++-- - lib/dirfd.c | 10 +- - lib/dirname-lgpl.c | 10 +- - lib/dirname.h | 39 +- - lib/dup2.c | 10 +- - lib/duplocale.c | 10 +- - lib/dynarray.h | 20 +- - lib/errno.in.h | 12 +- - lib/fcntl.c | 10 +- - lib/fcntl.in.h | 10 +- - lib/fd-hook.c | 14 +- - lib/fd-hook.h | 14 +- - lib/float+.h | 12 +- - lib/float.c | 10 +- - lib/float.in.h | 10 +- - lib/floor.c | 10 +- - lib/free.c | 10 +- - lib/frexp.c | 10 +- - lib/fstat.c | 10 +- - lib/fsync.c | 14 +- - lib/full-read.c | 10 +- - lib/full-read.h | 10 +- - lib/full-write.c | 10 +- - lib/full-write.h | 10 +- - lib/gai_strerror.c | 12 +- - lib/getaddrinfo.c | 12 +- - lib/getdtablesize.c | 10 +- - lib/getlogin.c | 10 +- - lib/getpeername.c | 10 +- - lib/getrandom.c | 16 +- - lib/getsockname.c | 10 +- - lib/getsockopt.c | 10 +- - lib/gettext.h | 14 +- - lib/hard-locale.c | 10 +- - lib/hard-locale.h | 10 +- - lib/iconv.c | 14 +- - lib/iconv.in.h | 12 +- - lib/iconv_close.c | 14 +- - lib/iconv_open-aix.gperf | 14 +- - lib/iconv_open-hpux.gperf | 14 +- - lib/iconv_open-irix.gperf | 14 +- - lib/iconv_open-osf.gperf | 14 +- - lib/iconv_open-solaris.gperf | 14 +- - lib/iconv_open-zos.gperf | 14 +- - lib/iconv_open.c | 14 +- - lib/iconveh.h | 10 +- - lib/inet_ntop.c | 12 +- - lib/inet_pton.c | 10 +- - lib/inttypes.in.h | 10 +- - lib/isfinite.c | 14 +- - lib/isinf.c | 14 +- - lib/isnan.c | 10 +- - lib/isnand-nolibm.h | 10 +- - lib/isnand.c | 10 +- - lib/isnanf-nolibm.h | 10 +- - lib/isnanf.c | 10 +- - lib/isnanl-nolibm.h | 10 +- - lib/isnanl.c | 10 +- - lib/itold.c | 10 +- - lib/langinfo.in.h | 12 +- - lib/lc-charset-dispatch.c | 10 +- - lib/lc-charset-dispatch.h | 10 +- - lib/libc-config.h | 20 +- - lib/libunistring.valgrind | 22 +- - lib/limits.in.h | 28 +- - lib/link.c | 12 +- - lib/listen.c | 10 +- - lib/localcharset.c | 14 +- - lib/localcharset.h | 14 +- - lib/locale.in.h | 10 +- - lib/localeconv.c | 10 +- - lib/log.c | 10 +- - lib/log1p.c | 10 +- - lib/lstat.c | 10 +- - lib/malloc.c | 47 +- - lib/malloc/dynarray_at_failure.c | 3 +- - lib/malloca.c | 36 +- - lib/malloca.h | 36 +- - lib/math.c | 18 + - lib/math.in.h | 10 +- - lib/mbrtowc-impl-utf8.h | 10 +- - lib/mbrtowc-impl.h | 10 +- - lib/mbrtowc.c | 10 +- - lib/mbsinit.c | 10 +- - lib/mbtowc-impl.h | 10 +- - lib/mbtowc-lock.c | 10 +- - lib/mbtowc-lock.h | 10 +- - lib/mbtowc.c | 10 +- - lib/memchr.c | 24 +- - lib/memchr.valgrind | 10 +- - lib/mempcpy.c | 12 +- - lib/minmax.h | 12 +- - lib/mkdir.c | 10 +- - lib/mkostemp.c | 10 +- - lib/msvc-inval.c | 14 +- - lib/msvc-inval.h | 14 +- - lib/msvc-nothrow.c | 14 +- - lib/msvc-nothrow.h | 14 +- - lib/netdb.in.h | 12 +- - lib/netinet_in.in.h | 12 +- - lib/nl_langinfo-lock.c | 10 +- - lib/nl_langinfo.c | 10 +- - lib/nproc.c | 12 +- - lib/nproc.h | 12 +- - lib/nstrftime.c | 19 +- - lib/open.c | 10 +- - lib/pathmax.h | 12 +- - lib/pipe.c | 14 +- - lib/pipe2.c | 14 +- - lib/poll.c | 14 +- - lib/poll.in.h | 14 +- - lib/printf-args.c | 14 +- - lib/printf-args.h | 14 +- - lib/printf-parse.c | 25 +- - lib/printf-parse.h | 14 +- - lib/putenv.c | 10 +- - lib/raise.c | 10 +- - lib/rawmemchr.c | 10 +- - lib/rawmemchr.valgrind | 10 +- - lib/read.c | 10 +- - lib/readlink.c | 10 +- - lib/realloc.c | 68 +-- - lib/recv.c | 10 +- - lib/recvfrom.c | 10 +- - lib/regex_internal.c | 9 +- - lib/regexec.c | 12 +- - lib/rename.c | 10 +- - lib/rmdir.c | 10 +- - lib/round.c | 14 +- - lib/safe-read.c | 10 +- - lib/safe-read.h | 10 +- - lib/safe-write.c | 10 +- - lib/safe-write.h | 10 +- - lib/same-inode.h | 10 +- - lib/scratch_buffer.h | 20 +- - lib/select.c | 23 +- - lib/send.c | 10 +- - lib/sendto.c | 10 +- - lib/setenv.c | 10 +- - lib/setlocale-lock.c | 10 +- - lib/setlocale_null.c | 10 +- - lib/setlocale_null.h | 10 +- - lib/setsockopt.c | 10 +- - lib/shutdown.c | 10 +- - lib/signal.in.h | 10 +- - lib/signbitd.c | 10 +- - lib/signbitf.c | 10 +- - lib/signbitl.c | 10 +- - lib/size_max.h | 12 +- - lib/snprintf.c | 14 +- - lib/socket.c | 10 +- - lib/sockets.c | 10 +- - lib/sockets.h | 10 +- - lib/stat-time.c | 18 + - lib/stat-time.h | 10 +- - lib/stat-w32.c | 10 +- - lib/stat-w32.h | 10 +- - lib/stat.c | 10 +- - lib/stdalign.in.h | 12 +- - lib/stdbool.in.h | 12 +- - lib/stddef.in.h | 12 +- - lib/stdint.in.h | 16 +- - lib/stdio.in.h | 126 +++-- - lib/stdlib.in.h | 185 ++++++-- - lib/strdup.c | 14 +- - lib/streq.h | 14 +- - lib/strftime.h | 10 +- - lib/striconveh.c | 10 +- - lib/striconveh.h | 18 +- - lib/string.in.h | 68 ++- - lib/stripslash.c | 10 +- - lib/sys-limits.h | 12 +- - lib/sys_file.in.h | 12 +- - lib/sys_random.in.h | 12 +- - lib/sys_select.in.h | 12 +- - lib/sys_socket.c | 18 + - lib/sys_socket.in.h | 12 +- - lib/sys_stat.in.h | 12 +- - lib/sys_time.in.h | 12 +- - lib/sys_times.in.h | 12 +- - lib/sys_types.in.h | 12 +- - lib/sys_uio.in.h | 12 +- - lib/tempname.h | 10 +- - lib/time-internal.h | 14 +- - lib/time.in.h | 12 +- - lib/time_r.c | 14 +- - lib/time_rz.c | 14 +- - lib/times.c | 12 +- - lib/trunc.c | 10 +- - lib/tzset.c | 12 +- - lib/unistd.c | 18 + - lib/unistd.in.h | 25 +- - lib/unsetenv.c | 10 +- - lib/vasnprintf.c | 50 +- - lib/vasnprintf.h | 14 +- - lib/verify.h | 14 +- - lib/vsnprintf.c | 14 +- - lib/w32sock.h | 10 +- - lib/wchar.in.h | 63 ++- - lib/wcrtomb.c | 10 +- - lib/wctype-h.c | 19 + - lib/wctype.in.h | 22 +- - lib/windows-initguard.h | 12 +- - lib/write.c | 10 +- - lib/xalloc-oversized.h | 47 +- - lib/xsize.c | 18 + - lib/xsize.h | 12 +- - m4/arpa_inet_h.m4 | 31 +- - m4/dirent_h.m4 | 45 +- - m4/environ.m4 | 5 +- - m4/fcntl_h.m4 | 39 +- - m4/flock.m4 | 4 +- - m4/fstat.m4 | 4 +- - m4/getaddrinfo.m4 | 10 +- - m4/gnulib-common.m4 | 140 +++++- - m4/gnulib-comp.m4 | 140 ++++-- - m4/hostent.m4 | 4 +- - m4/iconv_h.m4 | 27 +- - m4/inttypes.m4 | 31 +- - m4/langinfo_h.m4 | 25 +- - m4/largefile.m4 | 28 +- - m4/limits-h.m4 | 3 +- - m4/locale_h.m4 | 37 +- - m4/malloc.m4 | 152 ++++-- - m4/math_h.m4 | 227 ++++----- - m4/memchr.m4 | 4 +- - m4/mempcpy.m4 | 4 +- - m4/mktime.m4 | 4 +- - m4/netdb_h.m4 | 25 +- - m4/poll_h.m4 | 29 +- - m4/printf.m4 | 5 +- - m4/rawmemchr.m4 | 4 +- - m4/realloc.m4 | 47 +- - m4/regex.m4 | 44 +- - m4/select.m4 | 4 +- - m4/servent.m4 | 4 +- - m4/signal_h.m4 | 33 +- - m4/sockpfaf.m4 | 6 +- - m4/stat.m4 | 4 +- - m4/stddef_h.m4 | 23 +- - m4/stdint.m4 | 6 +- - m4/stdio_h.m4 | 168 ++++--- - m4/stdlib_h.m4 | 116 +++-- - m4/strdup.m4 | 6 +- - m4/string_h.m4 | 124 ++--- - m4/sys_file_h.m4 | 29 +- - m4/sys_random_h.m4 | 25 +- - m4/sys_select_h.m4 | 29 +- - m4/sys_socket_h.m4 | 53 ++- - m4/sys_stat_h.m4 | 65 ++- - m4/sys_time_h.m4 | 34 +- - m4/sys_times_h.m4 | 25 +- - m4/sys_types_h.m4 | 16 +- - m4/sys_uio_h.m4 | 23 +- - m4/threadlib.m4 | 64 ++- - m4/time_h.m4 | 62 +-- - m4/time_r.m4 | 2 +- - m4/time_rz.m4 | 2 +- - m4/timegm.m4 | 4 +- - m4/tzset.m4 | 4 +- - m4/unistd_h.m4 | 194 ++++---- - m4/visibility.m4 | 6 +- - m4/wchar_h.m4 | 109 +++-- - m4/wctype_h.m4 | 39 +- - m4/wint_t.m4 | 10 +- - m4/year2038.m4 | 124 +++++ - maint.mk | 3 +- - 304 files changed, 4266 insertions(+), 3005 deletions(-) - create mode 100644 m4/year2038.m4 - -diff --git a/build-aux/announce-gen b/build-aux/announce-gen -index 84d2d63..f3b5461 100755 ---- a/build-aux/announce-gen -+++ b/build-aux/announce-gen -@@ -35,12 +35,14 @@ - eval 'exec perl -wSx "$0" "$@"' - if 0; - --my $VERSION = '2020-05-10 16:13'; # UTC -+my $VERSION = '2021-08-04 09:17'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - -+my $copyright_year = '2021'; -+ - use strict; - use Getopt::Long; - use POSIX qw(strftime); -@@ -49,12 +51,6 @@ use POSIX qw(strftime); - - my %valid_release_types = map {$_ => 1} qw (alpha beta stable); - my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz); --my %digest_classes = -- ( -- 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), -- 'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA') -- or (eval { require Digest::SHA1; } and 'Digest::SHA1')) -- ); - my $srcdir = '.'; - - sub usage ($) -@@ -94,7 +90,7 @@ The following are optional: - VERSION is the result of running git describe - in the gnulib source directory. - required if gnulib is in TOOL_LIST. -- --no-print-checksums do not emit MD5 or SHA1 checksums -+ --no-print-checksums do not emit SHA1 or SHA256 checksums - --archive-suffix=SUF add SUF to the list of archive suffixes - --mail-headers=HEADERS a space-separated list of mail headers, e.g., - To: x\@example.com Cc: y-announce\@example.com,... -@@ -161,7 +157,7 @@ sub print_locations ($\@\%@) - - =item C. -+Print the SHA1 and SHA256 signature section for each C<@file>. - - =cut - -@@ -169,23 +165,18 @@ sub print_checksums (@) - { - my (@file) = @_; - -- print "Here are the MD5 and SHA1 checksums:\n"; -+ print "Here are the SHA1 and SHA256 checksums:\n"; - print "\n"; - -- foreach my $meth (qw (md5 sha1)) -+ use Digest::file qw(digest_file_hex digest_file_base64); -+ -+ foreach my $f (@file) - { -- my $class = $digest_classes{$meth} or next; -- foreach my $f (@file) -- { -- open IN, '<', $f -- or die "$ME: $f: cannot open for reading: $!\n"; -- binmode IN; -- my $dig = $class->new->addfile(*IN)->hexdigest; -- close IN; -- print "$dig $f\n"; -- } -+ print digest_file_hex($f, "SHA-1"), " $f\n"; -+ print digest_file_base64($f, "SHA-256"), " $f\n"; - } -- print "\n"; -+ print "\nThe SHA256 checksum is base64 encoded, instead of the\n"; -+ print "hexadecimal encoding that most checksum tools default to.\n\n"; - } - - =item C \@archive_suffixes, - - help => sub { usage 0 }, -- version => sub { print "$ME version $VERSION\n"; exit }, -+ version => -+ sub -+ { -+ print "$ME version $VERSION\n"; -+ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; -+ print "License GPLv3+: GNU GPL version 3 or later .\n" -+ . "This is free software: you are free to change and redistribute it.\n" -+ . "There is NO WARRANTY, to the extent permitted by law.\n"; -+ print "\n"; -+ my $author = "Jim Meyering"; -+ print "Written by $author.\n"; -+ exit -+ }, - ) or usage 1; - - my $fail = 0; -diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh -index 1872de9..1241ee3 100755 ---- a/build-aux/gendocs.sh -+++ b/build-aux/gendocs.sh -@@ -2,7 +2,7 @@ - # gendocs.sh -- generate a GNU manual in many formats. This script is - # mentioned in maintain.texi. See the help message below for usage details. - --scriptversion=2021-01-01.00 -+scriptversion=2021-07-19.18 - - # Copyright 2003-2021 Free Software Foundation, Inc. - # -@@ -58,7 +58,7 @@ EMAIL=webmasters at gnu.org # please override with --email - commonarg= # passed to all makeinfo/texi2html invcations. - dirargs= # passed to all tools (-I dir). - dirs= # -I directories. --htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" -+htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" - default_htmlarg=true - infoarg=--no-split - generate_ascii=true -@@ -202,7 +202,7 @@ base=$PACKAGE - - if $default_htmlarg && test -n "$use_texi2html"; then - # The legacy texi2html doesn't support TOP_NODE_UP_URL -- htmlarg="--css-ref=/software/gnulib/manual.css" -+ htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css" - fi - - if test -n "$srcfile"; then -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen -index be0fc20..5e42afb 100755 ---- a/build-aux/git-version-gen -+++ b/build-aux/git-version-gen -@@ -75,10 +75,10 @@ me=$0 - year=`expr "$scriptversion" : '\([^-]*\)'` - version="git-version-gen $scriptversion - --Copyright $year Free Software Foundation, Inc. --There is NO warranty. You may redistribute this software --under the terms of the GNU General Public License. --For more information about these matters, see the files named COPYING." -+Copyright (C) ${year} Free Software Foundation, Inc. -+License GPLv3+: GNU GPL version 3 or later . -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law." - - usage="\ - Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] -diff --git a/build-aux/gnupload b/build-aux/gnupload -index 434741d..e7822ae 100755 ---- a/build-aux/gnupload -+++ b/build-aux/gnupload -@@ -1,13 +1,13 @@ - #!/bin/sh - # Sign files and upload them. - --scriptversion=2018-05-19.18; # UTC -+scriptversion=2021-04-11.09; # UTC - - # Copyright (C) 2004-2021 Free Software Foundation, Inc. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 3, or (at your option) -+# the Free Software Foundation; either version 2, or (at your option) - # any later version. - # - # This program is distributed in the hope that it will be useful, -@@ -27,8 +27,8 @@ set -e - GPG=gpg - # Choose the proper version of gpg, so as to avoid a - # "gpg-agent is not available in this session" error --# when gpg-agent is version 3 but gpg is still version 1. --# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg -+# when gpg-agent is version 2 but gpg is still version 1. -+# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg - gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` - case "$gpg_agent_version" in - 2.*) -@@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package - - Send patches and bug reports to ." - -+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` -+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. -+License GPLv2+: GNU GPL version 2 or later . -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law." -+ - # Read local configuration file - if test -r "$conffile"; then - echo "$0: Reading configuration file $conffile" -@@ -209,7 +215,8 @@ while test -n "$1"; do - ;; - --version) - echo "gnupload $scriptversion" -- exit $? -+ echo "$copyright" -+ exit 0 - ;; - --) - shift -diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free -index 784d80b..5bbbc44 100755 ---- a/build-aux/useless-if-before-free -+++ b/build-aux/useless-if-before-free -@@ -36,12 +36,14 @@ - eval 'exec perl -wSx "$0" "$@"' - if 0; - --my $VERSION = '2020-04-04 15:07'; # UTC -+my $VERSION = '2021-04-11 10:11'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - -+my $copyright_year = '2021'; -+ - use strict; - use warnings; - use Getopt::Long; -@@ -118,7 +120,19 @@ sub is_NULL ($) - GetOptions - ( - help => sub { usage 0 }, -- version => sub { print "$ME version $VERSION\n"; exit }, -+ version => -+ sub -+ { -+ print "$ME version $VERSION\n"; -+ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; -+ print "License GPLv3+: GNU GPL version 3 or later .\n" -+ . "This is free software: you are free to change and redistribute it.\n" -+ . "There is NO WARRANTY, to the extent permitted by law.\n"; -+ print "\n"; -+ my $author = "Jim Meyering"; -+ print "Written by $author.\n"; -+ exit -+ }, - list => \$list, - 'name=s@' => \@name, - ) or usage 1; -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 02480f6..cb29c31 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -288,8 +288,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON - -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ - -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ -- -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ -- -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ -+ -e 's/@''GNULIB_INET_NTOP''@/$(GL_GNULIB_INET_NTOP)/g' \ -+ -e 's/@''GNULIB_INET_PTON''@/$(GL_GNULIB_INET_PTON)/g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ - -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ -@@ -470,14 +470,14 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ -- -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ -- -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ -- -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ -- -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ -- -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ -- -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ -- -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ -- -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ -+ -e 's/@''GNULIB_OPENDIR''@/$(GL_GNULIB_OPENDIR)/g' \ -+ -e 's/@''GNULIB_READDIR''@/$(GL_GNULIB_READDIR)/g' \ -+ -e 's/@''GNULIB_REWINDDIR''@/$(GL_GNULIB_REWINDDIR)/g' \ -+ -e 's/@''GNULIB_CLOSEDIR''@/$(GL_GNULIB_CLOSEDIR)/g' \ -+ -e 's/@''GNULIB_DIRFD''@/$(GL_GNULIB_DIRFD)/g' \ -+ -e 's/@''GNULIB_FDOPENDIR''@/$(GL_GNULIB_FDOPENDIR)/g' \ -+ -e 's/@''GNULIB_SCANDIR''@/$(GL_GNULIB_SCANDIR)/g' \ -+ -e 's/@''GNULIB_ALPHASORT''@/$(GL_GNULIB_ALPHASORT)/g' \ - -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ - -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ - -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ -@@ -543,6 +543,32 @@ EXTRA_libgnu_la_SOURCES += duplocale.c - ## begin gnulib module dynarray - - if gl_GNULIB_ENABLED_dynarray -+BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h -+ -+malloc/dynarray.gl.h: malloc/dynarray.h -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t -+ -+malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|||g' \ -+ -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ -+ -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ -+ -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ -+ -e 's|__glibc_likely|_GL_LIKELY|g' \ -+ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ -+ < $(srcdir)/malloc/dynarray-skeleton.c; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t -+ - libgnu_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c - - endif -@@ -620,13 +646,13 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -- -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ -- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -- -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ -- -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ -+ -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ -+ -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ -+ -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ -+ -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ -+ -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ -+ -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ -@@ -930,7 +956,7 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ -- -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ -+ -e 's/@''GNULIB_ICONV''@/$(GL_GNULIB_ICONV)/g' \ - -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ - -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ - -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ -@@ -984,10 +1010,8 @@ EXTRA_libgnu_la_SOURCES += iconv.c iconv_close.c iconv_open.c - - ## begin gnulib module idx - --if gl_GNULIB_ENABLED_idx - libgnu_la_SOURCES += idx.h - --endif - ## end gnulib module idx - - ## begin gnulib module inet_ntop -@@ -1031,10 +1055,10 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U - -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ -- -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ -- -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ -- -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ -- -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ -+ -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ -+ -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ -+ -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ -+ -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ - -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ - -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ - -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -@@ -1151,7 +1175,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ -- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ -+ -e 's/@''GNULIB_NL_LANGINFO''@/$(GL_GNULIB_NL_LANGINFO)/g' \ - -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ - -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ - -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ -@@ -1264,11 +1288,11 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ -- -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -- -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ -- -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ -- -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ -- -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ -+ -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \ -+ -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ -+ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ -+ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ -+ -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ - -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ - -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ - -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ -@@ -1379,108 +1403,108 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ -- -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ -- -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ -- -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ -- -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ -- -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ -- -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ -- -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ -- -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ -- -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ -- -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ -- -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ -- -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ -- -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ -- -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ -- -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ -- -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ -- -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ -- -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ -- -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ -- -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ -- -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ -- -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ -- -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ -- -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ -- -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ -- -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ -- -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ -- -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ -- -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ -- -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ -- -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ -- -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ -- -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ -- -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ -- -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ -- -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ -- -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ -- -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ -- -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ -- -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ -- -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ -- -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ -- -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ -- -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ -+ -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ -+ -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ -+ -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ -+ -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ -+ -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ -+ -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ -+ -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ -+ -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ -+ -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ -+ -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ -+ -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ -+ -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ -+ -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ -+ -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ -+ -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ -+ -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ -+ -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ -+ -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ -+ -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ -+ -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ -+ -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ -+ -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ -+ -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ -+ -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ -+ -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ -+ -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ -+ -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ -+ -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ -+ -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ -+ -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ -+ -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ -+ -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ -+ -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ -+ -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ -+ -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ -+ -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ -+ -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ -+ -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ -+ -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ -+ -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ -+ -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ -+ -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ -+ -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ -+ -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ - < $(srcdir)/math.in.h | \ -- sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ -- -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ -- -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ -- -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ -- -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ -- -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ -- -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ -- -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ -- -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ -- -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ -- -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ -- -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ -- -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ -- -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ -- -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ -- -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ -- -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ -- -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ -- -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ -- -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ -- -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ -- -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ -- -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ -- -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ -- -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ -- -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ -- -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ -- -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ -- -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ -- -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ -- -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ -- -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ -- -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ -- -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ -- -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ -- -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ -- -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ -- -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ -- -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ -- -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ -- -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ -- -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ -- -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ -- -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ -- -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ -- -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ -- -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ -- -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ -- -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ -- -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ -- -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ -- -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ -- -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ -- -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ -- -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ -- -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ -- -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ -+ sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ -+ -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ -+ -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ -+ -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ -+ -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ -+ -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ -+ -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ -+ -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ -+ -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ -+ -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ -+ -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ -+ -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ -+ -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ -+ -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ -+ -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ -+ -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ -+ -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ -+ -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ -+ -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ -+ -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ -+ -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ -+ -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ -+ -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ -+ -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ -+ -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ -+ -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ -+ -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ -+ -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ -+ -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ -+ -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ -+ -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ -+ -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ -+ -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ -+ -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ -+ -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ -+ -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ -+ -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ -+ -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ -+ -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ -+ -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ -+ -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ -+ -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ -+ -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ -+ -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ -+ -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ -+ -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ -+ -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ -+ -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ -+ -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ -+ -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ -+ -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ -+ -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ -+ -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ -+ -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ -+ -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ -+ -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ -+ -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ - | \ - sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ - -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ -@@ -1804,7 +1828,7 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ - -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ -- -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ -+ -e 's/@''GNULIB_GETADDRINFO''@/$(GL_GNULIB_GETADDRINFO)/g' \ - -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ - -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ -@@ -1937,7 +1961,7 @@ poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_POLL_H''@|$(NEXT_POLL_H)|g' \ -- -e 's/@''GNULIB_POLL''@/$(GNULIB_POLL)/g' \ -+ -e 's/@''GNULIB_POLL''@/$(GL_GNULIB_POLL)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \ - -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \ -@@ -2098,6 +2122,21 @@ EXTRA_DIST += same-inode.h - ## begin gnulib module scratch_buffer - - if gl_GNULIB_ENABLED_scratch_buffer -+BUILT_SOURCES += malloc/scratch_buffer.gl.h -+ -+malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ -+ -e 's|__glibc_likely|_GL_LIKELY|g' \ -+ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ -+ -e '/libc_hidden_proto/d' \ -+ < $(srcdir)/malloc/scratch_buffer.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t -+ - libgnu_la_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c - - endif -@@ -2185,11 +2224,11 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -- -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ -- -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ -- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -+ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ -+ -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ -+ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ -+ -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ - -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ -@@ -2442,7 +2481,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status - -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ - < $(srcdir)/stdint.in.h; \ - } > $@-t && \ - mv $@-t $@ -@@ -2470,65 +2509,65 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ -- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ -- -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ -- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ -- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ -- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ -- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ -- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ -- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ -- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ -- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ -- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ -- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ -- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ -- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ -- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ -- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ -- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ -- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ -- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ -- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ -- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ -- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ -- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ -- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ -- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ -- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ -- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ -- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ -- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ -- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ -- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ -- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ -- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ -- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ -- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ -- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ -- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ -- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ -- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ -- -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ -- -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ -- -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ -- -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ -- -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ -+ -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \ -+ -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ -+ -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ -+ -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ -+ -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ -+ -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ -+ -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ -+ -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ -+ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ -+ -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ -+ -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ -+ -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ -+ -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ -+ -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ -+ -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ -+ -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ -+ -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ -+ -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ -+ -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ -+ -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ -+ -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ -+ -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ -+ -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ -+ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ -+ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ -+ -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ -+ -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ -+ -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ -+ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ -+ -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ -+ -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ -+ -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ -+ -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ -+ -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ -+ -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ -+ -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ -+ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ -+ -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ -+ -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ -+ -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ -+ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ -+ -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ -+ -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ -+ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ -+ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ -+ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ -+ -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ -+ -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ -+ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ -+ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ - -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -@@ -2606,51 +2645,51 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ -- -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ -- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ -- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ -- -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ -- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ -- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ -- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ -- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ -- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ -- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ -- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ -- -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ -- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ -- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ -- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ -- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ -- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ -- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ -- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ -- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ -- -e 's/@''GNULIB_STRTOL''@/$(GNULIB_STRTOL)/g' \ -- -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ -- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ -- -e 's/@''GNULIB_STRTOUL''@/$(GNULIB_STRTOUL)/g' \ -- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ -- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ -- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ -- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ -- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ -- -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ -- -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ -- -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ -- -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ -- -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ -+ -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ -+ -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ -+ -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ -+ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ -+ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ -+ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ -+ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ -+ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ -+ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ -+ -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ -+ -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ -+ -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ -+ -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ -+ -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ -+ -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ -+ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ -+ -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ -+ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ -+ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ -+ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ -+ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ -+ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ -+ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ -+ -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ -+ -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ -+ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ -+ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ -+ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ -+ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ -+ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ -+ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ -+ -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ -+ -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ -+ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ -+ -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ -+ -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ -+ -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ -+ -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ -+ -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ -+ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ -+ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ -+ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -@@ -2711,6 +2750,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -+ -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -@@ -2779,49 +2819,49 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -- -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ -- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ -- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ -- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ -- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ -- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ -- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ -- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ -- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ -- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ -- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ -- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ -- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ -- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ -- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ -- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ -- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ -- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ -- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ -- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ -- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ -- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ -- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ -- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ -- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ -- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ -- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ -- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ -- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ -- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ -- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ -- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ -- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ -- -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ -- -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ -- -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ -- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ -- -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ -- -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ -+ -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ -+ -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ -+ -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ -+ -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ -+ -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ -+ -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ -+ -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ -+ -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ -+ -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ -+ -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ -+ -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ -+ -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ -+ -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ -+ -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ -+ -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ -+ -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ -+ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ -+ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ -+ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ -+ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ -+ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ -+ -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ -+ -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ -+ -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ -+ -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ -+ -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ -+ -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ -+ -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ -+ -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ -+ -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ -+ -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ -+ -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ -+ -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ -+ -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ -+ -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ -+ -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ -+ -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ -+ -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ -+ -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ -+ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ - -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -@@ -2893,7 +2933,7 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ - -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ -- -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ -+ -e 's/@''GNULIB_FLOCK''@/$(GL_GNULIB_FLOCK)/g' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_file.in.h; \ - } > $@-t && \ -@@ -2922,7 +2962,7 @@ sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ - -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ -- -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ -+ -e 's/@''GNULIB_GETRANDOM''@/$(GL_GNULIB_GETRANDOM)/g' \ - -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ - -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -@@ -2955,8 +2995,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ - -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ -- -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ -- -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ -+ -e 's/@''GNULIB_PSELECT''@/$(GL_GNULIB_PSELECT)/g' \ -+ -e 's/@''GNULIB_SELECT''@/$(GL_GNULIB_SELECT)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ - -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ -@@ -2990,22 +3030,22 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ - -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ -- -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ -- -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ -- -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ -- -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ -- -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ -- -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ -- -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ -- -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ -- -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ -- -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ -- -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ -- -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ -- -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ -- -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ -+ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ -+ -e 's/@''GNULIB_SOCKET''@/$(GL_GNULIB_SOCKET)/g' \ -+ -e 's/@''GNULIB_CONNECT''@/$(GL_GNULIB_CONNECT)/g' \ -+ -e 's/@''GNULIB_ACCEPT''@/$(GL_GNULIB_ACCEPT)/g' \ -+ -e 's/@''GNULIB_BIND''@/$(GL_GNULIB_BIND)/g' \ -+ -e 's/@''GNULIB_GETPEERNAME''@/$(GL_GNULIB_GETPEERNAME)/g' \ -+ -e 's/@''GNULIB_GETSOCKNAME''@/$(GL_GNULIB_GETSOCKNAME)/g' \ -+ -e 's/@''GNULIB_GETSOCKOPT''@/$(GL_GNULIB_GETSOCKOPT)/g' \ -+ -e 's/@''GNULIB_LISTEN''@/$(GL_GNULIB_LISTEN)/g' \ -+ -e 's/@''GNULIB_RECV''@/$(GL_GNULIB_RECV)/g' \ -+ -e 's/@''GNULIB_SEND''@/$(GL_GNULIB_SEND)/g' \ -+ -e 's/@''GNULIB_RECVFROM''@/$(GL_GNULIB_RECVFROM)/g' \ -+ -e 's/@''GNULIB_SENDTO''@/$(GL_GNULIB_SENDTO)/g' \ -+ -e 's/@''GNULIB_SETSOCKOPT''@/$(GL_GNULIB_SETSOCKOPT)/g' \ -+ -e 's/@''GNULIB_SHUTDOWN''@/$(GL_GNULIB_SHUTDOWN)/g' \ -+ -e 's/@''GNULIB_ACCEPT4''@/$(GL_GNULIB_ACCEPT4)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ -@@ -3042,25 +3082,25 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ - -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -- -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ -- -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ -- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ -- -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ -- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ -- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ -- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ -- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ -- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -- -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -- -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ -- -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ -- -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ -+ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -+ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -+ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ -+ -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ -+ -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ -+ -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ -+ -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ -+ -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ -+ -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ -+ -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ -+ -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ -+ -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ -+ -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ -+ -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ -+ -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -+ -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ -+ -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ -+ -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ -@@ -3114,7 +3154,7 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -+ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GL_GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ -@@ -3148,7 +3188,7 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ -- -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ -+ -e 's/@''GNULIB_TIMES''@/$(GL_GNULIB_TIMES)/g' \ - -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ - -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -@@ -3239,18 +3279,18 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -- -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ -- -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -- -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -- -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ -- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -- -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ -- -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -- -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ -+ -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ -+ -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ -+ -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ -+ -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ -+ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ -+ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ -+ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ -+ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ -+ -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ -+ -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ -+ -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ -+ -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -@@ -3360,89 +3400,89 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ -- -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ -- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ -- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ -- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ -- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ -- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ -- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ -- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ -- -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ -- -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ -- -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ -- -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ -- -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ -- -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ -- -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ -- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ -- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ -- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ -- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ -- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ -- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ -- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ -- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ -- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ -- -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ -- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ -- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ -- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ -- -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ -- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -- -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ -- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ -- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ -- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ -- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ -- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ -- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ -- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ -- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ -- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ -- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ -- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ -- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ -- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ -- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ -- -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ -- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ -- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ -- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ -- -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ -- -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ -- -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ -- -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ -- -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ -- -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ -- -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ -- -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ -- -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ -- -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ -- -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ -- -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ -- -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ -- -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ -- -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ -- -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ -- -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ -- -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ -- -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ -- -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ -- -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ -+ -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ -+ -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ -+ -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ -+ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ -+ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ -+ -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ -+ -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ -+ -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ -+ -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ -+ -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ -+ -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ -+ -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ -+ -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ -+ -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ -+ -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ -+ -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ -+ -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ -+ -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ -+ -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ -+ -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ -+ -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ -+ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ -+ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ -+ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ -+ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ -+ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ -+ -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ -+ -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ -+ -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ -+ -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ -+ -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ -+ -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ -+ -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ -+ -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ -+ -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ -+ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ -+ -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ -+ -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ -+ -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ -+ -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ -+ -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ -+ -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ -+ -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ -+ -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ -+ -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ -+ -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ -+ -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ -+ -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ -+ -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ -+ -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ -+ -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ -+ -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ -+ -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ -+ -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ -+ -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ -+ -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ -+ -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ -+ -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ -+ -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ -+ -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ -+ -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ -+ -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ -+ -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ -+ -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ -+ -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ -+ -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ -+ -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ -+ -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ -+ -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ -+ -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ -+ -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ -+ -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ -+ -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ -+ -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ -+ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ -+ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ -@@ -3617,49 +3657,49 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ - -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ - -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ -- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ -- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ -- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ -- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ -- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ -- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ -- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ -- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ -- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ -- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ -- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ -- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ -- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ -- -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ -- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ -- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ -- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ -- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ -- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ -- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ -- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ -- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ -- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ -- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ -- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ -- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ -- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ -- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ -- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ -- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ -- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ -- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ -- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ -- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ -- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ -- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ -- -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ -- -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -+ -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ -+ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ -+ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ -+ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ -+ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ -+ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ -+ -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ -+ -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ -+ -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ -+ -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ -+ -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ -+ -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ -+ -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ -+ -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ -+ -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ -+ -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ -+ -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ -+ -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ -+ -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ -+ -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ -+ -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ -+ -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ -+ -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ -+ -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ -+ -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ -+ -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ -+ -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ -+ -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ -+ -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ -+ -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ -+ -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ -+ -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ -+ -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ -+ -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ -+ -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ -+ -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ -+ -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ -+ -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ -+ -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ -+ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ -+ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ -+ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ - -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -@@ -3760,14 +3800,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ - -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ -- -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ -- -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ -- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ -- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ -- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -+ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ -+ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ -+ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ -+ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ -+ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ -+ -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ -+ -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ - -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ - -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ - -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ -diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h -index cb72f26..6fed3c7 100644 ---- a/lib/_Noreturn.h -+++ b/lib/_Noreturn.h -@@ -29,7 +29,7 @@ - # elif ((!defined __cplusplus || defined __clang__) \ - && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || (!defined __STRICT_ANSI__ \ -- && (__4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ -+ && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))))) -diff --git a/lib/accept.c b/lib/accept.c -index 4ec4f43..71457db 100644 ---- a/lib/accept.c -+++ b/lib/accept.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/accept4.c b/lib/accept4.c -index b444e22..4c2b80e 100644 ---- a/lib/accept4.c -+++ b/lib/accept4.c -@@ -1,18 +1,18 @@ - /* Accept a connection on a socket, with specific opening flags. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/alignof.h b/lib/alignof.h -index 6977c3e..e6e7a51 100644 ---- a/lib/alignof.h -+++ b/lib/alignof.h -@@ -1,18 +1,18 @@ - /* Determine alignment of types. - Copyright (C) 2003-2004, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ALIGNOF_H - #define _ALIGNOF_H -diff --git a/lib/alloca.c b/lib/alloca.c -index 91b9ec3..4880283 100644 ---- a/lib/alloca.c -+++ b/lib/alloca.c -@@ -1,5 +1,7 @@ - /* alloca.c -- allocate automatically reclaimed memory -- (Mostly) portable public-domain implementation -- D A Gwyn -+ This file is in the public domain. */ -+ -+/* (Mostly) portable implementation -- D A Gwyn - - This implementation of the PWB library alloca function, - which is used to allocate space off the run-time stack so -diff --git a/lib/alloca.in.h b/lib/alloca.in.h -index 9c7ccbb..65c2d4d 100644 ---- a/lib/alloca.in.h -+++ b/lib/alloca.in.h -@@ -3,20 +3,18 @@ - Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, - Inc. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public -- License along with this program; if not, see -- . -- */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H - means there is a real alloca function. */ -diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h -index 0ac83ab..9968067 100644 ---- a/lib/arpa_inet.in.h -+++ b/lib/arpa_inet.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_ARPA_INET_H - -diff --git a/lib/asnprintf.c b/lib/asnprintf.c -index 420440a..c5367b2 100644 ---- a/lib/asnprintf.c -+++ b/lib/asnprintf.c -@@ -1,18 +1,18 @@ - /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/assure.h b/lib/assure.h -index d95c0c9..49aa82f 100644 ---- a/lib/assure.h -+++ b/lib/assure.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2014-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/attribute.h b/lib/attribute.h -index 27a0fce..80a23f5 100644 ---- a/lib/attribute.h -+++ b/lib/attribute.h -@@ -2,15 +2,15 @@ - - Copyright 2020-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -@@ -32,7 +32,7 @@ - - - /* This file defines two types of attributes: -- * C2X standard attributes. These have macro names that do not begin with -+ * C2x standard attributes. These have macro names that do not begin with - 'ATTRIBUTE_'. - * Selected GCC attributes; see: - https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html -diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c -index 405edfa..5dbd157 100644 ---- a/lib/basename-lgpl.c -+++ b/lib/basename-lgpl.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h -index 222d21f..d520c09 100644 ---- a/lib/basename-lgpl.h -+++ b/lib/basename-lgpl.h -@@ -1,20 +1,20 @@ --/* Extract the last component (base name) of a file name. -+/* Extract the last component (base name) of a file name. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -- Inc. -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -+ Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU Lesser General Public License for more details. -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _BASENAME_LGPL_H - #define _BASENAME_LGPL_H -diff --git a/lib/binary-io.c b/lib/binary-io.c -index 83a820a..adc0ae2 100644 ---- a/lib/binary-io.c -+++ b/lib/binary-io.c -@@ -1,12 +1,12 @@ - /* Binary mode I/O. - Copyright 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/binary-io.h b/lib/binary-io.h -index 1dfbe5a..0fa8d54 100644 ---- a/lib/binary-io.h -+++ b/lib/binary-io.h -@@ -1,12 +1,12 @@ - /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/bind.c b/lib/bind.c -index 87fe0ed..0e47254 100644 ---- a/lib/bind.c -+++ b/lib/bind.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/btowc.c b/lib/btowc.c -index e800878..b8239af 100644 ---- a/lib/btowc.c -+++ b/lib/btowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h -index c176238..113f878 100644 ---- a/lib/byteswap.in.h -+++ b/lib/byteswap.in.h -@@ -2,12 +2,12 @@ - Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - Written by Oskar Liljeblad , 2005. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/c-ctype.c b/lib/c-ctype.c -index 5d9d4d8..300f97c 100644 ---- a/lib/c-ctype.c -+++ b/lib/c-ctype.c -@@ -1,3 +1,21 @@ -+/* Character handling in C locale. -+ -+ Copyright (C) 2003-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define C_CTYPE_INLINE _GL_EXTERN_INLINE - #include "c-ctype.h" -diff --git a/lib/c-ctype.h b/lib/c-ctype.h -index e8403db..3a652ac 100644 ---- a/lib/c-ctype.h -+++ b/lib/c-ctype.h -@@ -7,18 +7,18 @@ - - Copyright (C) 2000-2003, 2006, 2008-2021 Free Software Foundation, Inc. - --This program is free software; you can redistribute it and/or modify --it under the terms of the GNU Lesser General Public License as published by --the Free Software Foundation; either version 2 of the License, or --(at your option) any later version. -- --This program is distributed in the hope that it will be useful, --but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --GNU Lesser General Public License for more details. -- --You should have received a copy of the GNU Lesser General Public License --along with this program; if not, see . */ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef C_CTYPE_H - #define C_CTYPE_H -diff --git a/lib/c-strcase.h b/lib/c-strcase.h -index 8240dbc..82f99bb 100644 ---- a/lib/c-strcase.h -+++ b/lib/c-strcase.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef C_STRCASE_H - #define C_STRCASE_H -diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c -index 805dc99..3c22455 100644 ---- a/lib/c-strcasecmp.c -+++ b/lib/c-strcasecmp.c -@@ -1,18 +1,18 @@ - /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h -index ed979aa..66b9cf3 100644 ---- a/lib/c-strcaseeq.h -+++ b/lib/c-strcaseeq.h -@@ -1,15 +1,15 @@ - /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c -index c3203fd..f3ca786 100644 ---- a/lib/c-strncasecmp.c -+++ b/lib/c-strncasecmp.c -@@ -1,18 +1,18 @@ - /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c -index c6fef17..92e9639 100644 ---- a/lib/canonicalize-lgpl.c -+++ b/lib/canonicalize-lgpl.c -@@ -74,7 +74,6 @@ - # define __pathconf pathconf - # define __rawmemchr rawmemchr - # define __readlink readlink --# define __stat stat - # if IN_RELOCWRAPPER - /* When building the relocatable program wrapper, use the system's memmove - function, not the gnulib override, otherwise we would get a link error. -@@ -105,7 +104,7 @@ file_accessible (char const *file) - return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; - # else - struct stat st; -- return __stat (file, &st) == 0 || errno == EOVERFLOW; -+ return stat (file, &st) == 0 || errno == EOVERFLOW; - # endif - } - -diff --git a/lib/cdefs.h b/lib/cdefs.h -index 90f9741..4dac9d2 100644 ---- a/lib/cdefs.h -+++ b/lib/cdefs.h -@@ -259,9 +259,7 @@ - # define __attribute_const__ /* Ignore */ - #endif - --#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ --# define __attribute_maybe_unused__ [[__maybe_unused__]] --#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) -+#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) - # define __attribute_maybe_unused__ __attribute__ ((__unused__)) - #else - # define __attribute_maybe_unused__ /* Ignore */ -@@ -320,7 +318,9 @@ - #endif - - /* The nonnull function attribute marks pointer parameters that -- must not be NULL. */ -+ must not be NULL. This has the name __nonnull in glibc, -+ and __attribute_nonnull__ in files shared with Gnulib to avoid -+ collision with a different __nonnull in DragonFlyBSD 5.9. */ - #ifndef __attribute_nonnull__ - # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) - # define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -@@ -332,6 +332,16 @@ - # define __nonnull(params) __attribute_nonnull__ (params) - #endif - -+/* The returns_nonnull function attribute marks the return type of the function -+ as always being non-null. */ -+#ifndef __returns_nonnull -+# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__) -+# define __returns_nonnull __attribute__ ((__returns_nonnull__)) -+# else -+# define __returns_nonnull -+# endif -+#endif -+ - /* If fortification mode, we warn about unused results of certain - function calls which can lead to problems. */ - #if __GNUC_PREREQ (3,4) || __glibc_has_attribute (__warn_unused_result__) -@@ -485,9 +495,9 @@ - [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] - #endif - --/* The #ifndef lets Gnulib avoid including these on non-glibc -- platforms, where the includes typically do not exist. */ --#ifndef __WORDSIZE -+/* Gnulib avoids including these, as they don't work on non-glibc or -+ older glibc platforms. */ -+#ifndef __GNULIB_CDEFS - # include - # include - #endif -@@ -594,9 +604,26 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf - array according to access mode, or at least one element when - size-index is not provided: - access (access-mode, [, ]) */ --#define __attr_access(x) __attribute__ ((__access__ x)) -+# define __attr_access(x) __attribute__ ((__access__ x)) -+# if __GNUC_PREREQ (11, 0) -+# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) -+# else -+# define __attr_access_none(argno) -+# endif - #else - # define __attr_access(x) -+# define __attr_access_none(argno) -+#endif -+ -+#if __GNUC_PREREQ (11, 0) -+/* Designates dealloc as a function to call to deallocate objects -+ allocated by the declared function. */ -+# define __attr_dealloc(dealloc, argno) \ -+ __attribute__ ((__malloc__ (dealloc, argno))) -+# define __attr_dealloc_free __attr_dealloc (__builtin_free, 1) -+#else -+# define __attr_dealloc(dealloc, argno) -+# define __attr_dealloc_free - #endif - - /* Specify that a function such as setjmp or vfork may return -diff --git a/lib/ceil.c b/lib/ceil.c -index 06e7e5e..fce05d9 100644 ---- a/lib/ceil.c -+++ b/lib/ceil.c -@@ -1,12 +1,12 @@ - /* Round towards positive infinity. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/cloexec.c b/lib/cloexec.c -index 1f58b72..7defa93 100644 ---- a/lib/cloexec.c -+++ b/lib/cloexec.c -@@ -2,20 +2,20 @@ - - Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . -+ along with this program. If not, see . */ - -- The code is taken from glibc/manual/llio.texi */ -+/* The code is taken from glibc/manual/llio.texi */ - - #include - -diff --git a/lib/cloexec.h b/lib/cloexec.h -index 7a71ad4..97a3659 100644 ---- a/lib/cloexec.h -+++ b/lib/cloexec.h -@@ -2,20 +2,18 @@ - - Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . -- --*/ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/close.c b/lib/close.c -index 11e31db..5b9ab6c 100644 ---- a/lib/close.c -+++ b/lib/close.c -@@ -1,12 +1,12 @@ - /* close replacement. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/connect.c b/lib/connect.c -index fe0de7e..b2b2e93 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/copysign.c b/lib/copysign.c -index ad5b102..fee131b 100644 ---- a/lib/copysign.c -+++ b/lib/copysign.c -@@ -1,12 +1,12 @@ - /* Copy sign into another 'double' number. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dirent.in.h b/lib/dirent.in.h -index a285bde..5775edf 100644 ---- a/lib/dirent.in.h -+++ b/lib/dirent.in.h -@@ -1,12 +1,12 @@ - /* A GNU-like . - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -74,6 +74,30 @@ typedef struct gl_directory DIR; - - /* Declare overridden functions. */ - -+#if @GNULIB_CLOSEDIR@ -+# if @REPLACE_CLOSEDIR@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef closedir -+# define closedir rpl_closedir -+# define GNULIB_defined_closedir 1 -+# endif -+_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); -+_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); -+# else -+# if !@HAVE_CLOSEDIR@ -+_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); -+# endif -+_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); -+# endif -+_GL_CXXALIASWARN (closedir); -+#elif defined GNULIB_POSIXCHECK -+# undef closedir -+# if HAVE_RAW_DECL_CLOSEDIR -+_GL_WARN_ON_USE (closedir, "closedir is not portable - " -+ "use gnulib module closedir for portability"); -+# endif -+#endif -+ - #if @GNULIB_OPENDIR@ - # if @REPLACE_OPENDIR@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -81,20 +105,36 @@ typedef struct gl_directory DIR; - # define opendir rpl_opendir - # define GNULIB_defined_opendir 1 - # endif --_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); - # else --# if !@HAVE_OPENDIR@ --_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); -+# if !@HAVE_OPENDIR@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - # endif - _GL_CXXALIAS_SYS (opendir, DIR *, (const char *dir_name)); - # endif - _GL_CXXALIASWARN (opendir); --#elif defined GNULIB_POSIXCHECK --# undef opendir --# if HAVE_RAW_DECL_OPENDIR -+#else -+# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined opendir -+/* For -Wmismatched-dealloc: Associate opendir with closedir or -+ rpl_closedir. */ -+_GL_FUNCDECL_SYS (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef opendir -+# if HAVE_RAW_DECL_OPENDIR - _GL_WARN_ON_USE (opendir, "opendir is not portable - " - "use gnulib module opendir for portability"); -+# endif - # endif - #endif - -@@ -126,30 +166,6 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " - # endif - #endif - --#if @GNULIB_CLOSEDIR@ --# if @REPLACE_CLOSEDIR@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef closedir --# define closedir rpl_closedir --# define GNULIB_defined_closedir 1 --# endif --_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); --# else --# if !@HAVE_CLOSEDIR@ --_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); --# endif --_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); --# endif --_GL_CXXALIASWARN (closedir); --#elif defined GNULIB_POSIXCHECK --# undef closedir --# if HAVE_RAW_DECL_CLOSEDIR --_GL_WARN_ON_USE (closedir, "closedir is not portable - " -- "use gnulib module closedir for portability"); --# endif --#endif -- - #if @GNULIB_DIRFD@ - /* Return the file descriptor associated with the given directory stream, - or -1 if none exists. */ -@@ -200,20 +216,33 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " - # undef fdopendir - # define fdopendir rpl_fdopendir - # endif --_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd)); -+_GL_FUNCDECL_RPL (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); - # else --# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ --_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd)); -+# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - # endif - _GL_CXXALIAS_SYS (fdopendir, DIR *, (int fd)); - # endif - _GL_CXXALIASWARN (fdopendir); --#elif defined GNULIB_POSIXCHECK --# undef fdopendir --# if HAVE_RAW_DECL_FDOPENDIR -+#else -+# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined fdopendir -+/* For -Wmismatched-dealloc: Associate fdopendir with closedir or -+ rpl_closedir. */ -+_GL_FUNCDECL_SYS (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fdopendir -+# if HAVE_RAW_DECL_FDOPENDIR - _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " - "use gnulib module fdopendir for portability"); -+# endif - # endif - #endif - -diff --git a/lib/dirfd.c b/lib/dirfd.c -index 7da640f..640cb4f 100644 ---- a/lib/dirfd.c -+++ b/lib/dirfd.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2001, 2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c -index 9cc5db7..95f9c99 100644 ---- a/lib/dirname-lgpl.c -+++ b/lib/dirname-lgpl.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dirname.h b/lib/dirname.h -index dce1859..25abc7b 100644 ---- a/lib/dirname.h -+++ b/lib/dirname.h -@@ -1,26 +1,26 @@ --/* Take file names apart into directory and base names. -+/* Take file names apart into directory and base names. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -- Inc. -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -+ Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU Lesser General Public License for more details. -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef DIRNAME_H_ - # define DIRNAME_H_ 1 - - # include --# include -+# include - # include "filename.h" - # include "basename-lgpl.h" - -@@ -33,11 +33,16 @@ extern "C" { - #endif - - # if GNULIB_DIRNAME --char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; --char *dir_name (char const *file); -+char *base_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE -+ _GL_ATTRIBUTE_RETURNS_NONNULL; -+char *dir_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE -+ _GL_ATTRIBUTE_RETURNS_NONNULL; - # endif - --char *mdir_name (char const *file); -+char *mdir_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; - - bool strip_trailing_slashes (char *file); -diff --git a/lib/dup2.c b/lib/dup2.c -index 653ef89..53e5552 100644 ---- a/lib/dup2.c -+++ b/lib/dup2.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/duplocale.c b/lib/duplocale.c -index 430634d..bc8740d 100644 ---- a/lib/duplocale.c -+++ b/lib/duplocale.c -@@ -1,12 +1,12 @@ - /* Duplicate a locale object. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dynarray.h b/lib/dynarray.h -index 5db6ed9..ec64273 100644 ---- a/lib/dynarray.h -+++ b/lib/dynarray.h -@@ -1,12 +1,12 @@ - /* Type-safe arrays which grow dynamically. - Copyright 2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * - - #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX - --# include -+# ifndef _GL_LIKELY -+/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -+# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -+# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -+# endif - - /* Define auxiliary structs and declare auxiliary functions, common to all - instantiations of dynarray. */ --# include -+# include - - /* Define the instantiation, specified through - DYNARRAY_STRUCT - DYNARRAY_ELEMENT - DYNARRAY_PREFIX - etc. */ --# include -+# include - - #else - -diff --git a/lib/errno.in.h b/lib/errno.in.h -index 0ae2ace..3cad9e2 100644 ---- a/lib/errno.in.h -+++ b/lib/errno.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_ERRNO_H - -diff --git a/lib/fcntl.c b/lib/fcntl.c -index e6c4b8e..c744eb9 100644 ---- a/lib/fcntl.c -+++ b/lib/fcntl.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h -index 7254a56..26dedc3 100644 ---- a/lib/fcntl.in.h -+++ b/lib/fcntl.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fd-hook.c b/lib/fd-hook.c -index f8e2781..75b1626 100644 ---- a/lib/fd-hook.c -+++ b/lib/fd-hook.c -@@ -2,15 +2,15 @@ - Copyright (C) 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2009. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/fd-hook.h b/lib/fd-hook.h -index 0005db7..98e2a52 100644 ---- a/lib/fd-hook.h -+++ b/lib/fd-hook.h -@@ -1,15 +1,15 @@ - /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/float+.h b/lib/float+.h -index d814bf1..ad891f6 100644 ---- a/lib/float+.h -+++ b/lib/float+.h -@@ -2,18 +2,18 @@ - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2007. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _FLOATPLUS_H - #define _FLOATPLUS_H -diff --git a/lib/float.c b/lib/float.c -index 5c16d61..dd1e84a 100644 ---- a/lib/float.c -+++ b/lib/float.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/float.in.h b/lib/float.in.h -index 1179df5..f52aba3 100644 ---- a/lib/float.in.h -+++ b/lib/float.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/floor.c b/lib/floor.c -index 9f13d16..1530300 100644 ---- a/lib/floor.c -+++ b/lib/floor.c -@@ -1,12 +1,12 @@ - /* Round towards negative infinity. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/free.c b/lib/free.c -index b221241..780f03d 100644 ---- a/lib/free.c -+++ b/lib/free.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/frexp.c b/lib/frexp.c -index 55340b8..ab5f343 100644 ---- a/lib/frexp.c -+++ b/lib/frexp.c -@@ -1,12 +1,12 @@ - /* Split a double into fraction and mantissa. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fstat.c b/lib/fstat.c -index 30440d6..512c688 100644 ---- a/lib/fstat.c -+++ b/lib/fstat.c -@@ -1,12 +1,12 @@ - /* fstat() replacement. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fsync.c b/lib/fsync.c -index 71fcdde..99a932d 100644 ---- a/lib/fsync.c -+++ b/lib/fsync.c -@@ -9,15 +9,15 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This library is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/full-read.c b/lib/full-read.c -index 32ff1a5..53be659 100644 ---- a/lib/full-read.c -+++ b/lib/full-read.c -@@ -1,12 +1,12 @@ - /* An interface to read that retries after partial reads and interrupts. - Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/full-read.h b/lib/full-read.h -index 450d645..b36f2e1 100644 ---- a/lib/full-read.h -+++ b/lib/full-read.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/full-write.c b/lib/full-write.c -index acbfc31..614ca0b 100644 ---- a/lib/full-write.c -+++ b/lib/full-write.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1993-1994, 1997-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/full-write.h b/lib/full-write.h -index 1220d05..c316224 100644 ---- a/lib/full-write.h -+++ b/lib/full-write.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c -index 907e8e6..4874ef5 100644 ---- a/lib/gai_strerror.c -+++ b/lib/gai_strerror.c -@@ -3,18 +3,18 @@ - This file is part of the GNU C Library. - Contributed by Philip Blundell , 1997. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c -index 05fc59e..0c42d1b 100644 ---- a/lib/getaddrinfo.c -+++ b/lib/getaddrinfo.c -@@ -2,18 +2,18 @@ - Copyright (C) 1997, 2001-2002, 2004-2021 Free Software Foundation, Inc. - Contributed by Simon Josefsson . - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc - optimizes away the sa == NULL test below. */ -diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c -index 918db9d..5006c2d 100644 ---- a/lib/getdtablesize.c -+++ b/lib/getdtablesize.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getlogin.c b/lib/getlogin.c -index 4a70994..7b78c67 100644 ---- a/lib/getlogin.c -+++ b/lib/getlogin.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getpeername.c b/lib/getpeername.c -index 5d9cf79..468bb3d 100644 ---- a/lib/getpeername.c -+++ b/lib/getpeername.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getrandom.c b/lib/getrandom.c -index b467caa..a186c4d 100644 ---- a/lib/getrandom.c -+++ b/lib/getrandom.c -@@ -2,12 +2,12 @@ - - Copyright 2020-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -178,7 +178,11 @@ getrandom (void *buffer, size_t length, unsigned int flags) - + (flags & GRND_NONBLOCK ? O_NONBLOCK : 0)); - fd = open (randdevice[devrandom], oflags); - if (fd < 0) -- return fd; -+ { -+ if (errno == ENOENT || errno == ENOTDIR) -+ errno = ENOSYS; -+ return -1; -+ } - randfd[devrandom] = fd; - } - -diff --git a/lib/getsockname.c b/lib/getsockname.c -index 83c1b7d..d1f17b3 100644 ---- a/lib/getsockname.c -+++ b/lib/getsockname.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getsockopt.c b/lib/getsockopt.c -index cec4933..b92d034 100644 ---- a/lib/getsockopt.c -+++ b/lib/getsockopt.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/gettext.h b/lib/gettext.h -index dd05cda..f1c7a24 100644 ---- a/lib/gettext.h -+++ b/lib/gettext.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBGETTEXT_H - #define _LIBGETTEXT_H 1 -diff --git a/lib/hard-locale.c b/lib/hard-locale.c -index ab3610d..8b6802d 100644 ---- a/lib/hard-locale.c -+++ b/lib/hard-locale.c -@@ -3,12 +3,12 @@ - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/hard-locale.h b/lib/hard-locale.h -index c4449f9..eba6601 100644 ---- a/lib/hard-locale.h -+++ b/lib/hard-locale.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1999, 2003-2004, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/iconv.c b/lib/iconv.c -index f3480aa..bf51493 100644 ---- a/lib/iconv.c -+++ b/lib/iconv.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconv.in.h b/lib/iconv.in.h -index 0fc0fa7..3a2f94e 100644 ---- a/lib/iconv.in.h -+++ b/lib/iconv.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_ICONV_H - -diff --git a/lib/iconv_close.c b/lib/iconv_close.c -index bc40fec..7429b92 100644 ---- a/lib/iconv_close.c -+++ b/lib/iconv_close.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconv_open-aix.gperf b/lib/iconv_open-aix.gperf -index 20ce70a..d073759 100644 ---- a/lib/iconv_open-aix.gperf -+++ b/lib/iconv_open-aix.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-hpux.gperf b/lib/iconv_open-hpux.gperf -index 921c722..f4664d6 100644 ---- a/lib/iconv_open-hpux.gperf -+++ b/lib/iconv_open-hpux.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[9 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-irix.gperf b/lib/iconv_open-irix.gperf -index 6241de6..9885d92 100644 ---- a/lib/iconv_open-irix.gperf -+++ b/lib/iconv_open-irix.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-osf.gperf b/lib/iconv_open-osf.gperf -index 97d570c..d818d79 100644 ---- a/lib/iconv_open-osf.gperf -+++ b/lib/iconv_open-osf.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-solaris.gperf b/lib/iconv_open-solaris.gperf -index 0283aba..648dd3a 100644 ---- a/lib/iconv_open-solaris.gperf -+++ b/lib/iconv_open-solaris.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-zos.gperf b/lib/iconv_open-zos.gperf -index faf5d65..1c3552e 100644 ---- a/lib/iconv_open-zos.gperf -+++ b/lib/iconv_open-zos.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open.c b/lib/iconv_open.c -index 304592e..e573556 100644 ---- a/lib/iconv_open.c -+++ b/lib/iconv_open.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconveh.h b/lib/iconveh.h -index b2be8fa..cbf692e 100644 ---- a/lib/iconveh.h -+++ b/lib/iconveh.h -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c -index 5b9ea11..409e88c 100644 ---- a/lib/inet_ntop.c -+++ b/lib/inet_ntop.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* - * Copyright (c) 1996-1999 by Internet Software Consortium. -diff --git a/lib/inet_pton.c b/lib/inet_pton.c -index 57dc7dc..14e8b0a 100644 ---- a/lib/inet_pton.c -+++ b/lib/inet_pton.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h -index fe0af82..41cb422 100644 ---- a/lib/inttypes.in.h -+++ b/lib/inttypes.in.h -@@ -2,12 +2,12 @@ - Written by Paul Eggert, Bruno Haible, Derek Price. - This file is part of gnulib. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isfinite.c b/lib/isfinite.c -index cfd2d33..f1373b9 100644 ---- a/lib/isfinite.c -+++ b/lib/isfinite.c -@@ -1,18 +1,18 @@ - /* Test for finite value (zero, subnormal, or normal, and not infinite or NaN). - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2007. */ - -diff --git a/lib/isinf.c b/lib/isinf.c -index 6d4dfc0..62becf2 100644 ---- a/lib/isinf.c -+++ b/lib/isinf.c -@@ -1,18 +1,18 @@ - /* Test for positive or negative infinity. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2008. */ - -diff --git a/lib/isnan.c b/lib/isnan.c -index 2282269..ed3452f 100644 ---- a/lib/isnan.c -+++ b/lib/isnan.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h -index fbed474..df64f4e 100644 ---- a/lib/isnand-nolibm.h -+++ b/lib/isnand-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnand.c b/lib/isnand.c -index f359130..7c5df90 100644 ---- a/lib/isnand.c -+++ b/lib/isnand.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h -index ba609d5..bd85811 100644 ---- a/lib/isnanf-nolibm.h -+++ b/lib/isnanf-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanf.c b/lib/isnanf.c -index 94a32e5..3b60340 100644 ---- a/lib/isnanf.c -+++ b/lib/isnanf.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h -index 797c06b..41fe156 100644 ---- a/lib/isnanl-nolibm.h -+++ b/lib/isnanl-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanl.c b/lib/isnanl.c -index b459560..e8dedf0 100644 ---- a/lib/isnanl.c -+++ b/lib/isnanl.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/itold.c b/lib/itold.c -index f52216a..7984866 100644 ---- a/lib/itold.c -+++ b/lib/itold.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h -index e8ac12c..4873899 100644 ---- a/lib/langinfo.in.h -+++ b/lib/langinfo.in.h -@@ -1,18 +1,18 @@ - /* Substitute for and wrapper around . - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* - * POSIX for platforms that lack it or have an incomplete one. -diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c -index 98c6e9d..88a0bd3 100644 ---- a/lib/lc-charset-dispatch.c -+++ b/lib/lc-charset-dispatch.c -@@ -1,12 +1,12 @@ - /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h -index d9d1ac1..59b485d 100644 ---- a/lib/lc-charset-dispatch.h -+++ b/lib/lc-charset-dispatch.h -@@ -1,12 +1,12 @@ - /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/libc-config.h b/lib/libc-config.h -index f14013f..886c11f 100644 ---- a/lib/libc-config.h -+++ b/lib/libc-config.h -@@ -28,7 +28,10 @@ - - When compiled as part of glibc this is a no-op; when compiled as - part of Gnulib this includes Gnulib's and defines macros -- that glibc library code would normally assume. */ -+ that glibc library code would normally assume. -+ -+ Note: This header file MUST NOT be included by public header files -+ of Gnulib. */ - - #include - -@@ -71,7 +74,7 @@ - # endif - #endif - --#ifndef __attribute_maybe_unused__ -+#ifndef __attribute_nonnull__ - /* either does not exist, or is too old for Gnulib. - Prepare to include , which is Gnulib's version of a - more-recent glibc . */ -@@ -80,13 +83,9 @@ - # ifndef _FEATURES_H - # define _FEATURES_H 1 - # endif --/* Define __WORDSIZE so that does not attempt to include -- nonexistent files. Make it a syntax error, since Gnulib does not -- use __WORDSIZE now, and if Gnulib uses it later the syntax error -- will let us know that __WORDSIZE needs configuring. */ --# ifndef __WORDSIZE --# define __WORDSIZE %%% --# endif -+/* Define __GNULIB_CDEFS so that does not attempt to include -+ nonexistent files. */ -+# define __GNULIB_CDEFS - /* Undef the macros unconditionally defined by our copy of glibc - , so that they do not clash with any system-defined - versions. */ -@@ -118,6 +117,9 @@ - # undef __THROW - # undef __THROWNL - # undef __attr_access -+# undef __attr_access_none -+# undef __attr_dealloc -+# undef __attr_dealloc_free - # undef __attribute__ - # undef __attribute_alloc_size__ - # undef __attribute_artificial__ -diff --git a/lib/libunistring.valgrind b/lib/libunistring.valgrind -index 712c39a..9eee19a 100644 ---- a/lib/libunistring.valgrind -+++ b/lib/libunistring.valgrind -@@ -2,18 +2,26 @@ - - # Copyright (C) 2010-2021 Free Software Foundation, Inc. - # --# This program is free software: you can redistribute it and/or modify it --# under the terms of the GNU Lesser General Public License as published --# by the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. -+# This file is free software. -+# It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". -+# You can redistribute it and/or modify it under either -+# - the terms of the GNU Lesser General Public License as published -+# by the Free Software Foundation; either version 3, or (at your -+# option) any later version, or -+# - the terms of the GNU General Public License as published by the -+# Free Software Foundation; either version 2, or (at your option) -+# any later version, or -+# - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". - # - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Lesser General Public License for more details. -+# Lesser General Public License and the GNU General Public License -+# for more details. - # --# You should have received a copy of the GNU Lesser General Public License --# along with this program. If not, see . -+# You should have received a copy of the GNU Lesser General Public -+# License and of the GNU General Public License along with this -+# program. If not, see . - - # Suppress a valgrind message about use of uninitialized memory in freea(). - # This use is OK because it provides only a speedup. -diff --git a/lib/limits.in.h b/lib/limits.in.h -index 4675ba4..2ecafeb 100644 ---- a/lib/limits.in.h -+++ b/lib/limits.in.h -@@ -2,18 +2,18 @@ - - Copyright 2016-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation; either version 2, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -99,10 +99,11 @@ - # endif - #endif - --/* Macros specified by ISO/IEC TS 18661-1:2014. */ -+/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014. */ - - #if (! defined ULLONG_WIDTH \ -- && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) -+ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ -+ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) - # define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) - # define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) - # define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) -@@ -114,7 +115,16 @@ - # define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) - # define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) - # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) --#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ -+#endif -+ -+/* Macros specified by C2x. */ -+ -+#if (! defined BOOL_WIDTH \ -+ && (defined _GNU_SOURCE \ -+ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) -+# define BOOL_MAX 1 -+# define BOOL_WIDTH 1 -+#endif - - #endif /* _ at GUARD_PREFIX@_LIMITS_H */ - #endif /* _ at GUARD_PREFIX@_LIMITS_H */ -diff --git a/lib/link.c b/lib/link.c -index 3ba897a..bd4bef9 100644 ---- a/lib/link.c -+++ b/lib/link.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/listen.c b/lib/listen.c -index ccf881c..a145f82 100644 ---- a/lib/listen.c -+++ b/lib/listen.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/localcharset.c b/lib/localcharset.c -index 87a5979..9c22050 100644 ---- a/lib/localcharset.c -+++ b/lib/localcharset.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2000-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Bruno Haible . */ - -diff --git a/lib/localcharset.h b/lib/localcharset.h -index c2c1c67..27c3ab6 100644 ---- a/lib/localcharset.h -+++ b/lib/localcharset.h -@@ -2,18 +2,18 @@ - Copyright (C) 2000-2003, 2009-2021 Free Software Foundation, Inc. - This file is part of the GNU CHARSET Library. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LOCALCHARSET_H - #define _LOCALCHARSET_H -diff --git a/lib/locale.in.h b/lib/locale.in.h -index 4eb3c80..1063070 100644 ---- a/lib/locale.in.h -+++ b/lib/locale.in.h -@@ -1,12 +1,12 @@ - /* A POSIX . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/localeconv.c b/lib/localeconv.c -index cdcaf86..25e95a1 100644 ---- a/lib/localeconv.c -+++ b/lib/localeconv.c -@@ -1,12 +1,12 @@ - /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/log.c b/lib/log.c -index 03e9ac9..3f142e8 100644 ---- a/lib/log.c -+++ b/lib/log.c -@@ -1,12 +1,12 @@ - /* Logarithm. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/log1p.c b/lib/log1p.c -index 0e51498..c45c6ff 100644 ---- a/lib/log1p.c -+++ b/lib/log1p.c -@@ -1,12 +1,12 @@ - /* Natural logarithm of 1 plus argument. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/lstat.c b/lib/lstat.c -index d414d3a..7de0bf1 100644 ---- a/lib/lstat.c -+++ b/lib/lstat.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1997-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/malloc.c b/lib/malloc.c -index 6bbb97d..0d8b359 100644 ---- a/lib/malloc.c -+++ b/lib/malloc.c -@@ -2,61 +2,50 @@ - - Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* written by Jim Meyering and Bruno Haible */ - - #define _GL_USE_STDLIB_ALLOC 1 - #include --/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ --#ifdef malloc --# define NEED_MALLOC_GNU 1 --# undef malloc --/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ --#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU --# define NEED_MALLOC_GNU 1 --#endif - - #include - --/* A function definition is only needed if NEED_MALLOC_GNU is defined above -- or if the module 'malloc-posix' requests it. */ --#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) -+#include - --# include -+#include "xalloc-oversized.h" - --/* Allocate an N-byte block of memory from the heap. -- If N is zero, allocate a 1-byte block. */ -+/* Allocate an N-byte block of memory from the heap, even if N is 0. */ - - void * - rpl_malloc (size_t n) - { -- void *result; -- --# if NEED_MALLOC_GNU - if (n == 0) - n = 1; --# endif - -- result = malloc (n); -+ if (xalloc_oversized (n, 1)) -+ { -+ errno = ENOMEM; -+ return NULL; -+ } -+ -+ void *result = malloc (n); - --# if !HAVE_MALLOC_POSIX -+#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; --# endif -+#endif - - return result; - } -- --#endif -diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c -index 4f840db..8dd6850 100644 ---- a/lib/malloc/dynarray_at_failure.c -+++ b/lib/malloc/dynarray_at_failure.c -@@ -18,11 +18,11 @@ - - #ifndef _LIBC - # include -+# include - #endif - - #include - #include --#include - - void - __libc_dynarray_at_failure (size_t size, size_t index) -@@ -32,6 +32,7 @@ __libc_dynarray_at_failure (size_t size, size_t index) - __snprintf (buf, sizeof (buf), "Fatal glibc error: " - "array index %zu not less than array length %zu\n", - index, size); -+ __libc_fatal (buf); - #else - abort (); - #endif -diff --git a/lib/malloca.c b/lib/malloca.c -index a546b30..b488423 100644 ---- a/lib/malloca.c -+++ b/lib/malloca.c -@@ -2,18 +2,18 @@ - Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2003, 2018. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #define _GL_USE_STDLIB_ALLOC 1 - #include -@@ -21,6 +21,8 @@ - /* Specification. */ - #include "malloca.h" - -+#include "idx.h" -+#include "intprops.h" - #include "verify.h" - - /* The speed critical point in this file is freea() applied to an alloca() -@@ -45,24 +47,30 @@ mmalloca (size_t n) - #if HAVE_ALLOCA - /* Allocate one more word, used to determine the address to pass to freea(), - and room for the alignment ? sa_alignment_max mod 2*sa_alignment_max. */ -- size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; -- -- if (nplus >= n) -+ uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; -+ int plus = sizeof (small_t) + alignment2_mask; -+ idx_t nplus; -+ if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) - { - char *mem = (char *) malloc (nplus); - - if (mem != NULL) - { -- char *p = -- (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) -- & ~(uintptr_t)(2 * sa_alignment_max - 1)) -- + sa_alignment_max); -+ uintptr_t umem = (uintptr_t)mem, umemplus; -+ /* The INT_ADD_WRAPV avoids signed integer overflow on -+ theoretical platforms where UINTPTR_MAX <= INT_MAX. */ -+ INT_ADD_WRAPV (umem, sizeof (small_t) + sa_alignment_max - 1, -+ &umemplus); -+ idx_t offset = ((umemplus & ~alignment2_mask) -+ + sa_alignment_max - umem); -+ void *vp = mem + offset; -+ small_t *p = vp; - /* Here p >= mem + sizeof (small_t), - and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 - hence p + n <= mem + nplus. - So, the memory range [p, p+n) lies in the allocated memory range - [mem, mem + nplus). */ -- ((small_t *) p)[-1] = p - mem; -+ p[-1] = offset; - /* p ? sa_alignment_max mod 2*sa_alignment_max. */ - return p; - } -diff --git a/lib/malloca.h b/lib/malloca.h -index 9cf7fbb..7eb63d2 100644 ---- a/lib/malloca.h -+++ b/lib/malloca.h -@@ -2,18 +2,18 @@ - Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _MALLOCA_H - #define _MALLOCA_H -@@ -51,6 +51,13 @@ extern "C" { - # define safe_alloca(N) ((void) (N), NULL) - #endif - -+/* Free a block of memory allocated through malloca(). */ -+#if HAVE_ALLOCA -+extern void freea (void *p); -+#else -+# define freea free -+#endif -+ - /* malloca(N) is a safe variant of alloca(N). It allocates N bytes of - memory allocated on the stack, that must be freed using freea() before - the function returns. Upon failure, it returns NULL. */ -@@ -65,21 +72,16 @@ extern "C" { - # define malloca(N) \ - mmalloca (N) - #endif --extern void * mmalloca (size_t n); -- --/* Free a block of memory allocated through malloca(). */ --#if HAVE_ALLOCA --extern void freea (void *p); --#else --# define freea free --#endif -+extern void *mmalloca (size_t n) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (freea, 1) -+ _GL_ATTRIBUTE_ALLOC_SIZE ((1)); - - /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). - It allocates an array of N objects, each with S bytes of memory, -- on the stack. S must be positive and N must be nonnegative. -- Either N or S should be of type ptrdiff_t or size_t or wider. -+ on the stack. N and S should be nonnegative and free of side effects. - The array must be freed using freea() before the function returns. */ --#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) -+#define nmalloca(n, s) \ -+ (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) - - - #ifdef __cplusplus -diff --git a/lib/math.c b/lib/math.c -index ba2a6ab..3ffd1d7 100644 ---- a/lib/math.c -+++ b/lib/math.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_MATH_INLINE _GL_EXTERN_INLINE - #include "math.h" - typedef int dummy; -diff --git a/lib/math.in.h b/lib/math.in.h -index d80047c..6a055fb 100644 ---- a/lib/math.in.h -+++ b/lib/math.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h -index ea5ef1f..330fb10 100644 ---- a/lib/mbrtowc-impl-utf8.h -+++ b/lib/mbrtowc-impl-utf8.h -@@ -1,12 +1,12 @@ - /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h -index f7e28fc..bc3e688 100644 ---- a/lib/mbrtowc-impl.h -+++ b/lib/mbrtowc-impl.h -@@ -1,12 +1,12 @@ - /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c -index 0db5104..8832f6e 100644 ---- a/lib/mbrtowc.c -+++ b/lib/mbrtowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbsinit.c b/lib/mbsinit.c -index 7ca8df7..f440155 100644 ---- a/lib/mbsinit.c -+++ b/lib/mbsinit.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h -index 01342af..30d715d 100644 ---- a/lib/mbtowc-impl.h -+++ b/lib/mbtowc-impl.h -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c -index ce74793..0f7ae6c 100644 ---- a/lib/mbtowc-lock.c -+++ b/lib/mbtowc-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h -index 0939517..d31b0b6 100644 ---- a/lib/mbtowc-lock.h -+++ b/lib/mbtowc-lock.h -@@ -1,12 +1,12 @@ - /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc.c b/lib/mbtowc.c -index 2711194..47b431a 100644 ---- a/lib/mbtowc.c -+++ b/lib/mbtowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/memchr.c b/lib/memchr.c -index d8feb19..56fd59d 100644 ---- a/lib/memchr.c -+++ b/lib/memchr.c -@@ -7,21 +7,21 @@ - adaptation to memchr suggested by Dick Karpinski (dick at cca.ucsf.edu), - and implemented by Roland McGrath (roland at ai.mit.edu). - --NOTE: The canonical source of this file is maintained with the GNU C Library. --Bugs can be reported to bug-glibc at prep.ai.mit.edu. -+ NOTE: The canonical source of this file is maintained with the GNU C Library. -+ Bugs can be reported to bug-glibc at prep.ai.mit.edu. - --This program is free software: you can redistribute it and/or modify it --under the terms of the GNU Lesser General Public License as published by the --Free Software Foundation; either version 3 of the License, or any --later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - --This program is distributed in the hope that it will be useful, --but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --GNU Lesser General Public License for more details. -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - --You should have received a copy of the GNU Lesser General Public License --along with this program. If not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind -index 034d1ee..4f16481 100644 ---- a/lib/memchr.valgrind -+++ b/lib/memchr.valgrind -@@ -2,12 +2,12 @@ - - # Copyright (C) 2009-2021 Free Software Foundation, Inc. - # --# This program is free software: you can redistribute it and/or modify --# it under the terms of the GNU Lesser General Public License as published by --# the Free Software Foundation; either version 3 of the License, or --# (at your option) any later version. -+# This file is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2.1 of the -+# License, or (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, -+# This file is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU Lesser General Public License for more details. -diff --git a/lib/mempcpy.c b/lib/mempcpy.c -index c80e119..cacacdb 100644 ---- a/lib/mempcpy.c -+++ b/lib/mempcpy.c -@@ -1,18 +1,18 @@ - /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/minmax.h b/lib/minmax.h -index 7d0b672..a03361b 100644 ---- a/lib/minmax.h -+++ b/lib/minmax.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _MINMAX_H - #define _MINMAX_H -diff --git a/lib/mkdir.c b/lib/mkdir.c -index 453e428..2766cc7 100644 ---- a/lib/mkdir.c -+++ b/lib/mkdir.c -@@ -3,12 +3,12 @@ - - Copyright (C) 2001, 2003, 2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mkostemp.c b/lib/mkostemp.c -index cfab635..285f1ba 100644 ---- a/lib/mkostemp.c -+++ b/lib/mkostemp.c -@@ -2,12 +2,12 @@ - Foundation, Inc. - This file is derived from the one in the GNU C Library. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c -index de6ebee..a23dac9 100644 ---- a/lib/msvc-inval.c -+++ b/lib/msvc-inval.c -@@ -1,18 +1,18 @@ - /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h -index 0d418e1..e115a35 100644 ---- a/lib/msvc-inval.h -+++ b/lib/msvc-inval.h -@@ -1,18 +1,18 @@ - /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _MSVC_INVAL_H - #define _MSVC_INVAL_H -diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c -index e72dabe..d3c1f54 100644 ---- a/lib/msvc-nothrow.c -+++ b/lib/msvc-nothrow.c -@@ -2,18 +2,18 @@ - with MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h -index a56cd4e..057b5dd 100644 ---- a/lib/msvc-nothrow.h -+++ b/lib/msvc-nothrow.h -@@ -2,18 +2,18 @@ - with MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _MSVC_NOTHROW_H - #define _MSVC_NOTHROW_H -diff --git a/lib/netdb.in.h b/lib/netdb.in.h -index 6bcaf1a..eb5c960 100644 ---- a/lib/netdb.in.h -+++ b/lib/netdb.in.h -@@ -2,18 +2,18 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* This file is supposed to be used on platforms that lack . - It is intended to provide definitions and prototypes needed by an -diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h -index 3c1cad6..21f3a64 100644 ---- a/lib/netinet_in.in.h -+++ b/lib/netinet_in.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_NETINET_IN_H - -diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c -index 915c38b..fcdf56d 100644 ---- a/lib/nl_langinfo-lock.c -+++ b/lib/nl_langinfo-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by nl_langinfo. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c -index e8f3cef..b481f20 100644 ---- a/lib/nl_langinfo.c -+++ b/lib/nl_langinfo.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/nproc.c b/lib/nproc.c -index fef1f8b..e3ddb92 100644 ---- a/lib/nproc.c -+++ b/lib/nproc.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Glen Lenker and Bruno Haible. */ - -diff --git a/lib/nproc.h b/lib/nproc.h -index cd3ed36..d7659a5 100644 ---- a/lib/nproc.h -+++ b/lib/nproc.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Glen Lenker and Bruno Haible. */ - -diff --git a/lib/nstrftime.c b/lib/nstrftime.c -index 7ef7529..7f258e8 100644 ---- a/lib/nstrftime.c -+++ b/lib/nstrftime.c -@@ -1,19 +1,18 @@ - /* Copyright (C) 1991-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- The GNU C Library is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifdef _LIBC - # define USE_IN_EXTENDED_LOCALE_MODEL 1 -diff --git a/lib/open.c b/lib/open.c -index 5dc117e..372cda8 100644 ---- a/lib/open.c -+++ b/lib/open.c -@@ -1,12 +1,12 @@ - /* Open a descriptor to a file. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/pathmax.h b/lib/pathmax.h -index 4af7802..716f4a9 100644 ---- a/lib/pathmax.h -+++ b/lib/pathmax.h -@@ -2,18 +2,18 @@ - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _PATHMAX_H - # define _PATHMAX_H -diff --git a/lib/pipe.c b/lib/pipe.c -index 3316ceb..fc978f2 100644 ---- a/lib/pipe.c -+++ b/lib/pipe.c -@@ -1,18 +1,18 @@ - /* Create a pipe. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/pipe2.c b/lib/pipe2.c -index 25bce6f..9ba8c3b 100644 ---- a/lib/pipe2.c -+++ b/lib/pipe2.c -@@ -1,18 +1,18 @@ - /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/poll.c b/lib/poll.c -index d787676..8d5ba96 100644 ---- a/lib/poll.c -+++ b/lib/poll.c -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Tell gcc not to warn about the (nfd < 0) tests, below. */ - #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ -diff --git a/lib/poll.in.h b/lib/poll.in.h -index 1fe8370..e94cd31 100644 ---- a/lib/poll.in.h -+++ b/lib/poll.in.h -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_POLL_H - -diff --git a/lib/printf-args.c b/lib/printf-args.c -index 22e44ef..b822682 100644 ---- a/lib/printf-args.c -+++ b/lib/printf-args.c -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. -diff --git a/lib/printf-args.h b/lib/printf-args.h -index d15b12d..c8d9174 100644 ---- a/lib/printf-args.h -+++ b/lib/printf-args.h -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _PRINTF_ARGS_H - #define _PRINTF_ARGS_H -diff --git a/lib/printf-parse.c b/lib/printf-parse.c -index 9f97995..f21cc17 100644 ---- a/lib/printf-parse.c -+++ b/lib/printf-parse.c -@@ -1,18 +1,18 @@ - /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - CHAR_T The element type of the format string. -@@ -48,16 +48,7 @@ - #include - - /* Get intmax_t. */ --#if defined IN_LIBINTL || defined IN_LIBASPRINTF --# if HAVE_STDINT_H_WITH_UINTMAX --# include --# endif --# if HAVE_INTTYPES_H_WITH_UINTMAX --# include --# endif --#else --# include --#endif -+#include - - /* malloc(), realloc(), free(). */ - #include -diff --git a/lib/printf-parse.h b/lib/printf-parse.h -index e05ac8f..77b7409 100644 ---- a/lib/printf-parse.h -+++ b/lib/printf-parse.h -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _PRINTF_PARSE_H - #define _PRINTF_PARSE_H -diff --git a/lib/putenv.c b/lib/putenv.c -index d342b81..435d10f 100644 ---- a/lib/putenv.c -+++ b/lib/putenv.c -@@ -4,12 +4,12 @@ - NOTE: The canonical source of this file is maintained with the GNU C - Library. Bugs can be reported to bug-glibc at prep.ai.mit.edu. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published by the -- Free Software Foundation; either version 3 of the License, or any -- later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/raise.c b/lib/raise.c -index eda9126..37c100d 100644 ---- a/lib/raise.c -+++ b/lib/raise.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c -index ef35689..896d435 100644 ---- a/lib/rawmemchr.c -+++ b/lib/rawmemchr.c -@@ -1,12 +1,12 @@ - /* Searching in a string. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind -index 90ed95e..d489c32 100644 ---- a/lib/rawmemchr.valgrind -+++ b/lib/rawmemchr.valgrind -@@ -2,12 +2,12 @@ - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # --# This program is free software: you can redistribute it and/or modify --# it under the terms of the GNU Lesser General Public License as published by --# the Free Software Foundation; either version 3 of the License, or --# (at your option) any later version. -+# This file is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2.1 of the -+# License, or (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, -+# This file is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU Lesser General Public License for more details. -diff --git a/lib/read.c b/lib/read.c -index 125e738..840d9ed 100644 ---- a/lib/read.c -+++ b/lib/read.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/readlink.c b/lib/readlink.c -index 38d9e0c..d4f4b08 100644 ---- a/lib/readlink.c -+++ b/lib/readlink.c -@@ -1,12 +1,12 @@ - /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/realloc.c b/lib/realloc.c -index 1145514..af03f0c 100644 ---- a/lib/realloc.c -+++ b/lib/realloc.c -@@ -3,12 +3,12 @@ - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -18,68 +18,46 @@ - - /* written by Jim Meyering and Bruno Haible */ - --#define _GL_USE_STDLIB_ALLOC 1 - #include - --/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ --#ifdef realloc --# define NEED_REALLOC_GNU 1 --/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ --#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU --# define NEED_REALLOC_GNU 1 --#endif -- --/* Infer the properties of the system's malloc function. -- The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ --#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU --# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 --#endif -- - #include - --/* A function definition is only needed if NEED_REALLOC_GNU is defined above -- or if the module 'realloc-posix' requests it. */ --#if NEED_REALLOC_GNU || (GNULIB_REALLOC_POSIX && !HAVE_REALLOC_POSIX) -+#include -+ -+#include "xalloc-oversized.h" - --# include -+/* Call the system's realloc below. This file does not define -+ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ -+#undef realloc - - /* Change the size of an allocated block of memory P to N bytes, -- with error checking. If N is zero, change it to 1. If P is NULL, -- use malloc. */ -+ with error checking. If P is NULL, use malloc. Otherwise if N is zero, -+ free P and return NULL. */ - - void * - rpl_realloc (void *p, size_t n) - { -- void *result; -+ if (p == NULL) -+ return malloc (n); - --# if NEED_REALLOC_GNU - if (n == 0) - { -- n = 1; -- -- /* In theory realloc might fail, so don't rely on it to free. */ - free (p); -- p = NULL; -+ return NULL; - } --# endif - -- if (p == NULL) -+ if (xalloc_oversized (n, 1)) - { --# if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE -- if (n == 0) -- n = 1; --# endif -- result = malloc (n); -+ errno = ENOMEM; -+ return NULL; - } -- else -- result = realloc (p, n); - --# if !HAVE_REALLOC_POSIX -+ void *result = realloc (p, n); -+ -+#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; --# endif -+#endif - - return result; - } -- --#endif -diff --git a/lib/recv.c b/lib/recv.c -index f2a342f..3eb2b4d 100644 ---- a/lib/recv.c -+++ b/lib/recv.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/recvfrom.c b/lib/recvfrom.c -index 8abda0c..25231ff 100644 ---- a/lib/recvfrom.c -+++ b/lib/recvfrom.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/regex_internal.c b/lib/regex_internal.c -index 55f6b66..aefcfa2 100644 ---- a/lib/regex_internal.c -+++ b/lib/regex_internal.c -@@ -1211,6 +1211,10 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) - - if (__glibc_unlikely (dest->nelem == 0)) - { -+ /* Although we already guaranteed above that dest->alloc != 0 and -+ therefore dest->elems != NULL, add a debug assertion to pacify -+ GCC 11.2.1's -fanalyzer. */ -+ DEBUG_ASSERT (dest->elems); - dest->nelem = src->nelem; - memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); - return REG_NOERROR; -@@ -1286,7 +1290,10 @@ re_node_set_insert (re_node_set *set, Idx elem) - - if (__glibc_unlikely (set->nelem) == 0) - { -- /* We already guaranteed above that set->alloc != 0. */ -+ /* Although we already guaranteed above that set->alloc != 0 and -+ therefore set->elems != NULL, add a debug assertion to pacify -+ GCC 11.2 -fanalyzer. */ -+ DEBUG_ASSERT (set->elems); - set->elems[0] = elem; - ++set->nelem; - return true; -diff --git a/lib/regexec.c b/lib/regexec.c -index 6309dea..5e4eb49 100644 ---- a/lib/regexec.c -+++ b/lib/regexec.c -@@ -1220,9 +1220,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, - { - re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; - re_node_set *edests = &dfa->edests[node]; -- bool ok = re_node_set_insert (eps_via_nodes, node); -- if (__glibc_unlikely (! ok)) -- return -2; -+ -+ if (! re_node_set_contains (eps_via_nodes, node)) -+ { -+ bool ok = re_node_set_insert (eps_via_nodes, node); -+ if (__glibc_unlikely (! ok)) -+ return -2; -+ } - - /* Pick a valid destination, or return -1 if none is found. */ - Idx dest_node = -1; -@@ -1414,7 +1418,7 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, - update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); - - if ((idx == pmatch[0].rm_eo && cur_node == mctx->last_node) -- || re_node_set_contains (&eps_via_nodes, cur_node)) -+ || (fs && re_node_set_contains (&eps_via_nodes, cur_node))) - { - Idx reg_idx; - cur_node = -1; -diff --git a/lib/rename.c b/lib/rename.c -index 4873025..a3b7dc6 100644 ---- a/lib/rename.c -+++ b/lib/rename.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/rmdir.c b/lib/rmdir.c -index a99fb1e..6295e41 100644 ---- a/lib/rmdir.c -+++ b/lib/rmdir.c -@@ -3,12 +3,12 @@ - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/round.c b/lib/round.c -index 47a3936..5525050 100644 ---- a/lib/round.c -+++ b/lib/round.c -@@ -1,18 +1,18 @@ - /* Round toward nearest, breaking ties away from zero. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2007. - Based heavily on code by Bruno Haible. */ -diff --git a/lib/safe-read.c b/lib/safe-read.c -index a4a1b08..e187b12 100644 ---- a/lib/safe-read.c -+++ b/lib/safe-read.c -@@ -3,12 +3,12 @@ - Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/safe-read.h b/lib/safe-read.h -index 5050124..111aff5 100644 ---- a/lib/safe-read.h -+++ b/lib/safe-read.h -@@ -1,12 +1,12 @@ - /* An interface to read() that retries after interrupts. - Copyright (C) 2002, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/safe-write.c b/lib/safe-write.c -index f8b3b8b..494de14 100644 ---- a/lib/safe-write.c -+++ b/lib/safe-write.c -@@ -1,12 +1,12 @@ - /* An interface to write that retries after interrupts. - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/safe-write.h b/lib/safe-write.h -index 459629e..25d8c71 100644 ---- a/lib/safe-write.h -+++ b/lib/safe-write.h -@@ -1,12 +1,12 @@ - /* An interface to write() that retries after interrupts. - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/same-inode.h b/lib/same-inode.h -index 45e322a8..c727777 100644 ---- a/lib/same-inode.h -+++ b/lib/same-inode.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h -index 4b17f72..8873577 100644 ---- a/lib/scratch_buffer.h -+++ b/lib/scratch_buffer.h -@@ -1,12 +1,12 @@ - /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -110,14 +110,18 @@ extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, - - /* The implementation is imported from glibc. */ - --#include -- - /* Avoid possible conflicts with symbols exported by the GNU libc. */ - #define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree - #define __libc_scratch_buffer_grow gl_scratch_buffer_grow - #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve - #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size - --#include -+#ifndef _GL_LIKELY -+/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -+# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -+# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -+#endif -+ -+#include - - #endif /* _GL_SCRATCH_BUFFER_H */ -diff --git a/lib/select.c b/lib/select.c -index 9a6fc28..eddac4b 100644 ---- a/lib/select.c -+++ b/lib/select.c -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -@@ -530,12 +530,13 @@ restart: - if (h != handle_array[nhandles]) - { - /* Perform handle->descriptor mapping. */ -- WSAEventSelect ((SOCKET) h, NULL, 0); -- if (FD_ISSET (h, &handle_rfds)) -+ SOCKET s = (SOCKET) h; -+ WSAEventSelect (s, NULL, 0); -+ if (FD_ISSET (s, &handle_rfds)) - FD_SET (i, rfds); -- if (FD_ISSET (h, &handle_wfds)) -+ if (FD_ISSET (s, &handle_wfds)) - FD_SET (i, wfds); -- if (FD_ISSET (h, &handle_xfds)) -+ if (FD_ISSET (s, &handle_xfds)) - FD_SET (i, xfds); - } - else -diff --git a/lib/send.c b/lib/send.c -index 3625864..58cb70b 100644 ---- a/lib/send.c -+++ b/lib/send.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sendto.c b/lib/sendto.c -index 5372a66..029ccd6 100644 ---- a/lib/sendto.c -+++ b/lib/sendto.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setenv.c b/lib/setenv.c -index 5374044..3ad3477 100644 ---- a/lib/setenv.c -+++ b/lib/setenv.c -@@ -1,12 +1,12 @@ - /* Copyright (C) 1992, 1995-2003, 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c -index 3cb5d47..53e231c 100644 ---- a/lib/setlocale-lock.c -+++ b/lib/setlocale-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by setlocale_null_r. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c -index 4c50472..dbfda25 100644 ---- a/lib/setlocale_null.c -+++ b/lib/setlocale_null.c -@@ -1,12 +1,12 @@ - /* Query the name of the current global locale. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h -index bf96fa4..00c42e2 100644 ---- a/lib/setlocale_null.h -+++ b/lib/setlocale_null.h -@@ -1,12 +1,12 @@ - /* Query the name of the current global locale. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setsockopt.c b/lib/setsockopt.c -index db32996..10b1e90 100644 ---- a/lib/setsockopt.c -+++ b/lib/setsockopt.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/shutdown.c b/lib/shutdown.c -index c5527cd..70c927c 100644 ---- a/lib/shutdown.c -+++ b/lib/shutdown.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signal.in.h b/lib/signal.in.h -index b211137..275da8c 100644 ---- a/lib/signal.in.h -+++ b/lib/signal.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signbitd.c b/lib/signbitd.c -index 2992dd4..2259771 100644 ---- a/lib/signbitd.c -+++ b/lib/signbitd.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signbitf.c b/lib/signbitf.c -index 01be49a..b196d9a 100644 ---- a/lib/signbitf.c -+++ b/lib/signbitf.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signbitl.c b/lib/signbitl.c -index 6e0f64e..f73802d 100644 ---- a/lib/signbitl.c -+++ b/lib/signbitl.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/size_max.h b/lib/size_max.h -index c6d4a18..1186ba9 100644 ---- a/lib/size_max.h -+++ b/lib/size_max.h -@@ -2,18 +2,18 @@ - Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef GNULIB_SIZE_MAX_H - #define GNULIB_SIZE_MAX_H -diff --git a/lib/snprintf.c b/lib/snprintf.c -index 357f287..a589cf1 100644 ---- a/lib/snprintf.c -+++ b/lib/snprintf.c -@@ -2,18 +2,18 @@ - Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - Written by Simon Josefsson and Paul Eggert. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/socket.c b/lib/socket.c -index 8525260..0f2e6ff 100644 ---- a/lib/socket.c -+++ b/lib/socket.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sockets.c b/lib/sockets.c -index 394b01e..934da73 100644 ---- a/lib/sockets.c -+++ b/lib/sockets.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sockets.h b/lib/sockets.h -index a13b0cb..e70c2bb 100644 ---- a/lib/sockets.h -+++ b/lib/sockets.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat-time.c b/lib/stat-time.c -index 81b83dd..7b92792 100644 ---- a/lib/stat-time.c -+++ b/lib/stat-time.c -@@ -1,3 +1,21 @@ -+/* stat-related time functions. -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE - #include "stat-time.h" -diff --git a/lib/stat-time.h b/lib/stat-time.h -index 00c9329..fe3483d 100644 ---- a/lib/stat-time.h -+++ b/lib/stat-time.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat-w32.c b/lib/stat-w32.c -index fe505cb..4164199 100644 ---- a/lib/stat-w32.c -+++ b/lib/stat-w32.c -@@ -1,12 +1,12 @@ - /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat-w32.h b/lib/stat-w32.h -index 05c9b0f..5b56c09 100644 ---- a/lib/stat-w32.h -+++ b/lib/stat-w32.h -@@ -1,12 +1,12 @@ - /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat.c b/lib/stat.c -index 39a1269..bc9a767 100644 ---- a/lib/stat.c -+++ b/lib/stat.c -@@ -1,12 +1,12 @@ - /* Work around platform bugs in stat. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h -index 7b51043..592d58e 100644 ---- a/lib/stdalign.in.h -+++ b/lib/stdalign.in.h -@@ -2,18 +2,18 @@ - - Copyright 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Paul Eggert and Bruno Haible. */ - -diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h -index c404f8d..2a1992d 100644 ---- a/lib/stdbool.in.h -+++ b/lib/stdbool.in.h -@@ -1,18 +1,18 @@ - /* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2001. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _GL_STDBOOL_H - #define _GL_STDBOOL_H -diff --git a/lib/stddef.in.h b/lib/stddef.in.h -index 4c53e64..42290d4 100644 ---- a/lib/stddef.in.h -+++ b/lib/stddef.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake. */ - -diff --git a/lib/stdint.in.h b/lib/stdint.in.h -index a98f1c8..85c5418 100644 ---- a/lib/stdint.in.h -+++ b/lib/stdint.in.h -@@ -2,18 +2,18 @@ - Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* - * ISO C 99 for platforms that lack it. -@@ -85,7 +85,7 @@ - - /* Override WINT_MIN and WINT_MAX if gnulib's or overrides - wint_t. */ --#if @GNULIB_OVERRIDES_WINT_T@ -+#if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # undef WINT_MIN - # undef WINT_MAX - # define WINT_MIN 0x0U -@@ -598,7 +598,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) - /* wint_t limits */ - /* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not - accurate, therefore use the definitions from above. */ --# if !@GNULIB_OVERRIDES_WINT_T@ -+# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ - # undef WINT_MIN - # undef WINT_MAX - # if @HAVE_SIGNED_WINT_T@ -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index 6e10c74..f1bf817 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -242,7 +242,7 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " - _GL_CXXALIAS_MDA (fcloseall, int, (void)); - # else - # if @HAVE_DECL_FCLOSEALL@ --# if defined __FreeBSD__ -+# if defined __FreeBSD__ || defined __DragonFly__ - _GL_CXXALIAS_SYS (fcloseall, void, (void)); - # else - _GL_CXXALIAS_SYS (fcloseall, int, (void)); -@@ -260,8 +260,9 @@ _GL_CXXALIASWARN (fcloseall); - # undef fdopen - # define fdopen rpl_fdopen - # endif --_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) -- _GL_ARG_NONNULL ((2))); -+_GL_FUNCDECL_RPL (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); - # elif defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -270,28 +271,42 @@ _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); - # endif - _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); - # endif - _GL_CXXALIASWARN (fdopen); --#elif defined GNULIB_POSIXCHECK --# undef fdopen -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen -+/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fdopen - /* Assume fdopen is always declared. */ - _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " - "use gnulib module fdopen for portability"); --#elif @GNULIB_MDA_FDOPEN@ -+# elif @GNULIB_MDA_FDOPEN@ - /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::fdopen always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef fdopen --# define fdopen _fdopen --# endif -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef fdopen -+# define fdopen _fdopen -+# endif - _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); --# else -+# else - _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); --# endif -+# endif - _GL_CXXALIASWARN (fdopen); -+# endif - #endif - - #if @GNULIB_FFLUSH@ -@@ -380,21 +395,35 @@ _GL_CXXALIASWARN (fileno); - # endif - _GL_FUNCDECL_RPL (fopen, FILE *, - (const char *restrict filename, const char *restrict mode) -- _GL_ARG_NONNULL ((1, 2))); -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (fopen, FILE *, - (const char *restrict filename, const char *restrict mode)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fopen, FILE *, -+ (const char *restrict filename, const char *restrict mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (fopen, FILE *, - (const char *restrict filename, const char *restrict mode)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (fopen); - # endif --#elif defined GNULIB_POSIXCHECK --# undef fopen -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen -+/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fopen, FILE *, -+ (const char *restrict filename, const char *restrict mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fopen - /* Assume fopen is always declared. */ - _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - " - "use gnulib module fopen for portability"); -+# endif - #endif - - #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@ -@@ -1009,22 +1038,32 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " - # undef popen - # define popen rpl_popen - # endif --_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode) -- _GL_ARG_NONNULL ((1, 2))); -+_GL_FUNCDECL_RPL (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); - _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); - # else --# if !@HAVE_POPEN@ --_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) -- _GL_ARG_NONNULL ((1, 2))); -+# if !@HAVE_POPEN@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); - # endif - _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode)); - # endif - _GL_CXXALIASWARN (popen); --#elif defined GNULIB_POSIXCHECK --# undef popen --# if HAVE_RAW_DECL_POPEN -+#else -+# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen -+/* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ -+_GL_FUNCDECL_SYS (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef popen -+# if HAVE_RAW_DECL_POPEN - _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " - "use gnulib module popen or pipe for more portability"); -+# endif - # endif - #endif - -@@ -1257,6 +1296,7 @@ _GL_CXXALIASWARN (scanf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define snprintf rpl_snprintf - # endif -+# define GNULIB_overrides_snprintf 1 - _GL_FUNCDECL_RPL (snprintf, int, - (char *restrict str, size_t size, - const char *restrict format, ...) -@@ -1302,6 +1342,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define sprintf rpl_sprintf - # endif -+# define GNULIB_overrides_sprintf 1 - _GL_FUNCDECL_RPL (sprintf, int, - (char *restrict str, const char *restrict format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) -@@ -1344,19 +1385,32 @@ _GL_CXXALIASWARN (tempnam); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define tmpfile rpl_tmpfile - # endif --_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)); -+_GL_FUNCDECL_RPL (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (tmpfile); - # endif --#elif defined GNULIB_POSIXCHECK --# undef tmpfile --# if HAVE_RAW_DECL_TMPFILE -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile -+/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef tmpfile -+# if HAVE_RAW_DECL_TMPFILE - _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " - "use gnulib module tmpfile for portability"); -+# endif - # endif - #endif - -@@ -1369,6 +1423,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define asprintf rpl_asprintf - # endif -+# define GNULIB_overrides_asprintf - _GL_FUNCDECL_RPL (asprintf, int, - (char **result, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) -@@ -1390,6 +1445,7 @@ _GL_CXXALIASWARN (asprintf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vasprintf rpl_vasprintf - # endif -+# define GNULIB_overrides_vasprintf 1 - _GL_FUNCDECL_RPL (vasprintf, int, - (char **result, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) -@@ -1573,6 +1629,7 @@ _GL_CXXALIASWARN (vscanf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vsnprintf rpl_vsnprintf - # endif -+# define GNULIB_overrides_vsnprintf 1 - _GL_FUNCDECL_RPL (vsnprintf, int, - (char *restrict str, size_t size, - const char *restrict format, va_list args) -@@ -1609,6 +1666,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vsprintf rpl_vsprintf - # endif -+# define GNULIB_overrides_vsprintf 1 - _GL_FUNCDECL_RPL (vsprintf, int, - (char *restrict str, - const char *restrict format, va_list args) -diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h -index 7e01262..d86a880 100644 ---- a/lib/stdlib.in.h -+++ b/lib/stdlib.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -149,6 +149,28 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " - #endif - - -+#if @GNULIB_FREE_POSIX@ -+# if @REPLACE_FREE@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef free -+# define free rpl_free -+# endif -+_GL_FUNCDECL_RPL (free, void, (void *ptr)); -+_GL_CXXALIAS_RPL (free, void, (void *ptr)); -+# else -+_GL_CXXALIAS_SYS (free, void, (void *ptr)); -+# endif -+# if __GLIBC__ >= 2 -+_GL_CXXALIASWARN (free); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef free -+/* Assume free is always declared. */ -+_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " -+ "use gnulib module free for portability"); -+#endif -+ -+ - /* Allocate memory with indefinite extent and specified alignment. */ - #if @GNULIB_ALIGNED_ALLOC@ - # if @REPLACE_ALIGNED_ALLOC@ -@@ -156,21 +178,37 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " - # undef aligned_alloc - # define aligned_alloc rpl_aligned_alloc - # endif --_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); -+_GL_FUNCDECL_RPL (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); - # else - # if @HAVE_ALIGNED_ALLOC@ -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); - # endif - # endif - # if @HAVE_ALIGNED_ALLOC@ - _GL_CXXALIASWARN (aligned_alloc); - # endif --#elif defined GNULIB_POSIXCHECK --# undef aligned_alloc --# if HAVE_RAW_DECL_ALIGNED_ALLOC -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc -+/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef aligned_alloc -+# if HAVE_RAW_DECL_ALIGNED_ALLOC - _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " - "use gnulib module aligned_alloc for portability"); -+# endif - # endif - #endif - -@@ -198,19 +236,35 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " - # undef calloc - # define calloc rpl_calloc - # endif --_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size)); -+_GL_FUNCDECL_RPL (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (calloc); - # endif --#elif defined GNULIB_POSIXCHECK --# undef calloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc -+/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef calloc - /* Assume calloc is always declared. */ - _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " - "use gnulib module calloc-posix for portability"); -+# endif - #endif - - #if @GNULIB_CANONICALIZE_FILE_NAME@ -@@ -218,13 +272,17 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define canonicalize_file_name rpl_canonicalize_file_name - # endif --_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name) -- _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); - # else --# if !@HAVE_CANONICALIZE_FILE_NAME@ --_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) -- _GL_ARG_NONNULL ((1))); -+# if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); - # endif -@@ -233,12 +291,22 @@ _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); - (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) - # endif - _GL_CXXALIASWARN (canonicalize_file_name); --#elif defined GNULIB_POSIXCHECK --# undef canonicalize_file_name --# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name -+/* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or -+ rpl_free. */ -+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef canonicalize_file_name -+# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME - _GL_WARN_ON_USE (canonicalize_file_name, - "canonicalize_file_name is unportable - " - "use gnulib module canonicalize-lgpl for portability"); -+# endif - # endif - #endif - -@@ -288,27 +356,6 @@ _GL_CXXALIASWARN (fcvt); - # endif - #endif - --#if @GNULIB_FREE_POSIX@ --# if @REPLACE_FREE@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef free --# define free rpl_free --# endif --_GL_FUNCDECL_RPL (free, void, (void *ptr)); --_GL_CXXALIAS_RPL (free, void, (void *ptr)); --# else --_GL_CXXALIAS_SYS (free, void, (void *ptr)); --# endif --# if __GLIBC__ >= 2 --_GL_CXXALIASWARN (free); --# endif --#elif defined GNULIB_POSIXCHECK --# undef free --/* Assume free is always declared. */ --_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " -- "use gnulib module free for portability"); --#endif -- - #if @GNULIB_MDA_GCVT@ - /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -@@ -404,19 +451,35 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " - # undef malloc - # define malloc rpl_malloc - # endif --_GL_FUNCDECL_RPL (malloc, void *, (size_t size)); -+_GL_FUNCDECL_RPL (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (malloc); - # endif --#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC --# undef malloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc -+/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -+# undef malloc - /* Assume malloc is always declared. */ - _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " - "use gnulib module malloc-posix for portability"); -+# endif - #endif - - /* Convert a multibyte character to a wide character. */ -@@ -1015,29 +1078,53 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " - # undef realloc - # define realloc rpl_realloc - # endif --_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)); -+_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (realloc); - # endif --#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC --# undef realloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc -+/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -+# undef realloc - /* Assume realloc is always declared. */ - _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " - "use gnulib module realloc-posix for portability"); -+# endif - #endif - - - #if @GNULIB_REALLOCARRAY@ --# if ! @HAVE_REALLOCARRAY@ -+# if @REPLACE_REALLOCARRAY@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef reallocarray -+# define reallocarray rpl_reallocarray -+# endif -+_GL_FUNCDECL_RPL (reallocarray, void *, -+ (void *ptr, size_t nmemb, size_t size)); -+_GL_CXXALIAS_RPL (reallocarray, void *, -+ (void *ptr, size_t nmemb, size_t size)); -+# else -+# if ! @HAVE_REALLOCARRAY@ - _GL_FUNCDECL_SYS (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); --# endif -+# endif - _GL_CXXALIAS_SYS (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); -+# endif - _GL_CXXALIASWARN (reallocarray); - #elif defined GNULIB_POSIXCHECK - # undef reallocarray -diff --git a/lib/strdup.c b/lib/strdup.c -index 2a37049..e5d4d75 100644 ---- a/lib/strdup.c -+++ b/lib/strdup.c -@@ -3,18 +3,18 @@ - - This file is part of the GNU C Library. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/streq.h b/lib/streq.h -index 2d9d4c2..adabd15 100644 ---- a/lib/streq.h -+++ b/lib/streq.h -@@ -1,15 +1,15 @@ - /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/strftime.h b/lib/strftime.h -index 645e8c7..790a80e 100644 ---- a/lib/strftime.h -+++ b/lib/strftime.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002, 2004, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/striconveh.c b/lib/striconveh.c -index 82f6467..78a5e02 100644 ---- a/lib/striconveh.c -+++ b/lib/striconveh.c -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2021 Free Software Foundation, Inc. - Written by Bruno Haible and Simon Josefsson. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/striconveh.h b/lib/striconveh.h -index c9dff1e..60c6329 100644 ---- a/lib/striconveh.h -+++ b/lib/striconveh.h -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible and Simon Josefsson. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -18,7 +18,7 @@ - #ifndef _STRICONVEH_H - #define _STRICONVEH_H - --#include -+#include - #if HAVE_ICONV - #include - #endif -@@ -95,7 +95,8 @@ extern int - extern char * - str_cd_iconveh (const char *src, - const iconveh_t *cd, -- enum iconv_ilseq_handler handler); -+ enum iconv_ilseq_handler handler) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - - #endif - -@@ -129,7 +130,8 @@ extern int - extern char * - str_iconveh (const char *src, - const char *from_codeset, const char *to_codeset, -- enum iconv_ilseq_handler handler); -+ enum iconv_ilseq_handler handler) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - - - #ifdef __cplusplus -diff --git a/lib/string.in.h b/lib/string.in.h -index 1292e29..b043c75 100644 ---- a/lib/string.in.h -+++ b/lib/string.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -47,6 +47,9 @@ - /* NetBSD 5.0 mis-defines NULL. */ - #include - -+/* Get free(). */ -+#include -+ - /* MirBSD defines mbslen as a macro. */ - #if @GNULIB_MBSLEN@ && defined __MirBSD__ - # include -@@ -418,7 +421,10 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " - # undef strdup - # define strdup rpl_strdup - # endif --_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); - # elif defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -431,35 +437,47 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); - /* strdup exists as a function and as a macro. Get rid of the macro. */ - # undef strdup - # endif --# if !(@HAVE_DECL_STRDUP@ || defined strdup) --_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); -+# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup -+_GL_FUNCDECL_SYS (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); - # endif - _GL_CXXALIASWARN (strdup); --#elif defined GNULIB_POSIXCHECK --# undef strdup --# if HAVE_RAW_DECL_STRDUP -+#else -+# if __GNUC__ >= 11 && !defined strdup -+/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ -+_GL_FUNCDECL_SYS (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef strdup -+# if HAVE_RAW_DECL_STRDUP - _GL_WARN_ON_USE (strdup, "strdup is unportable - " - "use gnulib module strdup for portability"); --# endif --#elif @GNULIB_MDA_STRDUP@ -+# endif -+# elif @GNULIB_MDA_STRDUP@ - /* On native Windows, map 'creat' to '_creat', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -- platforms by defining GNULIB_NAMESPACE::creat always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef strdup --# define strdup _strdup --# endif -+ platforms by defining GNULIB_NAMESPACE::strdup always. */ -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef strdup -+# define strdup _strdup -+# endif - _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); --# else --# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup --# undef strdup --# endif -+# else -+# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup -+# undef strdup -+# endif - _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); --# endif -+# endif - _GL_CXXALIASWARN (strdup); -+# endif - #endif - - /* Append no more than N characters from SRC onto DEST. */ -diff --git a/lib/stripslash.c b/lib/stripslash.c -index b079795..99bfbe6 100644 ---- a/lib/stripslash.c -+++ b/lib/stripslash.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 2001, 2003-2006, 2009-2021 Free Software Foundation, - Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sys-limits.h b/lib/sys-limits.h -index 1856e7f..2d9784d 100644 ---- a/lib/sys-limits.h -+++ b/lib/sys-limits.h -@@ -2,18 +2,18 @@ - - Copyright 2018-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _GL_SYS_LIMITS_H - #define _GL_SYS_LIMITS_H -diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h -index e18594f..4166082 100644 ---- a/lib/sys_file.in.h -+++ b/lib/sys_file.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Richard W.M. Jones. */ - -diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h -index 1a479e9..1abd6c5 100644 ---- a/lib/sys_random.in.h -+++ b/lib/sys_random.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h -index d82c5d1..f8ef648 100644 ---- a/lib/sys_select.in.h -+++ b/lib/sys_select.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_socket.c b/lib/sys_socket.c -index 3b261da..d90b32c 100644 ---- a/lib/sys_socket.c -+++ b/lib/sys_socket.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE - #include "sys/socket.h" - typedef int dummy; -diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h -index c0baa71..0a2c57d 100644 ---- a/lib/sys_socket.in.h -+++ b/lib/sys_socket.in.h -@@ -3,18 +3,18 @@ - Copyright (C) 2005-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* This file is supposed to be used on platforms that lack , - on platforms where cannot be included standalone, and on -diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h -index 125aca0..babe3db 100644 ---- a/lib/sys_stat.in.h -+++ b/lib/sys_stat.in.h -@@ -1,18 +1,18 @@ - /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ - -diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h -index f310ca5..8035fbe 100644 ---- a/lib/sys_time.in.h -+++ b/lib/sys_time.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h -index 3d96200..85b728f 100644 ---- a/lib/sys_times.in.h -+++ b/lib/sys_times.in.h -@@ -1,18 +1,18 @@ - /* Provide a sys/times.h header file. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Simon Josefsson , 2008. */ - -diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h -index 26e7db7..2079d72 100644 ---- a/lib/sys_types.in.h -+++ b/lib/sys_types.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h -index 1941360..507ab01 100644 ---- a/lib/sys_uio.in.h -+++ b/lib/sys_uio.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/tempname.h b/lib/tempname.h -index c91a58d..795bb49 100644 ---- a/lib/tempname.h -+++ b/lib/tempname.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/time-internal.h b/lib/time-internal.h -index b86b7a0..6bbd0a7 100644 ---- a/lib/time-internal.h -+++ b/lib/time-internal.h -@@ -2,18 +2,18 @@ - - Copyright 2015-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/time.in.h b/lib/time.in.h -index cbd2bba..a73fe59 100644 ---- a/lib/time.in.h -+++ b/lib/time.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/time_r.c b/lib/time_r.c -index 2510c4e..88d3c1c 100644 ---- a/lib/time_r.c -+++ b/lib/time_r.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2003, 2006-2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/time_rz.c b/lib/time_rz.c -index d32cce7..e772244 100644 ---- a/lib/time_rz.c -+++ b/lib/time_rz.c -@@ -2,18 +2,18 @@ - - Copyright 2015-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/times.c b/lib/times.c -index b8afa60..72b852e 100644 ---- a/lib/times.c -+++ b/lib/times.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Simon Josefsson , 2008. */ - -diff --git a/lib/trunc.c b/lib/trunc.c -index cf2adac..1c9c420 100644 ---- a/lib/trunc.c -+++ b/lib/trunc.c -@@ -1,12 +1,12 @@ - /* Round towards zero. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/tzset.c b/lib/tzset.c -index 1f423c4..7fd4936 100644 ---- a/lib/tzset.c -+++ b/lib/tzset.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2001-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* written by Jim Meyering */ - -diff --git a/lib/unistd.c b/lib/unistd.c -index 72bad1c..0763456 100644 ---- a/lib/unistd.c -+++ b/lib/unistd.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE - #include "unistd.h" - typedef int dummy; -diff --git a/lib/unistd.in.h b/lib/unistd.in.h -index 5914fd5..73c882f 100644 ---- a/lib/unistd.in.h -+++ b/lib/unistd.in.h -@@ -1,18 +1,18 @@ - /* Substitute for and wrapper around . - Copyright (C) 2003-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_UNISTD_H - -@@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " - # undef isatty - # define isatty rpl_isatty - # endif -+# define GNULIB_defined_isatty 1 - _GL_FUNCDECL_RPL (isatty, int, (int fd)); - _GL_CXXALIAS_RPL (isatty, int, (int fd)); - # elif defined _WIN32 && !defined __CYGWIN__ -@@ -2027,15 +2028,23 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " - #if @GNULIB_MDA_SWAB@ - /* On native Windows, map 'swab' to '_swab', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -- platforms by defining GNULIB_NAMESPACE::creat always. */ -+ platforms by defining GNULIB_NAMESPACE::swab always. */ - # if defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef swab - # define swab _swab - # endif --_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); -+/* Need to cast, because in old mingw the arguments are -+ (const char *from, char *to, size_t n). */ -+_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); - # else -+# if defined __hpux /* HP-UX */ -+_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); -+# elif defined __sun && !defined _XPG4 /* Solaris */ -+_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); -+# else - _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); -+# endif - # endif - _GL_CXXALIASWARN (swab); - #endif -diff --git a/lib/unsetenv.c b/lib/unsetenv.c -index 005fb1f..b2e910e 100644 ---- a/lib/unsetenv.c -+++ b/lib/unsetenv.c -@@ -1,12 +1,12 @@ - /* Copyright (C) 1992, 1995-2002, 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index 8d51006..d9b669d 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -1,18 +1,18 @@ - /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - VASNPRINTF The name of the function being defined. -@@ -60,10 +60,16 @@ - #ifndef VASNPRINTF - # include - #endif --#ifndef IN_LIBINTL --# include -+ -+/* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's -+ use of CHECK macros expands to code that is too complicated for gcc -+ -fanalyzer. Suppress the resulting bogus warnings. */ -+#if 10 <= __GNUC__ -+# pragma GCC diagnostic ignored "-Wanalyzer-null-argument" - #endif - -+#include -+ - /* Specification. */ - #ifndef VASNPRINTF - # if WIDE_CHAR_VERSION -@@ -1924,7 +1930,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - - /* Ensures that allocated >= needed. Aborts through a jump to - out_of_memory if needed is SIZE_MAX or otherwise too big. */ --#define ENSURE_ALLOCATION(needed) \ -+#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ - if ((needed) > allocated) \ - { \ - size_t memory_size; \ -@@ -1935,17 +1941,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - allocated = (needed); \ - memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ - if (size_overflow_p (memory_size)) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf || result == NULL) \ - memory = (DCHAR_T *) malloc (memory_size); \ - else \ - memory = (DCHAR_T *) realloc (result, memory_size); \ - if (memory == NULL) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf && length > 0) \ - DCHAR_CPY (memory, result, length); \ - result = memory; \ - } -+#define ENSURE_ALLOCATION(needed) \ -+ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) - - for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) - { -@@ -2193,7 +2201,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2317,7 +2326,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2441,7 +2451,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2944,7 +2955,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -3147,7 +3159,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -5598,7 +5611,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - CLEANUP (); - return NULL; - } -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - count = tmpdst_len; -diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h -index aaed859..9b02cdf 100644 ---- a/lib/vasnprintf.h -+++ b/lib/vasnprintf.h -@@ -1,18 +1,18 @@ - /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _VASNPRINTF_H - #define _VASNPRINTF_H -diff --git a/lib/verify.h b/lib/verify.h -index d1b4995..a8ca59b 100644 ---- a/lib/verify.h -+++ b/lib/verify.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -25,7 +25,7 @@ - works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. - - Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as -- per C2X. This is supported by GCC 9.1+. -+ per C2x. This is supported by GCC 9.1+. - - Support compilers claiming conformance to the relevant standard, - and also support GCC when not pedantic. If we were willing to slow -@@ -202,7 +202,7 @@ template - - This macro requires three or more arguments but uses at most the first - two, so that the _Static_assert macro optionally defined below supports -- both the C11 two-argument syntax and the C2X one-argument syntax. -+ both the C11 two-argument syntax and the C2x one-argument syntax. - - Unfortunately, unlike C11, this implementation must appear as an - ordinary declaration, and cannot appear inside struct { ... }. */ -diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c -index c94c5cb..4a0a3dc 100644 ---- a/lib/vsnprintf.c -+++ b/lib/vsnprintf.c -@@ -2,18 +2,18 @@ - Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - Written by Simon Josefsson and Yoann Vandoorselaere . - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifdef HAVE_CONFIG_H - # include -diff --git a/lib/w32sock.h b/lib/w32sock.h -index 9b6a231..635a1b2 100644 ---- a/lib/w32sock.h -+++ b/lib/w32sock.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/wchar.in.h b/lib/wchar.in.h -index fe4171c..be5d36c 100644 ---- a/lib/wchar.in.h -+++ b/lib/wchar.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake. */ - -@@ -72,6 +72,9 @@ - # include - #endif - -+/* Get free(). */ -+#include -+ - /* Include the original if it exists. - Some builds of uClibc lack it. */ - /* The include_next requires a split double-inclusion guard. */ -@@ -111,7 +114,7 @@ - /* mingw and MSVC define wint_t as 'unsigned short' in or - . This is too small: ISO C 99 section 7.24.1.(2) says that - wint_t must be "unchanged by default argument promotions". Override it. */ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !GNULIB_defined_wint_t - # if @HAVE_CRTDEFS_H@ - # include -@@ -941,36 +944,48 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " - # endif - _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); - # else --# if !@HAVE_WCSDUP@ --_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -+# if !@HAVE_WCSDUP@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); - # endif - _GL_CXXALIASWARN (wcsdup); --#elif defined GNULIB_POSIXCHECK --# undef wcsdup --# if HAVE_RAW_DECL_WCSDUP -+#else -+# if __GNUC__ >= 11 && !defined wcsdup -+/* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef wcsdup -+# if HAVE_RAW_DECL_WCSDUP - _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " - "use gnulib module wcsdup for portability"); --# endif --#elif @GNULIB_MDA_WCSDUP@ -+# endif -+# elif @GNULIB_MDA_WCSDUP@ - /* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::wcsdup always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef wcsdup --# define wcsdup _wcsdup --# endif -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef wcsdup -+# define wcsdup _wcsdup -+# endif - _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); --# else --_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); --# if @HAVE_DECL_WCSDUP@ -+# else -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# if @HAVE_DECL_WCSDUP@ - _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -+# endif - # endif --# endif --# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ -+# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ - _GL_CXXALIASWARN (wcsdup); -+# endif - # endif - #endif - -diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c -index 76d21ae..5c9fd79 100644 ---- a/lib/wcrtomb.c -+++ b/lib/wcrtomb.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/wctype-h.c b/lib/wctype-h.c -index bb5f847..150221d 100644 ---- a/lib/wctype-h.c -+++ b/lib/wctype-h.c -@@ -1,4 +1,23 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - /* Normally this would be wctype.c, but that name's already taken. */ -+ - #include -+ - #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE - #include "wctype.h" -diff --git a/lib/wctype.in.h b/lib/wctype.in.h -index 6f0cd21..652d811 100644 ---- a/lib/wctype.in.h -+++ b/lib/wctype.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Bruno Haible and Paul Eggert. */ - -@@ -103,7 +103,7 @@ _GL_INLINE_HEADER_BEGIN - /* mingw and MSVC define wint_t as 'unsigned short' in or - . This is too small: ISO C 99 section 7.24.1.(2) says that - wint_t must be "unchanged by default argument promotions". Override it. */ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !GNULIB_defined_wint_t - # if @HAVE_CRTDEFS_H@ - # include -@@ -132,7 +132,7 @@ typedef unsigned int rpl_wint_t; - same way, or not at all. */ - # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ - --# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ - - _GL_WCTYPE_INLINE int - rpl_iswalnum (wint_t wc) -@@ -496,7 +496,7 @@ _GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); - - # endif - --# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ -+# if defined __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ - - /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. - The functions towlower and towupper are implemented in the MSVCRT library -@@ -529,7 +529,7 @@ rpl_towupper (wint_t wc) - # define towupper rpl_towupper - # endif - --# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ -+# endif /* __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ */ - - # define GNULIB_defined_wctype_functions 1 - #endif -@@ -646,7 +646,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " - The argument WC must be either a wchar_t value or WEOF. - The argument DESC must have been returned by the wctype() function. */ - #if @GNULIB_ISWCTYPE@ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef iswctype - # define iswctype rpl_iswctype -diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h -index e84051e..7999b23 100644 ---- a/lib/windows-initguard.h -+++ b/lib/windows-initguard.h -@@ -1,18 +1,18 @@ - /* Init guards, somewhat like spinlocks (native Windows implementation). - Copyright (C) 2005-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Bruno Haible , 2005. - Based on GCC's gthr-win32.h. */ -diff --git a/lib/write.c b/lib/write.c -index bc53d4d..614cdc6 100644 ---- a/lib/write.c -+++ b/lib/write.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h -index d255969..4184f33 100644 ---- a/lib/xalloc-oversized.h -+++ b/lib/xalloc-oversized.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -22,33 +22,38 @@ - #include - - /* True if N * S does not fit into both ptrdiff_t and size_t. -- S must be positive and N must be nonnegative. -+ N and S should be nonnegative and free of side effects. - This expands to a constant expression if N and S are both constants. - By gnulib convention, SIZE_MAX represents overflow in size_t - calculations, so the conservative size_t-based dividend to use here - is SIZE_MAX - 1. */ - #define __xalloc_oversized(n, s) \ -- ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) -+ ((s) != 0 \ -+ && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ -+ < (n))) - --#if PTRDIFF_MAX < SIZE_MAX --typedef ptrdiff_t xalloc_count_t; --#else --typedef size_t xalloc_count_t; --#endif -+/* Return 1 if and only if an array of N objects, each of size S, -+ cannot exist reliably because its total size in bytes would exceed -+ MIN (PTRDIFF_MAX, SIZE_MAX - 1). -+ -+ N and S should be nonnegative and free of side effects. -+ -+ Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can -+ misbehave if N and S are both narrower than ptrdiff_t and size_t, -+ and can be rewritten as (xalloc_oversized (N, S) ? NULL -+ : malloc (N * (size_t) S)). - --/* Return 1 if an array of N objects, each of size S, cannot exist reliably -- because its total size in bytes exceeds MIN (PTRDIFF_MAX, SIZE_MAX). -- N must be nonnegative, S must be positive, and either N or S should be -- of type ptrdiff_t or size_t or wider. This is a macro, not a function, -- so that it works even if an argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ --#if 7 <= __GNUC__ && !defined __clang__ -+ This is a macro, not a function, so that it works even if an -+ argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ -+#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX - # define xalloc_oversized(n, s) \ -- __builtin_mul_overflow_p (n, s, (xalloc_count_t) 1) --#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ -+ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) -+#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ -+ && PTRDIFF_MAX < SIZE_MAX) - # define xalloc_oversized(n, s) \ - (__builtin_constant_p (n) && __builtin_constant_p (s) \ - ? __xalloc_oversized (n, s) \ -- : ({ xalloc_count_t __xalloc_count; \ -+ : ({ ptrdiff_t __xalloc_count; \ - __builtin_mul_overflow (n, s, &__xalloc_count); })) - - /* Other compilers use integer division; this may be slower but is -diff --git a/lib/xsize.c b/lib/xsize.c -index 4b4914c..b3d73a2 100644 ---- a/lib/xsize.c -+++ b/lib/xsize.c -@@ -1,3 +1,21 @@ -+/* Checked size_t computations. -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define XSIZE_INLINE _GL_EXTERN_INLINE - #include "xsize.h" -diff --git a/lib/xsize.h b/lib/xsize.h -index d4d7b1c..91fa877 100644 ---- a/lib/xsize.h -+++ b/lib/xsize.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _XSIZE_H - #define _XSIZE_H -diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 -index c4e386d..a3ba256 100644 ---- a/m4/arpa_inet_h.m4 -+++ b/m4/arpa_inet_h.m4 -@@ -1,4 +1,4 @@ --# arpa_inet_h.m4 serial 14 -+# arpa_inet_h.m4 serial 17 - dnl Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Simon Josefsson and Bruno Haible - --AC_DEFUN([gl_HEADER_ARPA_INET], -+AC_DEFUN_ONCE([gl_ARPA_INET_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) - - AC_CHECK_HEADERS_ONCE([arpa/inet.h]) -@@ -40,17 +40,32 @@ AC_DEFUN([gl_HEADER_ARPA_INET], - ]], [inet_ntop inet_pton]) - ]) - -+# gl_ARPA_INET_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_ARPA_INET_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_ARPA_INET_H_DEFAULTS], - [ -- GNULIB_INET_NTOP=0; AC_SUBST([GNULIB_INET_NTOP]) -- GNULIB_INET_PTON=0; AC_SUBST([GNULIB_INET_PTON]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_INET_NTOP=1; AC_SUBST([HAVE_DECL_INET_NTOP]) - HAVE_DECL_INET_PTON=1; AC_SUBST([HAVE_DECL_INET_PTON]) -diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 -index 6d86142..17e2a20 100644 ---- a/m4/dirent_h.m4 -+++ b/m4/dirent_h.m4 -@@ -1,4 +1,4 @@ --# dirent_h.m4 serial 16 -+# dirent_h.m4 serial 19 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Bruno Haible. - --AC_DEFUN([gl_DIRENT_H], -+AC_DEFUN_ONCE([gl_DIRENT_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) - - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -27,26 +27,41 @@ AC_DEFUN([gl_DIRENT_H], - ]], [alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir]) - ]) - -+# gl_DIRENT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_DIRENT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_DIRENT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REWINDDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSEDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DIRFD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPENDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALPHASORT]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_DIRENT_H_DEFAULTS], - [ -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR -- GNULIB_OPENDIR=0; AC_SUBST([GNULIB_OPENDIR]) -- GNULIB_READDIR=0; AC_SUBST([GNULIB_READDIR]) -- GNULIB_REWINDDIR=0; AC_SUBST([GNULIB_REWINDDIR]) -- GNULIB_CLOSEDIR=0; AC_SUBST([GNULIB_CLOSEDIR]) -- GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) -- GNULIB_FDOPENDIR=0; AC_SUBST([GNULIB_FDOPENDIR]) -- GNULIB_SCANDIR=0; AC_SUBST([GNULIB_SCANDIR]) -- GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_OPENDIR=1; AC_SUBST([HAVE_OPENDIR]) - HAVE_READDIR=1; AC_SUBST([HAVE_READDIR]) -diff --git a/m4/environ.m4 b/m4/environ.m4 -index d971770..ae53291 100644 ---- a/m4/environ.m4 -+++ b/m4/environ.m4 -@@ -1,4 +1,4 @@ --# environ.m4 serial 7 -+# environ.m4 serial 8 - dnl Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -33,7 +33,8 @@ AC_DEFUN([gt_CHECK_VAR_DECL], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[$1 -- extern struct { int foo; } $2;]], -+ typedef struct { int foo; } foo_t; -+ extern foo_t $2;]], - [[$2.foo = 1;]])], - [gt_cv_var=no], - [gt_cv_var=yes])]) -diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 -index e63a82f..aba4473 100644 ---- a/m4/fcntl_h.m4 -+++ b/m4/fcntl_h.m4 -@@ -1,4 +1,4 @@ --# serial 17 -+# serial 20 - # Configure fcntl.h. - dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Paul Eggert. - --AC_DEFUN([gl_FCNTL_H], -+AC_DEFUN_ONCE([gl_FCNTL_H], - [ - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - AC_REQUIRE([gl_FCNTL_O_FLAGS]) -@@ -26,25 +26,40 @@ AC_DEFUN([gl_FCNTL_H], - ]], [fcntl openat]) - ]) - -+# gl_FCNTL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_FCNTL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_FCNTL_H_DEFAULTS], - [ -- GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) -- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) -- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) -- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) -- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) -- GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) - HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) -diff --git a/m4/flock.m4 b/m4/flock.m4 -index eb46642..e1e5fe0 100644 ---- a/m4/flock.m4 -+++ b/m4/flock.m4 -@@ -1,4 +1,4 @@ --# flock.m4 serial 3 -+# flock.m4 serial 4 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_FLOCK], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([flock]) - if test $ac_cv_func_flock = no; then - HAVE_FLOCK=0 -diff --git a/m4/fstat.m4 b/m4/fstat.m4 -index 3b5b238..cdaca80 100644 ---- a/m4/fstat.m4 -+++ b/m4/fstat.m4 -@@ -1,4 +1,4 @@ --# fstat.m4 serial 7 -+# fstat.m4 serial 8 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], - - # Prerequisites of lib/fstat.c and lib/stat-w32.c. - AC_DEFUN([gl_PREREQ_FSTAT], [ -- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ AC_REQUIRE([gl_SYS_STAT_H]) - AC_REQUIRE([gl_PREREQ_STAT_W32]) - : - ]) -diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 -index 97889a8..3f8e04f 100644 ---- a/m4/getaddrinfo.m4 -+++ b/m4/getaddrinfo.m4 -@@ -1,4 +1,4 @@ --# getaddrinfo.m4 serial 33 -+# getaddrinfo.m4 serial 34 - dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,8 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_GETADDRINFO], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -- AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H - GETADDRINFO_LIB= - gai_saved_LIBS="$LIBS" - -@@ -156,13 +156,13 @@ const char *gai_strerror(int);]])], - # Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c. - AC_DEFUN([gl_PREREQ_GETADDRINFO], [ - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB - AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB - AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_SOCKET_FAMILIES]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - - dnl Including sys/socket.h is wrong for Windows, but Windows does not -diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 -index f2eff10..c801b3d 100644 ---- a/m4/gnulib-common.m4 -+++ b/m4/gnulib-common.m4 -@@ -1,4 +1,4 @@ --# gnulib-common.m4 serial 63 -+# gnulib-common.m4 serial 67 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -85,12 +85,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) - # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) - # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -+# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) - # ifdef _ICC - # define _GL_ATTR_may_alias 0 - # else - # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) - # endif --# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) - # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) - # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) - # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) -@@ -103,6 +103,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) - #endif - -+#ifdef __has_c_attribute -+# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) -+#else -+# define _GL_HAS_C_ATTRIBUTE(attr) 0 -+#endif -+ - ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. - [ - #if _GL_HAS_ATTRIBUTE (alloc_size) -@@ -142,7 +148,20 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_CONST - #endif - --#if 201710L < __STDC_VERSION__ -+/* _GL_ATTRIBUTE_DEALLOC (F, I) is for functions returning pointers -+ that can be freed by passing them as the Ith argument to the -+ function F. _GL_ATTRIBUTE_DEALLOC_FREE is for functions that -+ return pointers that can be freed via 'free'; it can be used -+ only after including stdlib.h. These macros cannot be used on -+ inline functions. */ -+#if _GL_GNUC_PREREQ (11, 0) -+# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -+#else -+# define _GL_ATTRIBUTE_DEALLOC(f, i) -+#endif -+#define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) -+ -+#if _GL_HAS_C_ATTRIBUTE (deprecated) - # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] - #elif _GL_HAS_ATTRIBUTE (deprecated) - # define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -@@ -168,7 +187,7 @@ AC_DEFUN([gl_COMMON_BODY], [ - #endif - - /* FALLTHROUGH is special, because it always expands to something. */ --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (fallthrough) - # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] - #elif _GL_HAS_ATTRIBUTE (fallthrough) - # define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -@@ -188,6 +207,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_LEAF - #endif - -+#if _GL_HAS_ATTRIBUTE (malloc) -+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -+#else -+# define _GL_ATTRIBUTE_MALLOC -+#endif -+ - /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ - #if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C - # define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -@@ -195,24 +220,15 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_MAY_ALIAS - #endif - --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (maybe_unused) - # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] --#elif _GL_HAS_ATTRIBUTE (unused) --# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) - #else --# define _GL_ATTRIBUTE_MAYBE_UNUSED -+# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED - #endif - /* Earlier spellings of this macro. */ --#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED - #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED - --#if _GL_HAS_ATTRIBUTE (malloc) --# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) --#else --# define _GL_ATTRIBUTE_MALLOC --#endif -- --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (nodiscard) - # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] - #elif _GL_HAS_ATTRIBUTE (warn_unused_result) - # define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -@@ -270,11 +286,19 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_SENTINEL(pos) - #endif - -+#if _GL_HAS_ATTRIBUTE (unused) -+# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#else -+# define _GL_ATTRIBUTE_UNUSED -+#endif -+/* Earlier spellings of this macro. */ -+#define _GL_UNUSED _GL_ATTRIBUTE_UNUSED -+ - ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. - [ - /* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ - #if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) --# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED -+# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED - #else - # define _GL_UNUSED_LABEL - #endif -@@ -357,6 +381,16 @@ AC_DEFUN([gl_COMMON_BODY], [ - export LIBC_FATAL_STDERR_ - ]) - -+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) -+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) -+# initializes the shell variable that indicates the presence of the given module -+# as a C preprocessor expression. -+AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], -+[ -+ GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) -+ AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) -+]) -+ - # gl_MODULE_INDICATOR_CONDITION - # expands to a C preprocessor expression that evaluates to 1 or 0, depending - # whether a gnulib module that has been requested shall be considered present -@@ -369,9 +403,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) - AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], - [ - gl_MODULE_INDICATOR_SET_VARIABLE_AUX( -- [GNULIB_[]m4_translit([[$1]], -- [abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], -+ [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], -+ [abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], - [gl_MODULE_INDICATOR_CONDITION]) - ]) - -@@ -656,6 +690,72 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], - ]) - ]) - -+# gl_CC_ALLOW_WARNINGS -+# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option -+# that reverts a preceding '-Werror' option, if available. -+# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang -+# and empty otherwise. -+AC_DEFUN([gl_CC_ALLOW_WARNINGS], -+[ -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_CACHE_CHECK([for C compiler option to allow warnings], -+ [gl_cv_cc_wallow], -+ [rm -f conftest* -+ echo 'int dummy;' > conftest.c -+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null -+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null -+ dnl Test the number of error output lines, because AIX xlc accepts the -+ dnl option '-Wno-error', just to produce a warning -+ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." -+ dnl afterwards. -+ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then -+ gl_cv_cc_wallow='-Wno-error' -+ else -+ gl_cv_cc_wallow=none -+ fi -+ rm -f conftest* -+ ]) -+ case "$gl_cv_cc_wallow" in -+ none) GL_CFLAG_ALLOW_WARNINGS='' ;; -+ *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; -+ esac -+ AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) -+]) -+ -+# gl_CXX_ALLOW_WARNINGS -+# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option -+# that reverts a preceding '-Werror' option, if available. -+AC_DEFUN([gl_CXX_ALLOW_WARNINGS], -+[ -+ dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. -+ if test -n "$CXX" && test "$CXX" != no; then -+ AC_CACHE_CHECK([for C++ compiler option to allow warnings], -+ [gl_cv_cxx_wallow], -+ [rm -f conftest* -+ echo 'int dummy;' > conftest.cc -+ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null -+ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null -+ dnl Test the number of error output lines, because AIX xlC accepts the -+ dnl option '-Wno-error', just to produce a warning -+ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." -+ dnl afterwards. -+ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then -+ gl_cv_cxx_wallow='-Wno-error' -+ else -+ gl_cv_cxx_wallow=none -+ fi -+ rm -f conftest* -+ ]) -+ case "$gl_cv_cxx_wallow" in -+ none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; -+ *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; -+ esac -+ else -+ GL_CXXFLAG_ALLOW_WARNINGS='' -+ fi -+ AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) -+]) -+ - dnl Expands to some code for use in .c programs that, on native Windows, defines - dnl the Microsoft deprecated alias function names to the underscore-prefixed - dnl actual function names. With this macro, these function names are available -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 1290d75..0ae96ea 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -142,6 +142,7 @@ AC_DEFUN([gl_EARLY], - # Code from module langinfo: - # Code from module largefile: - AC_REQUIRE([AC_SYS_LARGEFILE]) -+ AC_REQUIRE([gl_YEAR2038_EARLY]) - # Code from module ldexp: - # Code from module lib-symbol-versions: - # Code from module lib-symbol-visibility: -@@ -281,9 +282,11 @@ AC_DEFUN([gl_INIT], - m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) - m4_pushdef([gl_LIBSOURCES_LIST], []) - m4_pushdef([gl_LIBSOURCES_DIR], []) -+ m4_pushdef([GL_MACRO_PREFIX], [gl]) -+ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) - gl_COMMON - gl_source_base='lib' -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([accept]) - fi -@@ -291,9 +294,10 @@ AC_DEFUN([gl_INIT], - gl_FUNC_ACCEPT4 - gl_SYS_SOCKET_MODULE_INDICATOR([accept4]) - gl_FUNC_ALLOCA -- gl_HEADER_ARPA_INET -+ gl_ARPA_INET_H -+ gl_ARPA_INET_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([bind]) - fi -@@ -317,7 +321,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([close]) - fi - gl_UNISTD_MODULE_INDICATOR([close]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([connect]) - fi -@@ -328,6 +332,7 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([copysign]) - gl_DIRENT_H -+ gl_DIRENT_H_REQUIRE_DEFAULTS - gl_FUNC_DIRFD - if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \ - || test $REPLACE_DIRFD = 1; then -@@ -347,6 +352,7 @@ AC_DEFUN([gl_INIT], - gl_HEADER_ERRNO_H - AC_REQUIRE([gl_EXTERN_INLINE]) - gl_FCNTL_H -+ gl_FCNTL_H_REQUIRE_DEFAULTS - AC_C_FLEXIBLE_ARRAY_MEMBER - gl_FLOAT_H - if test $REPLACE_FLOAT_LDBL = 1; then -@@ -360,7 +366,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([flock]) - gl_PREREQ_FLOCK - fi -- gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) -+ gl_SYS_FILE_MODULE_INDICATOR([flock]) - AC_REQUIRE([gl_FUNC_FLOOR]) - if test $REPLACE_FLOOR = 1; then - AC_LIBOBJ([floor]) -@@ -409,17 +415,17 @@ AC_DEFUN([gl_INIT], - fi - gl_UNISTD_MODULE_INDICATOR([getlogin]) - AC_REQUIRE([gl_LIB_GETLOGIN]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getpeername]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([getpeername]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getsockname]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([getsockname]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getsockopt]) - fi -@@ -439,6 +445,7 @@ AC_DEFUN([gl_INIT], - m4_ifdef([gl_ICONV_MODULE_INDICATOR], - [gl_ICONV_MODULE_INDICATOR([iconv])]) - gl_ICONV_H -+ gl_ICONV_H_REQUIRE_DEFAULTS - gl_FUNC_ICONV_OPEN - if test $REPLACE_ICONV_OPEN = 1; then - AC_LIBOBJ([iconv_open]) -@@ -461,6 +468,7 @@ AC_DEFUN([gl_INIT], - fi - gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) - gl_INTTYPES_INCOMPLETE -+ gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_ISFINITE - if test $REPLACE_ISFINITE = 1; then - AC_LIBOBJ([isfinite]) -@@ -501,6 +509,7 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([isnanl]) - gl_LANGINFO_H -+ gl_LANGINFO_H_REQUIRE_DEFAULTS - AC_REQUIRE([gl_LARGEFILE]) - gl_FUNC_LDEXP - gl_LD_VERSION_SCRIPT -@@ -512,7 +521,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([link]) - fi - gl_UNISTD_MODULE_INDICATOR([link]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([listen]) - fi -@@ -522,6 +531,7 @@ AC_DEFUN([gl_INIT], - LOCALCHARSET_TESTS_ENVIRONMENT= - AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) - gl_LOCALE_H -+ gl_LOCALE_H_REQUIRE_DEFAULTS - gl_FUNC_LOG1P - if test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1; then - AC_LIBOBJ([log1p]) -@@ -541,15 +551,14 @@ AC_DEFUN([gl_INIT], - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi -- gl_MODULE_INDICATOR([malloc-gnu]) -- gl_FUNC_MALLOC_POSIX -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi - gl_STDLIB_MODULE_INDICATOR([malloc-posix]) -- gl_MODULE_INDICATOR([malloc-posix]) - gl_MALLOCA - gl_MATH_H -+ gl_MATH_H_REQUIRE_DEFAULTS - gl_MINMAX - gl_FUNC_MKDIR - if test $REPLACE_MKDIR = 1; then -@@ -573,7 +582,8 @@ AC_DEFUN([gl_INIT], - fi - gl_MODULE_INDICATOR([msvc-nothrow]) - gl_MULTIARCH -- gl_HEADER_NETDB -+ gl_NETDB_H -+ gl_NETDB_H_REQUIRE_DEFAULTS - gl_HEADER_NETINET_IN - AC_PROG_MKDIR_P - gl_FUNC_NL_LANGINFO -@@ -607,6 +617,7 @@ AC_DEFUN([gl_INIT], - fi - gl_POLL_MODULE_INDICATOR([poll]) - gl_POLL_H -+ gl_POLL_H_REQUIRE_DEFAULTS - gl_FUNC_PUTENV - if test $REPLACE_PUTENV = 1; then - AC_LIBOBJ([putenv]) -@@ -625,12 +636,12 @@ AC_DEFUN([gl_INIT], - gl_PREREQ_READLINK - fi - gl_UNISTD_MODULE_INDICATOR([readlink]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([recv]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([recv]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([recvfrom]) - fi -@@ -657,12 +668,12 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([select]) - fi - gl_SYS_SELECT_MODULE_INDICATOR([select]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([send]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([send]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([sendto]) - fi -@@ -672,25 +683,26 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([setenv]) - fi - gl_STDLIB_MODULE_INDICATOR([setenv]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([setsockopt]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([shutdown]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([shutdown]) - gl_SIGNAL_H -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ gl_SIGNAL_H_REQUIRE_DEFAULTS -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([socket]) - fi - # When this module is used, sockets may actually occur as file descriptors, - # hence it is worth warning if the modules 'close' and 'ioctl' are not used. -- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) -- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) -+ m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) -+ m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS]) - AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) - if test "$ac_cv_header_winsock2_h" = yes; then - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 -@@ -705,31 +717,67 @@ AC_DEFUN([gl_INIT], - gl_STDALIGN_H - AM_STDBOOL_H - gl_STDDEF_H -+ gl_STDDEF_H_REQUIRE_DEFAULTS - gl_STDINT_H - gl_STDIO_H -+ gl_STDIO_H_REQUIRE_DEFAULTS -+ dnl No need to create extra modules for these functions. Everyone who uses -+ dnl likely needs them. -+ gl_STDIO_MODULE_INDICATOR([fscanf]) -+ gl_MODULE_INDICATOR([fscanf]) -+ gl_STDIO_MODULE_INDICATOR([scanf]) -+ gl_MODULE_INDICATOR([scanf]) -+ gl_STDIO_MODULE_INDICATOR([fgetc]) -+ gl_STDIO_MODULE_INDICATOR([getc]) -+ gl_STDIO_MODULE_INDICATOR([getchar]) -+ gl_STDIO_MODULE_INDICATOR([fgets]) -+ gl_STDIO_MODULE_INDICATOR([fread]) -+ dnl No need to create extra modules for these functions. Everyone who uses -+ dnl likely needs them. -+ gl_STDIO_MODULE_INDICATOR([fprintf]) -+ gl_STDIO_MODULE_INDICATOR([printf]) -+ gl_STDIO_MODULE_INDICATOR([vfprintf]) -+ gl_STDIO_MODULE_INDICATOR([vprintf]) -+ gl_STDIO_MODULE_INDICATOR([fputc]) -+ gl_STDIO_MODULE_INDICATOR([putc]) -+ gl_STDIO_MODULE_INDICATOR([putchar]) -+ gl_STDIO_MODULE_INDICATOR([fputs]) -+ gl_STDIO_MODULE_INDICATOR([puts]) -+ gl_STDIO_MODULE_INDICATOR([fwrite]) - gl_STDLIB_H -+ gl_STDLIB_H_REQUIRE_DEFAULTS - if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" - fi -- gl_HEADER_STRING_H -- gl_HEADER_SYS_FILE_H -+ gl_STRING_H -+ gl_STRING_H_REQUIRE_DEFAULTS -+ gl_SYS_FILE_H -+ gl_SYS_FILE_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SELECT]) -+ gl_SYS_SELECT_H -+ gl_SYS_SELECT_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ gl_SYS_SOCKET_H -+ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_STAT_H -+ gl_SYS_STAT_H -+ gl_SYS_STAT_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_TIME_H -+ gl_SYS_TIME_H -+ gl_SYS_TIME_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_SYS_TIMES_H -+ gl_SYS_TIMES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_SYS_TYPES_H -+ gl_SYS_TYPES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_UIO -+ gl_SYS_UIO_H -+ gl_SYS_UIO_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_TIME_H -+ gl_TIME_H -+ gl_TIME_H_REQUIRE_DEFAULTS - gl_TIME_RZ - if test $HAVE_TIMEZONE_T = 0; then - AC_LIBOBJ([time_rz]) -@@ -746,9 +794,11 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([trunc]) - gl_UNISTD_H -+ gl_UNISTD_H_REQUIRE_DEFAULTS - gl_FUNC_VSNPRINTF - gl_STDIO_MODULE_INDICATOR([vsnprintf]) - gl_WCHAR_H -+ gl_WCHAR_H_REQUIRE_DEFAULTS - gl_FUNC_WRITE - if test $REPLACE_WRITE = 1; then - AC_LIBOBJ([write]) -@@ -771,7 +821,6 @@ AC_DEFUN([gl_INIT], - gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false - gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false - gl_gnulib_enabled_hostent=false -- gl_gnulib_enabled_idx=false - gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21=false - gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66=false - gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f=false -@@ -880,7 +929,9 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_dynarray () - { - if ! $gl_gnulib_enabled_dynarray; then -+ AC_PROG_MKDIR_P - gl_gnulib_enabled_dynarray=true -+ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - fi - } -@@ -963,12 +1014,6 @@ AC_SUBST([LTALLOCA]) - gl_gnulib_enabled_hostent=true - fi - } -- func_gl_gnulib_m4code_idx () -- { -- if ! $gl_gnulib_enabled_idx; then -- gl_gnulib_enabled_idx=true -- fi -- } - func_gl_gnulib_m4code_b1df7117b479d2da59d76deba468ee21 () - { - if ! $gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21; then -@@ -1181,7 +1226,6 @@ AC_SUBST([LTALLOCA]) - AC_LIBOBJ([realloc]) - fi - gl_STDLIB_MODULE_INDICATOR([realloc-posix]) -- gl_MODULE_INDICATOR([realloc-posix]) - gl_gnulib_enabled_61bcaca76b3e6f9ae55d57a1c3193bc4=true - fi - } -@@ -1205,7 +1249,9 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_scratch_buffer () - { - if ! $gl_gnulib_enabled_scratch_buffer; then -+ AC_PROG_MKDIR_P - gl_gnulib_enabled_scratch_buffer=true -+ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - func_gl_gnulib_m4code_61bcaca76b3e6f9ae55d57a1c3193bc4 - fi -@@ -1319,7 +1365,8 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_sys_random () - { - if ! $gl_gnulib_enabled_sys_random; then -- gl_HEADER_SYS_RANDOM -+ gl_SYS_RANDOM_H -+ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_gnulib_enabled_sys_random=true - fi -@@ -1416,6 +1463,7 @@ AC_SUBST([LTALLOCA]) - { - if ! $gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410; then - gl_WCTYPE_H -+ gl_WCTYPE_H_REQUIRE_DEFAULTS - gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410=true - fi - } -@@ -1431,9 +1479,6 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_925677f0343de64b89a9f0c790b4104c - fi - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -- func_gl_gnulib_m4code_idx -- fi -- if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - fi - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -@@ -1584,9 +1629,6 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_sockets - fi - if test $HAVE_TIMEZONE_T = 0; then -- func_gl_gnulib_m4code_idx -- fi -- if test $HAVE_TIMEZONE_T = 0; then - func_gl_gnulib_m4code_time_r - fi - if test $HAVE_TIMEZONE_T = 0; then -@@ -1621,7 +1663,6 @@ AC_SUBST([LTALLOCA]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_hostent], [$gl_gnulib_enabled_hostent]) -- AM_CONDITIONAL([gl_GNULIB_ENABLED_idx], [$gl_gnulib_enabled_idx]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_b1df7117b479d2da59d76deba468ee21], [$gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_3f0e593033d1fc2c127581960f641b66], [$gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_dbdf22868a5367f28bf18e0013ac6f8f], [$gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f]) -@@ -1673,6 +1714,8 @@ AC_SUBST([LTALLOCA]) - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) -+ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) -+ m4_popdef([GL_MACRO_PREFIX]) - m4_popdef([gl_LIBSOURCES_DIR]) - m4_popdef([gl_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) -@@ -1699,6 +1742,8 @@ AC_SUBST([LTALLOCA]) - m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) - m4_pushdef([gltests_LIBSOURCES_LIST], []) - m4_pushdef([gltests_LIBSOURCES_DIR], []) -+ m4_pushdef([GL_MACRO_PREFIX], [gltests]) -+ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) - gl_COMMON - gl_source_base='tests' - changequote(,)dnl -@@ -1720,6 +1765,8 @@ changequote([, ])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) -+ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) -+ m4_popdef([GL_MACRO_PREFIX]) - m4_popdef([gltests_LIBSOURCES_DIR]) - m4_popdef([gltests_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) -@@ -2265,6 +2312,7 @@ AC_DEFUN([gl_FILE_LIST], [ - m4/wint_t.m4 - m4/write.m4 - m4/xsize.m4 -+ m4/year2038.m4 - m4/zzgnulib.m4 - top/GNUmakefile - top/maint.mk -diff --git a/m4/hostent.m4 b/m4/hostent.m4 -index 641d72f..f1390a3 100644 ---- a/m4/hostent.m4 -+++ b/m4/hostent.m4 -@@ -1,4 +1,4 @@ --# hostent.m4 serial 3 -+# hostent.m4 serial 4 - dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ AC_DEFUN([gl_HOSTENT], - dnl - On BeOS, they are in libnet. - dnl - On native Windows, they are in ws2_32.dll. - dnl - Otherwise they are in libc. -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - HOSTENT_LIB= - gl_saved_libs="$LIBS" - AC_SEARCH_LIBS([gethostbyname], [nsl network net], -diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 -index ab8e283..2940988 100644 ---- a/m4/iconv_h.m4 -+++ b/m4/iconv_h.m4 -@@ -1,10 +1,10 @@ --# iconv_h.m4 serial 12 -+# iconv_h.m4 serial 15 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_ICONV_H], -+AC_DEFUN_ONCE([gl_ICONV_H], - [ - AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - -@@ -24,22 +24,37 @@ AC_DEFUN([gl_ICONV_H], - dnl Unconditionally enables the replacement of . - AC_DEFUN([gl_REPLACE_ICONV_H], - [ -- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+ gl_ICONV_H_REQUIRE_DEFAULTS - ICONV_H='iconv.h' - AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) - ]) - -+# gl_ICONV_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_ICONV_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_ICONV_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_ICONV_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_ICONV_H_DEFAULTS], - [ - m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) -- GNULIB_ICONV=0; AC_SUBST([GNULIB_ICONV]) - dnl Assume proper GNU behavior unless another module says otherwise. - ICONV_CONST=; AC_SUBST([ICONV_CONST]) - REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) -diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 -index f56e94a..64b1de5 100644 ---- a/m4/inttypes.m4 -+++ b/m4/inttypes.m4 -@@ -1,4 +1,4 @@ --# inttypes.m4 serial 32 -+# inttypes.m4 serial 35 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - dnl From Derek Price, Bruno Haible. - dnl Test whether is supported or must be substituted. - --AC_DEFUN([gl_INTTYPES_H], -+AC_DEFUN_ONCE([gl_INTTYPES_H], - [ - AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) - gl_INTTYPES_PRI_SCN -@@ -136,19 +136,34 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], - AC_SUBST([$1]) - ]) - -+# gl_INTTYPES_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_INTTYPES_H_DEFAULTS], - [ -- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) -- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) -- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) -- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) - HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) -diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 -index 950fe20..87959f7 100644 ---- a/m4/langinfo_h.m4 -+++ b/m4/langinfo_h.m4 -@@ -1,10 +1,10 @@ --# langinfo_h.m4 serial 9 -+# langinfo_h.m4 serial 12 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_LANGINFO_H], -+AC_DEFUN_ONCE([gl_LANGINFO_H], - [ - AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) - -@@ -104,18 +104,33 @@ int a = YESEXPR; - ]], [nl_langinfo]) - ]) - -+# gl_LANGINFO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_LANGINFO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_LANGINFO_H_DEFAULTS], - [ -- GNULIB_NL_LANGINFO=0; AC_SUBST([GNULIB_NL_LANGINFO]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_NL_LANGINFO=1; AC_SUBST([HAVE_NL_LANGINFO]) - REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO]) -diff --git a/m4/largefile.m4 b/m4/largefile.m4 -index cadb16d..fbde5e6 100644 ---- a/m4/largefile.m4 -+++ b/m4/largefile.m4 -@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - esac - ]) - --# The following implementation works around a problem in autoconf <= 2.69; -+# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ -+# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. - m4_version_prereq([2.70], [], [ -@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]];[]dnl - ]) -+])# m4_version_prereq 2.70 - - - # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], - [AC_LANG_PROGRAM([$5], [$6])], - [$3=no; break]) - m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( -- [AC_LANG_PROGRAM([#define $1 $2 -+ [AC_LANG_PROGRAM([#undef $1 -+#define $1 $2 - $5], [$6])], - [$3=$2; break]) - $3=unknown -@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl - AC_DEFUN([AC_SYS_LARGEFILE], - [AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) --if test "$enable_largefile" != no; then -- -- AC_CACHE_CHECK([for special C compiler options needed for large files], -+AS_IF([test "$enable_largefile" != no], -+ [AC_CACHE_CHECK([for special C compiler options needed for large files], - ac_cv_sys_largefile_CC, - [ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then -@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.], - [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- if test $ac_cv_sys_file_offset_bits = unknown; then -- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, -- ac_cv_sys_large_files, -- [Define for large files, on AIX-style hosts.], -- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- fi --fi -+ AS_CASE([$ac_cv_sys_file_offset_bits], -+ [unknown], -+ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], -+ [ac_cv_sys_large_files], -+ [Define for large files, on AIX-style hosts.], -+ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], -+ [64], -+ [gl_YEAR2038_BODY([])])]) - ])# AC_SYS_LARGEFILE --])# m4_version_prereq 2.70 - - # Enable large files on systems where this is implemented by Gnulib, not by the - # system headers. -diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 -index 70dbb7d..00c9fe9 100644 ---- a/m4/limits-h.m4 -+++ b/m4/limits-h.m4 -@@ -11,7 +11,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], - [ - gl_CHECK_NEXT_HEADERS([limits.h]) - -- AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], -+ AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.], - [gl_cv_header_limits_width], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( -@@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], - long long llm = LLONG_MAX; - int wb = WORD_BIT; - int ullw = ULLONG_WIDTH; -+ int bw = BOOL_WIDTH; - ]])], - [gl_cv_header_limits_width=yes], - [gl_cv_header_limits_width=no])]) -diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 -index 7b50aa7..444a381 100644 ---- a/m4/locale_h.m4 -+++ b/m4/locale_h.m4 -@@ -1,13 +1,13 @@ --# locale_h.m4 serial 25 -+# locale_h.m4 serial 28 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_LOCALE_H], -+AC_DEFUN_ONCE([gl_LOCALE_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) - - dnl Persuade glibc to define locale_t and the int_p_*, int_n_* -@@ -129,22 +129,37 @@ AC_DEFUN([gl_LOCALE_T], - AC_SUBST([HAVE_XLOCALE_H]) - ]) - -+# gl_LOCALE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_LOCALE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_LOCALE_H_DEFAULTS], - [ -- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) -- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) -- GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) -- GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) -- GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) - HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) -diff --git a/m4/malloc.m4 b/m4/malloc.m4 -index 32ab42e..972e808 100644 ---- a/m4/malloc.m4 -+++ b/m4/malloc.m4 -@@ -1,21 +1,21 @@ --# malloc.m4 serial 22 -+# malloc.m4 serial 27 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - # This is adapted with modifications from upstream Autoconf here: --# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c -+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 - AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ - AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles -- AC_CACHE_CHECK([for GNU libc compatible malloc], -+ AC_CACHE_CHECK([whether malloc (0) returns nonnull], - [ac_cv_func_malloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], -- [[char *p = malloc (0); -+ [[void *p = malloc (0); - int result = !p; - free (p); - return result;]]) -@@ -24,75 +24,151 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ac_cv_func_malloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ -+ | gnu* | *-musl* | midnightbsd* \ -+ | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - ]) - ]) -- case "$ac_cv_func_malloc_0_nonnull" in -- *yes) -- $1 -- ;; -- *) -- $2 -- ;; -- esac -+ AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) - ])# _AC_FUNC_MALLOC_IF - - # gl_FUNC_MALLOC_GNU - # ------------------ --# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if --# it is not. -+# Replace malloc if it is not compatible with GNU libc. - AC_DEFUN([gl_FUNC_MALLOC_GNU], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. -- _AC_FUNC_MALLOC_IF( -- [AC_DEFINE([HAVE_MALLOC_GNU], [1], -- [Define to 1 if your system has a GNU libc compatible 'malloc' -- function, and to 0 otherwise.])], -- [AC_DEFINE([HAVE_MALLOC_GNU], [0]) -- REPLACE_MALLOC=1 -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) -+ if test $REPLACE_MALLOC = 0; then -+ _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC=1]) -+ fi -+]) -+ -+# gl_FUNC_MALLOC_PTRDIFF -+# ---------------------- -+# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, -+# and replace malloc otherwise. -+AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], -+[ -+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) -+ test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC=1 -+]) -+ -+# Test whether malloc, realloc, calloc refuse to create objects -+# larger than what can be expressed in ptrdiff_t. -+# Set gl_cv_func_malloc_gnu to yes or no accordingly. -+AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], -+[ -+ AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], -+ [gl_cv_malloc_ptrdiff], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ ]], -+ [[/* 64-bit ptrdiff_t is so wide that no practical platform -+ can exceed it. */ -+ #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) -+ -+ /* On rare machines where size_t fits in ptrdiff_t there -+ is no problem. */ -+ #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) -+ -+ /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t -+ bounds even on 32-bit platforms. We don't know which -+ non-glibc systems are safe. */ -+ #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) -+ -+ #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE -+ return 0; -+ #else -+ #error "malloc might not be ptrdiff_t safe" -+ syntax error -+ #endif -+ ]])], -+ [gl_cv_malloc_ptrdiff=yes], -+ [gl_cv_malloc_ptrdiff=no]) - ]) - ]) - - # gl_FUNC_MALLOC_POSIX - # -------------------- - # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it --# fails), and replace malloc if it is not. -+# fails, and doesn't mess up with ptrdiff_t overflow), and replace -+# malloc if it is not. - AC_DEFUN([gl_FUNC_MALLOC_POSIX], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) - AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) -- if test $gl_cv_func_malloc_posix = yes; then -+ if test "$gl_cv_func_malloc_posix" = yes; then - AC_DEFINE([HAVE_MALLOC_POSIX], [1], -- [Define if the 'malloc' function is POSIX compliant.]) -+ [Define if malloc, realloc, and calloc set errno on allocation failure.]) - else - REPLACE_MALLOC=1 - fi - ]) - --# Test whether malloc, realloc, calloc are POSIX compliant, -+# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. - # Set gl_cv_func_malloc_posix to yes or no accordingly. - AC_DEFUN([gl_CHECK_MALLOC_POSIX], - [ -- AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], - [gl_cv_func_malloc_posix], - [ - dnl It is too dangerous to try to allocate a large amount of memory: - dnl some systems go to their knees when you do that. So assume that -- dnl all Unix implementations of the function are POSIX compliant. -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM( -- [[]], -- [[#if defined _WIN32 && ! defined __CYGWIN__ -- choke me -- #endif -- ]])], -- [gl_cv_func_malloc_posix=yes], -- [gl_cv_func_malloc_posix=no]) -+ dnl all Unix implementations of the function set errno on failure, -+ dnl except on those platforms where we have seen 'test-malloc-gnu', -+ dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. -+ case "$host_os" in -+ mingw*) -+ gl_cv_func_malloc_posix=no ;; -+ irix* | solaris*) -+ dnl On IRIX 6.5, the three functions return NULL with errno unset -+ dnl when the argument is larger than PTRDIFF_MAX. -+ dnl On Solaris 11.3, the three functions return NULL with errno set -+ dnl to EAGAIN, not ENOMEM, when the argument is larger than -+ dnl PTRDIFF_MAX. -+ dnl Here is a test program: -+m4_divert_push([KILL]) -+#include -+#include -+#include -+#define ptrdiff_t long -+#ifndef PTRDIFF_MAX -+# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) -+#endif -+ -+int main () -+{ -+ void *p; -+ -+ fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); -+ -+ errno = 0; -+ p = malloc ((unsigned long) PTRDIFF_MAX + 1); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ errno = 0; -+ p = calloc (PTRDIFF_MAX / 2 + 1, 2); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ errno = 0; -+ p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ return 0; -+} -+m4_divert_pop([KILL]) -+ gl_cv_func_malloc_posix=no ;; -+ *) -+ gl_cv_func_malloc_posix=yes ;; -+ esac - ]) - ]) -diff --git a/m4/math_h.m4 b/m4/math_h.m4 -index a9ba5e6..b3a10c3 100644 ---- a/m4/math_h.m4 -+++ b/m4/math_h.m4 -@@ -1,10 +1,10 @@ --# math_h.m4 serial 122 -+# math_h.m4 serial 125 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_MATH_H], -+AC_DEFUN_ONCE([gl_MATH_H], - [ - AC_REQUIRE([gl_MATH_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([math.h]) -@@ -53,119 +53,134 @@ AC_DEFUN([gl_MATH_H], - tanf tanl tanhf trunc truncf truncl]) - ]) - -+# gl_MATH_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_MATH_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_MATH_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_MATH_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_MATH_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_MATH_H_DEFAULTS], - [ -- GNULIB_ACOSF=0; AC_SUBST([GNULIB_ACOSF]) -- GNULIB_ACOSL=0; AC_SUBST([GNULIB_ACOSL]) -- GNULIB_ASINF=0; AC_SUBST([GNULIB_ASINF]) -- GNULIB_ASINL=0; AC_SUBST([GNULIB_ASINL]) -- GNULIB_ATANF=0; AC_SUBST([GNULIB_ATANF]) -- GNULIB_ATANL=0; AC_SUBST([GNULIB_ATANL]) -- GNULIB_ATAN2F=0; AC_SUBST([GNULIB_ATAN2F]) -- GNULIB_CBRT=0; AC_SUBST([GNULIB_CBRT]) -- GNULIB_CBRTF=0; AC_SUBST([GNULIB_CBRTF]) -- GNULIB_CBRTL=0; AC_SUBST([GNULIB_CBRTL]) -- GNULIB_CEIL=0; AC_SUBST([GNULIB_CEIL]) -- GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) -- GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) -- GNULIB_COPYSIGN=0; AC_SUBST([GNULIB_COPYSIGN]) -- GNULIB_COPYSIGNF=0; AC_SUBST([GNULIB_COPYSIGNF]) -- GNULIB_COPYSIGNL=0; AC_SUBST([GNULIB_COPYSIGNL]) -- GNULIB_COSF=0; AC_SUBST([GNULIB_COSF]) -- GNULIB_COSL=0; AC_SUBST([GNULIB_COSL]) -- GNULIB_COSHF=0; AC_SUBST([GNULIB_COSHF]) -- GNULIB_EXPF=0; AC_SUBST([GNULIB_EXPF]) -- GNULIB_EXPL=0; AC_SUBST([GNULIB_EXPL]) -- GNULIB_EXP2=0; AC_SUBST([GNULIB_EXP2]) -- GNULIB_EXP2F=0; AC_SUBST([GNULIB_EXP2F]) -- GNULIB_EXP2L=0; AC_SUBST([GNULIB_EXP2L]) -- GNULIB_EXPM1=0; AC_SUBST([GNULIB_EXPM1]) -- GNULIB_EXPM1F=0; AC_SUBST([GNULIB_EXPM1F]) -- GNULIB_EXPM1L=0; AC_SUBST([GNULIB_EXPM1L]) -- GNULIB_FABSF=0; AC_SUBST([GNULIB_FABSF]) -- GNULIB_FABSL=0; AC_SUBST([GNULIB_FABSL]) -- GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR]) -- GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) -- GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) -- GNULIB_FMA=0; AC_SUBST([GNULIB_FMA]) -- GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF]) -- GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL]) -- GNULIB_FMOD=0; AC_SUBST([GNULIB_FMOD]) -- GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF]) -- GNULIB_FMODL=0; AC_SUBST([GNULIB_FMODL]) -- GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF]) -- GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) -- GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) -- GNULIB_HYPOT=0; AC_SUBST([GNULIB_HYPOT]) -- GNULIB_HYPOTF=0; AC_SUBST([GNULIB_HYPOTF]) -- GNULIB_HYPOTL=0; AC_SUBST([GNULIB_HYPOTL]) -- GNULIB_ILOGB=0; AC_SUBST([GNULIB_ILOGB]) -- GNULIB_ILOGBF=0; AC_SUBST([GNULIB_ILOGBF]) -- GNULIB_ILOGBL=0; AC_SUBST([GNULIB_ILOGBL]) -- GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) -- GNULIB_ISINF=0; AC_SUBST([GNULIB_ISINF]) -- GNULIB_ISNAN=0; AC_SUBST([GNULIB_ISNAN]) -- GNULIB_ISNANF=0; AC_SUBST([GNULIB_ISNANF]) -- GNULIB_ISNAND=0; AC_SUBST([GNULIB_ISNAND]) -- GNULIB_ISNANL=0; AC_SUBST([GNULIB_ISNANL]) -- GNULIB_LDEXPF=0; AC_SUBST([GNULIB_LDEXPF]) -- GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) -- GNULIB_LOG=0; AC_SUBST([GNULIB_LOG]) -- GNULIB_LOGF=0; AC_SUBST([GNULIB_LOGF]) -- GNULIB_LOGL=0; AC_SUBST([GNULIB_LOGL]) -- GNULIB_LOG10=0; AC_SUBST([GNULIB_LOG10]) -- GNULIB_LOG10F=0; AC_SUBST([GNULIB_LOG10F]) -- GNULIB_LOG10L=0; AC_SUBST([GNULIB_LOG10L]) -- GNULIB_LOG1P=0; AC_SUBST([GNULIB_LOG1P]) -- GNULIB_LOG1PF=0; AC_SUBST([GNULIB_LOG1PF]) -- GNULIB_LOG1PL=0; AC_SUBST([GNULIB_LOG1PL]) -- GNULIB_LOG2=0; AC_SUBST([GNULIB_LOG2]) -- GNULIB_LOG2F=0; AC_SUBST([GNULIB_LOG2F]) -- GNULIB_LOG2L=0; AC_SUBST([GNULIB_LOG2L]) -- GNULIB_LOGB=0; AC_SUBST([GNULIB_LOGB]) -- GNULIB_LOGBF=0; AC_SUBST([GNULIB_LOGBF]) -- GNULIB_LOGBL=0; AC_SUBST([GNULIB_LOGBL]) -- GNULIB_MODF=0; AC_SUBST([GNULIB_MODF]) -- GNULIB_MODFF=0; AC_SUBST([GNULIB_MODFF]) -- GNULIB_MODFL=0; AC_SUBST([GNULIB_MODFL]) -- GNULIB_POWF=0; AC_SUBST([GNULIB_POWF]) -- GNULIB_REMAINDER=0; AC_SUBST([GNULIB_REMAINDER]) -- GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF]) -- GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL]) -- GNULIB_RINT=0; AC_SUBST([GNULIB_RINT]) -- GNULIB_RINTF=0; AC_SUBST([GNULIB_RINTF]) -- GNULIB_RINTL=0; AC_SUBST([GNULIB_RINTL]) -- GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) -- GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) -- GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) -- GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) -- GNULIB_SINF=0; AC_SUBST([GNULIB_SINF]) -- GNULIB_SINL=0; AC_SUBST([GNULIB_SINL]) -- GNULIB_SINHF=0; AC_SUBST([GNULIB_SINHF]) -- GNULIB_SQRTF=0; AC_SUBST([GNULIB_SQRTF]) -- GNULIB_SQRTL=0; AC_SUBST([GNULIB_SQRTL]) -- GNULIB_TANF=0; AC_SUBST([GNULIB_TANF]) -- GNULIB_TANL=0; AC_SUBST([GNULIB_TANL]) -- GNULIB_TANHF=0; AC_SUBST([GNULIB_TANHF]) -- GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) -- GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) -- GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_J0=1; AC_SUBST([GNULIB_MDA_J0]) -- GNULIB_MDA_J1=1; AC_SUBST([GNULIB_MDA_J1]) -- GNULIB_MDA_JN=1; AC_SUBST([GNULIB_MDA_JN]) -- GNULIB_MDA_Y0=1; AC_SUBST([GNULIB_MDA_Y0]) -- GNULIB_MDA_Y1=1; AC_SUBST([GNULIB_MDA_Y1]) -- GNULIB_MDA_YN=1; AC_SUBST([GNULIB_MDA_YN]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_ACOSF=1; AC_SUBST([HAVE_ACOSF]) - HAVE_ACOSL=1; AC_SUBST([HAVE_ACOSL]) -diff --git a/m4/memchr.m4 b/m4/memchr.m4 -index 64470de..ca08192 100644 ---- a/m4/memchr.m4 -+++ b/m4/memchr.m4 -@@ -1,4 +1,4 @@ --# memchr.m4 serial 17 -+# memchr.m4 serial 18 - dnl Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], - AC_CHECK_HEADERS_ONCE([sys/mman.h]) - AC_CHECK_FUNCS_ONCE([mprotect]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - # Detect platform-specific bugs in some versions of glibc: - # memchr should not dereference anything with length 0 - # https://bugzilla.redhat.com/show_bug.cgi?id=499689 -diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 -index c5ee2af..f9d9ec8 100644 ---- a/m4/mempcpy.m4 -+++ b/m4/mempcpy.m4 -@@ -1,4 +1,4 @@ --# mempcpy.m4 serial 11 -+# mempcpy.m4 serial 12 - dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], - dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. - AC_REQUIRE([AC_C_RESTRICT]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([mempcpy]) - if test $ac_cv_func_mempcpy = no; then - HAVE_MEMPCPY=0 -diff --git a/m4/mktime.m4 b/m4/mktime.m4 -index 245649e..721189a 100644 ---- a/m4/mktime.m4 -+++ b/m4/mktime.m4 -@@ -1,4 +1,4 @@ --# serial 35 -+# serial 36 - dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -255,7 +255,7 @@ main () - dnl Main macro of module 'mktime'. - AC_DEFUN([gl_FUNC_MKTIME], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - -diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 -index db84c78..eb7c3b8 100644 ---- a/m4/netdb_h.m4 -+++ b/m4/netdb_h.m4 -@@ -1,10 +1,10 @@ --# netdb_h.m4 serial 12 -+# netdb_h.m4 serial 15 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_NETDB], -+AC_DEFUN_ONCE([gl_NETDB_H], - [ - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([netdb.h]) -@@ -21,18 +21,33 @@ AC_DEFUN([gl_HEADER_NETDB], - [getaddrinfo freeaddrinfo gai_strerror getnameinfo]) - ]) - -+# gl_NETDB_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_NETDB_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_NETDB_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_NETDB_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_NETDB_H_DEFAULTS], - [ -- GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_STRUCT_ADDRINFO=1; AC_SUBST([HAVE_STRUCT_ADDRINFO]) - HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO]) -diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 -index 20692d8..1f0d796 100644 ---- a/m4/poll_h.m4 -+++ b/m4/poll_h.m4 -@@ -1,4 +1,4 @@ --# poll_h.m4 serial 3 -+# poll_h.m4 serial 6 - dnl Copyright (C) 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Bruno Haible. - --AC_DEFUN([gl_POLL_H], -+AC_DEFUN_ONCE([gl_POLL_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_POLL_H_DEFAULTS]) - - AC_CHECK_HEADERS_ONCE([poll.h]) -@@ -31,18 +31,33 @@ AC_DEFUN([gl_POLL_H], - [poll]) - ]) - -+# gl_POLL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_POLL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_POLL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_POLL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_POLL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_POLL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_POLL_H_DEFAULTS], - [ -- GNULIB_POLL=0; AC_SUBST([GNULIB_POLL]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POLL=1; AC_SUBST([HAVE_POLL]) - REPLACE_POLL=0; AC_SUBST([REPLACE_POLL]) -diff --git a/m4/printf.m4 b/m4/printf.m4 -index d8b3521..284c7c5 100644 ---- a/m4/printf.m4 -+++ b/m4/printf.m4 -@@ -1,4 +1,4 @@ --# printf.m4 serial 72 -+# printf.m4 serial 73 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -537,7 +537,7 @@ int main () - && strcmp (buf, "-0X6.488P-1 33") != 0 - && strcmp (buf, "-0XC.91P-2 33") != 0)) - result |= 2; -- /* This catches a FreeBSD 6.1 bug: it doesn't round. */ -+ /* This catches a FreeBSD 13.0 bug: it doesn't round. */ - if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 - || (strcmp (buf, "0x1.83p+0 33") != 0 - && strcmp (buf, "0x3.05p-1 33") != 0 -@@ -1690,6 +1690,7 @@ dnl - dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 - dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . - dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . -+dnl FreeBSD 13.0 . . . . # . . . . . . . . # . . . . . . - dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . - dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . - dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . -diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 -index f928465..452fab1 100644 ---- a/m4/rawmemchr.m4 -+++ b/m4/rawmemchr.m4 -@@ -1,4 +1,4 @@ --# rawmemchr.m4 serial 2 -+# rawmemchr.m4 serial 3 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR], - dnl Persuade glibc to declare rawmemchr(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([rawmemchr]) - if test $ac_cv_func_rawmemchr = no; then - HAVE_RAWMEMCHR=0 -diff --git a/m4/realloc.m4 b/m4/realloc.m4 -index a80a02a..0abc418 100644 ---- a/m4/realloc.m4 -+++ b/m4/realloc.m4 -@@ -1,21 +1,21 @@ --# realloc.m4 serial 20 -+# realloc.m4 serial 24 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - # This is adapted with modifications from upstream Autoconf here: --# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c -+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 - AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ - AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles -- AC_CACHE_CHECK([for GNU libc compatible realloc], -+ AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], - [ac_cv_func_realloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], -- [[char *p = realloc (0, 0); -+ [[void *p = realloc (0, 0); - int result = !p; - free (p); - return result;]]) -@@ -24,53 +24,40 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ac_cv_func_realloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ -+ | gnu* | *-musl* | midnightbsd* \ -+ | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - ]) - ]) -- case "$ac_cv_func_realloc_0_nonnull" in -- *yes) -- $1 -- ;; -- *) -- $2 -- ;; -- esac -+ AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) - ])# AC_FUNC_REALLOC - - # gl_FUNC_REALLOC_GNU - # ------------------- --# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace --# realloc if it is not. -+# Replace realloc if it is not compatible with GNU libc. - AC_DEFUN([gl_FUNC_REALLOC_GNU], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. -- _AC_FUNC_REALLOC_IF( -- [AC_DEFINE([HAVE_REALLOC_GNU], [1], -- [Define to 1 if your system has a GNU libc compatible 'realloc' -- function, and to 0 otherwise.])], -- [AC_DEFINE([HAVE_REALLOC_GNU], [0]) -- REPLACE_REALLOC=1 -- ]) -+ AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) -+ if test $REPLACE_REALLOC = 0; then -+ _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC=1]) -+ fi - ])# gl_FUNC_REALLOC_GNU - - # gl_FUNC_REALLOC_POSIX - # --------------------- - # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it --# fails), and replace realloc if it is not. -+# fails, and doesn't mess up with ptrdiff_t overflow), -+# and replace realloc if it is not. - AC_DEFUN([gl_FUNC_REALLOC_POSIX], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) -- if test $gl_cv_func_malloc_posix = yes; then -- AC_DEFINE([HAVE_REALLOC_POSIX], [1], -- [Define if the 'realloc' function is POSIX compliant.]) -- else -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) -+ if test $REPLACE_MALLOC = 1; then - REPLACE_REALLOC=1 - fi - ]) -diff --git a/m4/regex.m4 b/m4/regex.m4 -index 850c572..1c7e562 100644 ---- a/m4/regex.m4 -+++ b/m4/regex.m4 -@@ -1,4 +1,4 @@ --# serial 71 -+# serial 73 - - # Copyright (C) 1996-2001, 2003-2021 Free Software Foundation, Inc. - # -@@ -246,7 +246,7 @@ AC_DEFUN([gl_REGEX], - & ~RE_CONTEXT_INVALID_DUP - & ~RE_NO_EMPTY_RANGES); - memset (®ex, 0, sizeof regex); -- s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); -+ s = re_compile_pattern ("[[:alnum:]_-]\\\\+\$", 16, ®ex); - if (s) - result |= 32; - else -@@ -264,14 +264,50 @@ AC_DEFUN([gl_REGEX], - back reference. */ - re_set_syntax (RE_SYNTAX_POSIX_EGREP); - memset (®ex, 0, sizeof regex); -- s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); -+ s = re_compile_pattern ("0|()0|\\\\1|0", 10, ®ex); - if (!s) -- result |= 64; -+ { -+ memset (®s, 0, sizeof regs); -+ i = re_search (®ex, "x", 1, 0, 1, ®s); -+ if (i != -1) -+ result |= 64; -+ if (0 <= i) -+ { -+ free (regs.start); -+ free (regs.end); -+ } -+ regfree (®ex); -+ } - else - { - if (strcmp (s, "Invalid back reference")) - result |= 64; -+ } -+ -+ /* glibc bug 11053. */ -+ re_set_syntax (RE_SYNTAX_POSIX_BASIC); -+ memset (®ex, 0, sizeof regex); -+ static char const pat_sub2[] = "\\\\(a*\\\\)*a*\\\\1"; -+ s = re_compile_pattern (pat_sub2, sizeof pat_sub2 - 1, ®ex); -+ if (s) -+ result |= 64; -+ else -+ { -+ memset (®s, 0, sizeof regs); -+ static char const data[] = "a"; -+ int datalen = sizeof data - 1; -+ i = re_search (®ex, data, datalen, 0, datalen, ®s); -+ if (i != 0) -+ result |= 64; -+ else if (regs.num_regs < 2) -+ result |= 64; -+ else if (! (regs.start[0] == 0 && regs.end[0] == 1)) -+ result |= 64; -+ else if (! (regs.start[1] == 0 && regs.end[1] == 0)) -+ result |= 64; - regfree (®ex); -+ free (regs.start); -+ free (regs.end); - } - - #if 0 -diff --git a/m4/select.m4 b/m4/select.m4 -index c7409d2..72c068f 100644 ---- a/m4/select.m4 -+++ b/m4/select.m4 -@@ -1,4 +1,4 @@ --# select.m4 serial 12 -+# select.m4 serial 13 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_SELECT], - [ -- AC_REQUIRE([gl_HEADER_SYS_SELECT]) -+ AC_REQUIRE([gl_SYS_SELECT_H]) - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_SOCKETS]) -diff --git a/m4/servent.m4 b/m4/servent.m4 -index 2dda177..9bc3bcd 100644 ---- a/m4/servent.m4 -+++ b/m4/servent.m4 -@@ -1,4 +1,4 @@ --# servent.m4 serial 3 -+# servent.m4 serial 4 - dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -15,7 +15,7 @@ AC_DEFUN([gl_SERVENT], - dnl - On BeOS, they are in libnet. - dnl - On native Windows, they are in ws2_32.dll. - dnl - Otherwise they are in libc. -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - SERVENT_LIB= - gl_saved_libs="$LIBS" - AC_SEARCH_LIBS([getservbyname], [socket network net], -diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 -index ff9f025..8b93880 100644 ---- a/m4/signal_h.m4 -+++ b/m4/signal_h.m4 -@@ -1,10 +1,10 @@ --# signal_h.m4 serial 19 -+# signal_h.m4 serial 22 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_SIGNAL_H], -+AC_DEFUN_ONCE([gl_SIGNAL_H], - [ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) -@@ -52,22 +52,37 @@ AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], - fi - ]) - -+# gl_SIGNAL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SIGNAL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SIGNAL_H_DEFAULTS], - [ -- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) -- GNULIB_RAISE=0; AC_SUBST([GNULIB_RAISE]) -- GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) -- GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) -- GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) - HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) -diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 -index edae5d8..17e14c7 100644 ---- a/m4/sockpfaf.m4 -+++ b/m4/sockpfaf.m4 -@@ -1,4 +1,4 @@ --# sockpfaf.m4 serial 9 -+# sockpfaf.m4 serial 10 - dnl Copyright (C) 2004, 2006, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ dnl From Bruno Haible. - - AC_DEFUN([gl_SOCKET_FAMILIES], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_CHECK_HEADERS_ONCE([netinet/in.h]) - - AC_CACHE_CHECK([for IPv4 sockets], -@@ -60,7 +60,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES], - - AC_DEFUN([gl_SOCKET_FAMILY_UNIX], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_CHECK_HEADERS_ONCE([sys/un.h]) - - AC_CACHE_CHECK([for UNIX domain sockets], -diff --git a/m4/stat.m4 b/m4/stat.m4 -index 66f6c8c..9bcdb72 100644 ---- a/m4/stat.m4 -+++ b/m4/stat.m4 -@@ -1,4 +1,4 @@ --# serial 17 -+# serial 18 - - # Copyright (C) 2009-2021 Free Software Foundation, Inc. - # -@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], - - # Prerequisites of lib/stat.c and lib/stat-w32.c. - AC_DEFUN([gl_PREREQ_STAT], [ -- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ AC_REQUIRE([gl_SYS_STAT_H]) - AC_REQUIRE([gl_PREREQ_STAT_W32]) - : - ]) -diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 -index cd666c4..1303d2e 100644 ---- a/m4/stddef_h.m4 -+++ b/m4/stddef_h.m4 -@@ -1,4 +1,4 @@ --# stddef_h.m4 serial 9 -+# stddef_h.m4 serial 11 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl A placeholder for , for platforms that have issues. - --AC_DEFUN([gl_STDDEF_H], -+AC_DEFUN_ONCE([gl_STDDEF_H], - [ - AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) -@@ -68,13 +68,28 @@ AC_DEFUN([gl_STDDEF_H], - fi - ]) - -+# gl_STDDEF_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDDEF_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDDEF_H_DEFAULTS], - [ - dnl Assume proper GNU behavior unless another module says otherwise. -diff --git a/m4/stdint.m4 b/m4/stdint.m4 -index a785b44..2eb1652 100644 ---- a/m4/stdint.m4 -+++ b/m4/stdint.m4 -@@ -1,4 +1,4 @@ --# stdint.m4 serial 58 -+# stdint.m4 serial 60 - dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -170,7 +170,7 @@ struct s { - PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) - && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) - ? 1 : -1; -- /* Detect bug in FreeBSD 6.0 / ia64. */ -+ /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ - int check_SIG_ATOMIC: - SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) - && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) -@@ -527,7 +527,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], - dnl requirement that wint_t is "unchanged by default argument promotions". - dnl In this case gnulib's and override wint_t. - dnl Set the variable BITSIZEOF_WINT_T accordingly. -- if test $GNULIB_OVERRIDES_WINT_T = 1; then -+ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then - BITSIZEOF_WINT_T=32 - fi - ]) -diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 -index 4c3f24a..e704383 100644 ---- a/m4/stdio_h.m4 -+++ b/m4/stdio_h.m4 -@@ -1,11 +1,12 @@ --# stdio_h.m4 serial 52 -+# stdio_h.m4 serial 56 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_STDIO_H], -+AC_DEFUN_ONCE([gl_STDIO_H], - [ -+ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AH_VERBATIM([MINGW_ANSI_STDIO], - [/* Use GNU style printf and scanf. */ - #ifndef __USE_MINGW_ANSI_STDIO -@@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], - #endif - ]) - AC_DEFINE([__USE_MINGW_ANSI_STDIO]) -- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - gl_NEXT_HEADERS([stdio.h]) - - dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and -@@ -40,17 +40,6 @@ AC_DEFUN([gl_STDIO_H], - attribute "__gnu_printf__" instead of "__printf__"]) - fi - -- dnl No need to create extra modules for these functions. Everyone who uses -- dnl likely needs them. -- GNULIB_FSCANF=1 -- gl_MODULE_INDICATOR([fscanf]) -- GNULIB_SCANF=1 -- gl_MODULE_INDICATOR([scanf]) -- GNULIB_FGETC=1 -- GNULIB_GETC=1 -- GNULIB_GETCHAR=1 -- GNULIB_FGETS=1 -- GNULIB_FREAD=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result -@@ -64,18 +53,6 @@ AC_DEFUN([gl_STDIO_H], - fi - ]) - -- dnl No need to create extra modules for these functions. Everyone who uses -- dnl likely needs them. -- GNULIB_FPRINTF=1 -- GNULIB_PRINTF=1 -- GNULIB_VFPRINTF=1 -- GNULIB_VPRINTF=1 -- GNULIB_FPUTC=1 -- GNULIB_PUTC=1 -- GNULIB_PUTCHAR=1 -- GNULIB_FPUTS=1 -- GNULIB_PUTS=1 -- GNULIB_FWRITE=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result -@@ -116,77 +93,92 @@ AC_DEFUN([gl_STDIO_H], - fi - ]) - -+# gl_STDIO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDIO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDIO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDIO_H_DEFAULTS], - [ -- GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) -- GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) -- GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN]) -- GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) -- GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC]) -- GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS]) -- GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) -- GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) -- GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) -- GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE]) -- GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) -- GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) -- GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD]) -- GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) -- GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF]) -- GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) -- GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) -- GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) -- GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) -- GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) -- GNULIB_GETC=0; AC_SUBST([GNULIB_GETC]) -- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) -- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) -- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) -- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) -- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) -- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) -- GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) -- GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) -- GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) -- GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) -- GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) -- GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) -- GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) -- GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE]) -- GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME]) -- GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT]) -- GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF]) -- GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) -- GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) -- GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING]) -- GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) -- GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE]) -- GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) -- GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF]) -- GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF]) -- GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) -- GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) -- GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) -- GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) -- GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) -- GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) -- GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) -- GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) -- GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) -- GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) -- GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) -- GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) - HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) -diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 -index 5fdb0a7..9c1d1c7 100644 ---- a/m4/stdlib_h.m4 -+++ b/m4/stdlib_h.m4 -@@ -1,10 +1,10 @@ --# stdlib_h.m4 serial 59 -+# stdlib_h.m4 serial 63 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_STDLIB_H], -+AC_DEFUN_ONCE([gl_STDLIB_H], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - gl_NEXT_HEADERS([stdlib.h]) -@@ -46,63 +46,78 @@ AC_DEFUN([gl_STDLIB_H], - fi - ]) - -+# gl_STDLIB_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDLIB_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDLIB_H_DEFAULTS], - [ -- GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) -- GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) -- GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) -- GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) -- GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) -- GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) -- GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) -- GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) -- GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) -- GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) -- GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) -- GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) -- GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) -- GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) -- GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) -- GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) -- GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) -- GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) -- GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) -- GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) -- GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) -- GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) -- GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) -- GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) -- GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) -- GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) -- GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) -- GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) -- GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) -- GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) -- GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) -- GNULIB_STRTOL=0; AC_SUBST([GNULIB_STRTOL]) -- GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) -- GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) -- GNULIB_STRTOUL=0; AC_SUBST([GNULIB_STRTOUL]) -- GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) -- GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) -- GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) -- GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) -- GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) -- GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) -- GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) -- GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) -- GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) - HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) -@@ -164,6 +179,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], - REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) - REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) - REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) -+ REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) - REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) - REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) - REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) -diff --git a/m4/strdup.m4 b/m4/strdup.m4 -index f6f421d..5b6018f 100644 ---- a/m4/strdup.m4 -+++ b/m4/strdup.m4 -@@ -1,4 +1,4 @@ --# strdup.m4 serial 14 -+# strdup.m4 serial 15 - - dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. - -@@ -8,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_STRDUP], - [ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_DECLS_ONCE([strdup]) - if test $ac_cv_have_decl_strdup = no; then - HAVE_DECL_STRDUP=0 -@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], - - AC_DEFUN([gl_FUNC_STRDUP_POSIX], - [ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) - if test $gl_cv_func_malloc_posix != yes; then - REPLACE_STRDUP=1 -diff --git a/m4/string_h.m4 b/m4/string_h.m4 -index a4cc5b4..80d1e58 100644 ---- a/m4/string_h.m4 -+++ b/m4/string_h.m4 -@@ -5,20 +5,15 @@ - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 29 -+# serial 32 - - # Written by Paul Eggert. - --AC_DEFUN([gl_HEADER_STRING_H], -+AC_DEFUN_ONCE([gl_STRING_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_STRING_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_STRING_H_BODY], --[ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - gl_NEXT_HEADERS([string.h]) - - dnl Check for declarations of anything we want to poison if the -@@ -33,62 +28,77 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], - AC_REQUIRE([AC_C_RESTRICT]) - ]) - -+# gl_STRING_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STRING_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STRING_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_STRING_H_DEFAULTS], - [ -- GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) -- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) -- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) -- GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) -- GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) -- GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) -- GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) -- GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) -- GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) -- GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) -- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) -- GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) -- GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) -- GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) -- GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) -- GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) -- GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) -- GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) -- GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) -- GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) -- GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) -- GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) -- GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) -- GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) -- GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) -- GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) -- GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) -- GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) -- GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) -- GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) -- GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) -- GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) -- GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) -- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) -- GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) -- GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) -- GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) -- GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) -- GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) -- GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) -- GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) - HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) -- GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) - HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) -diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 -index 99c2285..bcde4d7 100644 ---- a/m4/sys_file_h.m4 -+++ b/m4/sys_file_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 6 -+# serial 9 - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,9 +8,9 @@ - - # Written by Richard W.M. Jones. - --AC_DEFUN([gl_HEADER_SYS_FILE_H], -+AC_DEFUN_ONCE([gl_SYS_FILE_H], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) - - dnl is always overridden, because of GNULIB_POSIXCHECK. - gl_CHECK_NEXT_HEADERS([sys/file.h]) -@@ -28,14 +28,29 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H], - ]], [flock]) - ]) - --AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR], -+# gl_SYS_FILE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. -+AC_DEFUN([gl_SYS_FILE_MODULE_INDICATOR], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ gl_SYS_FILE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - --AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_FILE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_SYS_FILE_H_DEFAULTS], - [ -- GNULIB_FLOCK=0; AC_SUBST([GNULIB_FLOCK]) - HAVE_FLOCK=1; AC_SUBST([HAVE_FLOCK]) - ]) -diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 -index 45e0469..37bc316 100644 ---- a/m4/sys_random_h.m4 -+++ b/m4/sys_random_h.m4 -@@ -1,10 +1,10 @@ --# sys_random_h.m4 serial 5 -+# sys_random_h.m4 serial 8 - dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_RANDOM], -+AC_DEFUN_ONCE([gl_SYS_RANDOM_H], - [ - AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -35,18 +35,33 @@ AC_DEFUN([gl_HEADER_SYS_RANDOM], - [getrandom]) - ]) - -+# gl_SYS_RANDOM_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_RANDOM_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], - [ -- GNULIB_GETRANDOM=0; AC_SUBST([GNULIB_GETRANDOM]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM]) - REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM]) -diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 -index 4b33d31..2e7d140 100644 ---- a/m4/sys_select_h.m4 -+++ b/m4/sys_select_h.m4 -@@ -1,13 +1,13 @@ --# sys_select_h.m4 serial 20 -+# sys_select_h.m4 serial 23 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_SELECT], -+AC_DEFUN_ONCE([gl_SYS_SELECT_H], - [ -- AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+ AC_REQUIRE([AC_C_RESTRICT]) - AC_CACHE_CHECK([whether is self-contained], - [gl_cv_header_sys_select_h_selfcontained], - [ -@@ -75,19 +75,34 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], - ]], [pselect select]) - ]) - -+# gl_SYS_SELECT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_SELECT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_SELECT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS], - [ -- GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT]) -- GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT]) - REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT]) -diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 -index 503cb96..5676a0d 100644 ---- a/m4/sys_socket_h.m4 -+++ b/m4/sys_socket_h.m4 -@@ -1,4 +1,4 @@ --# sys_socket_h.m4 serial 25 -+# sys_socket_h.m4 serial 28 - dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl From Simon Josefsson. - --AC_DEFUN([gl_HEADER_SYS_SOCKET], -+AC_DEFUN_ONCE([gl_SYS_SOCKET_H], - [ - AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) -@@ -156,32 +156,47 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], - AC_SUBST([HAVE_WS2TCPIP_H]) - ]) - -+# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], - [ -- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) -- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) -- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) -- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) -- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) -- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) -- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) -- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) -- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) -- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) -- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) -- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) -- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) -- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) -- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) - HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) - HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; - AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) -diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 -index 23cbdd2..ac91d42 100644 ---- a/m4/sys_stat_h.m4 -+++ b/m4/sys_stat_h.m4 -@@ -1,4 +1,4 @@ --# sys_stat_h.m4 serial 38 -*- Autoconf -*- -+# sys_stat_h.m4 serial 41 -*- Autoconf -*- - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - dnl From Eric Blake. - dnl Provide a GNU-like . - --AC_DEFUN([gl_HEADER_SYS_STAT_H], -+AC_DEFUN_ONCE([gl_SYS_STAT_H], - [ - AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - -@@ -52,38 +52,53 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], - AC_REQUIRE([AC_C_RESTRICT]) - ]) - -+# gl_SYS_STAT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_STAT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], - [ -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR -- GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) -- GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) -- GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) -- GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) -- GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) -- GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) -- GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) -- GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) -- GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) -- GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) -- GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) -- GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) -- GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) -- GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) -- GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) -- GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) -- GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) -- GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) - HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) -diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 -index 64f133d..c425a96 100644 ---- a/m4/sys_time_h.m4 -+++ b/m4/sys_time_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 9 -+# serial 12 - - # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,18 +8,13 @@ - - # Written by Paul Eggert and Martin Lambers. - --AC_DEFUN([gl_HEADER_SYS_TIME_H], -+AC_DEFUN_ONCE([gl_SYS_TIME_H], - [ - dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement - dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1 - dnl statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], --[ -+ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) - AC_CHECK_HEADERS_ONCE([sys/time.h]) - gl_CHECK_NEXT_HEADERS([sys/time.h]) - -@@ -89,18 +84,33 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], - ]], [gettimeofday]) - ]) - -+# gl_SYS_TIME_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_TIME_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_SYS_TIME_H_DEFAULTS], - [ -- GNULIB_GETTIMEOFDAY=0; AC_SUBST([GNULIB_GETTIMEOFDAY]) - dnl Assume POSIX behavior unless another module says otherwise. - HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) - HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) -diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4 -index b9daaa7..577ead6 100644 ---- a/m4/sys_times_h.m4 -+++ b/m4/sys_times_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 8 -+# serial 11 - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,7 +8,7 @@ - - # Written by Simon Josefsson. - --AC_DEFUN([gl_SYS_TIMES_H], -+AC_DEFUN_ONCE([gl_SYS_TIMES_H], - [ - AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) - -@@ -36,16 +36,31 @@ AC_DEFUN([gl_SYS_TIMES_H], - ]], [times]) - ]) - -+# gl_SYS_TIMES_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_TIMES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TIMES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS], - [ -- GNULIB_TIMES=0; AC_SUBST([GNULIB_TIMES]) - HAVE_STRUCT_TMS=1; AC_SUBST([HAVE_STRUCT_TMS]) - HAVE_TIMES=1; AC_SUBST([HAVE_TIMES]) - ]) -diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 -index 2172c83..6dd6fee 100644 ---- a/m4/sys_types_h.m4 -+++ b/m4/sys_types_h.m4 -@@ -1,4 +1,4 @@ --# sys_types_h.m4 serial 11 -+# sys_types_h.m4 serial 13 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN_ONCE([gl_SYS_TYPES_H], - [ -+ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -+ - dnl Use sane struct stat types in OpenVMS 8.2 and later. - AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) - -- AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) - gl_NEXT_HEADERS([sys/types.h]) - - dnl Ensure the type pid_t gets defined. -@@ -30,6 +31,17 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], - AC_SUBST([WINDOWS_STAT_INODES]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], - [ - ]) -diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 -index 503de4d..fa176e0 100644 ---- a/m4/sys_uio_h.m4 -+++ b/m4/sys_uio_h.m4 -@@ -1,10 +1,10 @@ --# sys_uio_h.m4 serial 1 -+# sys_uio_h.m4 serial 3 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_UIO], -+AC_DEFUN_ONCE([gl_SYS_UIO_H], - [ - AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -17,15 +17,30 @@ AC_DEFUN([gl_HEADER_SYS_UIO], - AC_SUBST([HAVE_SYS_UIO_H]) - ]) - -+# gl_SYS_UIO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_UIO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_UIO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_UIO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_UIO_H_DEFAULTS], - [ - ]) -diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 -index 8fc3dfd..37b797c 100644 ---- a/m4/threadlib.m4 -+++ b/m4/threadlib.m4 -@@ -1,4 +1,4 @@ --# threadlib.m4 serial 30 -+# threadlib.m4 serial 31 - dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -212,6 +212,27 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - LIBS=$save_LIBS - test $gl_pthread_api = yes && break - done -+ echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: LIBPTHREAD=$LIBPTHREAD" >&AS_MESSAGE_LOG_FD -+ -+ gl_pthread_in_glibc=no -+ # On Linux with glibc >= 2.34, libc contains the fully functional -+ # pthread functions. -+ case "$host_os" in -+ linux*) -+ AC_EGREP_CPP([Lucky user], -+ [#include -+ #ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) || (__GLIBC__ > 2) -+ Lucky user -+ #endif -+ #endif -+ ], -+ [gl_pthread_in_glibc=yes], -+ []) -+ ;; -+ esac -+ echo "$as_me:__oline__: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&AS_MESSAGE_LOG_FD - - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) -@@ -219,18 +240,22 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB([pthread], [pthread_kill], -- [LIBPMULTITHREAD=-lpthread -- # On Solaris and HP-UX, most pthread functions exist also in libc. -- # Therefore pthread_in_use() needs to actually try to create a -- # thread: pthread_create from libc will fail, whereas -- # pthread_create will actually create a thread. -- # On Solaris 10 or newer, this test is no longer needed, because -- # libc contains the fully functional pthread functions. -- case "$host_os" in -- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], -- [Define if the pthread_in_use() detection is hard.]) -- esac -+ [if test $gl_pthread_in_glibc = yes; then -+ LIBPMULTITHREAD= -+ else -+ LIBPMULTITHREAD=-lpthread -+ # On Solaris and HP-UX, most pthread functions exist also in libc. -+ # Therefore pthread_in_use() needs to actually try to create a -+ # thread: pthread_create from libc will fail, whereas -+ # pthread_create will actually create a thread. -+ # On Solaris 10 or newer, this test is no longer needed, because -+ # libc contains the fully functional pthread functions. -+ case "$host_os" in -+ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -+ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], -+ [Define if the pthread_in_use() detection is hard.]) -+ esac -+ fi - ]) - elif test $gl_pthread_api != yes; then - # Some library is needed. Try libpthread and libc_r. -@@ -246,6 +271,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - LIBPMULTITHREAD=-lc_r]) - fi - fi -+ echo "$as_me:__oline__: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&AS_MESSAGE_LOG_FD - fi - AC_MSG_CHECKING([whether POSIX threads API is available]) - AC_MSG_RESULT([$gl_pthread_api]) -@@ -311,7 +337,8 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], - dnl glibc >= 2.29 has thrd_create in libpthread. - dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends - dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). -- dnl AIX >= 7.1 and Solaris >= 11.4 have thrd_create in libc. -+ dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in -+ dnl libc. - AC_CHECK_FUNCS([thrd_create]) - if test $ac_cv_func_thrd_create = yes; then - LIBSTDTHREAD= -@@ -481,7 +508,10 @@ AC_DEFUN([gl_THREADLIB_BODY], - gl_threads_api=posix - AC_DEFINE([USE_POSIX_THREADS], [1], - [Define if the POSIX multithreading library can be used.]) -- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then -+ if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then -+ AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1], -+ [Define if references to the POSIX multithreading library are satisfied by libc.]) -+ else - if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then - AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], - [Define if references to the POSIX multithreading library should be made weak.]) -@@ -576,7 +606,9 @@ dnl flavours option weak result - dnl --------------- --------- --------- -------- --------- - dnl Linux 2.4/glibc posix -lpthread Y OK - dnl --dnl GNU Hurd/glibc posix -+dnl Linux/glibc 2.34 posix Y OK -+dnl -+dnl GNU Hurd/glibc posix -lpthread Y OK - dnl - dnl Ubuntu 14.04 posix -pthread Y OK - dnl -diff --git a/m4/time_h.m4 b/m4/time_h.m4 -index b6a1aa3..b57474b 100644 ---- a/m4/time_h.m4 -+++ b/m4/time_h.m4 -@@ -2,7 +2,7 @@ - - # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. - --# serial 15 -+# serial 18 - - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -10,16 +10,11 @@ - - # Written by Paul Eggert and Jim Meyering. - --AC_DEFUN([gl_HEADER_TIME_H], -+AC_DEFUN_ONCE([gl_TIME_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_TIME_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_TIME_H_BODY], --[ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - - gl_NEXT_HEADERS([time.h]) - AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) -@@ -111,30 +106,45 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], - AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) - ]) - -+# gl_TIME_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_TIME_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_TIME_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_TIME_H_DEFAULTS], - [ -- GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) -- GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) -- GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) -- GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) -- GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) -- GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) -- GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) -- GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) -- GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) -- GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) -- GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) - HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) -diff --git a/m4/time_r.m4 b/m4/time_r.m4 -index 713e93a..2d49b64 100644 ---- a/m4/time_r.m4 -+++ b/m4/time_r.m4 -@@ -12,7 +12,7 @@ AC_DEFUN([gl_TIME_R], - dnl Persuade glibc and Solaris to declare localtime_r. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) - - dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is -diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 -index 34ef0ba..c5e85dc 100644 ---- a/m4/time_rz.m4 -+++ b/m4/time_rz.m4 -@@ -10,7 +10,7 @@ dnl Written by Paul Eggert. - AC_DEFUN([gl_TIME_RZ], - [ - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_STRUCT_TIMEZONE]) - - # On Mac OS X 10.6, localtime loops forever with some time_t values. -diff --git a/m4/timegm.m4 b/m4/timegm.m4 -index 098c857..58123be 100644 ---- a/m4/timegm.m4 -+++ b/m4/timegm.m4 -@@ -1,4 +1,4 @@ --# timegm.m4 serial 12 -+# timegm.m4 serial 13 - dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_TIMEGM], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - REPLACE_TIMEGM=0 - AC_CHECK_FUNCS_ONCE([timegm]) -diff --git a/m4/tzset.m4 b/m4/tzset.m4 -index 8eaf41f..8a4f285 100644 ---- a/m4/tzset.m4 -+++ b/m4/tzset.m4 -@@ -1,4 +1,4 @@ --# serial 15 -+# serial 16 - - # Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -9,7 +9,7 @@ - - AC_DEFUN([gl_FUNC_TZSET], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - REPLACE_TZSET=0 - case "$host_os" in -diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 -index 0f26fb9..0ce4ea4 100644 ---- a/m4/unistd_h.m4 -+++ b/m4/unistd_h.m4 -@@ -1,4 +1,4 @@ --# unistd_h.m4 serial 85 -+# unistd_h.m4 serial 89 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Simon Josefsson, Bruno Haible. - --AC_DEFUN([gl_UNISTD_H], -+AC_DEFUN_ONCE([gl_UNISTD_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - - gl_CHECK_NEXT_HEADERS([unistd.h]) -@@ -59,100 +59,116 @@ AC_DEFUN([gl_UNISTD_H], - fi - ]) - -+# gl_UNISTD_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_UNISTD_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_UNISTD_H_DEFAULTS], - [ -- GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) -- GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) -- GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) -- GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) -- GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) -- GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) -- GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) -- GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) -- GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) -- GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) -- GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) -- GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) -- GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) -- GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) -- GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) -- GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) -- GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) -- GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) -- GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) -- GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) -- GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) -- GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) -- GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) -- GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) -- GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) -- GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) -- GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) -- GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) -- GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) -- GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) -- GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) -- GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) -- GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) -- GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) -- GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) -- GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) -- GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) -- GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) -- GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) -- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) -- GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) -- GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) -- GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) -- GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) -- GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) -- GNULIB_READ=0; AC_SUBST([GNULIB_READ]) -- GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) -- GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) -- GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) -- GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) -- GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) -- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) -- GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) -- GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) -- GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) -- GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) -- GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) -- GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) -- GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) -- GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) -- GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) -- GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) -- GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) -- GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) -- GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) -- GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) -- GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) -- GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) -- GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) -- GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) -- GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) -- GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) -- GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) -- GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) -- GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) -- GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) -- GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) -- GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) -- GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) -- GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) -- GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) - HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) -diff --git a/m4/visibility.m4 b/m4/visibility.m4 -index 8f27a12..d161bd7 100644 ---- a/m4/visibility.m4 -+++ b/m4/visibility.m4 -@@ -1,4 +1,4 @@ --# visibility.m4 serial 7 -+# visibility.m4 serial 8 - dnl Copyright (C) 2005, 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -59,6 +59,10 @@ AC_DEFUN([gl_VISIBILITY], - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); - void dummyfunc (void); -+ int hiddenvar; -+ int exportedvar; -+ int hiddenfunc (void) { return 51; } -+ int exportedfunc (void) { return 1225736919; } - void dummyfunc (void) {} - ]], - [[]])], -diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 -index 59c55fc..818b319 100644 ---- a/m4/wchar_h.m4 -+++ b/m4/wchar_h.m4 -@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Eric Blake. - --# wchar_h.m4 serial 50 -+# wchar_h.m4 serial 53 - --AC_DEFUN([gl_WCHAR_H], -+AC_DEFUN_ONCE([gl_WCHAR_H], - [ - AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) - AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) -@@ -125,60 +125,75 @@ Configuration aborted.]) - fi - ]) - -+# gl_WCHAR_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_WCHAR_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_WCHAR_H_DEFAULTS], - [ -- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) -- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) -- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) -- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) -- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) -- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) -- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) -- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) -- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) -- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) -- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) -- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) -- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) -- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) -- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) -- GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) -- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) -- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) -- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) -- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) -- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) -- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) -- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) -- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) -- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) -- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) -- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) -- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) -- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) -- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) -- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) -- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) -- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) -- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) -- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) -- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) -- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) -- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) -- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) -- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) -- GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) - HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) -diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 -index 1ab0bc9..7d74212 100644 ---- a/m4/wctype_h.m4 -+++ b/m4/wctype_h.m4 -@@ -1,4 +1,4 @@ --# wctype_h.m4 serial 26 -+# wctype_h.m4 serial 30 - - dnl A placeholder for ISO C99 , for platforms that lack it. - -@@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Paul Eggert. - --AC_DEFUN([gl_WCTYPE_H], -+AC_DEFUN_ONCE([gl_WCTYPE_H], - [ - AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) - AC_REQUIRE([AC_PROG_CC]) -@@ -62,7 +62,7 @@ AC_DEFUN([gl_WCTYPE_H], - fi - AC_SUBST([HAVE_WCTYPE_H]) - -- if test $GNULIB_OVERRIDES_WINT_T = 1; then -+ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then - REPLACE_ISWCNTRL=1 - else - case "$gl_cv_func_iswcntrl_works" in -@@ -157,24 +157,39 @@ AC_DEFUN([gl_WCTYPE_H], - ]) - ]) - -+# gl_WCTYPE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_WCTYPE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_WCTYPE_H_DEFAULTS], - [ -- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) -- GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) -- GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) -- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) -- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) -- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) -- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) - HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) -diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 -index 2fc7467..a49c508 100644 ---- a/m4/wint_t.m4 -+++ b/m4/wint_t.m4 -@@ -1,4 +1,4 @@ --# wint_t.m4 serial 10 -+# wint_t.m4 serial 11 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,14 +34,14 @@ AC_DEFUN([gt_TYPE_WINT_T], - [gl_cv_type_wint_t_large_enough=yes], - [gl_cv_type_wint_t_large_enough=no])]) - if test $gl_cv_type_wint_t_large_enough = no; then -- GNULIB_OVERRIDES_WINT_T=1 -+ GNULIBHEADERS_OVERRIDE_WINT_T=1 - else -- GNULIB_OVERRIDES_WINT_T=0 -+ GNULIBHEADERS_OVERRIDE_WINT_T=0 - fi - else -- GNULIB_OVERRIDES_WINT_T=0 -+ GNULIBHEADERS_OVERRIDE_WINT_T=0 - fi -- AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+ AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) - ]) - - dnl Prerequisites of the 'wint_t' override. -diff --git a/m4/year2038.m4 b/m4/year2038.m4 -new file mode 100644 -index 0000000..da0f8d7 ---- /dev/null -+++ b/m4/year2038.m4 -@@ -0,0 +1,124 @@ -+# year2038.m4 serial 7 -+dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl Attempt to ensure that 'time_t' can go past the year 2038 and that -+dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. -+ -+AC_DEFUN([gl_YEAR2038_EARLY], -+[ -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ case "$host_os" in -+ mingw*) -+ AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], -+ [For 64-bit time_t on 32-bit mingw.]) -+ ;; -+ esac -+]) -+ -+# gl_YEAR2038_TEST_INCLUDES -+# ------------------------- -+AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], -+[[ -+ #include -+ /* Check that time_t can represent 2**32 - 1 correctly. */ -+ #define LARGE_TIME_T \\ -+ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) -+ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 -+ && LARGE_TIME_T % 65537 == 0) -+ ? 1 : -1]; -+]]) -+ -+# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) -+----------------------------------------- -+AC_DEFUN([gl_YEAR2038_BODY], -+[ -+ AC_ARG_ENABLE([year2038], -+ [ --disable-year2038 omit support for timestamps past the year 2038]) -+ AS_IF([test "$enable_year2038" != no], -+ [ -+ dnl On many systems, time_t is already a 64-bit type. -+ dnl On those systems where time_t is still 32-bit, it requires kernel -+ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, -+ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. -+ dnl -+ dnl On native Windows, the system include files define types __time32_t -+ dnl and __time64_t. By default, time_t is an alias of -+ dnl - __time32_t on 32-bit mingw, -+ dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). -+ dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an -+ dnl alias of __time64_t. -+ dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of -+ dnl __time32_t. -+ AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) -+ ]) -+ if test "$gl_cv_type_time_t_y2038" = no; then -+ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], -+ [gl_cv_type_time_t_bits_macro], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([[#define _TIME_BITS 64 -+ #define _FILE_OFFSET_BITS 64 -+ ]gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_bits_macro=yes], -+ [gl_cv_type_time_t_bits_macro=no]) -+ ]) -+ if test "$gl_cv_type_time_t_bits_macro" = yes; then -+ AC_DEFINE([_TIME_BITS], [64], -+ [Number of bits in a timestamp, on hosts where this is settable.]) -+ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. -+ AC_DEFINE([_FILE_OFFSET_BITS], [64], -+ [Number of bits in a file offset, on hosts where this is settable.]) -+ gl_cv_type_time_t_y2038=yes -+ fi -+ fi -+ if test $gl_cv_type_time_t_y2038 = no; then -+ AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE( -+ [[#ifdef _USE_32BIT_TIME_T -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], -+ [AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038. -+ Remove _USE_32BIT_TIME_T from the compiler flags.])], -+ [# If not cross-compiling and $1 says we should check, -+ # and 'touch' works with a large timestamp, then evidently wider time_t -+ # is desired and supported, so fail and ask the builder to fix the -+ # problem. Otherwise, just warn the builder. -+ m4_ifval([$1], -+ [if test $cross_compiling = no \ -+ && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then -+ case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in -+ *'Feb 7 2106'* | *'Feb 7 17:10'*) -+ AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038, -+ and your system appears to support a wider 'time_t'. -+ Try configuring with 'CC="${CC} -m64"'. -+ To build with a 32-bit time_t anyway (not recommended), -+ configure with '--disable-year2038'.]);; -+ esac -+ rm -f conftest.time -+ fi]) -+ if test "$gl_warned_about_y2038" != yes; then -+ AC_MSG_WARN( -+ [The 'time_t' type stops working after January 2038, -+ and this package needs a wider 'time_t' type -+ if there is any way to access timestamps after that. -+ Configure with 'CC="${CC} -m64"' perhaps?]) -+ gl_warned_about_y2038=yes -+ fi -+ ]) -+ fi]) -+]) -+ -+AC_DEFUN([gl_YEAR2038], -+[ -+ gl_YEAR2038_BODY([require-year2038-safe]) -+]) -diff --git a/maint.mk b/maint.mk -index ae3a817..6a3ea96 100644 ---- a/maint.mk -+++ b/maint.mk -@@ -1409,7 +1409,7 @@ announcement_mail_headers_alpha = \ - announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) - announcement_mail_headers_beta = $(announcement_mail_headers_alpha) - --announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type)) -+announcement_Cc_ ?= $(announcement_Cc_$(release-type)) - announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) - announcement: NEWS ChangeLog $(rel-files) - # Not $(AM_V_GEN) since the output of this command serves as -@@ -1426,7 +1426,6 @@ announcement: NEWS ChangeLog $(rel-files) - --bootstrap-tools=$(bootstrap-tools) \ - $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ - echo --gnulib-version=$(gnulib-version);; esac) \ -- --no-print-checksums \ - $(addprefix --url-dir=, $(url_dir_list)) - - .PHONY: release-commit --- -cgit v1.1 - -- 2.25.1 From yann.morin.1998 at free.fr Sun Mar 20 23:24:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 21 Mar 2022 00:24:31 +0100 Subject: [Buildroot] [PATCH 2/2] packages/guile: remove patches not needed in 3.0.8 In-Reply-To: <20220320221445.10259-2-paguilar@paguilar.org> References: <20220320221445.10259-1-paguilar@paguilar.org> <20220320221445.10259-2-paguilar@paguilar.org> Message-ID: <20220320232431.GJ1566358@scaer> Pedro, All, On 2022-03-20 23:14 +0100, Pedro Aguilar spake thusly: > These patches are already part of Guile's source code in > version 3.0.8. Let's remove them to avoid errors while > patching the package. Then this should have been part of the patch that bumps the version. No need to resend, as this is a big patch; this can be squashed locally when applying. Regards, Yann E. MORIN. > 0003-module-system-base-target.scm-support-riscv32.patch > 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch > > Signed-off-by: Pedro Aguilar > --- [--SNIP--] -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From buildroot at busybox.net Mon Mar 21 00:55:31 2022 From: buildroot at busybox.net (busybox.net) Date: 21 Mar 2022 01:55:31 +0100 Subject: [Buildroot] ACTION REQUIRED Message-ID: <20220321015530.507203A9004534EC@busybox.net> An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Mon Mar 21 05:53:37 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 21 Mar 2022 08:53:37 +0300 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 In-Reply-To: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> References: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Message-ID: <9c95f18f-fcfc-47a2-4522-95eac502c73f@inbox.ru> On 20.03.2022 19:39, Fabrice Fontaine wrote: > Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may > allow privilege escalation during extension installation. The > installation process uses commands such as CREATE x IF NOT EXIST that > allow an unprivileged user to precreate objects. These objects will be > used by the installer (which executes as Superuser), leading to > privilege escalation. In order to be able to take advantage of this, an > unprivileged user would need to be able to create objects in a database > and then get a Superuser to install TimescaleDB into their database. (In > the fixed versions, the installation aborts when it finds that an object > already exists.) > > "This release contains bug fixes since the 2.5.1 release. > This release is high priority for upgrade. We strongly recommend that > you upgrade as soon as possible." > > https://github.com/timescale/timescaledb/releases/tag/2.5.2 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From peter at korsgaard.com Mon Mar 21 07:12:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:12:20 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220320113553.43bf3c6f@windsurf> (Thomas Petazzoni's message of "Sun, 20 Mar 2022 11:35:53 +0100") References: <20220316215654.8E8188424D@busybox.osuosl.org> <20220320113553.43bf3c6f@windsurf> Message-ID: <871qyvlqy3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > Hello Peter, > Could you cherry-pick this commit into the currently maintained stable > branches? Sure, applied to 2021.02.x / 2021.11.x / 2022.02.x. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:23:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:23:10 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.20.1 In-Reply-To: <20220316221046.GD283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 23:10:46 +0100") References: <20220316213614.16878-1-ps.report@gmx.net> <20220316221046.GD283544@scaer> Message-ID: <87tubrkbvl.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2022-03-16 22:36 +0100, Peter Seiderer spake thusly: >> For details see [1] and [2]. >> >> [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-March/079724.html >> [2] https://gstreamer.freedesktop.org/releases/1.20/#1.20.1 >> >> Peter Seiderer (12): >> package/gstreamer1: bump version to 1.20.1 >> package/gst1-plugins-base: bump version to 1.20.1 >> package/gst1-plugins-good: bump version to 1.20.1 >> package/gst1-plugins-bad: bump version to 1.20.1 >> package/gst1-plugins-ugly: bump version to 1.20.1 >> package/gst1-devtools: bump version to 1.20.1 >> package/gst1-libav: bump version to 1.20.1 >> package/gst1-vaapi: bump version to 1.20.1 >> package/gst1-rtsp-server: bump version to 1.20.1 >> package/gstreamer1-editing-services: bump version to 1.20.1 >> package/gst-omx: bump version to 1.20.1 >> package/gst1-python: bump version to 1.20.1 > Whole series applied to master, thanks. And to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:30:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:30:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: bump version to 3.3.3 Message-ID: <20220321072912.C72AD84710@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6481753b2de93bb1c781068619e0fdd0cee40d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 711a83624c8a80217dd0ce9328235120dc9d4be8) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 94b50103f0..5f6b22aede 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 7c32ff037597ce471c7cfd9dcb8471cda3a02983aeba3315059362ceb3934b84 libressl-3.2.7.tar.gz +sha256 a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066 libressl-3.3.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 9e91fea19c..f1f5e1974d 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.2.7 +LIBRESSL_VERSION = 3.3.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:31:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:31:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: always expose SSL_OP_NO_TLSv1_3 Message-ID: <20220321072912.CFF8384711@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b1b2c3b77371fcda26c9f49738570b22d04b9a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the build of vsftpd 3.0.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 181a5e229b347c1996eeca7d7727ee66bc566f01) Signed-off-by: Peter Korsgaard --- .../0001-always-expose-SSL_OP_NO_TLSv1_3.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch new file mode 100644 index 0000000000..f34ae85834 --- /dev/null +++ b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch @@ -0,0 +1,37 @@ +always expose SSL_OP_NO_TLSv1_3 + +like in OpenSSL, see https://github.com/openssl/openssl/blob/master/include/openssl/ssl.h.in#L399 + +like SSL_OP_NO_DTLSv1_2, see commit "Expose various DTLSv1.2 specific functions and defines" + +this change fixes the compilation of vsftpd 3.0.4 & 3.0.5, which fails with the following error: +``` +ssl.c: In function 'ssl_init': +ssl.c:98:18: error: 'SSL_OP_NO_TLSv1_3' undeclared (first use in this function); did you mean 'SSL_OP_NO_TLSv1_1'? +``` + +Signed-off-by: Francois Perrad +Fetched from: https://github.com/libressl-portable/openbsd/pull/124 +--- + include/openssl/ssl.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h +index 46f24b2ea..4048a6e63 100644 +--- a/include/openssl/ssl.h ++++ b/include/openssl/ssl.h +@@ -516,11 +516,7 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, + #define SSL_OP_NO_TLSv1 0x04000000L + #define SSL_OP_NO_TLSv1_2 0x08000000L + #define SSL_OP_NO_TLSv1_1 0x10000000L +- +-#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) + #define SSL_OP_NO_TLSv1_3 0x20000000L +-#endif +- + #define SSL_OP_NO_DTLSv1 0x40000000L + #define SSL_OP_NO_DTLSv1_2 0x80000000L + +-- +2.30.2 + From peter at korsgaard.com Mon Mar 21 07:36:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:36:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: security bump to version 3.3.6 Message-ID: <20220321072912.EF4D084711@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6eca04a4ecbfe2e545853b17b37b57efb4933f14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x It includes the following security fix: * A malicious certificate can cause an infinite loop. Reported by and fix from Tavis Ormandy and David Benjamin, Google. https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.6-relnotes.txt Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index d046e89518..e35e52bf4d 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 0a51393f0df1cf27e070054a2788a4d073339f363d79cd594076a1b4c48be9a5 libressl-3.3.5.tar.gz +sha256 3f28849365e1190db2baf9014ff9686012c25b1ca6df8b3a085f789e24fe4b9a libressl-3.3.6.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 268ded69af..b415708b46 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.3.5 +LIBRESSL_VERSION = 3.3.6 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:32:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:32:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: bump to version 3.3.5 Message-ID: <20220321072912.E48097FD02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba8df4289069a365c3c092979bbb8f6f6f371183 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Bugfix release, fixing a stack overread issue: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.5-relnotes.txt Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ec87e249237ed0ece942c277e15fcfaa4901e2e9) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 45afd04dca..d046e89518 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 bcce767a3fed252bfd1210f8a7e3505a2b54d3008f66e43d9b95e3f30c072931 libressl-3.3.4.tar.gz +sha256 0a51393f0df1cf27e070054a2788a4d073339f363d79cd594076a1b4c48be9a5 libressl-3.3.5.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index f1847b18dd..268ded69af 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.3.4 +LIBRESSL_VERSION = 3.3.5 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:31:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:31:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: bump to version 3.3.4 Message-ID: <20220321072912.DA11384712@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb318bb611644209960dc7c1d4007b9c5d59731e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3c056db673430f5f85b0a6c7c1133bcde3f4c095) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 5f6b22aede..45afd04dca 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066 libressl-3.3.3.tar.gz +sha256 bcce767a3fed252bfd1210f8a7e3505a2b54d3008f66e43d9b95e3f30c072931 libressl-3.3.4.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index f1f5e1974d..f1847b18dd 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.3.3 +LIBRESSL_VERSION = 3.3.4 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:23:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:23:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libressl: security bump to 3.4.3 Message-ID: <20220321072922.08D8F84713@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1602ff300478aea29f71d86a45b0197ca5a4b522 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit b92210ce36588038aa728e48f3826f6b32d471c0) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda8..e923998713 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda9..0bb468cedb 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:39:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:39:00 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to 3.4.3 In-Reply-To: <20220316105753.1134088-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 16 Mar 2022 11:57:53 +0100") References: <20220316105753.1134088-1-francois.perrad@gadz.org> Message-ID: <87pmmfkb57.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 > Signed-off-by: Francois Perrad Committed to 2022.02.x and 2021.11.x, thanks. For 2021.02.x I will instead bump to 3.3.6, which contains the same fix. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gstreamer1: bump version to 1.20.1 Message-ID: <20220321073042.0F54484756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5d8eda986ca683a0765435bdcd382d2009ab805 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 05b0f785cec573092b5292237a03dc756c6b9d5b) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f4a74a6125..128bb564d4 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.1.tar.xz.sha256sum +sha256 de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 gstreamer-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf6..995c5b118b 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.20.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-base: bump version to 1.20.1 Message-ID: <20220321073042.1CBC8846D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a34ed56dfd5a23b209431b7f1d4c6bbe534b8ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 1f0a550b6d8dedc04fbcd94df0c45effbec6ec1b) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cda..748d951966 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.1.tar.xz.sha256sum +sha256 96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 gst-plugins-base-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 08aac850cd..766af88e96 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.0 +GST1_PLUGINS_BASE_VERSION = 1.20.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-good: bump version to 1.20.1 Message-ID: <20220321073042.2675F84756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86e8e12143c02db510f476236e685175cd8f0e5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 69b7c008fa154b5174d8c67006002f48a686086b) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf46..cccd07dd2d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.1.tar.xz.sha256sum +sha256 3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa gst-plugins-good-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6298d578ed..1168feb293 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.20.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-libav: bump version to 1.20.1 Message-ID: <20220321073042.4E0E184756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b66c5d001ece0b95c4e226587b62ca7d42443c1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 9763aab6a0bd9f53343b3ecd37d00efef777379a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14..3f9c849729 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.1.tar.xz.sha256sum +sha256 91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 gst-libav-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4..4e99de45f9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.20.0 +GST1_LIBAV_VERSION = 1.20.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-python: bump version to 1.20.1 Message-ID: <20220321073042.7884E84756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05f62c6a080d2d18c6111148c653c083885be0ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit fd7ebd2ca426aeacd0e509461d1d94962e65a8bf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fd..fe1e2068b1 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.1.tar.xz.sha256sum +sha256 ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 gst-python-1.20.1.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d7..3fd8059bee 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.20.0 +GST1_PYTHON_VERSION = 1.20.1 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:23:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:23:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libressl: security bump to 3.4.3 Message-ID: <20220321073042.817B284758@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=881575856a742346aecdabea65baef106b9a188e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit b92210ce36588038aa728e48f3826f6b32d471c0) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda8..e923998713 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda9..0bb468cedb 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-rtsp-server: bump version to 1.20.1 Message-ID: <20220321073042.5E7428475F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b597419ddd01f18ac9c3b3322f5f50bf2b0c147b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit bb3a4e313a8ff70644f0702ac84d2ba877e1ca08) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 00ff974c6e..1e66ed7246 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.1.tar.xz.sha256sum +sha256 4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509 gst-rtsp-server-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d22dd5e7cc..978f7b4491 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.20.0 +GST1_RTSP_SERVER_VERSION = 1.20.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst-omx: bump version to 1.20.1 Message-ID: <20220321073042.6F63484762@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88b6bb5129b0ddbefb3eeb98c1221cb68bd7e6b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit f62284487af114fdf2cb4069d62c8b6a7f90268c) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f..33c20defbc 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.1.tar.xz.sha256sum +sha256 86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c gst-omx-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff..462c88765b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.20.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-devtools: bump version to 1.20.1 Message-ID: <20220321073042.4092384756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c219b85f7dbc95ce730dc0e26a72b5991c08908 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit a70131455b59487864358eadc9ff34263f6670ff) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9c..7173dbe266 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.1.tar.xz.sha256sum +sha256 81f1c7ef105b8bdb63412638952f6320723b3161c96a80f113b020e2de554b2b gst-devtools-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index f72df9cf71..8c430800d2 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.20.0 +GST1_DEVTOOLS_VERSION = 1.20.1 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-bad: bump version to 1.20.1 Message-ID: <20220321073042.2EE3C8475D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aa78bc78899d48ac0d805fe0bea510d80cf0793 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 3e3971565263385a4d2947bf74e20386838f3094) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b94..2874d955f4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.1.tar.xz.sha256sum +sha256 09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 gst-plugins-bad-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 24fd9dd312..343a53a3c5 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.20.0 +GST1_PLUGINS_BAD_VERSION = 1.20.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gstreamer1-editing-services: bump version to 1.20.1 Message-ID: <20220321073042.66DCD84761@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=870c1db51b91a0b769f3ca314e4249bdbc7c69f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit eed6566513fd17950a11b06db15477860e42353e) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb..5d77a9bb72 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.1.tar.xz.sha256sum +sha256 6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df gst-editing-services-1.20.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae7..dbdf2abca0 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-vaapi: bump version to 1.20.1 Message-ID: <20220321073042.563148475D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c99676913ee415d5cb8bdf6478fb58ed500f8fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 4d0a14b039c4c073baae5b0d4f88c3ed4b7d00d1) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e2..26a1f52ba0 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.1.tar.xz.sha256sum +sha256 87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 gstreamer-vaapi-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 19ee625703..e0502914b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.20.0 +GST1_VAAPI_VERSION = 1.20.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-ugly: bump version to 1.20.1 Message-ID: <20220321073042.3778584758@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4258840cb9646838328cda60995ffff43b5ea11e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit fd865dc6fcd049cf0c20bdbc5b26ab2acf055ecb) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24b..d022ba3180 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.1.tar.xz.sha256sum +sha256 42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 gst-plugins-ugly-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 05b1fab304..be45d183f3 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.20.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:46:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:46:15 +0100 Subject: [Buildroot] [git commit] package/gcr: depends on !gnupg In-Reply-To: <87czigmpsx.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sun, 20 Mar 2022 19:39:26 +0100") References: <20220315211222.E6D258408A@busybox.osuosl.org> <87czigmpsx.fsf@dell.be.48ers.dk> Message-ID: <87lex3kat4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: >> commit: https://git.buildroot.net/buildroot/commit/?id=5783a418f4b30931068b81f850fc06cd8d3d9732 >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master >> Since gcr selects gnupg2, it's incompatible with gnupg. Add this >> dependency and corresponding comment. >> While we're at it, also hide the existing comment when >> !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. Hmm, this doesn't work with the v1/v2 rework, so I'll revert: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:46:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:46:32 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Revert "package/gcr: depends on !gnupg" Message-ID: <20220321073806.2106A8475F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff5471d6983158cb5ad51e4eab577b72b601e461 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This reverts commit 816861524a079658040d6e059743697affdeafce. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS - -comment "gcr is incompatible with gnupg, gnupg2 only" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Mon Mar 21 07:45:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:45:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Revert "package/gcr: depends on !gnupg" Message-ID: <20220321073844.3865F84767@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4b78a0f8a9736ff555bd4accc29361df265dd6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This reverts commit 5c05744eca4a2453fe4403c97cee3229152f50e2. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS - -comment "gcr is incompatible with gnupg, gnupg2 only" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_GNUPG # gnupg2 From clement.leger at bootlin.com Mon Mar 21 07:46:22 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 21 Mar 2022 08:46:22 +0100 Subject: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220318224031.GV283544@scaer> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-5-clement.leger@bootlin.com> <20220318224031.GV283544@scaer> Message-ID: <20220321084622.4b14b1c8@fixe.home> Le Fri, 18 Mar 2022 23:40:31 +0100, "Yann E. MORIN" a ?crit : > 3.16.0 now needs the dependency on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS, > so if that is not met, there will only be the custom git as a fallback. > > This is not so nice that the latest has to, well, be the latest, and > that we don;t keep 3.15.0 around for those that can't have a host rustc > compiler. > > But then, who are we kidding? Builds on non-x86 are pretty rare yet; > even if some people might be on PPC or AArch64, they still are to be > no much more than two-handful (1023). > > Also, check-package whines; > > $ make check-package > boot/optee-os/Config.in:22: attributes order: type, default, depends > on, select, help (http://nightly.buildroot.org/#_config_files) Hi Yann, Sorry for the errors and thanks for the hint, I will use that next time I submit a patch for a package. > > And a hidden one: > > boot/optee-os/optee-os.hash:4: separation does not match expectation > (http://nightly.buildroot.org/#adding-packages-hash) > > Applied to master with those fixed, thanks. > > Regards, > Yann E. MORIN. -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From peter at korsgaard.com Mon Mar 21 07:43:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:43:35 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] Revert "package/gcr: depends on !gnupg" Message-ID: <20220321074138.579E484773@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ff60335b573f7bd8fa67511450ba542a5d45c8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This reverts commit cf0c9830c0eef17116081d04ccc10a1aa0850553. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS - -comment "gcr is incompatible with gnupg, gnupg2 only" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Mon Mar 21 07:50:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:50:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libminiupnpc: disable sample and tests Message-ID: <20220321074528.0B48784778@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1c068c11aa05aef561bbcc3b00abb5d5a43bcca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e1d0ac062cd65794a39e90b5f7abae354aa69be9) Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 21 07:50:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:50:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libminiupnpc: disable sample and tests Message-ID: <20220321074532.AE40584783@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33fe8c54921d2086705c435d418b561e87e7ae63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e1d0ac062cd65794a39e90b5f7abae354aa69be9) Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 21 07:50:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:50:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libminiupnpc: disable sample and tests Message-ID: <20220321074537.6C95884798@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=073bba9c3339eb864bb0314aced574395bcc1403 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e1d0ac062cd65794a39e90b5f7abae354aa69be9) Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 21 07:54:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:54:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests In-Reply-To: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 16 Mar 2022 21:39:21 +0100") References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Message-ID: <87h77rkafc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable sample and tests (which are built by default since version 2.1: > https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:56:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:56:30 +0100 Subject: [Buildroot] [PATCH] package/pango: bump to version 1.50.5 In-Reply-To: <20220310114211.920001-1-francois.perrad@gadz.org> (Francois Perrad's message of "Thu, 10 Mar 2022 12:42:11 +0100") References: <20220310114211.920001-1-francois.perrad@gadz.org> Message-ID: <87czifkac1.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:55:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:55:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pango: bump to version 1.50.5 Message-ID: <20220321074948.C588E847A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fb15224712d881c952e6d485c706acb5c00f93b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75) Signed-off-by: Peter Korsgaard --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c9..319d9778c1 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228f..69ec5bb490 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From bruno.seifert at 3brain.com Mon Mar 21 11:47:26 2022 From: bruno.seifert at 3brain.com (Bruno Seifert) Date: Mon, 21 Mar 2022 12:47:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: update site link In-Reply-To: References: <20220317095027.8939-1-bruno.seifert@3brain.com> Message-ID: Hi, This can absolutely wait for the next expat bump. I simply had to write this fix as I'm still on buildroot 2019.11 and the corresponding expat version isn't available on sourceforge anymore, only the new github location. I just guessed you guys weren't aware of the upcoming change yet. And since I had to figure out the solution anyway, I might as well tell you about it. Best regards, Bruno Fabrice Fontaine Thu, Mar 17, 11:17 AM (4 days ago) to me, Buildroot On Thu, Mar 17, 2022 at 11:17 AM Fabrice Fontaine < fontaine.fabrice at gmail.com> wrote: > Hello, > > Le jeu. 17 mars 2022 ? 10:51, bruno seifert a > ?crit : > > > > expat is currently in the process of changing the file hosting site from > > sourceforge to github. This adjusts the site URL to the new github > > location. Old versions are already not available on sourceforge anymore. > > > > Signed-off-by: bruno seifert > > --- > > Backport to: all versions > > I think the hashes don't need to be changed, but someone who actually > > knows stuff should confirm that. > > Indeed, the hash is the same. > > > Feel free to adjust the name and syntax. I've just started working a > month a go and really don't know what I'm doing. > > > > Signed-off-by: bruno seifert > > --- > > package/expat/expat.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/expat/expat.mk b/package/expat/expat.mk > > index b29b0e1d26..3dba920083 100644 > > --- a/package/expat/expat.mk > > +++ b/package/expat/expat.mk > > @@ -5,7 +5,8 @@ > > > ################################################################################ > > > > EXPAT_VERSION = 2.4.7 > > -EXPAT_SITE = > http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) > > +EXPAT_VERSION_TO_URL = $(subst .,_,$(EXPAT_VERSION)) > > +EXPAT_SITE = > https://github.com/libexpat/libexpat/releases/download/R_$(EXPAT_VERSION_TO_URL) > > A single liner would be better: > EXPAT_SITE = > https://github.com/libexpat/libexpat/releases/download/R_$(subst > .,_,$(EXPAT_VERSION)) > > > However, I don't understand why we have to update the URL now? > Can't we wait for the next expat bump? > > > EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz > > EXPAT_INSTALL_STAGING = YES > > EXPAT_DEPENDENCIES = host-pkgconf > > -- > > 2.25.1 > > > > > > -- > > > > 3Brain AG > > Einsiedlerstrasse 30 > > 8820 W?denswil > > Switzerland > > +41 81 322 70 86 > > > > www.3brain.com > > > > > > > > > > > > > > > > > > > > > > > > > > > Best Regards, > > Fabrice > -- 3Brain AG Einsiedlerstrasse 30 8820 W?denswil Switzerland +41 81 322 70 86 www.3brain.com ???? ???? ???? -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Mon Mar 21 12:21:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:21:40 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option In-Reply-To: <20220318202044.10413-2-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 21:20:41 +0100") References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-2-ps.report@gmx.net> Message-ID: <878rt3jy23.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - use explicit --with/without-libuuid option > Signed-off-by: Peter Seiderer Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:21:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:21:53 +0100 Subject: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency In-Reply-To: <20220318202044.10413-3-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 21:20:42 +0100") References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-3-ps.report@gmx.net> Message-ID: <874k3rjy1q.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add optional libpsl dependency > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:22:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:22:06 +0100 Subject: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency In-Reply-To: <20220318202044.10413-4-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 21:20:43 +0100") References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-4-ps.report@gmx.net> Message-ID: <87zgljijgx.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add optional c-ares dependency > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:20:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:20:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: use explicit --with/without-libuuid option Message-ID: <20220321121344.297FD847B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=967bd6de557dfa2bf585f880493dc5b210b7f351 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This has been like tht for ages (probably an implicit dependency check in older versions), but now wget has explicit flags, so let's use them. Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: expand commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit b0fc0a811ba198288a3aef8413466d9a61d1dfd4) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..58e04e3040 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -34,7 +34,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) From peter at korsgaard.com Mon Mar 21 12:20:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:20:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: add optional libpsl dependency Message-ID: <20220321121344.37EDC847B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=677c47b83332134da179d548559099e63139e905 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 0554aa59d7a27193f5b39f96ae0dbe6987723c1d) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 58e04e3040..795c2a2ccd 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,6 +12,13 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls From peter at korsgaard.com Mon Mar 21 12:20:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:20:41 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: add optional c-ares dependency Message-ID: <20220321121344.45E33847B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58c0ead1723686a911d4718ebbe0d983ccd69173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 0f2eb453321d227a9965a459c33a8fcbca4b2b4f) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 795c2a2ccd..8a73c33699 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -54,6 +54,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 From peter at korsgaard.com Mon Mar 21 13:09:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:09:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/wavpack: fix CVE-2021-44269 In-Reply-To: <20220318194058.760799-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Mar 2022 20:40:58 +0100") References: <20220318194058.760799-1-fontaine.fabrice@gmail.com> Message-ID: <87v8w7iha3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV > files. This issue triggered in function WavpackPackSamples of file > src/pack_utils.c, tainted variable cnt is too large, that makes pointer > sptr read beyond heap bound. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:59:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:59:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wavpack: fix CVE-2021-44269 Message-ID: <20220321130035.9C28B847BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79f90ac0d352001d36053e7ac3e8a1936a9daab9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26) Signed-off-by: Peter Korsgaard --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From peter at korsgaard.com Mon Mar 21 12:59:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:59:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wavpack: fix CVE-2021-44269 Message-ID: <20220321130111.C76C7847EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=404d4bcc66374c08425f810db3c41add65b2ac87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26) Signed-off-by: Peter Korsgaard --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From peter at korsgaard.com Mon Mar 21 12:58:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:58:55 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wavpack: fix CVE-2021-44269 Message-ID: <20220321130124.F3E6B84849@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d24d77e3e16fa26b5e729a3bb4c86650d1799de6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26) Signed-off-by: Peter Korsgaard --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From peter at korsgaard.com Mon Mar 21 13:10:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:10:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220321130152.6E66E848C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=548921598db5fad0f517934c78048f0effcc1d35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 0e41f883b800846435cd13081fa86abbc4e330d7) Signed-off-by: Peter Korsgaard --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..1d7d6d0538 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From peter at korsgaard.com Mon Mar 21 13:10:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:10:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220321130203.6BF1D848D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11374e363a42a8efb0bb87e3bbd01cd6cbfc755b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 0e41f883b800846435cd13081fa86abbc4e330d7) Signed-off-by: Peter Korsgaard --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..1d7d6d0538 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From peter at korsgaard.com Mon Mar 21 13:11:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:11:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: add OPENBLAS_CPE_ID_VENDOR In-Reply-To: <20220317220121.21498-1-ju.o@free.fr> (Julien Olivain's message of "Thu, 17 Mar 2022 23:01:21 +0100") References: <20220317220121.21498-1-ju.o@free.fr> Message-ID: <87r16vih6y.fsf@dell.be.48ers.dk> >>>>> "Julien" == Julien Olivain writes: > cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas > Signed-off-by: Julien Olivain Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 13:11:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:11:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220321130230.2758F848DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a12e8ddad2fada4e26525b1a98901761e887275a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 0e41f883b800846435cd13081fa86abbc4e330d7) Signed-off-by: Peter Korsgaard --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 2a9bd8b18c..330f7d42e0 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From vincent.stehle at laposte.net Mon Mar 21 14:53:22 2022 From: vincent.stehle at laposte.net (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Mon, 21 Mar 2022 15:53:22 +0100 Subject: [Buildroot] [PATCH] package/busybox: fix udhcpc options in minimal config Message-ID: <20220321145322.23881-1-vincent.stehle@laposte.net> The busybox-minimal.config, which is used by systems without an MMU, specifies the "-b" command line option for udhcpc. However, this option is not supported by BusyBox udhcpc anymore since version 1.27.0 when building for systems without an MMU. Remove the "-b" option from busybox-minimal.config to repair network initialization on systems without an MMU. This fixes the following network initialization failure: udhcpc: invalid option -- b FAIL Signed-off-by: Vincent Stehl? --- Hi, I have verified on qemu that this patch does fix the network initialization for qemu_arm_versatile_nommu_defconfig and qemu_m68k_mcf5208_defconfig. I could only verify the build for stm32f429_disco_xip_defconfig, stm32f469_disco_sd_defconfig and stm32f469_disco_xip_defconfig. Best regards, Vincent. package/busybox/busybox-minimal.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4..1fb4e39e21 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities -- 2.34.1 From peter at korsgaard.com Mon Mar 21 16:16:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:16:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireplumber: fix introspection build Message-ID: <20220321160938.4083C84924@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60a54bc0e88dc534c830996db3642cfd1dd1979f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Doxygen is required to build just the bare minimal (not the full documentation) since https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374 Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3e1de2ef067575ee33b55cfe02ffed09f7e3fe6b) Signed-off-by: Peter Korsgaard --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..37a8de5364 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled From peter at korsgaard.com Mon Mar 21 16:18:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:18:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: <20220318193310.752282-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Mar 2022 20:33:10 +0100") References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> Message-ID: <87ils7i8j0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > introspection needs host-doxygen and host-python-lxml since the addition > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 > ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml > Fixes: > - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:15:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:15:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wireplumber: fix introspection build Message-ID: <20220321160948.B12688492A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14a8b811e57bbc6b04cfd13b0ceef214d1414048 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Doxygen is required to build just the bare minimal (not the full documentation) since https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374 Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3e1de2ef067575ee33b55cfe02ffed09f7e3fe6b) Signed-off-by: Peter Korsgaard --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..37a8de5364 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled From peter at korsgaard.com Mon Mar 21 16:20:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:20:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix CVE-2022-25051 In-Reply-To: <20220317214203.258736-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Mar 2022 22:42:03 +0100") References: <20220317214203.258736-1-fontaine.fabrice@gmail.com> Message-ID: <87ee2vi8g0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when > decoding a crafted file. > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:22:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:22:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/minidlna: fix CVE-2022-26505 In-Reply-To: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:41:18 +0100") References: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> Message-ID: <87a6dji8cm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 > allows a remote web server to exfiltrate media files. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:21:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:21:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/minidlna: fix CVE-2022-26505 Message-ID: <20220321161327.BD48684987@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbaac16fcae7bd4030f640e7cbfa2d8ffc001423 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c7520b7ea1d4276fa762fa3be971155fcf2b2d01) Signed-off-by: Peter Korsgaard --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 86a2bb368d..b302423cae 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -11,6 +11,9 @@ MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From peter at korsgaard.com Mon Mar 21 16:20:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:20:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/minidlna: fix CVE-2022-26505 Message-ID: <20220321161333.D5DBE8498E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a13ada770aab7132f994cb0ab8791df9e7fa90ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c7520b7ea1d4276fa762fa3be971155fcf2b2d01) Signed-off-by: Peter Korsgaard --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From peter at korsgaard.com Mon Mar 21 16:19:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:19:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rtl_433: fix CVE-2022-25051 Message-ID: <20220321161338.2AADD84996@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60cf8eb4314dba952d183eb83246bebfa1f486bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when decoding a crafted file. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0368e0abd00529bd6af0f22c2b52abc3f53a5779) Signed-off-by: Peter Korsgaard --- ...overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ++++++++++++++++++++++ package/rtl_433/rtl_433.mk | 3 ++ 2 files changed, 61 insertions(+) diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch new file mode 100644 index 0000000000..e2088b29e7 --- /dev/null +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch @@ -0,0 +1,58 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] +Signed-off-by: Fabrice Fontaine +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index a5139ddae6..d1c28adbf5 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +RTL_433_IGNORE_CVES += CVE-2022-25051 + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON From peter at korsgaard.com Mon Mar 21 16:20:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:20:48 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/minidlna: fix CVE-2022-26505 Message-ID: <20220321161338.344A9849A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6654e556c441eee5dc1ce759efc27613d9501f9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c7520b7ea1d4276fa762fa3be971155fcf2b2d01) Signed-off-by: Peter Korsgaard --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From peter at korsgaard.com Mon Mar 21 16:25:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:25:20 +0100 Subject: [Buildroot] [git commit] package/pkg-generic: host variant inherits target download settings In-Reply-To: <20220318223159.059C983944@busybox.osuosl.org> (Yann E. MORIN's message of "Fri, 18 Mar 2022 23:21:44 +0100") References: <20220318223159.059C983944@busybox.osuosl.org> Message-ID: <875yo7i87j.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=efa7712b092950c92f994e2ee30c120a64e5451b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > It seems reasonable to expect that the download of the host and target > variants should usually be exactly the same and thus reuse the target > package values for the host package. This commits add support to > inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and > _DOwNLOAD_POST_PROCESS variables from target ones. These variables can > still be overriden if necessary for the host package. > Signed-off-by: Yann E. MORIN > Signed-off-by: Cl?ment L?ger > Signed-off-by: Yann E. MORIN Committed to 2022.02.x to make future backports easier, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:34:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/openvpn: security bump version to 2.5.6 In-Reply-To: <20220320115956.3242683-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 12:59:56 +0100") References: <20220320115956.3242683-1-bernd.kuhls@t-online.de> Message-ID: <871qyvi7t0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Switched _SITE to https and _SOURCE to .gz because upstream does not > provide a .xz tarball anymore. > Fixes CVE 2022-0547, changelog: > https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst > Signed-off-by: Bernd Kuhls Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:33:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: bump version to 2.5.3 Message-ID: <20220321162529.9ADFF84A58@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=178b77073e1eceb0542f7b1e76cf488dea170582 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release note: https://forums.openvpn.net/viewtopic.php?f=20&t=32497 CVE-2021-3606 fixed by this release is only relevant for Windows. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit e9f13a76eec48ac67af33d8d3ef6d068ff40e7ff) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 36f90ff111..1d365eeab4 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8 openvpn-2.5.2.tar.xz +sha256 fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e openvpn-2.5.3.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 9b3802fd80..c07f8b4ff5 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.2 +OPENVPN_VERSION = 2.5.3 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:33:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: bump version to 2.5.4 Message-ID: <20220321162529.A463884A59@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e453e1e4161d8db61dbc3a480ad0f4f07f566be9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 13e2912403361b6ff02a460ef8017a9927365a44) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 1d365eeab4..58751da277 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e openvpn-2.5.3.tar.xz +sha256 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436 openvpn-2.5.4.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index c07f8b4ff5..c0086b5b17 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.3 +OPENVPN_VERSION = 2.5.4 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:33:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:33 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: bump version to 2.5.5 Message-ID: <20220321162529.ADB7484A5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a26d685ee22f7d9b5ac4309b541e102ed0187ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 54ee9363f62de602690c193e2139e0dca5c46303) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 58751da277..f8e0493b54 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436 openvpn-2.5.4.tar.xz +sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index c0086b5b17..209de797b0 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.4 +OPENVPN_VERSION = 2.5.5 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:33:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: security bump version to 2.5.6 Message-ID: <20220321162529.B9EBF84A58@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b414e0fd9d161d605dec4508f891ad356997694 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f9c448a016f07951a41e5c0938e3dbd8630a704b) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 209de797b0..6dd88e8e91 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From peter at korsgaard.com Mon Mar 21 16:32:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:32:46 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openvpn: bump version to 2.5.5 Message-ID: <20220321162534.C8B8D84A78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a72aa869977513924a48463b0dac5976075b1cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 54ee9363f62de602690c193e2139e0dca5c46303) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 58751da277..f8e0493b54 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436 openvpn-2.5.4.tar.xz +sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 678b024551..d6bcad62ba 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.4 +OPENVPN_VERSION = 2.5.5 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:32:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:32:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openvpn: security bump version to 2.5.6 Message-ID: <20220321162534.D217D84A7C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e82b555a3d7ec4b5530966b2e231218683783f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f9c448a016f07951a41e5c0938e3dbd8630a704b) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From peter at korsgaard.com Mon Mar 21 16:23:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:23:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-generic: host variant inherits target download settings Message-ID: <20220321162539.6A05C84AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d804e2ce8e57bb46f0a1bc1858e09c0c7bd4cbdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x It seems reasonable to expect that the download of the host and target variants should usually be exactly the same and thus reuse the target package values for the host package. This commits add support to inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and _DOwNLOAD_POST_PROCESS variables from target ones. These variables can still be overriden if necessary for the host package. Signed-off-by: Yann E. MORIN Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN (cherry picked from commit efa7712b092950c92f994e2ee30c120a64e5451b) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) From peter at korsgaard.com Mon Mar 21 16:32:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:32:34 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openvpn: security bump version to 2.5.6 Message-ID: <20220321162539.7446684AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afbdc9e32cc62a20bbb26d49b88e852c3011a35e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f9c448a016f07951a41e5c0938e3dbd8630a704b) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From peter at korsgaard.com Mon Mar 21 16:36:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:36:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 14.2 In-Reply-To: <20220320120428.3294529-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 13:04:28 +0100") References: <20220320120428.3294529-1-bernd.kuhls@t-online.de> Message-ID: <87wngngt4x.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.postgresql.org/docs/release/14.2/ > Updated license hash due to copyright year bump: > https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e > Signed-off-by: Bernd Kuhls Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:37:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:37:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.6 In-Reply-To: <20220320121708.3679262-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 13:17:08 +0100") References: <20220320121708.3679262-1-bernd.kuhls@t-online.de> Message-ID: <87sfrbgt2f.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.6.html > Added new answer to samba4-cache.txt needed due to upstream commit: > https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc > Signed-off-by: Bernd Kuhls Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:38:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:38:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.17 In-Reply-To: <20220320122800.430173-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 13:28:00 +0100") References: <20220320122800.430173-1-bernd.kuhls@t-online.de> Message-ID: <87o81zgt18.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 > Signed-off-by: Bernd Kuhls Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:54:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:54:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 In-Reply-To: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 17:39:30 +0100") References: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Message-ID: <87k0cngsa7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may > allow privilege escalation during extension installation. The > installation process uses commands such as CREATE x IF NOT EXIST that > allow an unprivileged user to precreate objects. These objects will be > used by the installer (which executes as Superuser), leading to > privilege escalation. In order to be able to take advantage of this, an > unprivileged user would need to be able to create objects in a database > and then get a Superuser to install TimescaleDB into their database. (In > the fixed versions, the installation aborts when it finds that an object > already exists.) > "This release contains bug fixes since the 2.5.1 release. > This release is high priority for upgrade. We strongly recommend that > you upgrade as soon as possible." > https://github.com/timescale/timescaledb/releases/tag/2.5.2 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:44:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:44:41 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.1.1 Message-ID: <20220321164603.D5DEF849D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bba91f5b6eb3b7a9bed1445bbea43ae0c9f556a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.1.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 990b14768cd36663245b8a583aab0d8d6adac636) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index f84bd04cc0..98f966ee3d 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6de2af2ecfd7bff9b3634b6c5c29b209b25e147858d460469e8eb88e6d198692 timescaledb-2.1.0.tar.gz +sha256 e928c939803706d0d5b11d6751d4f0d0514e540ceffc74a46a9732f9a111d313 timescaledb-2.1.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 783017636b..d2a48a0f63 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.1.0 +TIMESCALEDB_VERSION = 2.1.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:44:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:44:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.3.0 Message-ID: <20220321164603.E3C3784BB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3b7654bcd800d2365815bd60390bad3b1aee830 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 2c61b1acfce416a0318a61ededa82a257f87e21f) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 98f966ee3d..e97045f7d5 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e928c939803706d0d5b11d6751d4f0d0514e540ceffc74a46a9732f9a111d313 timescaledb-2.1.1.tar.gz +sha256 730e61e48f471c1d643494421d21e43766128cbcb62a5c4b138c171379195cf2 timescaledb-2.3.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index d2a48a0f63..27e9142b0c 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.1.1 +TIMESCALEDB_VERSION = 2.3.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:45:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.4.0 Message-ID: <20220321164603.F046D849D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64f550116bdee300a68569361e6b2c89b8bc44fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.4.0 Starting from 2.4.0 timescaledb runs TAP tests by default so disable it by -DTAP_CHECKS=OFF. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 0610d838d82a46141d762a498b09762e8f423c68) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index e97045f7d5..4b6d6f77a8 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 730e61e48f471c1d643494421d21e43766128cbcb62a5c4b138c171379195cf2 timescaledb-2.3.0.tar.gz +sha256 1adbff3ae7f8f39d1b5ac2189d60b9bd0a8154c0c3603e53b030a204f72d86af timescaledb-2.4.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 27e9142b0c..900bac5a7e 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.3.0 +TIMESCALEDB_VERSION = 2.4.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE @@ -16,6 +16,7 @@ TIMESCALEDB_DEPENDENCIES = postgresql # pg_config replacement doesn't implement --cppflags --cflags # --ldflags and --libs. TIMESCALEDB_CONF_OPTS = \ + -DTAP_CHECKS=OFF \ -DREGRESS_CHECKS=OFF \ -DWARNINGS_AS_ERRORS=OFF \ -DPG_PKGLIBDIR=lib/postgresql \ From peter at korsgaard.com Mon Mar 21 16:45:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.4.2 Message-ID: <20220321164604.0709684AF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=affff7566faaf78ebee8ee7352a4ca301fb8d79d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.4.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d799b658c94d1567d0f86e61c7be6da62b4c011d) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4b6d6f77a8..4e3e91e152 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1adbff3ae7f8f39d1b5ac2189d60b9bd0a8154c0c3603e53b030a204f72d86af timescaledb-2.4.0.tar.gz +sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 900bac5a7e..4adf2bdbb3 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.0 +TIMESCALEDB_VERSION = 2.4.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:43:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:43:33 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.1.0 Message-ID: <20220321164603.CAA1784AE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=543187098e61189d34444e53aefbad4c80efc227 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Remove all PG13 upstream patches. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.1.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit db547e8b79a73d6766bec7523182ade58d79ad3e) Signed-off-by: Peter Korsgaard --- .../0001-Allow-building-against-PG13-source.patch | 85 ---- ...bilty-wrapper-functions-for-base64-encodi.patch | 73 ---- .../0003-Add-missing-utils-acl.h-includes.patch | 149 ------- ...-Add-support-for-PG13-List-implementation.patch | 473 --------------------- ...005-Adjust-code-to-PG13-list-sort-changes.patch | 59 --- ...t-copy-code-to-PG13-addRTEtoQuery-changes.patch | 37 -- ...-to-PG13-convert_tuples_by_name-signature.patch | 65 --- ...ust-code-to-PG13-tuple-conversion-changes.patch | 259 ----------- ...just-hypertable-expansion-to-PG13-changes.patch | 88 ---- ...just-decompress-code-to-Var-field-renames.patch | 41 -- .../0011-Adjust-jsonb_utils-to-PG13-changes.patch | 39 -- ...ndle-AT_DropExpression-in-process_utility.patch | 48 --- .../0013-Adjust-copy-code-to-PG13-changes.patch | 34 -- ...de-to-PG13-command-completion-tag-changes.patch | 186 -------- ...-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch | 51 --- ...ner-code-to-PG13-planner_hook-signature-c.patch | 58 --- ...17-Adjust-code-to-deparse_context-changes.patch | 34 -- package/timescaledb/0018-Update-compat.h.patch | 27 -- ...19-Adjust-code-to-PG13-tuptoaster-changes.patch | 70 --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 21 files changed, 2 insertions(+), 1878 deletions(-) Patch is too large, so refusing to show it From peter at korsgaard.com Mon Mar 21 16:45:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.5.0 Message-ID: <20220321164604.1160884AE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23694bac90106340d4669e0ffb2516847c1491bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This version adds support for PostgreSQL 14. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f250847551b4f1314ea69e026125c225605fd840) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4e3e91e152..88390bc674 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz +sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 4adf2bdbb3..39ba9e6ef4 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.2 +TIMESCALEDB_VERSION = 2.5.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:45:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.5.1 Message-ID: <20220321164604.1CA8384AF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7625b75fe69231a016ff28af021ceec143d211e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 8efb7beaa8bf536443e8de98773c6642c73cabef) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 88390bc674..5690ce65b3 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz +sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 39ba9e6ef4..b1e4342fe9 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.0 +TIMESCALEDB_VERSION = 2.5.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:46:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:46:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220321164604.25B8D84BB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82a4ae0e9b74c539bf43c3acd79f465ac8742706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:41:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:41:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/timescaledb: bump version to 2.5.1 Message-ID: <20220321164609.22D1D84A65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3d550b6f78b4fb3d5060818392c23124db43dd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 8efb7beaa8bf536443e8de98773c6642c73cabef) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 88390bc674..5690ce65b3 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz +sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 39ba9e6ef4..b1e4342fe9 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.0 +TIMESCALEDB_VERSION = 2.5.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:40:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:40:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/timescaledb: bump version to 2.5.0 Message-ID: <20220321164609.1A91C84BBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5616b4ce5e3b36949cf7e72056598bee2e97493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This version adds support for PostgreSQL 14. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f250847551b4f1314ea69e026125c225605fd840) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4e3e91e152..88390bc674 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz +sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 4adf2bdbb3..39ba9e6ef4 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.2 +TIMESCALEDB_VERSION = 2.5.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:41:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:41:11 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220321164609.2B15184BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71c72f6b49440a979cd7c9b827575d984301b539 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:36:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:36:54 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/samba4: bump version to 4.15.6 Message-ID: <20220321164613.2D65384BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5410fa69c67768718fc00d441e260349e80caa0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://www.samba.org/samba/history/samba-4.15.6.html Added new answer to samba4-cache.txt needed due to upstream commit: https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3eea7df286004430844bc9bd1d9b6c449b877d96) Signed-off-by: Peter Korsgaard --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e..d95776a03e 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37..20e5f00b21 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.6.tar.asc +sha256 0575b999a9048445820428dc540ba8a9527ce596fa66af02ea2ba1ea9578bcb4 samba-4.15.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742..688aaac3eb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.15.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 16:34:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:34:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/postgresql: bump version to 14.2 Message-ID: <20220321164613.2417A84BCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=943299ecf5671958f62d67914084d911cb5a128f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://www.postgresql.org/docs/release/14.2/ Updated license hash due to copyright year bump: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e8c436902bfac25074677858853f23d40bca8c0) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c2017a1226..2ba3b07563 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2.sha256 +sha256 2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a postgresql-14.2.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c..c389246f80 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 14.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From peter at korsgaard.com Mon Mar 21 16:38:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:38:11 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/php: bump version to 8.0.17 Message-ID: <20220321164613.362A784BCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d31474b95c823757b231950369b29121eb272fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ff867be0302b0abbb629a751eabf45c7a7b218fd) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb..3d73e60f90 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5 php-8.0.17.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94..6454d6fe87 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.0.17 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 16:39:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:39:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220321164613.3F25684BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a1adaa78b4df8c3cfce3e525192dc01293e1481 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:57:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:57:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/raptor: fix CVE-2020-25713 In-Reply-To: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 18:23:26 +0100") References: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnbgs5e.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A malformed input file can lead to a segfault due to an out of bounds > array access in raptor_xml_writer_start_element_common. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:57:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:57:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/raptor: fix CVE-2020-25713 Message-ID: <20220321164846.130DA84BCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11bd7ac38e1fbbb6bd3d3216bed1135c84a5ff90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fca33462b8ed4ed7c54d5d0640ddb64723b3dae) Signed-off-by: Peter Korsgaard --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From peter at korsgaard.com Mon Mar 21 16:57:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:57:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/raptor: fix CVE-2020-25713 Message-ID: <20220321164851.67FBC84BD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8e6b4b546f895651f1c48ed3f91ea3810d60de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fca33462b8ed4ed7c54d5d0640ddb64723b3dae) Signed-off-by: Peter Korsgaard --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From peter at korsgaard.com Mon Mar 21 16:56:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:56:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/raptor: fix CVE-2020-25713 Message-ID: <20220321164857.4B29484BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91510a411b0124b278ebe1dc1d650a5f795f9bfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fca33462b8ed4ed7c54d5d0640ddb64723b3dae) Signed-off-by: Peter Korsgaard --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From ps.report at gmx.net Mon Mar 21 19:29:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 21 Mar 2022 20:29:47 +0100 Subject: [Buildroot] [PATCH v3] package/wget: bump version to 1.21.3 Message-ID: <20220321192947.20712-1-ps.report@gmx.net> - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch - fix iri option enable dependency Changes v2 -> v3: - fix libiconv handling --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -- 2.35.1 From arnout at mind.be Mon Mar 21 20:56:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:56:34 +0100 Subject: [Buildroot] [git commit] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220321205120.E404F84C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d6e5a8501ff509760dca5c1477281d3f3430ddf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From arnout at mind.be Mon Mar 21 20:57:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:57:26 +0100 Subject: [Buildroot] [git commit] package/libodb-boost: add host variant Message-ID: <20220321205121.0051D84CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2f1f28efd4236431b333fabe6c75aceba9678bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Mon Mar 21 20:58:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:58:53 +0100 Subject: [Buildroot] [git commit] package/odb: add dependency on host-libodb Message-ID: <20220321205121.09C2484C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88471fe4fdc3d25d81b5b6898415a0550d06b90b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From arnout at mind.be Mon Mar 21 20:56:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:56:40 +0100 Subject: [Buildroot] [git commit] package/libodb: add host variant Message-ID: <20220321205120.EB54D84C9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b9c81cc4eefd0972b91abced472e2bce8b53fa2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Mon Mar 21 21:01:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:01:40 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <20220310095602.2435745-4-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-4-kamel.bouhara@bootlin.com> Message-ID: <990140a5-a769-2f7b-5786-c08557db4b6b@mind.be> On 10/03/2022 10:56, Kamel Bouhara via buildroot wrote: > Add host variant of libodb-boost required by the ODB compiler. > The libodb-boost headers are needed at compile time, and > therefore installed in $(HOST_DIR). > > Signed-off-by: Kamel Bouhara > --- > package/libodb-boost/libodb-boost.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > index bac5f1e78f..39c9f91030 100644 > --- a/package/libodb-boost/libodb-boost.mk > +++ b/package/libodb-boost/libodb-boost.mk > @@ -12,6 +12,8 @@ LIBODB_BOOST_INSTALL_STAGING = YES > LIBODB_BOOST_LICENSE = GPL-2.0 > LIBODB_BOOST_LICENSE_FILES = LICENSE > LIBODB_BOOST_DEPENDENCIES = boost libodb > +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb > LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" I have not double-checked (since I don't know for which GCC version exactly this -std=c++11 is needed), but I expect that if -std=c++11 is needed for target build, it's also going to be needed for host build. So I added HOST_LIBODB_BOOST_CONF_ENV. Series applied to master with that fixed, thanks. Regards, Arnout > > $(eval $(autotools-package)) > +$(eval $(host-autotools-package)) From arnout at mind.be Mon Mar 21 21:09:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:09:06 +0100 Subject: [Buildroot] [PATCH v2, 1/3] package/cmake: bump to version 3.18.6 In-Reply-To: <20220309220018.786891-1-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Message-ID: <49aefc4a-d973-5ed0-0e8c-c74607de9ff2@mind.be> On 09/03/2022 23:00, Fabrice Fontaine wrote: > Update hash of Copyright.txt (year updated and Qt Company Ltd. added: > https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50 > https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. This may create some fallout, but the autobuilders will tell us. Regards, Arnout > --- > package/cmake/cmake.hash | 6 +++--- > package/cmake/cmake.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash > index 97e83a274c..da514a6d6b 100644 > --- a/package/cmake/cmake.hash > +++ b/package/cmake/cmake.hash > @@ -1,5 +1,5 @@ > -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt > -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz > +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt > +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz > > # Locally calculated > -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt > +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt > diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk > index b1b214982e..4177b119ab 100644 > --- a/package/cmake/cmake.mk > +++ b/package/cmake/cmake.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -CMAKE_VERSION_MAJOR = 3.16 > -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 > +CMAKE_VERSION_MAJOR = 3.18 > +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 > CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) > CMAKE_LICENSE = BSD-3-Clause > CMAKE_LICENSE_FILES = Copyright.txt From arnout at mind.be Mon Mar 21 21:09:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:09:15 +0100 Subject: [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 In-Reply-To: <20220309220018.786891-2-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> <20220309220018.786891-2-fontaine.fabrice@gmail.com> Message-ID: <36d042a3-4b87-bd04-8895-3496d1c0b91a@mind.be> On 09/03/2022 23:00, Fabrice Fontaine wrote: > gerbera requires cmake 3.18 since version 1.10.0 and > https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > support/dependencies/check-host-cmake.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk > index dfc252e919..5760e4ded1 100644 > --- a/support/dependencies/check-host-cmake.mk > +++ b/support/dependencies/check-host-cmake.mk > @@ -1,9 +1,9 @@ > -# Set this to either 3.16 or higher, depending on the highest minimum > +# Set this to either 3.18 or higher, depending on the highest minimum > # version required by any of the packages bundled in Buildroot. If a > # package is bumped or a new one added, and it requires a higher > # version, our cmake infra will catch it and build its own. > # > -BR2_CMAKE_VERSION_MIN = 3.16 > +BR2_CMAKE_VERSION_MIN = 3.18 > > BR2_CMAKE_CANDIDATES ?= cmake cmake3 > BR2_CMAKE ?= $(call suitable-host-package,cmake,\ From arnout at mind.be Mon Mar 21 21:09:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:09:52 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 In-Reply-To: <20220309220018.786891-3-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> <20220309220018.786891-3-fontaine.fabrice@gmail.com> Message-ID: <3223aa54-91c0-c5f6-fda6-b4c6c781d426@mind.be> On 09/03/2022 23:00, Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/gerbera/gerbera/releases/tag/v1.10.0 > > Signed-off-by: Fabrice Fontaine I applied [1] instead, which also updates the config.xml file. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220320185144.10894-1-joerg.krause at embedded.rocks/ > --- > Changes v1 -> v2: > - Add cmake patches to the serie > > package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------------- > package/gerbera/gerbera.hash | 2 +- > package/gerbera/gerbera.mk | 2 +- > 3 files changed, 2 insertions(+), 46 deletions(-) > delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch > > diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch > deleted file mode 100644 > index c4419209a5..0000000000 > --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 > -From: kyak > -Date: Wed, 12 Jan 2022 19:41:37 +0300 > -Subject: [PATCH] Fix for fmt > 8.0 > - > -[Retrieved from: > -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] > -Signed-off-by: Fabrice Fontaine > ---- > - src/util/logger.h | 15 +++++++++++++++ > - 1 file changed, 15 insertions(+) > - > -diff --git a/src/util/logger.h b/src/util/logger.h > -index 58696e52f..ba64afa79 100644 > ---- a/src/util/logger.h > -+++ b/src/util/logger.h > -@@ -32,7 +32,9 @@ > - #ifndef __LOGGER_H__ > - #define __LOGGER_H__ > - > -+#include > - #include > -+#include > - > - #define log_debug SPDLOG_DEBUG > - #define log_info SPDLOG_INFO > -@@ -40,4 +42,17 @@ > - #define log_error SPDLOG_ERROR > - #define log_js SPDLOG_INFO > - > -+#if FMT_VERSION >= 80100 > -+template > -+struct fmt::formatter, char>> > -+ : formatter> { > -+ template > -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) > -+ { > -+ return fmt::formatter>::format( > -+ static_cast>(value), ctx); > -+ } > -+}; > -+#endif > -+ > - #endif // __LOGGER_H__ > diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash > index 5dcd364c33..89ac9ad55a 100644 > --- a/package/gerbera/gerbera.hash > +++ b/package/gerbera/gerbera.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz > +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz > sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md > diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk > index ab49f661ac..6acdfb86ac 100644 > --- a/package/gerbera/gerbera.mk > +++ b/package/gerbera/gerbera.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GERBERA_VERSION = 1.9.2 > +GERBERA_VERSION = 1.10.0 > GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) > GERBERA_LICENSE = GPL-2.0 > GERBERA_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:13:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:13:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 In-Reply-To: <20220320185144.10894-1-joerg.krause@embedded.rocks> References: <20220320185144.10894-1-joerg.krause@embedded.rocks> Message-ID: <109b1e93-1483-ad75-df49-6c04cbe5dc94@mind.be> On 20/03/2022 19:51, J?rg Krause wrote: > Drop patch wich is included in the new version. > > Also recreate config.xml by building and running Gerbera using: > > ``` > ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml > ``` > > Note, that Gerbera sets the `` parameter to the runtime user's home by > default when generating the script. This is not appropriate when running Gerbera > on an embedded Linux system as we usually do not have multiple users or even > users at all. Therefore, we set the home directory to /var/lib/gerbera`. > > Signed-off-by: J?rg Krause This also required an update of CMake, as observed by Francois. However, this patch also updates config.xml so I applied this one. I don't know if it's worth it, but would it be possible to build a minimal host-gerbera to automatically generate config.xml? Applied to master, thanks. Regards, Arnout > --- > package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------- > package/gerbera/config.xml | 58 ++++++++++++++++++---- > package/gerbera/gerbera.hash | 2 +- > package/gerbera/gerbera.mk | 2 +- > 4 files changed, 51 insertions(+), 55 deletions(-) > delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch > > diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch > deleted file mode 100644 > index c4419209a5..0000000000 > --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 > -From: kyak > -Date: Wed, 12 Jan 2022 19:41:37 +0300 > -Subject: [PATCH] Fix for fmt > 8.0 > - > -[Retrieved from: > -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] > -Signed-off-by: Fabrice Fontaine > ---- > - src/util/logger.h | 15 +++++++++++++++ > - 1 file changed, 15 insertions(+) > - > -diff --git a/src/util/logger.h b/src/util/logger.h > -index 58696e52f..ba64afa79 100644 > ---- a/src/util/logger.h > -+++ b/src/util/logger.h > -@@ -32,7 +32,9 @@ > - #ifndef __LOGGER_H__ > - #define __LOGGER_H__ > - > -+#include > - #include > -+#include > - > - #define log_debug SPDLOG_DEBUG > - #define log_info SPDLOG_INFO > -@@ -40,4 +42,17 @@ > - #define log_error SPDLOG_ERROR > - #define log_js SPDLOG_INFO > - > -+#if FMT_VERSION >= 80100 > -+template > -+struct fmt::formatter, char>> > -+ : formatter> { > -+ template > -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) > -+ { > -+ return fmt::formatter>::format( > -+ static_cast>(value), ctx); > -+ } > -+}; > -+#endif > -+ > - #endif // __LOGGER_H__ > diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml > index 30d70e21f7..e6261f25d0 100644 > --- a/package/gerbera/config.xml > +++ b/package/gerbera/config.xml > @@ -1,7 +1,7 @@ > > > > > @@ -11,7 +11,7 @@ > > > Gerbera > - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 > + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 > /var/lib/gerbera > /usr/share/gerbera/web > > - 1800 > + 180 > > > gerbera.db > > > + > + > + upnp:class derivedfrom "object.item" and last_updated > "@last7" > + > + > + upnp:class derivedfrom "object.item" and last_modified > "@last7" > + > + > > > * > @@ -45,12 +53,15 @@ > > > > - > - > - > + > + > + > + > > > > + > + > > > > @@ -98,14 +109,42 @@ > > > > + > + > > + > > + > + > + > > > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > > - > - > - > > > > @@ -133,3 +172,4 @@ > > > > + > diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash > index 5dcd364c33..89ac9ad55a 100644 > --- a/package/gerbera/gerbera.hash > +++ b/package/gerbera/gerbera.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz > +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz > sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md > diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk > index ab49f661ac..6acdfb86ac 100644 > --- a/package/gerbera/gerbera.mk > +++ b/package/gerbera/gerbera.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GERBERA_VERSION = 1.9.2 > +GERBERA_VERSION = 1.10.0 > GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) > GERBERA_LICENSE = GPL-2.0 > GERBERA_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:03:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:03:54 +0100 Subject: [Buildroot] [git commit] package/cmake: bump to version 3.18.6 Message-ID: <20220321210440.1E40884D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d32a0992bd03b1f7a96be78c5942bda574c36dcb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of Copyright.txt (year updated and Qt Company Ltd. added: https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50 https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 97e83a274c..da514a6d6b 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz # Locally calculated -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index b1b214982e..4177b119ab 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.16 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 3.18 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From arnout at mind.be Mon Mar 21 21:08:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:08:02 +0100 Subject: [Buildroot] [git commit] package/gerbera: bump to version 1.10.0 Message-ID: <20220321210440.2FDA284D85@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=585cf07e905dc61118bcdc15b49762f6aa0230a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch wich is included in the new version. Also recreate config.xml by building and running Gerbera using: ``` ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml ``` Note, that Gerbera sets the `` parameter to the runtime user's home by default when generating the script. This is not appropriate when running Gerbera on an embedded Linux system as we usually do not have multiple users or even users at all. Therefore, we set the home directory to /var/lib/gerbera`. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ----------------------- package/gerbera/config.xml | 58 +++++++++++++++++++++++++----- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 4 files changed, 51 insertions(+), 55 deletions(-) diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index 30d70e21f7..e6261f25d0 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ Gerbera - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 /var/lib/gerbera /usr/share/gerbera/web - 1800 + 180 gerbera.db + + + upnp:class derivedfrom "object.item" and last_updated > "@last7" + + + upnp:class derivedfrom "object.item" and last_modified > "@last7" + + * @@ -45,12 +53,15 @@ - - - + + + + + + @@ -98,14 +109,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -133,3 +172,4 @@ + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:04:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:04:16 +0100 Subject: [Buildroot] [git commit] support/dependencies: requires cmake >= 3.18 Message-ID: <20220321210440.268EA84D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee860ce3dc3dada4ee4af41dd0d0eee7c0489a28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gerbera requires cmake 3.18 since version 1.10.0 and https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/dependencies/check-host-cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index dfc252e919..5760e4ded1 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,9 @@ -# Set this to either 3.16 or higher, depending on the highest minimum +# Set this to either 3.18 or higher, depending on the highest minimum # version required by any of the packages bundled in Buildroot. If a # package is bumped or a new one added, and it requires a higher # version, our cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.16 +BR2_CMAKE_VERSION_MIN = 3.18 BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ From arnout at mind.be Mon Mar 21 21:17:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:17:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnetfilter_conntrack: fix musl build with headers >= 5.15 In-Reply-To: <20220313090209.161433-1-fontaine.fabrice@gmail.com> References: <20220313090209.161433-1-fontaine.fabrice@gmail.com> Message-ID: <42a78132-a0d1-b735-db43-10f23dc6407b@mind.be> On 13/03/2022 10:02, Fabrice Fontaine wrote: > Fix the following build failure with musl and headers >= 5.15 raised > since bump to version 1.0.9 in commit > 9af9dfa543907c46091c706b0f3a0eb89445ae74: > > In file included from /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/arpa/inet.h:9, > from ../../include/internal/internal.h:14, > from proto.c:2: > /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' > 23 | struct in6_addr { > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-fix-build-with-kernel-5-15-and-musl.patch | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch > > diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch > new file mode 100644 > index 0000000000..9e96594120 > --- /dev/null > +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch > @@ -0,0 +1,60 @@ > +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 > +From: Robert Marko > +Date: Thu, 24 Feb 2022 15:01:11 +0100 > +Subject: conntrack: fix build with kernel 5.15 and musl > + > +Currently, with kernel 5.15 headers and musl building is failing with > +redefinition errors due to a conflict between the kernel and musl headers. > + > +Musl is able to suppres the conflicting kernel header definitions if they > +are included after the standard libc ones, however since ICMP definitions > +were moved into a separate internal header to avoid duplication this has > +stopped working and is breaking the builds. > + > +It seems that the issue is that which contains the UAPI > +suppression defines is included in the internal.h header and not in the > +proto.h which actually includes the kernel ICMP headers and thus UAPI > +supression defines are not present. > + > +Solve this by moving the include before the ICMP kernel > +includes in the proto.h > + > +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") > +Signed-off-by: Robert Marko > +Signed-off-by: Florian Westphal > + > +[Retrieved from: > +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] > +Signed-off-by: Fabrice Fontaine > +--- > + include/internal/internal.h | 1 - > + include/internal/proto.h | 1 + > + 2 files changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/include/internal/internal.h b/include/internal/internal.h > +index 2ef8a90..7cd7c44 100644 > +--- a/include/internal/internal.h > ++++ b/include/internal/internal.h > +@@ -14,7 +14,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + #include > +diff --git a/include/internal/proto.h b/include/internal/proto.h > +index 40e7bfe..60a5f4e 100644 > +--- a/include/internal/proto.h > ++++ b/include/internal/proto.h > +@@ -2,6 +2,7 @@ > + #define _NFCT_PROTO_H_ > + > + #include > ++#include > + #include > + #include > + > +-- > +cgit v1.2.3 > + From arnout at mind.be Mon Mar 21 21:17:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:17:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/bind: reorder openssl variables In-Reply-To: <20220313092148.353432-1-fontaine.fabrice@gmail.com> References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> Message-ID: <32557300-c9ef-288e-46de-ed6f5bce6357@mind.be> On 13/03/2022 10:21, Fabrice Fontaine wrote: > openssl is mandatory since bump to version 9.16.26 in commit > 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in > the beginning of bind.mk instead of keeping them in the middle of the > file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as > host-pkgconf is already mandatory > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/bind/bind.mk | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index 5ddf7652eb..e0c81152e1 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen > BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate > BIND_CONF_ENV = \ > BUILD_CC="$(TARGET_CC)" \ > - BUILD_CFLAGS="$(TARGET_CFLAGS)" > + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ > + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` > BIND_CONF_OPTS = \ > $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ > --without-lmdb \ > @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ > --with-randomdev=/dev/urandom \ > --enable-epoll \ > --enable-filter-aaaa \ > - --disable-backtrace > + --disable-backtrace \ > + --with-openssl=$(STAGING_DIR)/usr \ > + --with-ecdsa=yes \ > + --with-eddsa=no \ > + --with-aes=yes > > -BIND_DEPENDENCIES = libuv > +BIND_DEPENDENCIES = host-pkgconf libuv openssl > > ifeq ($(BR2_PACKAGE_ZLIB),y) > BIND_CONF_OPTS += --with-zlib > BIND_DEPENDENCIES += zlib > -BIND_DEPENDENCIES += host-pkgconf zlib > else > BIND_CONF_OPTS += --without-zlib > endif > @@ -76,13 +80,6 @@ else > BIND_CONF_OPTS += --with-libxml2=no > endif > > -BIND_DEPENDENCIES += host-pkgconf openssl > -BIND_CONF_OPTS += \ > - --with-openssl=$(STAGING_DIR)/usr \ > - --with-ecdsa=yes \ > - --with-eddsa=no \ > - --with-aes=yes > -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` > # GOST cipher support requires openssl extra engines > ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) > BIND_CONF_OPTS += --with-gost=yes From arnout at mind.be Mon Mar 21 21:17:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:17:59 +0100 Subject: [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 22.0.3 In-Reply-To: <20220313095206.1266409-1-bernd.kuhls@t-online.de> References: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Message-ID: <50da868e-57e2-9137-52a9-a4baf2c4ed19@mind.be> On 13/03/2022 10:52, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied series to master, thanks. Regards, Arnout > --- > package/intel-gmmlib/intel-gmmlib.hash | 2 +- > package/intel-gmmlib/intel-gmmlib.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash > index 71a153e0a3..beb3cfd6ae 100644 > --- a/package/intel-gmmlib/intel-gmmlib.hash > +++ b/package/intel-gmmlib/intel-gmmlib.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz > +sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz > sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md > diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk > index 235f71341c..06628132a2 100644 > --- a/package/intel-gmmlib/intel-gmmlib.mk > +++ b/package/intel-gmmlib/intel-gmmlib.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -INTEL_GMMLIB_VERSION = 22.0.2 > +INTEL_GMMLIB_VERSION = 22.0.3 > INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive > INTEL_GMMLIB_LICENSE = MIT > INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:18:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:18:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/tree: fix build with gcc 4.8 In-Reply-To: <20220313092821.357580-1-fontaine.fabrice@gmail.com> References: <20220313092821.357580-1-fontaine.fabrice@gmail.com> Message-ID: <78b67931-ad98-a385-d250-e259ed045f21@mind.be> On 13/03/2022 10:28, Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.0.2 in commit 11a3989dbf7ac2535fac04b24ab3d959da3686b3: > > color.c: In function 'parse_dir_colors': > color.c:103:11: error: redeclaration of 'i' with no linkage > for(int i=0; i < DOT_EXTENSION; i++) color_code[i] = NULL; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/e05595696727622eaf517944d4ff4414baf66bb2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/tree/tree.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/tree/tree.mk b/package/tree/tree.mk > index 7c111b47d2..da0acbae49 100644 > --- a/package/tree/tree.mk > +++ b/package/tree/tree.mk > @@ -11,7 +11,8 @@ TREE_LICENSE = GPL-2.0+ > TREE_LICENSE_FILES = LICENSE > > define TREE_BUILD_CMDS > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) > + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ > + -C $(@D) > endef > > define TREE_INSTALL_TARGET_CMDS From arnout at mind.be Mon Mar 21 21:15:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:15:16 +0100 Subject: [Buildroot] [git commit] package/bind: fix libxml2 build Message-ID: <20220321210932.7AFD384E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33413b7e5326591dbfc29050a0d1136dcae868c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libxml2 raised since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead Fixes: - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 72f1e4dcdc..a595baabc5 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -67,7 +67,7 @@ BIND_CONF_OPTS += --with-gssapi=no endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-libxml2 BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no From arnout at mind.be Mon Mar 21 21:13:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:13:50 +0100 Subject: [Buildroot] [git commit] package/libnetfilter_conntrack: fix musl build with headers >= 5.15 Message-ID: <20220321210932.62A7D84E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52686b220d0c3c081f8259fc0ff6a307c519ec2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with musl and headers >= 5.15 raised since bump to version 1.0.9 in commit 9af9dfa543907c46091c706b0f3a0eb89445ae74: In file included from /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/arpa/inet.h:9, from ../../include/internal/internal.h:14, from proto.c:2: /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...track-fix-build-with-kernel-5-15-and-musl.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch new file mode 100644 index 0000000000..9e96594120 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch @@ -0,0 +1,60 @@ +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko +Signed-off-by: Florian Westphal + +[Retrieved from: +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] +Signed-off-by: Fabrice Fontaine +--- + include/internal/internal.h | 1 - + include/internal/proto.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/internal.h b/include/internal/internal.h +index 2ef8a90..7cd7c44 100644 +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/include/internal/proto.h b/include/internal/proto.h +index 40e7bfe..60a5f4e 100644 +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include ++#include + #include + #include + +-- +cgit v1.2.3 + From arnout at mind.be Mon Mar 21 21:15:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:15:57 +0100 Subject: [Buildroot] [git commit] package/intel-gmmlib: bump version to 22.0.3 Message-ID: <20220321210932.92A3A84D6A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=376f1b0b73b2af0b8d2a9a767416dcf033dc3528 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 71a153e0a3..beb3cfd6ae 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz +sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 235f71341c..06628132a2 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.2 +INTEL_GMMLIB_VERSION = 22.0.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:15:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:15:38 +0100 Subject: [Buildroot] [git commit] package/tree: fix build with gcc 4.8 Message-ID: <20220321210932.8695784EA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a4f6c497a5f90833509096ddd520037cede7272 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.0.2 in commit 11a3989dbf7ac2535fac04b24ab3d959da3686b3: color.c: In function 'parse_dir_colors': color.c:103:11: error: redeclaration of 'i' with no linkage for(int i=0; i < DOT_EXTENSION; i++) color_code[i] = NULL; ^ Fixes: - http://autobuild.buildroot.org/results/e05595696727622eaf517944d4ff4414baf66bb2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tree/tree.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 7c111b47d2..da0acbae49 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -11,7 +11,8 @@ TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE define TREE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + -C $(@D) endef define TREE_INSTALL_TARGET_CMDS From arnout at mind.be Mon Mar 21 21:16:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:16:11 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.2.2 Message-ID: <20220321210932.9C70F84D6A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=370249646872b5e4d1a60141357e6d69c0851a63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 7c615620ae..044b9d7013 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz +sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index e286a8b2c5..f0e9f46f07 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,8 +6,8 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.1 -INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive +INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause INTEL_MEDIADRIVER_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:16:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:16:34 +0100 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 22.2.2 Message-ID: <20220321210932.A6A0E84E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3476b1dedfbd6892b82e096a48199111032ba72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Rebased patch 0001. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch | 2 +- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch index a7e3b70294..b3ecfc98b7 100644 --- a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch +++ b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -40,7 +40,7 @@ index 7e36ae2d..5b8b9b9d 100644 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) if( ARGV1 MATCHES hw AND Linux ) -@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) +@@ -452,7 +452,7 @@ function(configure_dependencies target dependencies variant) endforeach() set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index ee4f317242..d9acf49637 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz +sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7589ff9737..698d2348b2 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.1 +INTEL_MEDIASDK_VERSION = 22.2.2 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From arnout at mind.be Mon Mar 21 21:13:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:13:59 +0100 Subject: [Buildroot] [git commit] package/bind: reorder openssl variables Message-ID: <20220321210932.704ED84D6A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b127b0c1b653b0e2ce3c1996a7eb370a258e712 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master openssl is mandatory since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in the beginning of bind.mk instead of keeping them in the middle of the file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as host-pkgconf is already mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bind/bind.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5b4c60b14c..72f1e4dcdc 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr \ + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes -BIND_DEPENDENCIES = libuv +BIND_DEPENDENCIES = host-pkgconf libuv openssl ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib -BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -69,13 +73,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes From arnout at mind.be Mon Mar 21 21:32:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:32:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: <20220316060219.3448648-1-james.hilliard1@gmail.com> References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: Hi James, On 16/03/2022 07:02, James Hilliard wrote: > Currently pillow doesn't correctly search pkg-config system paths > for some libraries which can prevent some libraries from being > properly detected/enabled in pillow. > > Signed-off-by: James Hilliard > --- > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ > package/python-pillow/python-pillow.mk | 23 +++---------- > 2 files changed, 37 insertions(+), 19 deletions(-) > create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > new file mode 100644 > index 0000000000..9f979b048f > --- /dev/null > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > @@ -0,0 +1,33 @@ > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > +Subject: [PATCH] Search pkg-config system libs/cflags. > + > +We need to search the system paths as well from pkg-config for > +some packages to be found properly. > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/python-pillow/Pillow/pull/6138] > +--- > + setup.py | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index 3468b260..59d65ce2 100755 > +--- a/setup.py > ++++ b/setup.py > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > + def _pkg_config(name): > + try: > + command = os.environ.get("PKG_CONFIG", "pkg-config") > +- command_libs = [command, "--libs-only-L", name] > +- command_cflags = [command, "--cflags-only-I", name] > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] > ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] You gave an additional explanation why this is needed in the upstream PR: Zlib and anything that has headers in the normal system libs/include folders seems to not get their headers picked up without this change. I think this issue is mostly going to be something people hit when cross compiling since the prefix based system libs/include folder would probably work in most of the usual cases(searching in sys.prefix will not work when cross compiling since it points to the host toolchain prefix rather than the target toolchain sysroot prefix): However, that implies that either we have to make sure that sys.prefix is set correctly (i.e. point it to staging instead of host), or pillow is using sys.prefix incorrectly. Before that, still, I don't understand how this can be an issue. Unless if pillow also passes something like -nostdinc, our toolchain wrapper should make sure that staging/usr/include is in the search path. There also doesn't seem to be an autobuilder failure due to this... But maybe it builds successfully, just without some optional dependency? Please provide more details about the failure in the commit message. > + if not DEBUG: > + command_libs.append("--silence-errors") > + command_cflags.append("--silence-errors") > +-- > +2.35.1 > + > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index 901876e0ee..ef677855b2 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > PYTHON_PILLOW_CPE_ID_VENDOR = python > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" This change isn't explained in the commit message, and seems unrelated. > + > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing The need for these two changes is also not clear at all from the commit message. I've marked the patch as Changes Requested. Regards, Arnout > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > @@ -68,22 +71,4 @@ else > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > endif > > -define PYTHON_PILLOW_BUILD_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) > -endef > - > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > -endef > - > $(eval $(python-package)) From arnout at mind.be Mon Mar 21 21:33:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:33:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support In-Reply-To: <20220314185945.2823356-1-bernd.kuhls@t-online.de> References: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Message-ID: <8ff7a156-e970-919e-9dd9-3876dfc724f4@mind.be> On 14/03/2022 19:59, Bernd Kuhls wrote: > Contrary to the helptext > https://github.com/curl/curl/blob/master/configure.ac#L152 > > the configure option is called --with-libgsasl: > https://github.com/curl/curl/blob/master/configure.ac#L1989 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libcurl/libcurl.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 0db0c088cb..a6e5b06b8f 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -128,9 +128,9 @@ endif > > ifeq ($(BR2_PACKAGE_LIBGSASL),y) > LIBCURL_DEPENDENCIES += libgsasl > -LIBCURL_CONF_OPTS += --with-gsasl > +LIBCURL_CONF_OPTS += --with-libgsasl > else > -LIBCURL_CONF_OPTS += --without-gsasl > +LIBCURL_CONF_OPTS += --without-libgsasl > endif > > ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From arnout at mind.be Mon Mar 21 21:18:32 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:18:32 +0100 Subject: [Buildroot] [git commit] package/libcurl: fix libgsasl support Message-ID: <20220321212436.DCDBA84EAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b98d8bba7c1358938f8930a0167abe7a3f6c521 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f271..4b2e52829c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From arnout at mind.be Mon Mar 21 21:49:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:49:41 +0100 Subject: [Buildroot] [git commit] package/rpi-firmware: fix missing files in overlays Message-ID: <20220321214630.36DD784F2F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..d4d1d07b3f 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -48,6 +48,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From james.hilliard1 at gmail.com Mon Mar 21 21:56:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 21 Mar 2022 15:56:27 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle wrote: > > Hi James, > > On 16/03/2022 07:02, James Hilliard wrote: > > Currently pillow doesn't correctly search pkg-config system paths > > for some libraries which can prevent some libraries from being > > properly detected/enabled in pillow. > > > > Signed-off-by: James Hilliard > > --- > > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ > > package/python-pillow/python-pillow.mk | 23 +++---------- > > 2 files changed, 37 insertions(+), 19 deletions(-) > > create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > > diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > new file mode 100644 > > index 0000000000..9f979b048f > > --- /dev/null > > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > @@ -0,0 +1,33 @@ > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > > +From: James Hilliard > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > > +Subject: [PATCH] Search pkg-config system libs/cflags. > > + > > +We need to search the system paths as well from pkg-config for > > +some packages to be found properly. > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/python-pillow/Pillow/pull/6138] > > +--- > > + setup.py | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/setup.py b/setup.py > > +index 3468b260..59d65ce2 100755 > > +--- a/setup.py > > ++++ b/setup.py > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > > + def _pkg_config(name): > > + try: > > + command = os.environ.get("PKG_CONFIG", "pkg-config") > > +- command_libs = [command, "--libs-only-L", name] > > +- command_cflags = [command, "--cflags-only-I", name] > > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] > > ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] > > You gave an additional explanation why this is needed in the upstream PR: > > Zlib and anything that has headers in the normal system libs/include folders > seems to not get their headers picked up without this change. > > I think this issue is mostly going to be something people hit when cross > compiling since the prefix based system libs/include folder would probably work > in most of the usual cases(searching in sys.prefix will not work when cross > compiling since it points to the host toolchain prefix rather than the target > toolchain sysroot prefix): > > > However, that implies that either we have to make sure that sys.prefix is set > correctly (i.e. point it to staging instead of host), or pillow is using > sys.prefix incorrectly. I think pillow is using sys.prefix in a way that is not really cross compilation compatible, however using pkg-config with sysm libs/cflags seems to be sufficient for it to pass its non-standard header checks. > > Before that, still, I don't understand how this can be an issue. Unless if > pillow also passes something like -nostdinc, our toolchain wrapper should make > sure that staging/usr/include is in the search path. It's due to pillow having custom header checks like this: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 > > There also doesn't seem to be an autobuilder failure due to this... But maybe > it builds successfully, just without some optional dependency? Please provide > more details about the failure in the commit message. The failure was getting hidden by the non-standard build/install cmd overrides it would appear, it seemed pillow was getting built for the host instead of the target with those, I didn't investigate in too much detail as those custom build/install overrides are not actually needed. > > > > > + if not DEBUG: > > + command_libs.append("--silence-errors") > > + command_cflags.append("--silence-errors") > > +-- > > +2.35.1 > > + > > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > > index 901876e0ee..ef677855b2 100644 > > --- a/package/python-pillow/python-pillow.mk > > +++ b/package/python-pillow/python-pillow.mk > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > > PYTHON_PILLOW_CPE_ID_VENDOR = python > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > > PYTHON_PILLOW_SETUP_TYPE = setuptools > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" > > This change isn't explained in the commit message, and seems unrelated. > > > + > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > > The need for these two changes is also not clear at all from the commit message. > > > I've marked the patch as Changes Requested. > > Regards, > Arnout > > > > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > > PYTHON_PILLOW_DEPENDENCIES += freetype > > @@ -68,22 +71,4 @@ else > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > > endif > > > > -define PYTHON_PILLOW_BUILD_CMDS > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) > > -endef > > - > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > > -endef > > - > > $(eval $(python-package)) From arnout at mind.be Mon Mar 21 21:56:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:56:41 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: On 17/03/2022 12:06, Sassen, Rutger wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. I've added a reference to the documentation. > > Signed-off-by: Rutger Sassen > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/Config.in | 12 ++++++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 19 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index 8070dc3019..36054353f8 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP In the end, I don't think this option is very useful. So I removed it... > + bool "Install DTB overlay map" > + default n > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need overlay_map.dtb for target dependent mapping of > + overlay names to one of several overlay implementations. > + > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk > b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > $(BINARIES_DIR)/rpi-firmware/overlays/ ... reducing the patch to just this single line. Please check if the commit [1] does what you need, if not I can recover the original patch with the Config.in option. Applied to master, thanks. Regards, Arnout [1] https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) > -- > 2.20.1 > > > *Disclaimer* > > This email communication is CONFIDENTIAL. If you are not the intended recipient, > you may not use, copy or disclose to anyone the message or any information > contained in the message and I ask that you please notify me by return email and > delete this communication immediately. Thank you. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Mon Mar 21 22:05:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 21 Mar 2022 16:05:22 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220321220522.283163-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. This is due to pillow implementing custom header validation checks which need system paths present to function correctly: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 Removed custom BUILD_CMDS and INSTALL_TARGET_CMDS which were causing python-pillow to be installed for the host, they are not required, we just need to set build_ext at the start of PYTHON_PILLOW_BUILD_OPTS instead. Signed-off-by: James Hilliard --- Changes v1 -> v2: - remove unrelated MAX_CONCURRENCY env variable --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 23 +++---------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..ef677855b2 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Mar 21 22:07:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 21 Mar 2022 16:07:04 -0600 Subject: [Buildroot] [PATCH v3 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220321220704.284635-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. This is due to pillow implementing custom header validation checks which need system paths present to function correctly: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 Removed custom BUILD_CMDS and INSTALL_TARGET_CMDS which were causing python-pillow to be installed for the host, they are not required, we just need to set build_ext at the start of PYTHON_PILLOW_BUILD_OPTS instead. Signed-off-by: James Hilliard --- Changes v2 -> v3: - actually remove MAX_CONCURRENCY env variable Changes v1 -> v2: - remove unrelated MAX_CONCURRENCY env variable --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 22 ++----------- 2 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..bea129889b 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,9 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +70,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From angelo at amarulasolutions.com Mon Mar 21 22:10:54 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 21 Mar 2022 23:10:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 10:56 PM James Hilliard wrote: > On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle > wrote: > > > > Hi James, > > > > On 16/03/2022 07:02, James Hilliard wrote: > > > Currently pillow doesn't correctly search pkg-config system paths > > > for some libraries which can prevent some libraries from being > > > properly detected/enabled in pillow. > > > > > > Signed-off-by: James Hilliard > > > --- > > > ...Search-pkg-config-system-libs-cflags.patch | 33 > +++++++++++++++++++ > > > package/python-pillow/python-pillow.mk | 23 +++---------- > > > 2 files changed, 37 insertions(+), 19 deletions(-) > > > create mode 100644 > package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > > > > diff --git > a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > new file mode 100644 > > > index 0000000000..9f979b048f > > > --- /dev/null > > > +++ > b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > @@ -0,0 +1,33 @@ > > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > > > +From: James Hilliard > > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > > > +Subject: [PATCH] Search pkg-config system libs/cflags. > > > + > > > +We need to search the system paths as well from pkg-config for > > > +some packages to be found properly. > > > + > > > +Signed-off-by: James Hilliard > > > +[Upstream status: > > > +https://github.com/python-pillow/Pillow/pull/6138] > > > +--- > > > + setup.py | 4 ++-- > > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > > + > > > +diff --git a/setup.py b/setup.py > > > +index 3468b260..59d65ce2 100755 > > > +--- a/setup.py > > > ++++ b/setup.py > > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > > > + def _pkg_config(name): > > > + try: > > > + command = os.environ.get("PKG_CONFIG", "pkg-config") > > > +- command_libs = [command, "--libs-only-L", name] > > > +- command_cflags = [command, "--cflags-only-I", name] > > > ++ command_libs = [command, "--libs-only-L", > "--keep-system-libs", name] > > > ++ command_cflags = [command, "--cflags-only-I", > "--keep-system-cflags", name] > > > > You gave an additional explanation why this is needed in the upstream > PR: > > > > Zlib and anything that has headers in the normal system libs/include > folders > > seems to not get their headers picked up without this change. > > > > I think this issue is mostly going to be something people hit when cross > > compiling since the prefix based system libs/include folder would > probably work > > in most of the usual cases(searching in sys.prefix will not work when > cross > > compiling since it points to the host toolchain prefix rather than the > target > > toolchain sysroot prefix): > > > > > > However, that implies that either we have to make sure that sys.prefix > is set > > correctly (i.e. point it to staging instead of host), or pillow is using > > sys.prefix incorrectly. > > I think pillow is using sys.prefix in a way that is not really cross > compilation > compatible, however using pkg-config with sysm libs/cflags seems to be > sufficient > for it to pass its non-standard header checks. > I remember having added the --disable-platform-guessing exactly to overcome this problem. All the setting should be provided by buildroot. Probably, the logic behind this is slightly changed, and the mechanism doesn't work anymore. I'll try to have a look. > > > > > Before that, still, I don't understand how this can be an issue. > Unless if > > pillow also passes something like -nostdinc, our toolchain wrapper > should make > > sure that staging/usr/include is in the search path. > > It's due to pillow having custom header checks like this: > https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 > > > > > There also doesn't seem to be an autobuilder failure due to this... > But maybe > > it builds successfully, just without some optional dependency? Please > provide > > more details about the failure in the commit message. > > The failure was getting hidden by the non-standard build/install cmd > overrides it > would appear, it seemed pillow was getting built for the host instead > of the target with > those, I didn't investigate in too much detail as those custom > build/install overrides > are not actually needed. > > > > > > > > > > + if not DEBUG: > > > + command_libs.append("--silence-errors") > > > + command_cflags.append("--silence-errors") > > > +-- > > > +2.35.1 > > > + > > > diff --git a/package/python-pillow/python-pillow.mk > b/package/python-pillow/python-pillow.mk > > > index 901876e0ee..ef677855b2 100644 > > > --- a/package/python-pillow/python-pillow.mk > > > +++ b/package/python-pillow/python-pillow.mk > > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > > > PYTHON_PILLOW_CPE_ID_VENDOR = python > > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > > > PYTHON_PILLOW_SETUP_TYPE = setuptools > > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" > > > > This change isn't explained in the commit message, and seems unrelated. > > > > > + > > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > > > > The need for these two changes is also not clear at all from the > commit message. > > > > > > I've marked the patch as Changes Requested. > > > > Regards, > > Arnout > > > > > > > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > > > PYTHON_PILLOW_DEPENDENCIES += freetype > > > @@ -68,22 +71,4 @@ else > > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > > > endif > > > > > > -define PYTHON_PILLOW_BUILD_CMDS > > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) > $(PYTHON_PILLOW_BUILD_OPTS) > > > -endef > > > - > > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > > > -endef > > > - > > > $(eval $(python-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From angelo at amarulasolutions.com Mon Mar 21 22:35:25 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 21 Mar 2022 23:35:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 11:10 PM Angelo Compagnucci < angelo at amarulasolutions.com> wrote: > > > On Mon, Mar 21, 2022 at 10:56 PM James Hilliard > wrote: > >> On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle >> wrote: >> > >> > Hi James, >> > >> > On 16/03/2022 07:02, James Hilliard wrote: >> > > Currently pillow doesn't correctly search pkg-config system paths >> > > for some libraries which can prevent some libraries from being >> > > properly detected/enabled in pillow. >> > > >> > > Signed-off-by: James Hilliard >> > > --- >> > > ...Search-pkg-config-system-libs-cflags.patch | 33 >> +++++++++++++++++++ >> > > package/python-pillow/python-pillow.mk | 23 +++---------- >> > > 2 files changed, 37 insertions(+), 19 deletions(-) >> > > create mode 100644 >> package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> > > >> > > diff --git >> a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> > > new file mode 100644 >> > > index 0000000000..9f979b048f >> > > --- /dev/null >> > > +++ >> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> > > @@ -0,0 +1,33 @@ >> > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 >> 2001 >> > > +From: James Hilliard >> > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 >> > > +Subject: [PATCH] Search pkg-config system libs/cflags. >> > > + >> > > +We need to search the system paths as well from pkg-config for >> > > +some packages to be found properly. >> > > + >> > > +Signed-off-by: James Hilliard >> > > +[Upstream status: >> > > +https://github.com/python-pillow/Pillow/pull/6138] >> > > +--- >> > > + setup.py | 4 ++-- >> > > + 1 file changed, 2 insertions(+), 2 deletions(-) >> > > + >> > > +diff --git a/setup.py b/setup.py >> > > +index 3468b260..59d65ce2 100755 >> > > +--- a/setup.py >> > > ++++ b/setup.py >> > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): >> > > + def _pkg_config(name): >> > > + try: >> > > + command = os.environ.get("PKG_CONFIG", "pkg-config") >> > > +- command_libs = [command, "--libs-only-L", name] >> > > +- command_cflags = [command, "--cflags-only-I", name] >> > > ++ command_libs = [command, "--libs-only-L", >> "--keep-system-libs", name] >> > > ++ command_cflags = [command, "--cflags-only-I", >> "--keep-system-cflags", name] >> > >> > You gave an additional explanation why this is needed in the upstream >> PR: >> > >> > Zlib and anything that has headers in the normal system libs/include >> folders >> > seems to not get their headers picked up without this change. >> > >> > I think this issue is mostly going to be something people hit when cross >> > compiling since the prefix based system libs/include folder would >> probably work >> > in most of the usual cases(searching in sys.prefix will not work when >> cross >> > compiling since it points to the host toolchain prefix rather than the >> target >> > toolchain sysroot prefix): >> > >> > >> > However, that implies that either we have to make sure that >> sys.prefix is set >> > correctly (i.e. point it to staging instead of host), or pillow is using >> > sys.prefix incorrectly. >> >> I think pillow is using sys.prefix in a way that is not really cross >> compilation >> compatible, however using pkg-config with sysm libs/cflags seems to be >> sufficient >> for it to pass its non-standard header checks. >> > > I remember having added the --disable-platform-guessing exactly to > overcome this problem. All the setting should be provided by buildroot. > Probably, the logic behind this is slightly changed, and the mechanism > doesn't work anymore. I'll try to have a look. > Yes, basically the paths leaks some host directories: [...] Checking for include file %s in %s ('libimagequant.h', '/usr/local/include') Checking for include file %s in %s ('libimagequant.h', '/usr/include') Looking forward for a fix. > >> >> > >> > Before that, still, I don't understand how this can be an issue. >> Unless if >> > pillow also passes something like -nostdinc, our toolchain wrapper >> should make >> > sure that staging/usr/include is in the search path. >> >> It's due to pillow having custom header checks like this: >> https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 >> >> > >> > There also doesn't seem to be an autobuilder failure due to this... >> But maybe >> > it builds successfully, just without some optional dependency? Please >> provide >> > more details about the failure in the commit message. >> >> The failure was getting hidden by the non-standard build/install cmd >> overrides it >> would appear, it seemed pillow was getting built for the host instead >> of the target with >> those, I didn't investigate in too much detail as those custom >> build/install overrides >> are not actually needed. >> >> > >> > >> > >> > > + if not DEBUG: >> > > + command_libs.append("--silence-errors") >> > > + command_cflags.append("--silence-errors") >> > > +-- >> > > +2.35.1 >> > > + >> > > diff --git a/package/python-pillow/python-pillow.mk >> b/package/python-pillow/python-pillow.mk >> > > index 901876e0ee..ef677855b2 100644 >> > > --- a/package/python-pillow/python-pillow.mk >> > > +++ b/package/python-pillow/python-pillow.mk >> > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE >> > > PYTHON_PILLOW_CPE_ID_VENDOR = python >> > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow >> > > PYTHON_PILLOW_SETUP_TYPE = setuptools >> > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing >> > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" >> > >> > This change isn't explained in the commit message, and seems >> unrelated. >> > >> > > + >> > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf >> > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing >> > >> > The need for these two changes is also not clear at all from the >> commit message. >> > >> > >> > I've marked the patch as Changes Requested. >> > >> > Regards, >> > Arnout >> > >> > > >> > > ifeq ($(BR2_PACKAGE_FREETYPE),y) >> > > PYTHON_PILLOW_DEPENDENCIES += freetype >> > > @@ -68,22 +71,4 @@ else >> > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux >> > > endif >> > > >> > > -define PYTHON_PILLOW_BUILD_CMDS >> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >> > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) >> $(PYTHON_PILLOW_BUILD_OPTS) >> > > -endef >> > > - >> > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS >> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >> > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ >> > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ >> > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) >> > > -endef >> > > - >> > > $(eval $(python-package)) >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> > > > -- > > Angelo Compagnucci > > Software Engineer > > angelo at amarulasolutions.com > __________________________________ > Amarula Solutions SRL > > Via le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 (0)42 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com > [`as] https://www.amarulasolutions.com| > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Mar 21 23:04:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 00:04:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: fix host build Message-ID: <20220321230452.1901382-1-fontaine.fabrice@gmail.com> host-bison and host-flex are mandatory dependencies of host-ola since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: bison not found, please install it Fixes: - http://autobuild.buildroot.org/results/ac089629a58d55ec5d1aa83fd77bd487bc9d76de Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 471ae8ed9b..cde90dbd5b 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -25,7 +25,7 @@ OLA_CONF_OPTS = \ --disable-unittests \ --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex # When building the host part, disable as much as possible to speed up # the configure step and avoid missing host dependencies. -- 2.35.1 From angelo at amarulasolutions.com Mon Mar 21 23:10:13 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Mar 2022 00:10:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 11:35 PM Angelo Compagnucci < angelo at amarulasolutions.com> wrote: > > > On Mon, Mar 21, 2022 at 11:10 PM Angelo Compagnucci < > angelo at amarulasolutions.com> wrote: > >> >> >> On Mon, Mar 21, 2022 at 10:56 PM James Hilliard < >> james.hilliard1 at gmail.com> wrote: >> >>> On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle >>> wrote: >>> > >>> > Hi James, >>> > >>> > On 16/03/2022 07:02, James Hilliard wrote: >>> > > Currently pillow doesn't correctly search pkg-config system paths >>> > > for some libraries which can prevent some libraries from being >>> > > properly detected/enabled in pillow. >>> > > >>> > > Signed-off-by: James Hilliard >>> > > --- >>> > > ...Search-pkg-config-system-libs-cflags.patch | 33 >>> +++++++++++++++++++ >>> > > package/python-pillow/python-pillow.mk | 23 +++---------- >>> > > 2 files changed, 37 insertions(+), 19 deletions(-) >>> > > create mode 100644 >>> package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> > > >>> > > diff --git >>> a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> > > new file mode 100644 >>> > > index 0000000000..9f979b048f >>> > > --- /dev/null >>> > > +++ >>> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> > > @@ -0,0 +1,33 @@ >>> > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 >>> 2001 >>> > > +From: James Hilliard >>> > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 >>> > > +Subject: [PATCH] Search pkg-config system libs/cflags. >>> > > + >>> > > +We need to search the system paths as well from pkg-config for >>> > > +some packages to be found properly. >>> > > + >>> > > +Signed-off-by: James Hilliard >>> > > +[Upstream status: >>> > > +https://github.com/python-pillow/Pillow/pull/6138] >>> > > +--- >>> > > + setup.py | 4 ++-- >>> > > + 1 file changed, 2 insertions(+), 2 deletions(-) >>> > > + >>> > > +diff --git a/setup.py b/setup.py >>> > > +index 3468b260..59d65ce2 100755 >>> > > +--- a/setup.py >>> > > ++++ b/setup.py >>> > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): >>> > > + def _pkg_config(name): >>> > > + try: >>> > > + command = os.environ.get("PKG_CONFIG", "pkg-config") >>> > > +- command_libs = [command, "--libs-only-L", name] >>> > > +- command_cflags = [command, "--cflags-only-I", name] >>> > > ++ command_libs = [command, "--libs-only-L", >>> "--keep-system-libs", name] >>> > > ++ command_cflags = [command, "--cflags-only-I", >>> "--keep-system-cflags", name] >>> > >>> > You gave an additional explanation why this is needed in the >>> upstream PR: >>> > >>> > Zlib and anything that has headers in the normal system libs/include >>> folders >>> > seems to not get their headers picked up without this change. >>> > >>> > I think this issue is mostly going to be something people hit when >>> cross >>> > compiling since the prefix based system libs/include folder would >>> probably work >>> > in most of the usual cases(searching in sys.prefix will not work when >>> cross >>> > compiling since it points to the host toolchain prefix rather than the >>> target >>> > toolchain sysroot prefix): >>> > >>> > >>> > However, that implies that either we have to make sure that >>> sys.prefix is set >>> > correctly (i.e. point it to staging instead of host), or pillow is >>> using >>> > sys.prefix incorrectly. >>> >>> I think pillow is using sys.prefix in a way that is not really cross >>> compilation >>> compatible, however using pkg-config with sysm libs/cflags seems to be >>> sufficient >>> for it to pass its non-standard header checks. >>> >> >> I remember having added the --disable-platform-guessing exactly to >> overcome this problem. All the setting should be provided by buildroot. >> Probably, the logic behind this is slightly changed, and the mechanism >> doesn't work anymore. I'll try to have a look. >> > > Yes, basically the paths leaks some host directories: > > [...] > Checking for include file %s in %s ('libimagequant.h', > '/usr/local/include') > Checking for include file %s in %s ('libimagequant.h', '/usr/include') > > Looking forward for a fix. > I came to the conclusion that James setup.py patch is necessary, pillow doesn't use sys.prefix but builds the paths from the pkg-config output. Withouth the patch, include and libraries directories are wrong. It misses a piece anyway +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) install target install options should match the build ones to have a correct library installation. > >> >>> >>> > >>> > Before that, still, I don't understand how this can be an issue. >>> Unless if >>> > pillow also passes something like -nostdinc, our toolchain wrapper >>> should make >>> > sure that staging/usr/include is in the search path. >>> >>> It's due to pillow having custom header checks like this: >>> https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 >>> >>> > >>> > There also doesn't seem to be an autobuilder failure due to this... >>> But maybe >>> > it builds successfully, just without some optional dependency? Please >>> provide >>> > more details about the failure in the commit message. >>> >>> The failure was getting hidden by the non-standard build/install cmd >>> overrides it >>> would appear, it seemed pillow was getting built for the host instead >>> of the target with >>> those, I didn't investigate in too much detail as those custom >>> build/install overrides >>> are not actually needed. >>> >>> > >>> > >>> > >>> > > + if not DEBUG: >>> > > + command_libs.append("--silence-errors") >>> > > + command_cflags.append("--silence-errors") >>> > > +-- >>> > > +2.35.1 >>> > > + >>> > > diff --git a/package/python-pillow/python-pillow.mk >>> b/package/python-pillow/python-pillow.mk >>> > > index 901876e0ee..ef677855b2 100644 >>> > > --- a/package/python-pillow/python-pillow.mk >>> > > +++ b/package/python-pillow/python-pillow.mk >>> > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE >>> > > PYTHON_PILLOW_CPE_ID_VENDOR = python >>> > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow >>> > > PYTHON_PILLOW_SETUP_TYPE = setuptools >>> > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing >>> > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" >>> > >>> > This change isn't explained in the commit message, and seems >>> unrelated. >>> > >>> > > + >>> > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf >>> > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing >>> > >>> > The need for these two changes is also not clear at all from the >>> commit message. >>> > >>> > >>> > I've marked the patch as Changes Requested. >>> > >>> > Regards, >>> > Arnout >>> > >>> > > >>> > > ifeq ($(BR2_PACKAGE_FREETYPE),y) >>> > > PYTHON_PILLOW_DEPENDENCIES += freetype >>> > > @@ -68,22 +71,4 @@ else >>> > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux >>> > > endif >>> > > >>> > > -define PYTHON_PILLOW_BUILD_CMDS >>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext >>> \ >>> > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) >>> $(PYTHON_PILLOW_BUILD_OPTS) >>> > > -endef >>> > > - >>> > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS >>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext >>> \ >>> > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ >>> > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ >>> > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) >>> > > -endef >>> > > - >>> > > $(eval $(python-package)) >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >> >> >> -- >> >> Angelo Compagnucci >> >> Software Engineer >> >> angelo at amarulasolutions.com >> __________________________________ >> Amarula Solutions SRL >> >> Via le Canevare 30, 31100 Treviso, Veneto, IT >> >> T. +39 (0)42 243 5310 >> info at amarulasolutions.com >> >> www.amarulasolutions.com >> [`as] https://www.amarulasolutions.com| >> > > > -- > > Angelo Compagnucci > > Software Engineer > > angelo at amarulasolutions.com > __________________________________ > Amarula Solutions SRL > > Via le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 (0)42 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com > [`as] https://www.amarulasolutions.com| > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at paral.in Tue Mar 22 05:14:48 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:14:48 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 Message-ID: <20220322051448.2589854-1-christian@paral.in> The latest Go release, version 1.18, is a significant release, including changes to the language, implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.18 Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 85e6adfb8c..e03050b1d3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz +sha256 38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 go1.18.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 3df16c9a68..049f846220 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.8 +GO_VERSION = 1.18 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.35.1 From christian at paral.in Tue Mar 22 05:18:58 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:18:58 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: <20220322051448.2589854-1-christian@paral.in> References: <20220322051448.2589854-1-christian@paral.in> Message-ID: Hi all, On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > The latest Go release, version 1.18, is a significant release, including changes > to the language, implementation of the toolchain, runtime, and libraries. > > https://go.dev/doc/go1.18 > > # From https://golang.org/dl/ > -sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz > +sha256 38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 go1.18.src.tar.gz > sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE I should note that this upgrade also will change a lot of the Go package hashes... Due to the way the "go mod vendor" step works, there's some incompatibility with the go 1.17 vendor format: go: inconsistent vendoring in /build/containerd-1.5.9: github.com/containerd/containerd: is marked as replaced in vendor/modules.txt, but not replaced in go.mod To ignore the vendor directory, use -mod=readonly or -mod=mod. To sync the vendor directory, run: go mod vendor We will need to update the hashes and the archives for these packages. Unfortunately I don't know of any way to avoid this, other than re-running "go mod vendor" if there's any conflict. Thanks & best regards, Christian Stewart From christian at paral.in Tue Mar 22 05:38:13 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:38:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: References: <20220322051448.2589854-1-christian@paral.in> Message-ID: All, On Mon, Mar 21, 2022 at 10:18 PM Christian Stewart wrote: > On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > > > The latest Go release, version 1.18, is a significant release, including changes > > to the language, implementation of the toolchain, runtime, and libraries. > > > > https://go.dev/doc/go1.18 > I should note that this upgrade also will change a lot of the Go > package hashes... > > Due to the way the "go mod vendor" step works, there's some > incompatibility with the go 1.17 vendor format: > > go: inconsistent vendoring in /build/containerd-1.5.9: > github.com/containerd/containerd: is marked as replaced in > vendor/modules.txt, but not replaced in go.mod > > To ignore the vendor directory, use -mod=readonly or -mod=mod. > To sync the vendor directory, run: > go mod vendor > > We will need to update the hashes and the archives for these packages. Something weird is going on here... https://asciinema.org/a/guJyOQeqbG5PIL1daVYQoyyef With containerd checked out at v1.6.1 with Go 1.18, "go mod vendor" -> "go build" ... always results in the error shown above, even after deleting the vendor/ tree. This issue might be one with Go 1.18 itself. Thanks, Christian Stewart From christian at paral.in Tue Mar 22 05:46:30 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:46:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: References: <20220322051448.2589854-1-christian@paral.in> Message-ID: All, On Mon, Mar 21, 2022 at 10:38 PM Christian Stewart wrote: > On Mon, Mar 21, 2022 at 10:18 PM Christian Stewart wrote: > > On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > > > > > The latest Go release, version 1.18, is a significant release, including changes > > > to the language, implementation of the toolchain, runtime, and libraries. > > > > > > https://go.dev/doc/go1.18 > > > I should note that this upgrade also will change a lot of the Go > > package hashes... > > > > Due to the way the "go mod vendor" step works, there's some > > incompatibility with the go 1.17 vendor format: > > > > go: inconsistent vendoring in /build/containerd-1.5.9: > > github.com/containerd/containerd: is marked as replaced in > > vendor/modules.txt, but not replaced in go.mod > > > > To ignore the vendor directory, use -mod=readonly or -mod=mod. > > To sync the vendor directory, run: > > go mod vendor > > > > We will need to update the hashes and the archives for these packages. > > Something weird is going on here... > > https://asciinema.org/a/guJyOQeqbG5PIL1daVYQoyyef > > With containerd checked out at v1.6.1 with Go 1.18, This was indeed an incompatibility between containerd 1.6.1 and go 1.18: - https://github.com/golang/go/issues/51285 - https://github.com/containerd/containerd/pull/6605 The fix has not yet been released (for containerd). ... so we should delay updating Go to 1.18 until all the packages in the tree support it w/ tagged releases. Thanks & best, Christian Stewart From peter at korsgaard.com Tue Mar 22 07:51:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:51:01 +0100 Subject: [Buildroot] [PATCH] support/scripts/graph-build-time: add support for timeline graphing In-Reply-To: <20220209203026.3724993-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 9 Feb 2022 21:30:26 +0100") References: <20220209203026.3724993-1-yann.morin.1998@free.fr> Message-ID: <878rt2h1cq.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > From: Thomas Petazzoni > This commit adds support for a new type of graph, showing the timeline > of a build. It shows, with one line per package, when each of this > package steps started/ended, and therefore allows to see the > sequencing of the package builds. > For a fully serialized build like we have today, this is not super > useful (except to show that everything is serialized), but it becomes > much more useful in the context of top-level parallel build. > We chose to order the graph by the time-of-configure, as it is the > closest to the actual cascade-style of a true dependency graph, which is > tiny bit more complex to achieve properly. The actual result still looks > pretty good. > The graph-build make target is extended to also generate this new > timeline graph. > Signed-off-by: Thomas Petazzoni > [yann.morin.1998 at free.fr: > - sort by start-of-configure time > - re-use existing colorsets (default or alternate) > - fix python2isms > - fix check-package > ] > Signed-off-by: Yann E. MORIN Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:50:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:50:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/scripts/graph-build-time: add support for timeline graphing Message-ID: <20220322074218.6AD1584F5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96b346cb56ccf5ef52b29d367db5149d212c45df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This commit adds support for a new type of graph, showing the timeline of a build. It shows, with one line per package, when each of this package steps started/ended, and therefore allows to see the sequencing of the package builds. For a fully serialized build like we have today, this is not super useful (except to show that everything is serialized), but it becomes much more useful in the context of top-level parallel build. We chose to order the graph by the time-of-configure, as it is the closest to the actual cascade-style of a true dependency graph, which is tiny bit more complex to achieve properly. The actual result still looks pretty good. The graph-build make target is extended to also generate this new timeline graph. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - sort by start-of-configure time - re-use existing colorsets (default or alternate) - fix python2isms - fix check-package ] Signed-off-by: Yann E. MORIN (cherry picked from commit 5e8b01afd5d8d8af8f4ce334073df9b15497cf36) Signed-off-by: Peter Korsgaard --- Makefile | 3 ++ support/scripts/graph-build-time | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 71f8096b71..db2ac30b10 100644 --- a/Makefile +++ b/Makefile @@ -873,6 +873,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a50..1edc3b3c00 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) From peter at korsgaard.com Tue Mar 22 07:54:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:54:17 +0100 Subject: [Buildroot] [PATCH 2021.02.x] DEVELOPERS: drop libqrtr-glib from Yegor Yefremov In-Reply-To: <20220320151649.767880-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni via buildroot's message of "Sun, 20 Mar 2022 16:16:49 +0100") References: <20220320151649.767880-1-thomas.petazzoni@bootlin.com> Message-ID: <874k3qh17a.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > Commit 73ce754531b5e45bd42b56c58718fbacc754406f in master added the > libqrtr-glib package to Yegor Yefremov. > This commit was backported as fad154253deb5b5399ea52a19ed6608dcd00ee4d > in the LTS 2021.02.x branch, but this branch does not have the > libqrtr-glib package, as it was added after 2021.02. > Due to this, the DEVELOPERS file is bogus in 2021.02.x, which causes > the following warning when running pkg-stats: > WARNING: 'package/libqrtr-glib/' doesn't match any file > This commit fixes this by dropping the bogus line from the DEVELOPERS > file. > Signed-off-by: Thomas Petazzoni Ups, committed to 2021.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:53:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:53:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: drop libqrtr-glib from Yegor Yefremov Message-ID: <20220322074531.A929B84FCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d51fb936f655dde1c68d54a9535541823ed59aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 73ce754531b5e45bd42b56c58718fbacc754406f in master added the libqrtr-glib package to Yegor Yefremov. This commit was backported as fad154253deb5b5399ea52a19ed6608dcd00ee4d in the LTS 2021.02.x branch, but this branch does not have the libqrtr-glib package, as it was added after 2021.02. Due to this, the DEVELOPERS file is bogus in 2021.02.x, which causes the following warning when running pkg-stats: WARNING: 'package/libqrtr-glib/' doesn't match any file This commit fixes this by dropping the bogus line from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index fad5c13844..3397565457 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2755,7 +2755,6 @@ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ F: package/libqmi/ -F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ From peter at korsgaard.com Tue Mar 22 07:56:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:56:24 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3 In-Reply-To: <20220315090209.206025-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:09 +0100") References: <20220315090209.206025-1-angelo@amarulasolutions.com> Message-ID: <87zglifmjb.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:56:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:56:38 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3-rt3 In-Reply-To: <20220315090220.206426-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:20 +0100") References: <20220315090220.206426-1-angelo@amarulasolutions.com> Message-ID: <87v8w6fmix.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci s/CIP/CIP-RT/ Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:55:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:55:33 +0100 Subject: [Buildroot] [git commit] linux: bump CIP kernel to version 5.10.104-cip3 Message-ID: <20220322074824.70E07850D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=781a01c9f3d8c7d970d75ca56198161352a91d4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 043e7c6574..c6590b31ee 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.104-cip3)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf856..18480a87bf 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz +sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes From peter at korsgaard.com Tue Mar 22 07:56:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:56:04 +0100 Subject: [Buildroot] [git commit] linux: bump CIP-RT kernel to version 5.10.104-cip3-rt3 Message-ID: <20220322074824.8000884F2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b6bd9b0de8c60f8acd87bb7ffaefc59be6d8dae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c6590b31ee..f21beb4222 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.104-cip3-rt3)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 18480a87bf..976f1d07c0 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From peter at korsgaard.com Tue Mar 22 07:57:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:57:04 +0100 Subject: [Buildroot] [git commit] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220322074824.8A505850F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52c372446f034cf8277951ad083abe5e1c10f52d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Tue Mar 22 07:57:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:57:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiec61850: security bump to version 1.5.1 In-Reply-To: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 18:34:29 +0100") References: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> Message-ID: <87r16ufmhu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Retrieve official tarball > - Fix CVE-2021-45769: A NULL pointer dereference in > AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 > v1.5.0 can lead to a segmentation fault or application crash. > - Fix many other vulnerabilities: > https://libiec61850.com/new-release-1-5-1-of-libiec61850 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From rsassen at comecer.com Tue Mar 22 08:16:49 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Tue, 22 Mar 2022 08:16:49 +0000 Subject: [Buildroot] [External] Re: [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: Hi Arnout, > > When supporting multiple hardware targets, overlay_map.dtb might > > be needed to map overlay names to one of several implementations. > > > > Signed-off-by: Rutger Sassen > > --- > > package/rpi-firmware/Config.in | 12 ++++++++++++ > > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > > index 8070dc3019..36054353f8 100644 > > --- a/package/rpi-firmware/Config.in > > +++ b/package/rpi-firmware/Config.in > > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > overlays, to support HATs (Hardware Attached on Top, add-on > > modules). > > > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > + > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > In the end, I don't think this option is very useful. So I removed it... ... > ... reducing the patch to just this single line. Almost back to the first iteration of my patch, where overlay_map.dtb and README were copied unconditionally ? > Please check if the commit [1] does what you need, if not I can recover the > original patch with the http://Config.in option. I've checked, and it works for me. Thanks. > Applied to master, thanks. > > Regards, > Arnout > > [1] > https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 Regards, Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Mar 22 08:21:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 09:21:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/apache: security bump version to 2.4.53 In-Reply-To: <20220314212000.2949718-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Mon, 14 Mar 2022 22:20:00 +0100") References: <20220314212000.2949718-1-bernd.kuhls@t-online.de> Message-ID: <87mthifldu.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 > Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. > Switch from pcre to pcre2 following upstream commit: > https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 > Signed-off-by: Bernd Kuhls > --- > v2: switch from pcre to pcre2 (Peter S.) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:59:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:59:18 +0100 Subject: [Buildroot] [git commit] package/apache: security bump version to 2.4.53 Message-ID: <20220322081231.402448513F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eaa8fcf546d84e38990566e49f4730c530d2577c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Tue Mar 22 08:29:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 09:29:38 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220322082939.2153092-1-peter@korsgaard.com> 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f21beb4222..f25b662aa5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.30" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 976f1d07c0..87a0f0465b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 cca7d6e053e33f44af1b39f7becec73a387911d81ede5a84ecf671692533138f linux-5.16.16.tar.xz +sha256 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132 linux-5.15.30.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831..479f64b72e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -381,13 +381,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 + default "5.15.30" if BR2_KERNEL_HEADERS_5_15 + default "5.16.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ -- 2.30.2 From kamel.bouhara at bootlin.com Tue Mar 22 09:40:41 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Tue, 22 Mar 2022 10:40:41 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <990140a5-a769-2f7b-5786-c08557db4b6b@mind.be> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-4-kamel.bouhara@bootlin.com> <990140a5-a769-2f7b-5786-c08557db4b6b@mind.be> Message-ID: On Mon, Mar 21, 2022 at 10:01:40PM +0100, Arnout Vandecappelle wrote: > > > On 10/03/2022 10:56, Kamel Bouhara via buildroot wrote: > > Add host variant of libodb-boost required by the ODB compiler. > > The libodb-boost headers are needed at compile time, and > > therefore installed in $(HOST_DIR). > > > > Signed-off-by: Kamel Bouhara > > --- > > package/libodb-boost/libodb-boost.mk | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > > index bac5f1e78f..39c9f91030 100644 > > --- a/package/libodb-boost/libodb-boost.mk > > +++ b/package/libodb-boost/libodb-boost.mk > > @@ -12,6 +12,8 @@ LIBODB_BOOST_INSTALL_STAGING = YES > > LIBODB_BOOST_LICENSE = GPL-2.0 > > LIBODB_BOOST_LICENSE_FILES = LICENSE > > LIBODB_BOOST_DEPENDENCIES = boost libodb > > +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb > > LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" > > I have not double-checked (since I don't know for which GCC version exactly > this -std=c++11 is needed), but I expect that if -std=c++11 is needed for > target build, it's also going to be needed for host build. So I added > HOST_LIBODB_BOOST_CONF_ENV. > It seems required seems GCC 11: http://lists.busybox.net/pipermail/buildroot/2021-August/618575.html Thanks, Kamel > > Series applied to master with that fixed, thanks. > > Regards, > Arnout > > > > $(eval $(autotools-package)) > > +$(eval $(host-autotools-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Kamel Bouhara, Bootlin Embedded Linux and kernel engineering https://bootlin.com From bugzilla at busybox.net Tue Mar 22 12:35:05 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Mar 2022 12:35:05 +0000 Subject: [Buildroot] [Bug 14676] New: BRCMFMAC SDIO firmware doesn't copy to target Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 Bug ID: 14676 Summary: BRCMFMAC SDIO firmware doesn't copy to target Product: buildroot Version: 2022.02 Hardware: PC OS: Linux Status: NEW Severity: major Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dmanlfc at gmail.com CC: buildroot at uclibc.org Target Milestone: --- package BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI doesn't copy the firmware to the target directory. My workaround: config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI bool "brcmfmac-sdio-firmware-rpi" depends on BR2_arm || BR2_aarch64 select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT # batocera - BR fix select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI # batocera - BR fix help Raspberry Broadcom Bluetooth and Wifi firmware. Alternatively remove the ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) & ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) conditionals from the makefile. Dan -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Tue Mar 22 12:40:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 22 Mar 2022 13:40:25 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220322110313.4061782-1-neal.frager@amd.com> References: <20220322110313.4061782-1-neal.frager@amd.com> Message-ID: <70D87B9E-978A-49CE-BECE-500C876CE13D@benettiengineering.com> Hi Neal, > Il giorno 22 mar 2022, alle ore 12:03, Neal Frager ha scritto: > > ?This patch migrates Xilinx Linux kernel and U-Boot from git:// to > https:// because git:// is no longer supported. > > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > > Signed-off-by: Neal Frager > --- > DEVELOPERS | 2 +- > configs/zynqmp_zcu102_defconfig | 4 ++-- > configs/zynqmp_zcu106_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 942bb8fe9c..58ed4f81cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2089,7 +2089,7 @@ F: package/libevdev/ > F: package/pkg-qmake.mk > F: package/qt5/qt5opcua/ > > -N: Neal Frager > +N: Neal Frager > F: board/zynqmp/ > F: configs/zynqmp_zcu102_defconfig This ^^^ should be splitted into another patch. Best regards ?- Giulio Benetti Benetti Engineering sas > > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index 4e96489179..2dd0817bd8 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index 0a97975aa0..d836edfaf0 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" > -- > 2.17.1 > From johan.oudinet at gmail.com Tue Mar 22 16:07:25 2022 From: johan.oudinet at gmail.com (Johan Oudinet) Date: Tue, 22 Mar 2022 17:07:25 +0100 Subject: [Buildroot] [PATCH] package/forge: new package Message-ID: <20220322160725.636205-1-johan.oudinet@gmail.com> A native implementation of TLS (and various other cryptographic tools) in JavaScript. Signed-off-by: Johan Oudinet --- DEVELOPERS | 1 + package/Config.in | 1 + package/forge/Config.in | 7 +++++++ package/forge/forge.hash | 3 +++ package/forge/forge.mk | 23 +++++++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/forge/Config.in create mode 100644 package/forge/forge.hash create mode 100644 package/forge/forge.mk diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..5830b45018 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1475,6 +1475,7 @@ F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ +F: package/forge/ F: package/nginx-dav-ext/ F: package/vuejs/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..f2587b5c66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1653,6 +1653,7 @@ endif source "package/duktape/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" + source "package/forge/Config.in" source "package/jquery/Config.in" if BR2_PACKAGE_JQUERY menu "External jQuery plugins" diff --git a/package/forge/Config.in b/package/forge/Config.in new file mode 100644 index 0000000000..86d4832101 --- /dev/null +++ b/package/forge/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FORGE + bool "forge" + help + A native implementation of TLS (and various other + cryptographic tools) in JavaScript. + + https://github.com/digitalbazaar/forge diff --git a/package/forge/forge.hash b/package/forge/forge.hash new file mode 100644 index 0000000000..256ac5b451 --- /dev/null +++ b/package/forge/forge.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 97f0276c32b39411ad85c5762bf546ca281451eeaa93bdd383ff082e8e0181b4 node-forge-1.3.0.tgz +sha256 f63ff0e4e239244aa79280da2dd4811a0469e5e201caf5cbc0d97c3a1dff8e82 LICENSE diff --git a/package/forge/forge.mk b/package/forge/forge.mk new file mode 100644 index 0000000000..1872cb4e70 --- /dev/null +++ b/package/forge/forge.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# forge +# +################################################################################ + +FORGE_VERSION = 1.3.0 +FORGE_SOURCE = node-forge-$(FORGE_VERSION).tgz +FORGE_SITE = https://registry.npmjs.org/node-forge/- +FORGE_LICENSE = BSD-3-Clause, GPL-2.0 +FORGE_LICENSE_FILES = LICENSE + +# Install .min.js as .js +define FORGE_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/dist/forge.all.min.js \ + $(TARGET_DIR)/var/www/forge.all.js + $(INSTALL) -m 644 -D $(@D)/dist/forge.min.js \ + $(TARGET_DIR)/var/www/forge.js + $(INSTALL) -m 644 -D $(@D)/dist/prime.worker.min.js \ + $(TARGET_DIR)/var/www/prime.worker.js +endef + +$(eval $(generic-package)) -- 2.32.0 From huth at tuxfamily.org Tue Mar 22 16:28:20 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Tue, 22 Mar 2022 17:28:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add s390x support In-Reply-To: <20220317223928.508338-1-fontaine.fabrice@gmail.com> References: <20220317223928.508338-1-fontaine.fabrice@gmail.com> Message-ID: <20220322172820.3d5763b9@tuxfamily.org> Am Thu, 17 Mar 2022 23:39:28 +0100 schrieb Fabrice Fontaine : > s390x is supported since > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a > > Signed-off-by: Fabrice Fontaine > --- > package/kvm-unit-tests/Config.in | 1 + > package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157..a3d6756fb9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > BR2_cortex_a17 || BR2_cortex_a17_a7 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_s390x > > config BR2_PACKAGE_KVM_UNIT_TESTS > bool "kvm-unit-tests" > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e03..2d05d08067 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 > else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > KVM_UNIT_TESTS_ARCH = ppc64 > +else ifeq ($(BR2_s390x),y) > +KVM_UNIT_TESTS_ARCH = s390x > else ifeq ($(BR2_x86_64),y) > KVM_UNIT_TESTS_ARCH = x86_64 > endif Reviewed-by: Thomas Huth From yann.morin.1998 at free.fr Tue Mar 22 17:05:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 22 Mar 2022 18:05:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: References: <20220322051448.2589854-1-christian@paral.in> Message-ID: <20220322170545.GA3355310@scaer> On 2022-03-21 22:18 -0700, Christian Stewart spake thusly: > On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > The latest Go release, version 1.18, is a significant release, including changes > > to the language, implementation of the toolchain, runtime, and libraries. > I should note that this upgrade also will change a lot of the Go > package hashes... > > Due to the way the "go mod vendor" step works, there's some > incompatibility with the go 1.17 vendor format: > > go: inconsistent vendoring in /build/containerd-1.5.9: > github.com/containerd/containerd: is marked as replaced in > vendor/modules.txt, but not replaced in go.mod > > To ignore the vendor directory, use -mod=readonly or -mod=mod. > To sync the vendor directory, run: > go mod vendor > > We will need to update the hashes and the archives for these packages. This is a no-go. We can't change hashes, otherwise there will be a conflict with the hashes of the backup download we store on sources.buildroot.org. Probably, the best solution forward would be to introduce a version suffix for the post-process. I quickly hacked something around: diff --git a/package/pkg-download.mk b/package/pkg-download.mk index a15e21e110..74369fc946 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -22,6 +22,7 @@ export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # download backend: BR_FMT_VERSION_git = -br1 BR_FMT_VERSION_svn = -br2 +BR_FMT_POST_PROCESS_go = -brgo1 DL_WRAPPER = support/download/dl-wrapper diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 7d1aea7710..e317750967 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -43,7 +43,7 @@ pkgname = $(lastword $(subst /, ,$(pkgdir))) # Helper to build the extension for a package archive, based on various # conditions. # $(1): upper-case package name -pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD)).tar.gz +pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD))$(BR_FMT_POST_PROCESS_$($(1)_DOWNLOAD_POST_PROCESS)).tar.gz # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) So, basically, we would need a series that does: 1. introduces the post-process versionning as shown above, and update the hashes accordingly 2. update go to 1.18, which at the same time updates the newly introduced post-process versionning, and update the hashes yet again. Regards, Yann E. MORIN. > Unfortunately I don't know of any way to avoid this, other than > re-running "go mod vendor" if there's any conflict. > > Thanks & best regards, > Christian Stewart -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From cohuck at redhat.com Tue Mar 22 17:08:00 2022 From: cohuck at redhat.com (Cornelia Huck) Date: Tue, 22 Mar 2022 18:08:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add more arm support Message-ID: <20220322170800.1872403-1-cohuck@redhat.com> Add some more cortexes with VHE, and enable aarch64. Signed-off-by: Cornelia Huck --- Resent because I was subscribed with a different email address. Sorry about the spam. --- package/kvm-unit-tests/Config.in | 5 ++++- package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157f0..b084375e62e9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS # On ARM, it uses virtualization extensions default y if BR2_cortex_a7 || BR2_cortex_a12 || \ BR2_cortex_a15 || BR2_cortex_a15_a7 || \ - BR2_cortex_a17 || BR2_cortex_a17_a7 + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ + BR2_cortex_a55 || BR2_cortex_a75 || \ + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ + BR2_cortex_a76_a55 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d610442e039f..d72eba02bc3b 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -ifeq ($(BR2_arm),y) +ifeq ($(BR2_aarch64),y) +KVM_UNIT_TESTS_ARCH = aarch64 +else ifeq ($(BR2_arm),y) KVM_UNIT_TESTS_ARCH = arm else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 22 17:48:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 18:48:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/jack2: fix build with libexecinfo Message-ID: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': sigsegv.c:(.text+0x98): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc Signed-off-by: Fabrice Fontaine --- package/jack2/jack2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 2e55169984..127c99eed1 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 22 17:48:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 18:48:39 +0100 Subject: [Buildroot] [PATCH 2/2] package/jack2: explicitly {dis, en}able opus and readline In-Reply-To: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Message-ID: <20220322174839.2189015-2-fontaine.fabrice@gmail.com> Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 127c99eed1..6939aac9a6 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -21,10 +21,16 @@ endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) -- 2.35.1 From bernd.kuhls at t-online.de Tue Mar 22 18:12:54 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Mar 2022 19:12:54 +0100 Subject: [Buildroot] [PATCH 2/3] package/intel-gmmlib: bump version to 22.1.1 In-Reply-To: <20220322181255.1325476-1-bernd.kuhls@t-online.de> References: <20220322181255.1325476-1-bernd.kuhls@t-online.de> Message-ID: <20220322181255.1325476-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index beb3cfd6ae..7e7b570bd1 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz +sha256 b448d83bcd7e155c627a0cdfd666c6a86f3655dfe6001ebb9b52d8a89564cf55 intel-gmmlib-22.1.1.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 06628132a2..dcb3857e8f 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.3 +INTEL_GMMLIB_VERSION = 22.1.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Tue Mar 22 18:12:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Mar 2022 19:12:53 +0100 Subject: [Buildroot] [PATCH 1/3] package/intel-mediadriver: bump version to 22.3.0 Message-ID: <20220322181255.1325476-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 044b9d7013..57499830b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 84eda811ae..c22aeecc77 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_VERSION = 22.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.30.2 From bernd.kuhls at t-online.de Tue Mar 22 18:12:55 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Mar 2022 19:12:55 +0100 Subject: [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 22.3.0 In-Reply-To: <20220322181255.1325476-1-bernd.kuhls@t-online.de> References: <20220322181255.1325476-1-bernd.kuhls@t-online.de> Message-ID: <20220322181255.1325476-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d9acf49637..802131a772 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz +sha256 e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 intel-mediasdk-22.3.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 698d2348b2..b90d252b4f 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.2 +INTEL_MEDIASDK_VERSION = 22.3.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From buildroot at busybox.net Tue Mar 22 18:27:42 2022 From: buildroot at busybox.net (E-mail Administrator) Date: 22 Mar 2022 19:27:42 +0100 Subject: [Buildroot] buildroot@busybox.net Password Expired Message-ID: <20220322192741.45326DF6CBE7C803@busybox.net> An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Tue Mar 22 18:29:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 12:29:52 -0600 Subject: [Buildroot] [PATCH v4 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220322182952.935255-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. This is due to pillow implementing custom header validation checks which need system paths present to function correctly: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 Removed custom BUILD_CMDS and INSTALL_TARGET_CMDS which were causing python-pillow to be installed for the host, they are not required, we just need to set build_ext at the start of PYTHON_PILLOW_BUILD_OPTS instead. Signed-off-by: James Hilliard --- Changes v3 -> v4: - pass BUILD_OPTS to INSTALL_TARGET_OPTS Changes v2 -> v3: - actually remove MAX_CONCURRENCY env variable Changes v1 -> v2: - remove unrelated MAX_CONCURRENCY env variable --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 23 +++---------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..1d99f44fa1 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From fontaine.fabrice at gmail.com Tue Mar 22 18:29:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 19:29:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 2.1.1 Message-ID: <20220322182946.2446236-1-fontaine.fabrice@gmail.com> - Switch to new active fork: https://github.com/enzo1982/mp4v2/discussions/1 https://github.com/TechSmith/mp4v2/commit/461abd2b1365e14ba28dd0e4a0cb6c3bee1bab41 - C++11 is not needed anymore thanks to https://github.com/enzo1982/mp4v2/commit/5a57bc2ce8948f6ffa96761286921ab3e2ebe467 - Drop patch (not needed since https://github.com/enzo1982/mp4v2/commit/23f8b907d4a221e1dae9e8b859cb6b1161206866) - Update license (minor fix: https://github.com/enzo1982/mp4v2/commit/0c37402d9d3644ea0b7d55db1d901bfad9723dfc) - Version 2.1.1 was never released before so no issue is expected (except a misunderstanding of users but new upstream is aware of this: https://github.com/enzo1982/mp4v2/discussions/1#discussioncomment-2399344) https://github.com/enzo1982/mp4v2/releases/tag/v2.1.1 https://github.com/enzo1982/mp4v2/releases/tag/v2.1.0 Signed-off-by: Fabrice Fontaine --- ...tatic-cast-to-unsigned-int-for-cases.patch | 99 ------------------- package/mp4v2/Config.in | 8 +- package/mp4v2/mp4v2.hash | 4 +- package/mp4v2/mp4v2.mk | 5 +- 4 files changed, 8 insertions(+), 108 deletions(-) delete mode 100644 package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch deleted file mode 100644 index 6c9b13bed8..0000000000 --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Thu, 6 Aug 2020 15:22:04 +0200 -Subject: [PATCH] Static cast to unsigned int for cases - -Signed-off-by: Jason A. Donenfeld -[Retrieved from: -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] -Signed-off-by: Fabrice Fontaine ---- - libutil/Utility.cpp | 2 +- - util/mp4art.cpp | 2 +- - util/mp4chaps.cpp | 2 +- - util/mp4file.cpp | 2 +- - util/mp4subtitle.cpp | 2 +- - util/mp4track.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp -index 76cdd12..d6739d4 100644 ---- a/libutil/Utility.cpp -+++ b/libutil/Utility.cpp -@@ -493,7 +493,7 @@ Utility::process_impl() - if( codes.find( code ) == codes.end() ) - continue; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case 'z': - _optimize = true; - break; -diff --git a/util/mp4art.cpp b/util/mp4art.cpp -index add935e..6e7f531 100644 ---- a/util/mp4art.cpp -+++ b/util/mp4art.cpp -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case LC_ART_ANY: - _artFilter = numeric_limits::max(); - break; -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp -index 98400f8..ccc8b70 100644 ---- a/util/mp4chaps.cpp -+++ b/util/mp4chaps.cpp -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case 'A': - case LC_CHPT_ANY: - _ChapterType = MP4ChapterTypeAny; -diff --git a/util/mp4file.cpp b/util/mp4file.cpp -index c27844b..b127cd1 100644 ---- a/util/mp4file.cpp -+++ b/util/mp4file.cpp -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &FileUtility::actionList; - break; -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp -index 7462153..19d977d 100644 ---- a/util/mp4subtitle.cpp -+++ b/util/mp4subtitle.cpp -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &SubtitleUtility::actionList; - break; -diff --git a/util/mp4track.cpp b/util/mp4track.cpp -index d550506..cd63d7e 100644 ---- a/util/mp4track.cpp -+++ b/util/mp4track.cpp -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_TRACK_WILDCARD: - _trackMode = TM_WILDCARD; - break; --- -2.28.0 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 00e80cd358..705a8c9d24 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,12 +1,11 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. - https://github.com/TechSmith/mp4v2/ + https://mp4v2.org/ if BR2_PACKAGE_MP4V2 @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 +comment "mp4v2 needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 7aa5402c8f..d3f0243650 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 6d29228a13..7de837c170 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,9 +4,10 @@ # ################################################################################ -MP4V2_VERSION = 5.0.1 +MP4V2_VERSION = 2.1.1 MP4V2_SITE = \ - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING -- 2.35.1 From james.hilliard1 at gmail.com Tue Mar 22 18:33:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 12:33:14 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 5:10 PM Angelo Compagnucci wrote: > > > > On Mon, Mar 21, 2022 at 11:35 PM Angelo Compagnucci wrote: >> >> >> >> On Mon, Mar 21, 2022 at 11:10 PM Angelo Compagnucci wrote: >>> >>> >>> >>> On Mon, Mar 21, 2022 at 10:56 PM James Hilliard wrote: >>>> >>>> On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle wrote: >>>> > >>>> > Hi James, >>>> > >>>> > On 16/03/2022 07:02, James Hilliard wrote: >>>> > > Currently pillow doesn't correctly search pkg-config system paths >>>> > > for some libraries which can prevent some libraries from being >>>> > > properly detected/enabled in pillow. >>>> > > >>>> > > Signed-off-by: James Hilliard >>>> > > --- >>>> > > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ >>>> > > package/python-pillow/python-pillow.mk | 23 +++---------- >>>> > > 2 files changed, 37 insertions(+), 19 deletions(-) >>>> > > create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>>> > > >>>> > > diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>>> > > new file mode 100644 >>>> > > index 0000000000..9f979b048f >>>> > > --- /dev/null >>>> > > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>>> > > @@ -0,0 +1,33 @@ >>>> > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 >>>> > > +From: James Hilliard >>>> > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 >>>> > > +Subject: [PATCH] Search pkg-config system libs/cflags. >>>> > > + >>>> > > +We need to search the system paths as well from pkg-config for >>>> > > +some packages to be found properly. >>>> > > + >>>> > > +Signed-off-by: James Hilliard >>>> > > +[Upstream status: >>>> > > +https://github.com/python-pillow/Pillow/pull/6138] >>>> > > +--- >>>> > > + setup.py | 4 ++-- >>>> > > + 1 file changed, 2 insertions(+), 2 deletions(-) >>>> > > + >>>> > > +diff --git a/setup.py b/setup.py >>>> > > +index 3468b260..59d65ce2 100755 >>>> > > +--- a/setup.py >>>> > > ++++ b/setup.py >>>> > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): >>>> > > + def _pkg_config(name): >>>> > > + try: >>>> > > + command = os.environ.get("PKG_CONFIG", "pkg-config") >>>> > > +- command_libs = [command, "--libs-only-L", name] >>>> > > +- command_cflags = [command, "--cflags-only-I", name] >>>> > > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] >>>> > > ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] >>>> > >>>> > You gave an additional explanation why this is needed in the upstream PR: >>>> > >>>> > Zlib and anything that has headers in the normal system libs/include folders >>>> > seems to not get their headers picked up without this change. >>>> > >>>> > I think this issue is mostly going to be something people hit when cross >>>> > compiling since the prefix based system libs/include folder would probably work >>>> > in most of the usual cases(searching in sys.prefix will not work when cross >>>> > compiling since it points to the host toolchain prefix rather than the target >>>> > toolchain sysroot prefix): >>>> > >>>> > >>>> > However, that implies that either we have to make sure that sys.prefix is set >>>> > correctly (i.e. point it to staging instead of host), or pillow is using >>>> > sys.prefix incorrectly. >>>> >>>> I think pillow is using sys.prefix in a way that is not really cross compilation >>>> compatible, however using pkg-config with sysm libs/cflags seems to be >>>> sufficient >>>> for it to pass its non-standard header checks. >>> >>> >>> I remember having added the --disable-platform-guessing exactly to overcome this problem. All the setting should be provided by buildroot. Probably, the logic behind this is slightly changed, and the mechanism doesn't work anymore. I'll try to have a look. >> >> >> Yes, basically the paths leaks some host directories: >> >> [...] >> Checking for include file %s in %s ('libimagequant.h', '/usr/local/include') >> Checking for include file %s in %s ('libimagequant.h', '/usr/include') >> >> Looking forward for a fix. > > > I came to the conclusion that James setup.py patch is necessary, pillow doesn't use sys.prefix but builds the paths from the pkg-config output. Withouth the patch, include and libraries directories are wrong. > It misses a piece anyway > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) install https://patchwork.ozlabs.org/project/buildroot/patch/20220322182952.935255-1-james.hilliard1 at gmail.com/ The install part isn't needed here since it will still get passed by _BASE_INSTALL_TARGET_CMD. See: https://github.com/buildroot/buildroot/blob/eaa8fcf546d84e38990566e49f4730c530d2577c/package/pkg-python.mk#L199 https://github.com/buildroot/buildroot/blob/eaa8fcf546d84e38990566e49f4730c530d2577c/package/pkg-python.mk#L285 > > target install options should match the build ones to have a correct library installation. > >> >>> >>>> >>>> >>>> > >>>> > Before that, still, I don't understand how this can be an issue. Unless if >>>> > pillow also passes something like -nostdinc, our toolchain wrapper should make >>>> > sure that staging/usr/include is in the search path. >>>> >>>> It's due to pillow having custom header checks like this: >>>> https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 >>>> >>>> > >>>> > There also doesn't seem to be an autobuilder failure due to this... But maybe >>>> > it builds successfully, just without some optional dependency? Please provide >>>> > more details about the failure in the commit message. >>>> >>>> The failure was getting hidden by the non-standard build/install cmd >>>> overrides it >>>> would appear, it seemed pillow was getting built for the host instead >>>> of the target with >>>> those, I didn't investigate in too much detail as those custom >>>> build/install overrides >>>> are not actually needed. >>>> >>>> > >>>> > >>>> > >>>> > > + if not DEBUG: >>>> > > + command_libs.append("--silence-errors") >>>> > > + command_cflags.append("--silence-errors") >>>> > > +-- >>>> > > +2.35.1 >>>> > > + >>>> > > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk >>>> > > index 901876e0ee..ef677855b2 100644 >>>> > > --- a/package/python-pillow/python-pillow.mk >>>> > > +++ b/package/python-pillow/python-pillow.mk >>>> > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE >>>> > > PYTHON_PILLOW_CPE_ID_VENDOR = python >>>> > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow >>>> > > PYTHON_PILLOW_SETUP_TYPE = setuptools >>>> > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing >>>> > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" >>>> > >>>> > This change isn't explained in the commit message, and seems unrelated. >>>> > >>>> > > + >>>> > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf >>>> > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing >>>> > >>>> > The need for these two changes is also not clear at all from the commit message. >>>> > >>>> > >>>> > I've marked the patch as Changes Requested. >>>> > >>>> > Regards, >>>> > Arnout >>>> > >>>> > > >>>> > > ifeq ($(BR2_PACKAGE_FREETYPE),y) >>>> > > PYTHON_PILLOW_DEPENDENCIES += freetype >>>> > > @@ -68,22 +71,4 @@ else >>>> > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux >>>> > > endif >>>> > > >>>> > > -define PYTHON_PILLOW_BUILD_CMDS >>>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >>>> > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) >>>> > > -endef >>>> > > - >>>> > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS >>>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >>>> > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ >>>> > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ >>>> > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) >>>> > > -endef >>>> > > - >>>> > > $(eval $(python-package)) >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> >>> >>> -- >>> >>> Angelo Compagnucci >>> >>> Software Engineer >>> >>> angelo at amarulasolutions.com >>> __________________________________ >>> Amarula Solutions SRL >>> >>> Via le Canevare 30, 31100 Treviso, Veneto, IT >>> >>> T. +39 (0)42 243 5310 >>> info at amarulasolutions.com >>> >>> www.amarulasolutions.com >>> >>> [`as] https://www.amarulasolutions.com| >> >> >> >> -- >> >> Angelo Compagnucci >> >> Software Engineer >> >> angelo at amarulasolutions.com >> __________________________________ >> Amarula Solutions SRL >> >> Via le Canevare 30, 31100 Treviso, Veneto, IT >> >> T. +39 (0)42 243 5310 >> info at amarulasolutions.com >> >> www.amarulasolutions.com >> >> [`as] https://www.amarulasolutions.com| > > > > -- > > Angelo Compagnucci > > Software Engineer > > angelo at amarulasolutions.com > __________________________________ > Amarula Solutions SRL > > Via le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 (0)42 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com > > [`as] https://www.amarulasolutions.com| From bugzilla at busybox.net Tue Mar 22 18:55:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Mar 2022 18:55:11 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 --- Comment #1 from Fabrice Fontaine --- Hi, Thanks for your bug report, however this is not a bug but an expected behavior. With your proposal, the user won't be able to select if we wants to install bluetooth firmware, wifi firmware or both firmwares. Moreover, the Wifi firmware can't always be installed as it conflicts with linux-firmware Broadcom BRCM bcm43xx. So, I would advise to update the batocera defconfigs (e.g. https://github.com/batocera-linux/batocera.linux/tree/master/configs) with: BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Tue Mar 22 19:00:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 20:00:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 6eaf023789..69bb34b0cb 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE -- 2.35.1 From ju.o at free.fr Tue Mar 22 21:27:50 2022 From: ju.o at free.fr (Julien Olivain) Date: Tue, 22 Mar 2022 22:27:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: new package Message-ID: <20220322212750.2271424-1-ju.o@free.fr> This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. https://github.com/linux-rdma/rdma-core Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/rdma-core/Config.in | 28 +++++++ package/rdma-core/linux-rdma.fragment | 9 +++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 ++++++ package/rdma-core/readme.txt | 74 +++++++++++++++++++ .../testing/tests/package/test_rdma_core.py | 41 ++++++++++ 8 files changed, 183 insertions(+) create mode 100644 package/rdma-core/Config.in create mode 100644 package/rdma-core/linux-rdma.fragment create mode 100644 package/rdma-core/rdma-core.hash create mode 100644 package/rdma-core/rdma-core.mk create mode 100644 package/rdma-core/readme.txt create mode 100644 support/testing/tests/package/test_rdma_core.py diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..8fea5e31aa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1615,6 +1615,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ +F: package/rdma-core/ F: package/riscv-isa-sim/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py diff --git a/package/Config.in b/package/Config.in index 0d5d763180..f21f1fbc66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -555,6 +555,7 @@ endmenu source "package/pulseview/Config.in" source "package/qoriq-cadence-dp-firmware/Config.in" source "package/raspi-gpio/Config.in" + source "package/rdma-core/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" source "package/rockchip-mali/Config.in" diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in new file mode 100644 index 0000000000..8fc2e4b8a1 --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_RDMA_CORE + bool "rdma-core" + depends on BR2_USE_MMU # fork() used in rstream example + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBNL + help + This is the userspace components for the Linux Kernel's + drivers/infiniband subsystem. + + https://github.com/linux-rdma/rdma-core + +if BR2_PACKAGE_RDMA_CORE + +# The "rdma" binary is not a runtime dependency of this package, so it +# is not selected. Since a Buildroot user might want to add this +# command, and the condition to enable it is not trivial, we give a +# hint here. +comment "Note: The 'rdma' command is provided by the 'iproute2' package when compiled with 'libmnl'." + depends on !BR2_PACKAGE_IPROUTE2 || !BR2_PACKAGE_LIBMNL + +endif # BR2_PACKAGE_RDMA_CORE + +comment "rdma-core needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/rdma-core/linux-rdma.fragment b/package/rdma-core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/package/rdma-core/linux-rdma.fragment @@ -0,0 +1,9 @@ +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y +CONFIG_INFINIBAND_RTRS_CLIENT=m +CONFIG_INFINIBAND_RTRS_SERVER=m diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..2dd01d749e --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 40737df5158abdfdbf79ea744a74251aedff92fdf8ab7aa637125de6a1cf7e1c rdma-core-39.0.tar.gz +sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 +sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk new file mode 100644 index 0000000000..a69c1b22d5 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 39.0 +RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) +RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause +RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md +RDMA_CORE_DEPENDENCIES = libnl +RDMA_CORE_INSTALL_STAGING = YES + +RDMA_CORE_CONF_OPTS = \ + -DNO_MAN_PAGES=1 \ + -DNO_PYVERBS=1 + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +RDMA_CORE_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + +$(eval $(cmake-package)) diff --git a/package/rdma-core/readme.txt b/package/rdma-core/readme.txt new file mode 100644 index 0000000000..4f90720ca3 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,74 @@ +Testing rdma-core userspace tools +================================= + +Testing rdma-core using Linux software RoCE implementation: +https://en.wikipedia.org/wiki/RDMA_over_Converged_Ethernet + +Using two systems with working TCP/IP conficutation, for example: +- Server IP: 192.168.123.10 +- Client IP: 192.168.123.20 + +Make sure firewall configurations are appropriate. Routable RoCE v2 +uses udp/4791. ibv_rc_pingpong uses tcp/18515 for initial +synchronization. + +Note: this test can be executed in two qemu virtual machines with +bridged networking. + + +Kernel configuration +-------------------- + +The Linux Kernel needs some Infiniband configuration. In this example +the kernel "rdma_rxe" driver is needed (CONFIG_RDMA_RXE=y). See the +example fragment file provided: + + package/rdma-core/linux-rdma.fragment + + +Buildroot package configuration +------------------------------- + +For setting up a software RoCE link, the "rdma" program is needed. It +is provided by the "iproute2" package, when "libmnl" is also +selected. Make sure to have in your Buildroot configuration: + + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_LIBMNL=y + BR2_PACKAGE_RDMA_CORE=y + + +Setting up the rdma link +------------------------ + +On both server and client: + + modprobe rdma_rxe + rdma link add rxe0 type rxe netdev eth0 + + +Testing with rping +------------------ + +On the server side, run the command: + + rping -s -v + +On the client side, run the command: + + rping -c -v -a 192.168.123.10 + + +Testing with ibv_rc_pingpong +---------------------------- + +To test with the pingpong example using the reliable connected (RC) +transport: + +On the server side, run the command: + + ibv_rc_pingpong -g rxe0 -g 1 + +On the client side, run the command: + + ibv_rc_pingpong -d rxe0 -g 1 192.168.123.10 diff --git a/support/testing/tests/package/test_rdma_core.py b/support/testing/tests/package/test_rdma_core.py new file mode 100644 index 0000000000..783146202d --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,41 @@ +import os + +import infra.basetest + + +class TestRdmaCore(infra.basetest.BRTest): + + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.30" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="package/rdma-core/linux-rdma.fragment" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_LIBMNL=y + BR2_PACKAGE_RDMA_CORE=y + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + # Add the rxe0 interface + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # ibv_devinfo returns 255 if no devices are found + self.assertRunOk("ibv_devinfo -v") -- 2.35.1 From f.fainelli at gmail.com Tue Mar 22 22:21:04 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 22 Mar 2022 15:21:04 -0700 Subject: [Buildroot] [PATCH 0/2] External GCC12 toolchain support Message-ID: <20220322222106.42347-1-f.fainelli@gmail.com> This patch series allows us to use Linaro's GCC12 snapshot that can be downloaded from here: https://snapshots.linaro.org/gnu-toolchain/12.0-2021.10-1/aarch64-linux-gnu/ Florian Fainelli (2): toolchain/Config.in: add BR2_TOOLCHAIN_GCC_AT_LEAST_12 blind option toolchain/toolchain-external/toolchain-external-custom: add gcc 12 version selection toolchain/Config.in | 11 +++++++++-- .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) -- 2.25.1 From f.fainelli at gmail.com Tue Mar 22 22:21:05 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 22 Mar 2022 15:21:05 -0700 Subject: [Buildroot] [PATCH 1/2] toolchain/Config.in: add BR2_TOOLCHAIN_GCC_AT_LEAST_12 blind option In-Reply-To: <20220322222106.42347-1-f.fainelli@gmail.com> References: <20220322222106.42347-1-f.fainelli@gmail.com> Message-ID: <20220322222106.42347-2-f.fainelli@gmail.com> In order to add gcc 12 support for internal and external toolchain in follow-up commits, introduce BR2_TOOLCHAIN_GCC_AT_LEAST_12 symbol. Signed-off-by: Florian Fainelli --- toolchain/Config.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index d2c81217c84a..b572a89f2f85 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -117,7 +117,8 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ - BR2_TOOLCHAIN_GCC_AT_LEAST_11 + BR2_TOOLCHAIN_GCC_AT_LEAST_11 || \ + BR2_TOOLCHAIN_GCC_AT_LEAST_12 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. @@ -150,7 +151,8 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 config BR2_TOOLCHAIN_HAS_GCC_BUG_83143 bool default y if BR2_sh - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || BR2_TOOLCHAIN_GCC_AT_LEAST_11 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || BR2_TOOLCHAIN_GCC_AT_LEAST_11 || \ + BR2_TOOLCHAIN_GCC_AT_LEAST_12 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. This bug no # longer exists in gcc 8.x. @@ -698,10 +700,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_11 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_10 +config BR2_TOOLCHAIN_GCC_AT_LEAST_12 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 default "10" if BR2_TOOLCHAIN_GCC_AT_LEAST_10 default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9 -- 2.25.1 From f.fainelli at gmail.com Tue Mar 22 22:21:06 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 22 Mar 2022 15:21:06 -0700 Subject: [Buildroot] [PATCH 2/2] toolchain/toolchain-external/toolchain-external-custom: add gcc 12 version selection In-Reply-To: <20220322222106.42347-1-f.fainelli@gmail.com> References: <20220322222106.42347-1-f.fainelli@gmail.com> Message-ID: <20220322222106.42347-3-f.fainelli@gmail.com> This patch allows to use an external toolchain based on gcc 12. Signed-off-by: Florian Fainelli --- .../toolchain-external-custom/Config.in.options | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 9346fa3feb75..683204e56ebd 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -31,6 +31,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_12 + bool "12.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + config BR2_TOOLCHAIN_EXTERNAL_GCC_11 bool "11.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_11 -- 2.25.1 From bugzilla at busybox.net Tue Mar 22 22:34:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Mar 2022 22:34:04 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 --- Comment #2 from Daniel Martin --- Thanks Fabrice. Yeah that makes sense - we don't use linux-firmware. Tested. Please close. -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Tue Mar 22 23:22:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:14 -0600 Subject: [Buildroot] [PATCH v12 01/11] package/llvm: bump to version 11.1.0 Message-ID: <20220322232224.2842266-1-james.hilliard1@gmail.com> From: Matt Weber Signed-off-by: Matthew Weber Signed-off-by: James Hilliard --- Changes v11 -> v12: - add gcc 5 dependency due to c++14 requirement - propagate gcc 5 reverse dependency - remove unsupported config options --- package/clang/Config.in | 6 +++--- package/llvm/Config.in | 6 +++--- package/llvm/llvm.hash | 2 +- package/llvm/llvm.mk | 20 ++++++-------------- package/mesa3d/Config.in | 6 +++--- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/package/clang/Config.in b/package/clang/Config.in index a67e7631a8..7c732c7af7 100644 --- a/package/clang/Config.in +++ b/package/clang/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CLANG bool "clang" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -14,10 +14,10 @@ config BR2_PACKAGE_CLANG http://clang.llvm.org -comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "clang needs a toolchain not affected by GCC bug 64735" diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 6ec2ffcfe6..c1887e36dd 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_LLVM_TARGET_ARCH config BR2_PACKAGE_LLVM bool "llvm" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -55,10 +55,10 @@ config BR2_PACKAGE_LLVM_BPF endif -comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm needs a toolchain not affected by GCC bug 64735" diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash index 6bf2755777..e93a922492 100644 --- a/package/llvm/llvm.hash +++ b/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a llvm-9.0.1.src.tar.xz +sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 6c721c30b9..825de96392 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -5,7 +5,7 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -LLVM_VERSION = 9.0.1 +LLVM_VERSION = 11.1.0 LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions @@ -157,15 +157,9 @@ LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON HOST_LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release -# Disable C++1y (ISO C++ 2014 standard) -# Disable C++1z (ISO C++ 2017 standard) -# Compile llvm with the C++11 (ISO C++ 2011 standard) which is the fallback. -HOST_LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_CXX1Y=OFF \ - -DLLVM_ENABLE_CXX1Z=OFF -LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_CXX1Y=OFF \ - -DLLVM_ENABLE_CXX1Z=OFF +# Compile llvm with the C++14 (ISO C++ 2014 standard). +HOST_LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 +LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 # Disabled, requires sys/ndir.h header # Disable debug in module @@ -237,13 +231,11 @@ endif HOST_LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - -DLLVM_POLLY_BUILD=OFF + -DLLVM_INCLUDE_RUNTIMES=OFF LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - -DLLVM_POLLY_BUILD=OFF + -DLLVM_INCLUDE_RUNTIMES=OFF HOST_LLVM_CONF_OPTS += \ -DLLVM_ENABLE_WARNINGS=ON \ diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e41da562dc..b0ebc09212 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -32,10 +32,10 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_USE_WCHAR # std::wstring select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm support needs a toolchain not affected by GCC bug 64735" -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:15 -0600 Subject: [Buildroot] [PATCH v12 02/11] package/clang: bump to version 11.1.0 In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-2-james.hilliard1@gmail.com> From: Matt Weber Signed-off-by: Matthew Weber --- package/clang/clang.hash | 2 +- package/clang/clang.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/clang/clang.hash b/package/clang/clang.hash index 067a2c0470..32a19c1659 100644 --- a/package/clang/clang.hash +++ b/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253 clang-9.0.1.src.tar.xz +sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 939f000cbd..d1667d79b6 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -5,7 +5,8 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -CLANG_VERSION = 9.0.1 +CLANG_VERSION_MAJOR = 11 +CLANG_VERSION = $(CLANG_VERSION_MAJOR).1.0 CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CLANG_VERSION) CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:16 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:16 -0600 Subject: [Buildroot] [PATCH v12 03/11] package/lld: bump to version 11.1.0 In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-3-james.hilliard1@gmail.com> From: Matt Weber --- package/lld/lld.hash | 2 +- package/lld/lld.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lld/lld.hash b/package/lld/lld.hash index 2144cc5666..17b8d18997 100644 --- a/package/lld/lld.hash +++ b/package/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 86262bad3e2fd784ba8c5e2158d7aa36f12b85f2515e95bc81d65d75bb9b0c82 lld-9.0.1.src.tar.xz +sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/lld/lld.mk b/package/lld/lld.mk index cd1a03c1d3..4bf903cda0 100644 --- a/package/lld/lld.mk +++ b/package/lld/lld.mk @@ -5,7 +5,7 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -LLD_VERSION = 9.0.1 +LLD_VERSION = 11.1.0 LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:17 -0600 Subject: [Buildroot] [PATCH v12 04/11] package/spirv-llvm-translator: new package In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- .../spirv-llvm-translator.hash | 3 +++ .../spirv-llvm-translator.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/spirv-llvm-translator/spirv-llvm-translator.hash create mode 100644 package/spirv-llvm-translator/spirv-llvm-translator.mk diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash new file mode 100644 index 0000000000..e6f9de3cad --- /dev/null +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 a121579379ac3c7b63294b5274e0c4787b76003c89f7702a651384c3915464e9 spirv-llvm-translator-llvm_release_110.tar.gz +sha256 e3bc36440fc927c62d5cc24efeefe225a14d4e34ffeb0c92e430625cce9ee444 LICENSE.TXT diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk new file mode 100644 index 0000000000..fcc482027c --- /dev/null +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# spirv-llvm-translator +# +################################################################################ + +SPIRV_LLVM_TRANSLATOR_VERSION = llvm_release_110 +SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) +SPIRV_LLVM_TRANSLATOR_LICENSE = Apache-2.0 with exceptions +SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm +HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(host-cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:18 -0600 Subject: [Buildroot] [PATCH v12 05/11] support/misc/toolchainfile.cmake.in: allow variables to be overridden In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-5-james.hilliard1@gmail.com> Some packages such as libclc need to override cmake toolchain variables, to avoid errors caused by trying to set overriden variables ensure that they are not defined before being set. This prevents difficult to debug silent dropping of overriden variables. Signed-off-by: James Hilliard --- support/misc/toolchainfile.cmake.in | 108 +++++++++++++++++++++------- 1 file changed, 81 insertions(+), 27 deletions(-) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index be575566a4..30c0e63bf2 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR # so that it can find our custom platform description. list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -set(CMAKE_SYSTEM_NAME Buildroot) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +if(NOT DEFINED CMAKE_SYSTEM_NAME) + set(CMAKE_SYSTEM_NAME Buildroot) +endif() +if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION 1) +endif() +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +endif() # Set the {C,CXX}FLAGS appended by CMake depending on the build type # defined by Buildroot. CMake defaults these variables with -g and/or @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # Note: # if the project forces some of these flag variables, Buildroot is # screwed up and there is nothing Buildroot can do about that :( -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") +endif() +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +endif() # Build type from the Buildroot configuration -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") +if(NOT DEFINED CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") +endif() # Buildroot defaults flags. # If you are using this toolchainfile.cmake file outside of Buildroot and @@ -41,33 +53,75 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... # * and make sure the project's CMake code extends them like this if needed: # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") +if(NOT DEFINED CMAKE_C_FLAGS) + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") +endif() +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") +endif() +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") +endif() +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") +endif() -set(CMAKE_INSTALL_SO_NO_EXE 0) +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + set(CMAKE_INSTALL_SO_NO_EXE 0) +endif() -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +if(NOT DEFINED CMAKE_PROGRAM_PATH) + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") +endif() +if(NOT DEFINED CMAKE_SYSROOT) + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") # This toolchain file can be used both inside and outside Buildroot. -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") +if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") +endif() if(@@TOOLCHAIN_HAS_CXX@@) - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_FLAGS) + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") + endif() endif() if(@@TOOLCHAIN_HAS_FORTRAN@@) - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_FLAGS) + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_COMPILER) + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") + endif() endif() -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:19 -0600 Subject: [Buildroot] [PATCH v12 06/11] package/libclc: bump version to 13.0.1 In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-6-james.hilliard1@gmail.com> From: Matt Weber * Converts to the cmake pkg type * Updates download site * Adds a crosscompile fixups patch * Allow prepare_builtins utility to be directly called (it isn't installed into the path when cross compiling) * Fix file_find() for root search limitation Signed-off-by: Matthew Weber Signed-off-by: James Hilliard --- Changes v11 -> v12: - update to 13.0.1 instead of 11.1.0 - pass required host cmake options for C/CXX compilers --- .../0001-support-out-of-tree-build.patch | 71 +++++++++++++++++++ package/libclc/libclc.hash | 2 +- package/libclc/libclc.mk | 56 +++++++-------- 3 files changed, 98 insertions(+), 31 deletions(-) create mode 100644 package/libclc/0001-support-out-of-tree-build.patch diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch new file mode 100644 index 0000000000..de7207bedb --- /dev/null +++ b/package/libclc/0001-support-out-of-tree-build.patch @@ -0,0 +1,71 @@ +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Tue, 9 Mar 2021 15:55:17 -0600 +Subject: [PATCH] support out of tree build + +(1) The package has a prepare_builtins tool which is built +but not placed in the path for later use in the build. This +fix allows the later build steps to use the binary in-place. + +(2) With cmake, find_file() when used for non-host builds is +limited by CMAKE_FIND_ROOT_PATH* scope. + +In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the +following target settings for CMAKE_FIND_ROOT_PATH* which +limit the scope. +set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + + +Signed-off-by: Matthew Weber +--- + CMakeLists.txt | 2 +- + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9472f19..a784519 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) + + # Add prepare target + add_custom_command( OUTPUT "${obj_suffix}" +- COMMAND prepare_builtins -o ++ COMMAND ./prepare_builtins -o + "${obj_suffix}" + "builtins.opt.${obj_suffix}" + DEPENDS "opt.${obj_suffix}" +diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake +index 94d85d9..5de6a48 100644 +--- a/cmake/CMakeDetermineCLCCompiler.cmake ++++ b/cmake/CMakeDetermineCLCCompiler.cmake +@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) + + set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") + set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") +-find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) ++set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) + # configure all variables set in this file + configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) + mark_as_advanced(clc_comp_in) +diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake +index 1c424c7..dd3bfb6 100644 +--- a/cmake/CMakeDetermineLLAsmCompiler.cmake ++++ b/cmake/CMakeDetermineLLAsmCompiler.cmake +@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) + set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") + set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") + set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") +-find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) ++set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) + # configure all variables set in this file + configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) + mark_as_advanced(ll_comp_in) +-- +2.17.1 + diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash index 2af64bc8e8..c496291d81 100644 --- a/package/libclc/libclc.hash +++ b/package/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk index 6fe8e10a77..5d246cf4f8 100644 --- a/package/libclc/libclc.mk +++ b/package/libclc/libclc.mk @@ -4,43 +4,39 @@ # ################################################################################ -# Use the latest commit from release_90 branch. -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 -LIBCLC_SITE = https://github.com/llvm-mirror/libclc -LIBCLC_SITE_METHOD = git +LIBCLC_VERSION = 13.0.1 +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT -LIBCLC_DEPENDENCIES = host-clang host-llvm +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator LIBCLC_INSTALL_STAGING = YES -# C++ compiler is used to build a small tool (prepare-builtins) for the host. -# It must be built with the C++ compiler from the host. +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes +# llvm-config provided values +# +# CMAKE_*_COMPILER has to be set to the host compiler to build a host +# 'prepare_builtins' tool used during the build process # # The headers are installed in /usr/share and not /usr/include, # because they are needed at runtime on the target to build the OpenCL # kernels. LIBCLC_CONF_OPTS = \ - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ - --prefix=/usr \ - --includedir=/usr/share \ - --pkgconfigdir=/usr/lib/pkgconfig \ - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) - -define LIBCLC_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) -endef - -define LIBCLC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define LIBCLC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -define LIBCLC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -$(eval $(generic-package)) + -DCMAKE_SYSROOT="" \ + -DCMAKE_C_COMPILER_FORCED=ON \ + -DCMAKE_CXX_COMPILER_FORCED=ON \ + -DCMAKE_CLC_COMPILER_FORCED=ON \ + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ + -DCMAKE_INSTALL_DATADIR="share" \ + -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ + -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" + +$(eval $(cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:20 -0600 Subject: [Buildroot] [PATCH v12 07/11] package/compiler-rt: new package In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-7-james.hilliard1@gmail.com> From: Matt Weber This patch adds support for the compiler-rt (CLANG runtime) library. It builds a set of static libraries and installs them into the CLANG/LLVM toolchain resource folder. These libraries can then be used by developers in the SDK for building target applications for analysis. What is fuzzing and why libfuzzer? https://www.moritz.systems/blog/an-introduction-to-llvm-libfuzzer/ The compiler-rt fuzzer and address sanitizer tools require additional LLVM binary tools installed to allow stack trace decoding actively during executable analysis. This patch conditionally enables these tools. https://github.com/google/sanitizers/wiki/AddressSanitizerCallStack Signed-off-by: Matthew Weber Signed-off-by: James Hilliard Cc: Romain Naour Cc: Ricardo Martincoski Cc: Valentin Korenblit Cc: Michael Drake --- Changes v1 -> v2 [Romain - Removed unnecessary host-cmake dependency v2 -> v3 [Romain - Update to use COMPILER_RT_INSTALL_PATH for library install [Ricardo - Fixed check-package extra line - Spelling in commit message v3 -> v4 [Valentin - Pointed out that non-glibc libraries won't build. Further investigation shows that the lib asan support in compiler-rt doesn't have the libc checks yet to support multiple libraries. (https://patchwork.ozlabs.org/patch/339938/ was the best example I could find and it doesn't look like anything has changed in the recent codebase) v4 -> v5 [Thomas P - Revisited staging install step and found a cleaner way to use the default and then a hook to setup the runtime library path v6 - Bumped to 7.0.1 to match current LLVM/Clang version v7 - Rebased on master for 8.0 LLVM/Clang version - Added comment about bumping verions of LLVM/Clang and Compiler-rt together [Romain - Disabled test cases (-DCOMPILER_RT_INCLUDE_TESTS=OFF) v8 - Rebased and updated version to 9.x to match llvm/clang [Romain - Squashed "[v7,1/5]package/llvm: install target binary/debug tools" to be included in this patch [Michael D - compiler-rt symlink creation to include shared folder such that control flow lists work v9 - Rebased post 2020.05 v10 - Switched compiler-rt site to point towards new github project - Updated compiler-rt version to 11.0.0 - Tested against master[8640e8ffde3f61c5838] using support/testing/run-tests -o runtest -k \ tests.package.test_clang.TestClangCompilerRT v11 - Updated compiler-rt version to 11.1.0 v12 - overwrite target llvm-config in staging with host llvm-config --- DEVELOPERS | 1 + package/Config.in | 1 + package/compiler-rt/Config.in | 14 +++++++++++ package/compiler-rt/compiler-rt.hash | 3 +++ package/compiler-rt/compiler-rt.mk | 37 ++++++++++++++++++++++++++++ package/llvm/llvm.mk | 20 ++++++++++++--- 6 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 package/compiler-rt/Config.in create mode 100644 package/compiler-rt/compiler-rt.hash create mode 100644 package/compiler-rt/compiler-rt.mk diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..5219626e45 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1886,6 +1886,7 @@ F: package/bridge-utils/ F: package/checkpolicy/ F: package/checksec/ F: package/cgroupfs-mount/ +F: package/compiler-rt/ F: package/crda/ F: package/cunit/ F: package/dacapo/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..e3ef75b0da 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1928,6 +1928,7 @@ menu "Other" source "package/cereal/Config.in" source "package/clang/Config.in" source "package/cmocka/Config.in" + source "package/compiler-rt/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" diff --git a/package/compiler-rt/Config.in b/package/compiler-rt/Config.in new file mode 100644 index 0000000000..9afc0d9d60 --- /dev/null +++ b/package/compiler-rt/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_COMPILER_RT + bool "compiler-rt" + depends on BR2_PACKAGE_LLVM + depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires + help + A collection of runtime libraries primarily used by clang and + llvm to provide builtins, sanitizer runtimes, and profiling + at runtime. + + https://compiler-rt.llvm.org/ + +comment "compiler-rt requires llvm to be enabled and a glibc toolchain" + depends on !BR2_PACKAGE_LLVM + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/compiler-rt/compiler-rt.hash b/package/compiler-rt/compiler-rt.hash new file mode 100644 index 0000000000..0689ec3d2a --- /dev/null +++ b/package/compiler-rt/compiler-rt.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz +sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/compiler-rt/compiler-rt.mk b/package/compiler-rt/compiler-rt.mk new file mode 100644 index 0000000000..57f9c26854 --- /dev/null +++ b/package/compiler-rt/compiler-rt.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# compiler-rt +# +################################################################################ + +# Compiler-RT should be bumped together with LLVM and Clang as the run-time is +# tied to the version of those tools +COMPILER_RT_VERSION = 11.1.0 +COMPILER_RT_SOURCE = compiler-rt-$(COMPILER_RT_VERSION).src.tar.xz +COMPILER_RT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(COMPILER_RT_VERSION) +COMPILER_RT_LICENSE = NCSA MIT +COMPILER_RT_LICENSE_FILES = LICENSE.TXT +COMPILER_RT_DEPENDENCIES = host-clang llvm + +COMPILER_RT_INSTALL_STAGING = YES +COMPILER_RT_INSTALL_TARGET = NO + +COMPILER_RT_CONF_OPTS=-DCOMPILER_RT_STANDALONE_BUILD=OFF \ + -DCOMPILER_RT_STANDALONE_BUILD=ON \ + -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \ + -DLLVM_CONFIG_PATH=$(HOST_DIR)/usr/bin/llvm-config + +# The installation of the target runtime libraries defaults to DESTDIR, however +# host-clang resources directory needs a link so Clang can find the runtime +# libraries in the same location they would be if built as part of the Clang +# build. The "resources" directory is loosely documented and seems to be +# assumed, as compiler-rt is usually build at the same time as Clang and not +# standalone. +define COMPILER_RT_SETUP_RUNTIME_LIBS + mkdir -p $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/lib/linux $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib/linux + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/share $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/share +endef +COMPILER_RT_POST_INSTALL_STAGING_HOOKS += COMPILER_RT_SETUP_RUNTIME_LIBS + +$(eval $(cmake-package)) diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 825de96392..7c73d5b564 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -214,8 +214,7 @@ HOST_LLVM_CONF_OPTS += \ # We need to activate LLVM_INCLUDE_TOOLS, otherwise it does not generate # libLLVM.so LLVM_CONF_OPTS += \ - -DLLVM_INCLUDE_TOOLS=ON \ - -DLLVM_BUILD_TOOLS=OFF + -DLLVM_INCLUDE_TOOLS=ON ifeq ($(BR2_PACKAGE_LLVM_RTTI),y) HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=ON @@ -278,11 +277,24 @@ LLVM_CONF_OPTS += \ # directories from STAGING_DIR. # output/staging/usr/bin/llvm-config --includedir # output/staging/usr/include -define HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +define LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR $(INSTALL) -D -m 0755 $(HOST_DIR)/bin/llvm-config \ $(STAGING_DIR)/usr/bin/llvm-config endef -HOST_LLVM_POST_INSTALL_HOOKS = HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +HOST_LLVM_POST_INSTALL_HOOKS = LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR + +# The llvm-symbolizer binary is used by the Compiler-RT Fuzzer +# and AddressSanitizer tools for stack traces. +# If we set -DLLVM_BUILD_TOOLS=ON we need to re-copy host llvm-config to +# replace the target llvm-config variant in staging that gets installed. +ifeq ($(BR2_PACKAGE_COMPILER_RT),y) +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_TOOLS=ON +LLVM_POST_INSTALL_STAGING_HOOKS = LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +else +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_TOOLS=OFF +endif # By default llvm-tblgen is built and installed on the target but it is # not necessary. Also erase LLVMHello.so from /usr/lib -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:21 -0600 Subject: [Buildroot] [PATCH v12 08/11] testing/tests: CLANG compiler-rt runtime test In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-8-james.hilliard1@gmail.com> From: Matt Weber This patch adds a test case that 1) Builds the complete LLVM and CLANG set of host tools 2) Cross-compiles the compiler-rt runtime using CLANG 3) Builds a cross-compiled application using CLANG and the libfuzzer compiler-rt library. 4) Executes the fuzz application (part of the libfuzzer package) on target and checks expected output for a heap-buffer-overflow. Note: The libfuzzer package is just a tutorial example of how to use the toolkit provided by llvm (Thus not adding it as a full Buildroot package). Signed-off-by: Matthew Weber Cc: Ricardo Martincoski Cc: Romain Naour --- Changes v1 -> v2 [Ricardo - updated yml with test case - moved emulator launch cmd to test case from infra - defconfig in the order provided by savedefconfig - indent defconfig - add full package for test code to the test br2-external - consolidated to one class only v2 -> v3 - Added Review/tested by Ricardo's [with the entire series applied on next branch: https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/121908178 NOTE: this test case takes longer than test_rust, ~2 hours in my host machine with all tarballs previously downloaded] v4 - None v5 - Rebased post 2018.11 on master v6 - Testing of LLVM/Clang bump v7 - Rebase on master and testing of LLVM/Clang bump to 8.0 - Updated hashes for archive and legal info (legal info changed because of spelling cleanup) v8 - Cleaned up wording the 4th item of the message above. [Romain - Removes a hardcoded toolchain/sysroot path "b option" for libfuzzer pkg build, however requires this series applied. http://patchwork.ozlabs.org/project/buildroot/list/?series=129565 - updated test case to check for heap overflow string to keep arch generic - Removed the fixed mcpu arg from clang++ build and dropped --sysroot as cross compiler wrapper now provides this for libfuzzer build v9 - Rebased post 2020.05 v10 - Updated site for libfuzzer test case and bumped version - Switched back to have no dependency on clang as cross compiler series - Fixed a libfuzzer link time gcc ld error by adding sysroot and -B to the BUILD_CMDS since we don't depend on the cross wrapper. - Tested against master[8640e8ffde3f61c583] using support/testing/run-tests -o runtest -k \ tests.package.test_clang.TestClangCompilerRT v11 - Updated compiler-rt version to 11.1.0 --- .../br2-external/clang-compiler-rt/Config.in | 1 + .../clang-compiler-rt/external.desc | 1 + .../clang-compiler-rt/external.mk | 1 + .../package/libfuzzer/Config.in | 8 ++++ .../package/libfuzzer/libfuzzer.hash | 2 + .../package/libfuzzer/libfuzzer.mk | 24 ++++++++++ support/testing/tests/package/test_clang.py | 46 +++++++++++++++++++ 7 files changed, 83 insertions(+) create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/Config.in create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/external.desc create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/external.mk create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk create mode 100644 support/testing/tests/package/test_clang.py diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in b/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in new file mode 100644 index 0000000000..e1f9f8c598 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_CLANG_COMPILER_RT_PATH/package/libfuzzer/Config.in" diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc b/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc new file mode 100644 index 0000000000..92df85911d --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc @@ -0,0 +1 @@ +name: CLANG_COMPILER_RT diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk new file mode 100644 index 0000000000..6fa55c1211 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_CLANG_COMPILER_RT_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in new file mode 100644 index 0000000000..2d335fd3c7 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBFUZZER + bool "libfuzzer" + help + This project aims at hosting tutorials, + examples, discussions, research proposals, + and other resources related to fuzzing. + + https://github.com/google/fuzzing diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash new file mode 100644 index 0000000000..9287005ed9 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash @@ -0,0 +1,2 @@ +sha256 c71360c3b1ba1d88b28b0b3cb3a1744d251b87a12f2881224cc53ec26eb7a2db libfuzzer-cec02db916d21baa4db5b8d262d78848b3a35f4b.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk new file mode 100644 index 0000000000..6c6371bea7 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# libfuzzer +# +################################################################################ + +LIBFUZZER_VERSION = cec02db916d21baa4db5b8d262d78848b3a35f4b +LIBFUZZER_SITE = $(call github,google,fuzzing,$(LIBFUZZER_VERSION)) +LIBFUZZER_LICENSE = Apache-2.0 +LIBFUZZER_LICENSE_FILES = LICENSE +LIBFUZZER_DEPENDENCIES = compiler-rt + +define LIBFUZZER_BUILD_CMDS + $(HOST_DIR)/bin/clang++ --sysroot=$(STAGING_DIR) \ + -B $(HOST_DIR)/opt/ext-toolchain -fsanitize=address,fuzzer \ + $(@D)/tutorial/libFuzzer/fuzz_me.cc \ + -o $(@D)/fuzz_me +endef + +define LIBFUZZER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/fuzz_me $(TARGET_DIR)/usr/bin/fuzz_me +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py new file mode 100644 index 0000000000..df3990c6be --- /dev/null +++ b/support/testing/tests/package/test_clang.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + +FUZZ_TIMEOUT = 120 + + +class TestClangCompilerRT(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/clang-compiler-rt")] + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_COMPILER_RT=y + BR2_PACKAGE_LLVM=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_LIBFUZZER=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + # Sanitizers overallocate memory and the minimum that seemed to work was 512MB + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a53", "-m", "512", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + # The test case verifies the application executes and that + # the symbolizer is working to decode the stack trace. + cmd = "fuzz_me 2>&1 | grep heap-buffer-overflow" + _, exit_code = self.emulator.run(cmd, FUZZ_TIMEOUT) + self.assertEqual(exit_code, 0) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:22 -0600 Subject: [Buildroot] [PATCH v12 09/11] package/clang: help host-clang to find our external toolchain In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-9-james.hilliard1@gmail.com> From: Romain Naour To build libfuzzer package Matthew Weber noticed that (host) clang doesn't run on the host without "-B $(HOST_DIR)/opt/ext-toolchain" option. This option add a new search path for binaries and object files used implicitly. Without -B clang fail to link due to missing crtbeging.o file and libgcc: output/host/bin/aarch64-linux-gnu-ld: cannot find crtbegin.o: No such file or directory output/host/bin/aarch64-linux-gnu-ld: cannot find -lgcc Indeed, clang search path doesn't include the dafault cross-gcc's search paths: $ output/host/bin/clang -print-search-dirs programs: = output/host/bin:output/host/bin:/..//bin libraries: = output/host/lib/clang/8.0.0: output/host/bin/../lib64: /lib/../lib64: /usr/lib/../lib64: output/host/bin/../lib: /lib:/usr/lib Here is the same command for cross-gcc: $ output/host/bin/aarch64-linux-gnu-gcc -print-search-dirs install: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/ programs: = output/host/opt/ext-toolchain/bin/../libexec/gcc/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../libexec/gcc/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/ libraries: = output/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../lib/gcc/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/../lib64/: output/host/aarch64-buildroot-linux-gnu/sysroot/lib/aarch64-linux-gnu/8.3.0/: output/host/aarch64-buildroot-linux-gnu/sysroot/lib/../lib64/: output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/8.3.0/: output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/../lib64/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/: output/host/aarch64-buildroot-linux-gnu/sysroot/lib/: output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/ We can see that gcc default search path contains "output/host/opt/ext-toolchain" directory where the external toolchain has been extracted. Since we want to use clang without additional option like -B, patch clang in order to use GCC_INSTALL_PREFIX instead of using automatic detection (which doesn't work for Buildroot). We eventually want to relocate the Buildroot SDK containing the clang cross-compiler, so we provide a relative path to GCC_INSTALL_PREFIX in order to avoid to hardcode the path to the GCC toolchain. Also the path between clang and the GCC external toolchain is not always the same, we have the following case: * Toolchain to be downloaded and installed The toolchain is extracted into $(HOST_DIR)/opt/ext-toolchain, so the path is "../opt/ext-toolchain". * Pre-installed toolchain The toolchain is localed somewhere in the host filesystem and defined by the user using BR2_TOOLCHAIN_EXTERNAL_PATH. So, set GCC_INSTALL_PREFIX using realpath: -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` When we use a Buildroot's internal toolchain, clang will find theses crt*.o files and libgcc. http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html Signed-off-by: Romain Naour Cc: Matthew Weber Cc: Valentin Korenblit Tested-by: Matt Weber --- Changes v1 -> v2 [Arnout - Can't dropped ":PATH" from "-DGCC_INSTALL_PREFIX:PATH=" as suggested, The string isn't set correctly and results in "cannot find crtbegin.o" - Attempting to post patch upstream - I did not address the relative vs absolute path comment. The current approach seemed correct per my understanding for handling the two toolchain install location cases --- ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 78 +++++++++++++++++++ package/clang/clang.mk | 7 ++ 2 files changed, 85 insertions(+) create mode 100644 package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch new file mode 100644 index 0000000000..08371154d5 --- /dev/null +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch @@ -0,0 +1,78 @@ +From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 5 Aug 2019 16:06:48 +0200 +Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set + of prefixes for searching the gcc toolchain + +By default, the Gnu Toolchains driver is looking at the parent +directory while looking for the gcc toolchain when clang is installed +at "D.InstalledDir" + +But this doesn't work with Buildroot since the external +toolchain is installed in host/opt/ext-toolchain and the sysroot is +moved to host/-buildroot-linux-gnu/sysroot/ directory. + +We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang +but it doesn't work since we already provide a sysroot [1]. + +Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. + +Since we want to be able to relocate the clang toolchain, +allow to use a relative path with GCC_INSTALL_PREFIX. + +Buildroot will provide such relative path by using: +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` + +Doing so allow to use clang without providing additional search +paths with -B option on the clang's command line. + +[1] https://reviews.llvm.org/D49244 +[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html + +Signed-off-by: Romain Naour +Signed-off-by: Matthew Weber +--- +Pending, access to llvm mailing lists to submit it is pending. They +seem to be having issues with their listserv. +--- + lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index 2ad45097dc..90d6b5b748 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( + + Prefixes.push_back(GCCToolchainDir); + } else { ++ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; ++ + // If we have a SysRoot, try that first. + if (!D.SysRoot.empty()) { + Prefixes.push_back(D.SysRoot); +@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( + // Then look for gcc installed alongside clang. + Prefixes.push_back(D.InstalledDir + "/.."); + ++ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. ++ if (!GccIinstallPrefix.empty()) ++ { ++ if (llvm::sys::path::is_relative(GccIinstallPrefix)) ++ { ++ // Use a relative path to gcc from clang install path. ++ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); ++ } ++ else ++ { ++ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. ++ Prefixes.push_back(GCC_INSTALL_PREFIX); ++ } ++ } ++ + // Next, look for prefix(es) that correspond to distribution-supplied gcc + // installations. + if (D.SysRoot.empty()) { +-- +2.20.1 + diff --git a/package/clang/clang.mk b/package/clang/clang.mk index d1667d79b6..95b4964be3 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -105,5 +105,12 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all +# Help host-clang to find our external toolchain, use a relative path from the clang +# installation directory to the external toolchain installation directory in order to +# not hardcode the toolchain absolute path. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:23 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:23 -0600 Subject: [Buildroot] [PATCH v12 10/11] package/clang: install a toolchain-wrapper for the host clang cross-compiler In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-10-james.hilliard1@gmail.com> From: Romain Naour In order to use Clang as a host cross-compiler for Buildroot, we need to provide at least the path to the sysroot (using --sysroot) and some other compiler flags. This series looks to reuse the toolchain wrapper for GCC since Clang support most of the gcc flags used in the Buildroot's toolchain wrapper. The only flag -mfused-madd (deprecated since gcc 4.6) for mips is not supported by clang. Since Clang require gcc >= 5.x this flag can never be used. host-clang refers to an existing GCC-based toolchain (internal or external) for libstdc++. However, a Buildroot external toolchain gets a different BR_CROSS_PATH_SUFFIX. Therefore, we can't reuse the toolchain-wrapper that gets built for the GCC-based toolchain, but instead have to compile an additional clang-specific wrapper, called toolchain-wrapper-clang. After building the clang toolchain wrapper, create the symlinks needed to force package infrastructure to use clang througt the wrapper. Initially clang install the clang-8 binary and create all other symlinks: # clang -> clang-8 # clang++ -> clang # clang-8 # clang-cl -> clang # clang-cpp -> clang Use a post install hook to rename the clang-8 binary to clang-8.br_real and recreate all symlinks: # clang -> toolchain-wrapper-clang # clang++ -> toolchain-wrapper-clang # clang-8 -> toolchain-wrapper-clang # clang-8.br_real # clang++.br_real -> clang-8.br_real # clang.br_real -> clang-8.br_real # clang-cl -> toolchain-wrapper-clang # clang-cl.br_real -> clang-8.br_real # clang-cpp -> toolchain-wrapper-clang # clang-cpp.br_real -> clang-8.br_real NOTE: *.br_real symlinks are needed as the wrapper references them Use the previously introduced CLANG_VERSION_MAJOR variable to create theses symlinks. Set BR_CROSS_PATH_SUFFIX to ".br_real" as for the Buildroot's internal GCC toolchain backend to find the "real" clang binary installed in $(HOST_DIR)/bin. Borrow TOOLCHAIN_WRAPPER_BUILD and TOOLCHAIN_WRAPPER_INSTALL to build and install the specific clang toolchain wrapper. Signed-off-by: Romain Naour Cc: Valentin Korenblit Signed-off-by: Matthew Weber --- Changes v1 -> v2 [Arnout - Fixup commit description and clarified *.br_real - Simplified loop --- package/clang/clang.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 95b4964be3..3c75f8d6b1 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -112,5 +112,33 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` endif +define HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS + $(Q)cd $(HOST_DIR)/bin; \ + rm -f clang-$(CLANG_VERSION_MAJOR).br_real; \ + mv clang-$(CLANG_VERSION_MAJOR) clang-$(CLANG_VERSION_MAJOR).br_real; \ + ln -sf toolchain-wrapper-clang clang-$(CLANG_VERSION_MAJOR); \ + for i in clang clang++ clang-cl clang-cpp; do \ + ln -snf toolchain-wrapper-clang $$i; \ + ln -snf clang-$(CLANG_VERSION_MAJOR).br_real $$i.br_real; \ + done +endef + +define HOST_CLANG_TOOLCHAIN_WRAPPER_BUILD + $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ + -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ + toolchain/toolchain-wrapper.c \ + -o $(@D)/toolchain-wrapper-clang +endef + +define HOST_CLANG_TOOLCHAIN_WRAPPER_INSTALL + $(INSTALL) -D -m 0755 $(@D)/toolchain-wrapper-clang \ + $(HOST_DIR)/bin/toolchain-wrapper-clang +endef + +HOST_CLANG_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' +HOST_CLANG_POST_BUILD_HOOKS += HOST_CLANG_TOOLCHAIN_WRAPPER_BUILD +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_TOOLCHAIN_WRAPPER_INSTALL +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS + $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:24 -0600 Subject: [Buildroot] [PATCH v12 11/11] package/compiler-rt: runtime test use toolchain-wrapper In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-11-james.hilliard1@gmail.com> From: Matt Weber The toolchain wrapper for clang allows the build of the libfuzzer package to not point at "-B $(HOST_DIR)/opt/ext-toolchain" which prevents a build failure to link due to missing crtbeging.o and libgcc. Signed-off-by: Matthew Weber --- .../clang-compiler-rt/package/libfuzzer/libfuzzer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk index 6c6371bea7..0515b9da35 100644 --- a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk @@ -12,7 +12,7 @@ LIBFUZZER_DEPENDENCIES = compiler-rt define LIBFUZZER_BUILD_CMDS $(HOST_DIR)/bin/clang++ --sysroot=$(STAGING_DIR) \ - -B $(HOST_DIR)/opt/ext-toolchain -fsanitize=address,fuzzer \ + -fsanitize=address,fuzzer \ $(@D)/tutorial/libFuzzer/fuzz_me.cc \ -o $(@D)/fuzz_me endef -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:25:48 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:25:48 -0600 Subject: [Buildroot] [PATCH v11 4/9] package/libclc: bump version to 11.1.0 In-Reply-To: References: <20210311142932.44985-1-matthew.weber@rockwellcollins.com> <20210311142932.44985-4-matthew.weber@rockwellcollins.com> Message-ID: On Tue, May 18, 2021 at 3:04 PM Arnout Vandecappelle wrote: > > Hi Matt, > > I was going to apply this series to next... > > On 11/03/2021 20:37, Matthew Weber via buildroot wrote: > [snip] > >>> -# C++ compiler is used to build a small tool (prepare-builtins) for the host. > >>> -# It must be built with the C++ compiler from the host. > >>> +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes > >>> +# llvm-config provided values > >>> # > >>> -# The headers are installed in /usr/share and not /usr/include, > >>> -# because they are needed at runtime on the target to build the OpenCL > >>> -# kernels. > >>> +# CMAKE_CXX_COMPILER has to be set to the host compiler to build a host > >>> +# 'prepare_builtins' tool used during the build process > >>> LIBCLC_CONF_OPTS = \ > >>> - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ > >>> - --prefix=/usr \ > >>> - --includedir=/usr/share \ > >>> - --pkgconfigdir=/usr/lib/pkgconfig \ > >>> - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) > >>> + -DCMAKE_CLC_COMPILER_FORCED=ON \ > >>> + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ > >>> + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" > > > > Looks like I have a couple of bugs (I didn't have opencl checked in menuconfig) > > ... but then I saw this. So I didn't. Instead, I've marked the series as Changes > Requested. If you think it should be applied after all, please repost (or just > update patchwork if unchanged). > > Oh, and 12.0.0 has been released now... > > > > > 1) mesa3d.mk needs MESA3D_MESON_EXTRA_BINARIES += > > llvm-config='$(STAGING_DIR)/bin/llvm-config' updated to point to the > > Normally, the foo-config programs are script, so it's OK to use the one in > staging. If it's an actual binary, we have to somehow patch it so it has target > config but compiles for host. > > I'd expect llvm and related to be cross-compile friendly though... > > > HOST_DIR llvm-config because it needs to be able to execute the tool. > > However this doesn't work since then you get the > > "host/lib/libLLVM-11.so when searching for -lLLVM-11 " error which > > makes sense since that's the host llvm-config we pointed at..... > > Unsure how to solve this one and we don't notice it in x86 builds. > > When you enable the AMD Radeon to build for aarch64 you can cause this > > error. > > > > 2) mesa3d doesn't quite build (pkgconfig can't find libclc). I didn't > > catch that CMAKE_INSTALL_PREFIX is getting ignored (we set it in the > > pkg-cmake.mk infra) so the libclc.pc is getting installed in > > $HOST_DIR/usr/local/share vs $HOST_DIR/usr/share . I haven't been > > able to figure out why the value doesn't take hold (ie after the > > configuration step libclc-11.1.0/CMakeCache.txt still shows /usr/local > > unless I force set the CMAKE_INSTALL_PREFIX value in > > libclc-11.1.0/CMakeList.txt before project(). > > That *is* weird... This should fix the CMAKE_INSTALL_PREFIX issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > > Regards, > Arnout > > > > > > > Matt > > _______________________________________________ > > buildroot mailing list > > buildroot at busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From joel at jms.id.au Wed Mar 23 02:32:08 2022 From: joel at jms.id.au (Joel Stanley) Date: Wed, 23 Mar 2022 02:32:08 +0000 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le In-Reply-To: <20220315130737.428449-1-joel@jms.id.au> References: <20220315130737.428449-1-joel@jms.id.au> Message-ID: On Tue, 15 Mar 2022 at 13:07, Joel Stanley wrote: > > When generating a filesystem image on a power10 build machine running > Ubuntu, we see a segfault when fakeroot is running chmod. > > This has been reported and fixed upstream in Debian in version 1.26-1.2: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 > > Add the samae patch to resolve the segfault. ping > > Signed-off-by: Joel Stanley > --- > This isn't a commit in the fakeroot tree, rather a patch from the Debian > packaging. > > I would appreciate if this was added to the 2022.02 stable tree. > > Signed-off-by: Joel Stanley > --- > .../fakeroot/fix-prototype-generation.patch | 59 +++++++++++++++++++ > 1 file changed, 59 insertions(+) > create mode 100644 package/fakeroot/fix-prototype-generation.patch > > diff --git a/package/fakeroot/fix-prototype-generation.patch b/package/fakeroot/fix-prototype-generation.patch > new file mode 100644 > index 000000000000..38d32ff3b22c > --- /dev/null > +++ b/package/fakeroot/fix-prototype-generation.patch > @@ -0,0 +1,59 @@ > +Subject: Fix prototype generation for openat > +Author: Christoph Biedl > +Date: 2021-12-30 > +Bug-Debian: https://bugs.debian.org/995393 > +Forwarded: Yes (implicitely) > + > + As jrtc27 pointed out in IRC, ppc64el is more strict than other > + architectures when it comes to va_arg handling: > + > + it's that ppc64le uses the elfv2 abi, and for variadic calls you > + must reserve space for a parameter save area > + > + So enhance wrapawk to create a proper prototype and argument > + handling although it's specific to the openat call. Also add the > + missing documentation for the sixth column to wrapfunc.inp. > + > +--- a/wrapawk > ++++ b/wrapawk > +@@ -37,7 +37,25 @@ > + argtype=$3; > + argname=$4; > + MACRO=$5; > +- if(MACRO){ > ++ openat_extra=$6; > ++ if(openat_extra){ > ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; > ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; > ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; > ++ > ++ print ret " tmp_" name, openat_extra "{" > tmpffile; > ++ print " mode_t mode = 0;" > tmpffile; > ++ print " if (flags & O_CREAT) {" > tmpffile; > ++ print " va_list args;" > tmpffile; > ++ print " va_start(args, flags);" > tmpffile; > ++ print " mode = va_arg(args, int);" > tmpffile; > ++ print " va_end(args);" > tmpffile; > ++ print " }" > tmpffile; > ++ print " load_library_symbols();" > tmpffile; > ++ print " return next_" name, argname ";" > tmpffile; > ++ print "}" > tmpffile; > ++ print "" > tmpffile; > ++ } else if(MACRO){ > + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; > + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; > + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; > +--- a/wrapfunc.inp > ++++ b/wrapfunc.inp > +@@ -9,8 +9,10 @@ > + /**/ */ > + /* each line of this file lists 4 fields, seperated by a ";". */ > + /* The first field is the name of the wrapped function, then it's return */ > +-/* value. After that come the function arguments with types, and the last */ > ++/* value. After that come the function arguments with types, and the fifth */ > + /* field contains the function arguments without types. */ > ++/* A sixth field is a special needed when wrapping the openat syscall. */ > ++/* Otherwise it's like the third (function arguments with types). */ > + /**/ > + > + /* __*xstat are used on glibc systems instead of just *xstat. */ > -- > 2.35.1 > From Jason at zx2c4.com Wed Mar 23 03:52:33 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 22 Mar 2022 21:52:33 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220323035233.140997-1-Jason@zx2c4.com> Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising to you, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. I fixed this in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/S20urandom | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..f971ea905a 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,26 +17,16 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { @@ -44,7 +34,9 @@ save_random_seed() { if touch "$URANDOM_SEED" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" + rm "$URANDOM_SEED.new" status=$? umask "$old_umask" if [ "$status" -eq 0 ]; then -- 2.35.1 From bugzilla at busybox.net Wed Mar 23 04:16:34 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 04:16:34 +0000 Subject: [Buildroot] [Bug 14681] New: QT5WEBENGINE not building Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14681 Bug ID: 14681 Summary: QT5WEBENGINE not building Product: buildroot Version: 2022.02 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dmanlfc at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Seems this package needs host-python3 instead of host-python for the latest buildroot changes. -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Wed Mar 23 04:47:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 22:47:51 -0600 Subject: [Buildroot] [Bug 14681] New: QT5WEBENGINE not building In-Reply-To: References: Message-ID: On Tue, Mar 22, 2022 at 10:16 PM wrote: > > https://bugs.busybox.net/show_bug.cgi?id=14681 > > Bug ID: 14681 > Summary: QT5WEBENGINE not building > Product: buildroot > Version: 2022.02 > Hardware: PC > OS: Linux > Status: NEW > Severity: normal > Priority: P5 > Component: Other > Assignee: unassigned at buildroot.uclibc.org > Reporter: dmanlfc at gmail.com > CC: buildroot at uclibc.org > Target Milestone: --- > > Seems this package needs host-python3 instead of host-python for the latest > buildroot changes. This series switches qt5webengine to python3: https://patchwork.ozlabs.org/project/buildroot/list/?series=&submitter=&state=*&q=&archive=both&delegate=&series=286165 > > -- > You are receiving this mail because: > You are on the CC list for the bug. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From Jason at zx2c4.com Wed Mar 23 05:10:14 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 22 Mar 2022 23:10:14 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323035233.140997-1-Jason@zx2c4.com> References: <20220323035233.140997-1-Jason@zx2c4.com> Message-ID: Hi Christoph, Yann, I realized I should have CC'd you on the below. Sorry about that. Jason On Tue, Mar 22, 2022 at 9:52 PM Jason A. Donenfeld wrote: > > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. > > As a result of this behavior, which may be understandably surprising to > you, writing a good seed file into /dev/urandom and then saving a new > seed file immediately after is dangerous, because the new seed file may > wind up being entirely deterministic, even if the old seed file was > quite good. > > I fixed this in systemd with > , > and fortunately it's possible to do the same thing in shell script here. > Specifically, instead of just saving new /dev/urandom output straight > up, we hash the new /dev/urandom together with the old seed, in order to > produce the new seed. This way the amount of entropy in the new seed > will stay the same or get better, but not appreciably regress. > > At the same time, the pool size check in this script is useless. Writing > to /dev/urandom never credits bits anyway, so no matter what, writing > into /dev/urandom is useful and not harmful. There's also not much of a > point in seeding with more than 256 bits, which is what the hashing > operation above produces. So this commit removes the file size check. > > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. > > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/S20urandom | 30 +++++++++++------------------- > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..f971ea905a 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -17,26 +17,16 @@ else > pool_size=512 > fi > > -check_file_size() { > - [ -f "$URANDOM_SEED" ] || return 1 > - # Try to read two blocks but exactly one will be read if the file has > - # the correct size. > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > - test "$size" -eq "$pool_size" > -} > - > init_rng() { > - if check_file_size; then > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > + printf 'Initializing random number generator: ' > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > fi > + return "$status" > } > > save_random_seed() { > @@ -44,7 +34,9 @@ save_random_seed() { > if touch "$URANDOM_SEED" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" > + rm "$URANDOM_SEED.new" > status=$? > umask "$old_umask" > if [ "$status" -eq 0 ]; then > -- > 2.35.1 > From bugzilla at busybox.net Wed Mar 23 08:13:06 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 08:13:06 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |yann.morin.1998 at free.fr --- Comment #3 from Yann E. MORIN --- Daniel, All, As Fabrice explained, the goal is for a user to be able to choose either firmware to install. However, when that the package does nothing by default is indeed not very nice; it might be good to ensure that at least one of the firmwares is installed, with something like (elided for brevity): config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI bool "brcmfmac-sdio-firmware-rpi" select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI \ if !BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT Care to send a proper patch to the list, please? -- You are receiving this mail because: You are on the CC list for the bug. From nicolas.cavallari at green-communications.fr Wed Mar 23 08:43:36 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Wed, 23 Mar 2022 09:43:36 +0100 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323035233.140997-1-Jason@zx2c4.com> References: <20220323035233.140997-1-Jason@zx2c4.com> Message-ID: <3211011a-129a-da72-a359-75bd72c7ad4b@green-communications.fr> On 23/03/2022 04:52, Jason A. Donenfeld wrote: > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. > > As a result of this behavior, which may be understandably surprising to > you, writing a good seed file into /dev/urandom and then saving a new > seed file immediately after is dangerous, because the new seed file may > wind up being entirely deterministic, even if the old seed file was > quite good. > > I fixed this in systemd with > , > and fortunately it's possible to do the same thing in shell script here. > Specifically, instead of just saving new /dev/urandom output straight > up, we hash the new /dev/urandom together with the old seed, in order to > produce the new seed. This way the amount of entropy in the new seed > will stay the same or get better, but not appreciably regress. > > At the same time, the pool size check in this script is useless. Writing > to /dev/urandom never credits bits anyway, so no matter what, writing > into /dev/urandom is useful and not harmful. There's also not much of a > point in seeding with more than 256 bits, which is what the hashing > operation above produces. So this commit removes the file size check. > > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. > > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/S20urandom | 30 +++++++++++------------------- > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..f971ea905a 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -17,26 +17,16 @@ else > pool_size=512 > fi > > -check_file_size() { > - [ -f "$URANDOM_SEED" ] || return 1 > - # Try to read two blocks but exactly one will be read if the file has > - # the correct size. > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > - test "$size" -eq "$pool_size" > -} > - > init_rng() { > - if check_file_size; then > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > + printf 'Initializing random number generator: ' > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null This will fail if the seed does not exist. Either because it's the first boot or because the system is read-only. The [ -f ] test is still useful in the first case, because init_rng must return 0 for save_random_seed to be called during boot. And if save_random_seed is not called during boot the seed might never be created (you cannot expect stop to be called). > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > fi > + return "$status" > } > > save_random_seed() { > @@ -44,7 +34,9 @@ save_random_seed() { > if touch "$URANDOM_SEED" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" > + rm "$URANDOM_SEED.new" > status=$? This breaks the error check. Either these commands must be chained by && or each of them should be tested. Also, i'm not sure why stderr is supressed for cat. In this case it is not supposed to fail or print anything to stderr. From yann.morin.1998 at free.fr Wed Mar 23 09:13:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 10:13:36 +0100 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323035233.140997-1-Jason@zx2c4.com> References: <20220323035233.140997-1-Jason@zx2c4.com> Message-ID: <20220323091336.GL1566358@scaer> Jason, All, On 2022-03-22 21:52 -0600, Jason A. Donenfeld spake thusly: > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. Thanks for this patch. I will blindly trust whatever you state about the kernel RNG. https://www.zx2c4.com/projects/linux-rng-5.17-5.18/ Still, I have a few comments about this change, see below... > As a result of this behavior, which may be understandably surprising to > you, writing a good seed file into /dev/urandom and then saving a new s/to you// (no "personal" address in a commit message) > seed file immediately after is dangerous, because the new seed file may > wind up being entirely deterministic, even if the old seed file was > quite good. > > I fixed this in systemd with s/I fixed this/This has been fixed/ (but "we" as you used later is ok) [--SNIP--] > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. Is there a way to do that within a shell script? If so, would you be kind enough to send a followup patch, please? > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/S20urandom | 30 +++++++++++------------------- > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..f971ea905a 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom [--SNIP--] > @@ -44,7 +34,9 @@ save_random_seed() { > if touch "$URANDOM_SEED" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" $ shellcheck package/urandom-scripts/S20urandom In package/urandom-scripts/S20urandom line 38: cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" ^-------------^ SC2094: Make sure not to read and write the same file in the same pipeline. > + rm "$URANDOM_SEED.new" > status=$? This status now only gets the result of the 'rm', which is not very interesting. I guess what we really need is whether the initial 'dd' that extracts from the pool succeeded. If that fails, then we should probably not update the saved seed, should we? Here's what I suggest instead: save_random_seed() { printf 'Saving random seed: ' status=1 if touch "$URANDOM_SEED" 2> /dev/null; then old_umask=$(umask) umask 077 dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null new_seed_len="$(wc -c "$URANDOM_SEED.tmp" 2> /dev/null |cut -d ' ' -f 1)" if [ "$new_seed_len" -eq "$pool_size" ]; then cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ | sha256sum \ | cut -d ' ' -f 1 > "$URANDOM_SEED.new" mv "$URANDOM_SEED.new" "$URANDOM_SEED" echo "OK" status=0 else echo "FAIL" fi rm -f "$URANDOM_SEED.tmp" umask "$old_umask" else echo "SKIP (read-only file system detected)" fi return "$status" } What do you think about that? Since this is a bit critical, I did not want to just do that change when applying. I do note that urandom should always return something, but this script will also need to work on older kernels, sometimes way back to oldish 3.x series, and my recollection of how urandom worked back then is a bit fuzzy. Are we sure it will always have returned enough? If so, then we can ditch the sanity check altogether. But then, if we failed to read anything from urandom, we'd just hash the old seed, which should not decrease the entropy it had, as the hash has the same size as the seed. Thoughts? Regards, Yann E. MORIN. > umask "$old_umask" > if [ "$status" -eq 0 ]; then > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From huth at tuxfamily.org Wed Mar 23 10:15:05 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Wed, 23 Mar 2022 11:15:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add more arm support In-Reply-To: <20220322170800.1872403-1-cohuck@redhat.com> References: <20220322170800.1872403-1-cohuck@redhat.com> Message-ID: <20220323111505.29ced52e@tuxfamily.org> Am Tue, 22 Mar 2022 18:08:00 +0100 schrieb Cornelia Huck : > Add some more cortexes with VHE, and enable aarch64. > > Signed-off-by: Cornelia Huck > --- > > Resent because I was subscribed with a different email address. > Sorry about the spam. > > --- > package/kvm-unit-tests/Config.in | 5 ++++- > package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157f0..b084375e62e9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > # On ARM, it uses virtualization extensions > default y if BR2_cortex_a7 || BR2_cortex_a12 || \ > BR2_cortex_a15 || BR2_cortex_a15_a7 || \ > - BR2_cortex_a17 || BR2_cortex_a17_a7 > + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ > + BR2_cortex_a55 || BR2_cortex_a75 || \ > + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ > + BR2_cortex_a76_a55 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e039f..d72eba02bc3b 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive > KVM_UNIT_TESTS_LICENSE = LGPL-2.0 > KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT > > -ifeq ($(BR2_arm),y) > +ifeq ($(BR2_aarch64),y) > +KVM_UNIT_TESTS_ARCH = aarch64 > +else ifeq ($(BR2_arm),y) > KVM_UNIT_TESTS_ARCH = arm > else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 Reviewed-by: Thomas Huth Note: This will likely have a contextual conflict with : https://lists.buildroot.org/pipermail/buildroot/2022-March/638940.html ... but I hope this will easy to sort out. Thomas From yann.morin.1998 at free.fr Wed Mar 23 11:07:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:07:06 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: add s390x support Message-ID: <20220323110309.58F65851C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9a011ab2c125b70c93e510812f00465a929142 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x is supported since https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a Signed-off-by: Fabrice Fontaine Reviewed-by: Thomas Huth Signed-off-by: Yann E. MORIN --- package/kvm-unit-tests/Config.in | 1 + package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157..a3d6756fb9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS BR2_cortex_a17 || BR2_cortex_a17_a7 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d610442e03..2d05d08067 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 +else ifeq ($(BR2_s390x),y) +KVM_UNIT_TESTS_ARCH = s390x else ifeq ($(BR2_x86_64),y) KVM_UNIT_TESTS_ARCH = x86_64 endif From yann.morin.1998 at free.fr Wed Mar 23 11:11:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:11:40 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: add more arm support Message-ID: <20220323110309.65464851CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7228dadd3719876c623cb95e611c6ec9ebf9346 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add some more cortexes with VHE, and enable aarch64. Signed-off-by: Cornelia Huck Reviewed-by: Thomas Huth Signed-off-by: Yann E. MORIN --- package/kvm-unit-tests/Config.in | 5 ++++- package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index a3d6756fb9..2b797e13b4 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS # On ARM, it uses virtualization extensions default y if BR2_cortex_a7 || BR2_cortex_a12 || \ BR2_cortex_a15 || BR2_cortex_a15_a7 || \ - BR2_cortex_a17 || BR2_cortex_a17_a7 + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ + BR2_cortex_a55 || BR2_cortex_a75 || \ + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ + BR2_cortex_a76_a55 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le default y if BR2_s390x diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 2d05d08067..e56436f802 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -ifeq ($(BR2_arm),y) +ifeq ($(BR2_aarch64),y) +KVM_UNIT_TESTS_ARCH = aarch64 +else ifeq ($(BR2_arm),y) KVM_UNIT_TESTS_ARCH = arm else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 From yann.morin.1998 at free.fr Wed Mar 23 11:12:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:12:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add s390x support In-Reply-To: <20220317223928.508338-1-fontaine.fabrice@gmail.com> References: <20220317223928.508338-1-fontaine.fabrice@gmail.com> Message-ID: <20220323111252.GM1566358@scaer> Fabrice, All, On 2022-03-17 23:39 +0100, Fabrice Fontaine spake thusly: > s390x is supported since > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kvm-unit-tests/Config.in | 1 + > package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157..a3d6756fb9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > BR2_cortex_a17 || BR2_cortex_a17_a7 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_s390x > > config BR2_PACKAGE_KVM_UNIT_TESTS > bool "kvm-unit-tests" > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e03..2d05d08067 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 > else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > KVM_UNIT_TESTS_ARCH = ppc64 > +else ifeq ($(BR2_s390x),y) > +KVM_UNIT_TESTS_ARCH = s390x > else ifeq ($(BR2_x86_64),y) > KVM_UNIT_TESTS_ARCH = x86_64 > endif > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 23 11:13:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:13:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add more arm support In-Reply-To: <20220322170800.1872403-1-cohuck@redhat.com> References: <20220322170800.1872403-1-cohuck@redhat.com> Message-ID: <20220323111323.GN1566358@scaer> Cornelia, All, On 2022-03-22 18:08 +0100, Cornelia Huck spake thusly: > Add some more cortexes with VHE, and enable aarch64. > > Signed-off-by: Cornelia Huck Applied to master, thanks. Regards, Yann E. MORIN. > --- > > Resent because I was subscribed with a different email address. > Sorry about the spam. > > --- > package/kvm-unit-tests/Config.in | 5 ++++- > package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157f0..b084375e62e9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > # On ARM, it uses virtualization extensions > default y if BR2_cortex_a7 || BR2_cortex_a12 || \ > BR2_cortex_a15 || BR2_cortex_a15_a7 || \ > - BR2_cortex_a17 || BR2_cortex_a17_a7 > + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ > + BR2_cortex_a55 || BR2_cortex_a75 || \ > + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ > + BR2_cortex_a76_a55 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e039f..d72eba02bc3b 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive > KVM_UNIT_TESTS_LICENSE = LGPL-2.0 > KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT > > -ifeq ($(BR2_arm),y) > +ifeq ($(BR2_aarch64),y) > +KVM_UNIT_TESTS_ARCH = aarch64 > +else ifeq ($(BR2_arm),y) > KVM_UNIT_TESTS_ARCH = arm > else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Wed Mar 23 12:47:53 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 12:47:53 +0000 Subject: [Buildroot] [Bug 14686] New: genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14686 Bug ID: 14686 Summary: genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: minor Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: roman at romanlebg.fr CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9251 --> https://bugs.busybox.net/attachment.cgi?id=9251&action=edit Last portion of the log Hello, I tried to build an image with a btrfs filesystem for a raspberry pi but at the end of the make command the genimage script look for a file ending by a .ext4 extension where it should be a .btrfs in my case. Setting the desired extension make the build succeed. Please note that I'm new to the embedded world so I may be missing a configuration somewhere, you can find the relevant part of the log attached. Thank you very much. -- You are receiving this mail because: You are on the CC list for the bug. From nicolas.cavallari at green-communications.fr Wed Mar 23 13:39:53 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Wed, 23 Mar 2022 14:39:53 +0100 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323091336.GL1566358@scaer> References: <20220323035233.140997-1-Jason@zx2c4.com> <20220323091336.GL1566358@scaer> Message-ID: <8ee34df1-a616-f9e4-a12d-777c055e83cf@green-communications.fr> On 23/03/2022 10:13, Yann E. MORIN wrote: >> As a final note, while this commit improves upon the status quo by >> removing a vulnerability, this shell script still does not actually >> initialize the RNG like it says it does. For initialization via a seed >> file, the RNDADDENTROPY ioctl must be used. > Is there a way to do that within a shell script? If so, would you be > kind enough to send a followup patch, please? No busybox applet is using RNDADDENTROPY, so it cannot probably be done in a shell script :( It's also unfortunate that the urandom(4) man page's example script tells people to write to /dev/urandom exactly the way S20urandom does. From jacques.samoun33 at gmail.com Wed Mar 23 14:01:23 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Wed, 23 Mar 2022 16:01:23 +0200 Subject: [Buildroot] cannot make the device_table In-Reply-To: <6aaa39df-836f-055e-6f40-a077f690b669@mind.be> References: <6aaa39df-836f-055e-6f40-a077f690b669@mind.be> Message-ID: Hi Arnout sorry for this delay. Indeed i was meaning doing a "ls -ls /dev/tty*" after boot. I was expecting to see there that the rights and group are like in the device_table.txt But it is not. Jacques On Tue, Mar 8, 2022 at 12:36 AM Arnout Vandecappelle wrote: > > > On 06/03/2022 13:46, Jacques Samoun wrote: > > Hello, > > despite all my tries, i just cannot make the "device_table" feature work > as > > described in the manual. > > Basically, i am trying to set 666 rights to /dev/tty + add a dialout > group, so i > > created the following file (device_table.txt" > > > > /dev/tty c 666 root dialout 5 0 - - - > > > > and have set the correct variable in menuconfig. I know for sure that > the build > > has handled this file ... but looking at the /dev/tty, it is clear that > nothing > > has happened, the permissions are still 600 and the dialout group has > not been set. > > When you say "looking at /dev/tty", do you mean looking at the contents > of the > tarball (or rootfs), or do you mean what appears after boot? Unless you > have a > very specific configuration (i.e. device managemnt: Static using device > table), > /dev will be a devtmpfs and the kernel will override anything you have set > in > device_table. So in that case you need dynamic handling using udev or mdev. > > > Regards, > Arnout > > > > > Am I missing something ? > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From neal.frager at amd.com Wed Mar 23 07:20:29 2022 From: neal.frager at amd.com (Neal Frager) Date: Wed, 23 Mar 2022 01:20:29 -0600 Subject: [Buildroot] [PATCH v1 1/1] DEVELOPERS: update email address Message-ID: <20220323072029.260340-1-neal.frager@amd.com> This patch updates my email address in the DEVELOPERS file. Signed-off-by: Neal Frager --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..58ed4f81cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2089,7 +2089,7 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager F: board/zynqmp/ F: configs/zynqmp_zcu102_defconfig -- 2.17.1 From yann.morin.1998 at free.fr Wed Mar 23 17:01:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 18:01:29 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update email address Message-ID: <20220323165239.4D09485212@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae1deebb9e78b5338f5f30fe4765e3eb9e5be3d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch updates my email address in the DEVELOPERS file. Signed-off-by: Neal Frager Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..58ed4f81cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2089,7 +2089,7 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager F: board/zynqmp/ F: configs/zynqmp_zcu102_defconfig From yann.morin.1998 at free.fr Wed Mar 23 17:02:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 18:02:35 +0100 Subject: [Buildroot] [PATCH v1 1/1] DEVELOPERS: update email address In-Reply-To: <20220323072029.260340-1-neal.frager@amd.com> References: <20220323072029.260340-1-neal.frager@amd.com> Message-ID: <20220323170235.GO1566358@scaer> Neal, All, On 2022-03-23 01:20 -0600, Neal Frager via buildroot spake thusly: > This patch updates my email address in the DEVELOPERS file. > > Signed-off-by: Neal Frager Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 942bb8fe9c..58ed4f81cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2089,7 +2089,7 @@ F: package/libevdev/ > F: package/pkg-qmake.mk > F: package/qt5/qt5opcua/ > > -N: Neal Frager > +N: Neal Frager > F: board/zynqmp/ > F: configs/zynqmp_zcu102_defconfig > > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Wed Mar 23 18:58:19 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 18:58:19 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 --- Comment #4 from Peter Seiderer --- (In reply to Yann E. MORIN from comment #3) As Fabrice said the user 'wants to install bluetooth firmware, wifi firmware or both firmwares', the user should select which one he would like to install... Why select one by default? Why handle differently as e.g. linux-firmware options? -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Wed Mar 23 18:06:14 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Mar 2022 19:06:14 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-19 References: <20220320082201.6612060B1F__26257.1082961344$1647764544$gmane$org@smtp3.osuosl.org> Message-ID: Am Sun, 20 Mar 2022 08:21:56 -0000 schrieb Thomas Petazzoni via buildroot: > Hello, > > Autobuild statistics for 2022-03-19 > =================================== Hi Thomas, it seems that there could be a problem with mails sent by the autobuilders. Since the beginning of March many days went by without the daily results: https://lore.kernel.org/buildroot/?q=Daily+results Regards, Bernd From yann.morin.1998 at free.fr Wed Mar 23 19:13:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 20:13:47 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-19 In-Reply-To: References: <20220320082201.6612060B1F__26257.1082961344$1647764544$gmane$org@smtp3.osuosl.org> Message-ID: <20220323191347.GA3631434@scaer> Bernd, All, On 2022-03-23 19:06 +0100, Bernd Kuhls spake thusly: > Am Sun, 20 Mar 2022 08:21:56 -0000 schrieb Thomas Petazzoni via buildroot: > > Autobuild statistics for 2022-03-19 > it seems that there could be a problem with mails sent by the autobuilders. > Since the beginning of March many days went by without the daily results: > https://lore.kernel.org/buildroot/?q=Daily+results Yes, we are aware of the issue. The script is more often than not killed by OOM... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Wed Mar 23 19:35:35 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 23 Mar 2022 20:35:35 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220323203535.307d504a@gmx.net> Hello Arnout, On Mon, 21 Mar 2022 22:56:41 +0100, Arnout Vandecappelle wrote: > On 17/03/2022 12:06, Sassen, Rutger wrote: > > When supporting multiple hardware targets, overlay_map.dtb might > > be needed to map overlay names to one of several implementations. > > I've added a reference to the documentation. > > > > > Signed-off-by: Rutger Sassen > > --- > > Changes v2 -> v3: > > - in Config.in use if statement instead of depends (suggested by Peter > > Seiderer) > > - mention the filename overlay_map.dtb in the help text (suggested by > > Peter Seiderer) > > > > Changes v1 -> v2: > > - instead of always copying overlay_map.dtb, make it configurable > > (suggested by Peter Seiderer) > > - do not copy README since it a special case, only needed when > > installing overlays to a non-standard location (suggested by Peter > > Seiderer) > > > > When supporting multiple hardware targets, overlay_map.dtb might > > be needed to map overlay names to one of several implementations. > > > > Signed-off-by: Rutger Sassen > > --- > > package/rpi-firmware/Config.in | 12 ++++++++++++ > > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > > index 8070dc3019..36054353f8 100644 > > --- a/package/rpi-firmware/Config.in > > +++ b/package/rpi-firmware/Config.in > > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > overlays, to support HATs (Hardware Attached on Top, add-on > > modules). > > > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > + > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > In the end, I don't think this option is very useful. So I removed it... Why to you think so? I am still convinced the overlay map should be optional (in favor of explicit overlay/feature loading/enabling instead of firmware magic) and the overlay map is only one way to achieve a hardware dependent feature loading (the other way is via Model Filters in config.txt, see [2])... > > > + bool "Install DTB overlay map" > > + default n > > + help > > + Say 'y' here if you need to support multiple hardware targets > > + and you need overlay_map.dtb for target dependent mapping of > > + overlay names to one of several overlay implementations. > > + > > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > + > > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > > bool "vcdbg" > > depends on BR2_arm # prebuilt arm binary, rpi-userland > > diff --git a/package/rpi-firmware/rpi-firmware.mk > > b/package/rpi-firmware/rpi-firmware.mk > > index b46a7f5270..800b560070 100644 > > --- a/package/rpi-firmware/rpi-firmware.mk > > +++ b/package/rpi-firmware/rpi-firmware.mk > > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > endef > > endif > > > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > > $(BINARIES_DIR)/rpi-firmware/overlays/ > > ... reducing the patch to just this single line. Which renders the review process to void (as the option was introduced by Rutger on my request and this is what I reviewed/acknowledged by the Reviewed-by tag)... > > Please check if the commit [1] does what you need, if not I can recover the > original patch with the Config.in option. +1 for the Config.in option ;-) Regards, Peter > > Applied to master, thanks. > > Regards, > Arnout > > [1] > https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 > > > > > +endef > > +endif > > + > > # Install prebuilt libraries if RPI_USERLAND not enabled > > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > > define RPI_FIRMWARE_INSTALL_TARGET_LIB > > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > > $(RPI_FIRMWARE_INSTALL_CONFIG) > > $(RPI_FIRMWARE_INSTALL_DTB) > > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > > endef > > > > $(eval $(generic-package)) > > -- > > 2.20.1 > > > > > > *Disclaimer* > > > > This email communication is CONFIDENTIAL. If you are not the intended recipient, > > you may not use, copy or disclose to anyone the message or any information > > contained in the message and I ask that you please notify me by return email and > > delete this communication immediately. Thank you. > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Wed Mar 23 19:49:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 23 Mar 2022 20:49:04 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: <20220323203535.307d504a@gmx.net> References: <20220323203535.307d504a@gmx.net> Message-ID: <20220323204904.3ebaeeb3@gmx.net> Hello *, On Wed, 23 Mar 2022 20:35:35 +0100, Peter Seiderer wrote: > Hello Arnout, > > On Mon, 21 Mar 2022 22:56:41 +0100, Arnout Vandecappelle wrote: > > > On 17/03/2022 12:06, Sassen, Rutger wrote: > > > When supporting multiple hardware targets, overlay_map.dtb might > > > be needed to map overlay names to one of several implementations. > > > > I've added a reference to the documentation. > > > > > > > > Signed-off-by: Rutger Sassen > > > --- > > > Changes v2 -> v3: > > > - in Config.in use if statement instead of depends (suggested by Peter > > > Seiderer) > > > - mention the filename overlay_map.dtb in the help text (suggested by > > > Peter Seiderer) > > > > > > Changes v1 -> v2: > > > - instead of always copying overlay_map.dtb, make it configurable > > > (suggested by Peter Seiderer) > > > - do not copy README since it a special case, only needed when > > > installing overlays to a non-standard location (suggested by Peter > > > Seiderer) > > > > > > When supporting multiple hardware targets, overlay_map.dtb might > > > be needed to map overlay names to one of several implementations. > > > > > > Signed-off-by: Rutger Sassen > > > --- > > > package/rpi-firmware/Config.in | 12 ++++++++++++ > > > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > > > 2 files changed, 19 insertions(+) > > > > > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > > > index 8070dc3019..36054353f8 100644 > > > --- a/package/rpi-firmware/Config.in > > > +++ b/package/rpi-firmware/Config.in > > > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > overlays, to support HATs (Hardware Attached on Top, add-on > > > modules). > > > > > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > + > > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > > > In the end, I don't think this option is very useful. So I removed it... > > Why to you think so? > > I am still convinced the overlay map should be optional (in favor of explicit > overlay/feature loading/enabling instead of firmware magic) and the > overlay map is only one way to achieve a hardware dependent feature loading > (the other way is via Model Filters in config.txt, see [2])... Missed to add the link [2] https://www.raspberrypi.com/documentation/computers/config_txt.html#model-filters Regards, Peter > > > > > > + bool "Install DTB overlay map" > > > + default n > > > + help > > > + Say 'y' here if you need to support multiple hardware targets > > > + and you need overlay_map.dtb for target dependent mapping of > > > + overlay names to one of several overlay implementations. > > > + > > > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > + > > > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > > > bool "vcdbg" > > > depends on BR2_arm # prebuilt arm binary, rpi-userland > > > diff --git a/package/rpi-firmware/rpi-firmware.mk > > > b/package/rpi-firmware/rpi-firmware.mk > > > index b46a7f5270..800b560070 100644 > > > --- a/package/rpi-firmware/rpi-firmware.mk > > > +++ b/package/rpi-firmware/rpi-firmware.mk > > > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > endef > > > endif > > > > > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > > > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > > > $(BINARIES_DIR)/rpi-firmware/overlays/ > > > > ... reducing the patch to just this single line. > > Which renders the review process to void (as the option was introduced by > Rutger on my request and this is what I reviewed/acknowledged by the Reviewed-by tag)... > > > > > Please check if the commit [1] does what you need, if not I can recover the > > original patch with the Config.in option. > > +1 for the Config.in option ;-) > > Regards, > Peter > > > > > Applied to master, thanks. > > > > Regards, > > Arnout > > > > [1] > > https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 > > > > > > > > > +endef > > > +endif > > > + > > > # Install prebuilt libraries if RPI_USERLAND not enabled > > > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > > > define RPI_FIRMWARE_INSTALL_TARGET_LIB > > > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > > > $(RPI_FIRMWARE_INSTALL_CONFIG) > > > $(RPI_FIRMWARE_INSTALL_DTB) > > > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > > > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > > > endef > > > > > > $(eval $(generic-package)) > > > -- > > > 2.20.1 > > > > > > > > > *Disclaimer* > > > > > > This email communication is CONFIDENTIAL. If you are not the intended recipient, > > > you may not use, copy or disclose to anyone the message or any information > > > contained in the message and I ask that you please notify me by return email and > > > delete this communication immediately. Thank you. > > > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Wed Mar 23 19:49:25 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 19:49:25 +0000 Subject: [Buildroot] [Bug 14686] genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14686 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Arnout Vandecappelle --- The genimage.cfg that is shipped with Buildroot is only meant for the Buildroot configuration. If you change the configuration, you're also expected to change other parts accordingly. -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Wed Mar 23 20:06:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:06:14 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: <20220323203535.307d504a@gmx.net> References: <20220323203535.307d504a@gmx.net> Message-ID: <140ba00d-9876-4d53-e00a-c6469551b7a7@mind.be> On 23/03/2022 20:35, Peter Seiderer wrote: > Hello Arnout, > > On Mon, 21 Mar 2022 22:56:41 +0100, Arnout Vandecappelle wrote: > >> On 17/03/2022 12:06, Sassen, Rutger wrote: >>> When supporting multiple hardware targets, overlay_map.dtb might >>> be needed to map overlay names to one of several implementations. >> >> I've added a reference to the documentation. >> >>> >>> Signed-off-by: Rutger Sassen >>> --- >>> Changes v2 -> v3: >>> - in Config.in use if statement instead of depends (suggested by Peter >>> Seiderer) >>> - mention the filename overlay_map.dtb in the help text (suggested by >>> Peter Seiderer) >>> >>> Changes v1 -> v2: >>> - instead of always copying overlay_map.dtb, make it configurable >>> (suggested by Peter Seiderer) >>> - do not copy README since it a special case, only needed when >>> installing overlays to a non-standard location (suggested by Peter >>> Seiderer) >>> >>> When supporting multiple hardware targets, overlay_map.dtb might >>> be needed to map overlay names to one of several implementations. >>> >>> Signed-off-by: Rutger Sassen >>> --- >>> package/rpi-firmware/Config.in | 12 ++++++++++++ >>> package/rpi-firmware/rpi-firmware.mk | 7 +++++++ >>> 2 files changed, 19 insertions(+) >>> >>> diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in >>> index 8070dc3019..36054353f8 100644 >>> --- a/package/rpi-firmware/Config.in >>> +++ b/package/rpi-firmware/Config.in >>> @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> overlays, to support HATs (Hardware Attached on Top, add-on >>> modules). >>> >>> +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> + >>> +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP >> >> In the end, I don't think this option is very useful. So I removed it... > > Why to you think so? > > I am still convinced the overlay map should be optional (in favor of explicit > overlay/feature loading/enabling instead of firmware magic) and the > overlay map is only one way to achieve a hardware dependent feature loading > (the other way is via Model Filters in config.txt, see [2])... But AFAIU the presence of the overlay map doesn't stop you from using the other mechanisms, right? It's similar to how we install all the dtbo files even though maybe only one of them is relevant for you. If the presence of the overlay map does have an effect (i.e. if you'd need to remove it in the post-build script to get a correctly booting system), then the option indeed does make sense. Context: we want to avoid adding too many Config.in options, to make the complexity of the menus manageable. We make something a Config.in option only if it has a significant impact on rootfs size, or if it makes the difference between working and non-working system. Regards, Arnout > >> >>> + bool "Install DTB overlay map" >>> + default n >>> + help >>> + Say 'y' here if you need to support multiple hardware targets >>> + and you need overlay_map.dtb for target dependent mapping of >>> + overlay names to one of several overlay implementations. >>> + >>> +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> + >>> config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG >>> bool "vcdbg" >>> depends on BR2_arm # prebuilt arm binary, rpi-userland >>> diff --git a/package/rpi-firmware/rpi-firmware.mk >>> b/package/rpi-firmware/rpi-firmware.mk >>> index b46a7f5270..800b560070 100644 >>> --- a/package/rpi-firmware/rpi-firmware.mk >>> +++ b/package/rpi-firmware/rpi-firmware.mk >>> @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> endef >>> endif >>> >>> +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) >>> +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP >>> + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb >>> $(BINARIES_DIR)/rpi-firmware/overlays/ >> >> ... reducing the patch to just this single line. > > Which renders the review process to void (as the option was introduced by > Rutger on my request and this is what I reviewed/acknowledged by the Reviewed-by tag)... > >> >> Please check if the commit [1] does what you need, if not I can recover the >> original patch with the Config.in option. > > +1 for the Config.in option ;-) > > Regards, > Peter > >> >> Applied to master, thanks. >> >> Regards, >> Arnout >> >> [1] >> https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 >> >> >> >>> +endef >>> +endif >>> + >>> # Install prebuilt libraries if RPI_USERLAND not enabled >>> ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) >>> define RPI_FIRMWARE_INSTALL_TARGET_LIB >>> @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS >>> $(RPI_FIRMWARE_INSTALL_CONFIG) >>> $(RPI_FIRMWARE_INSTALL_DTB) >>> $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) >>> + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) >>> endef >>> >>> $(eval $(generic-package)) >>> -- >>> 2.20.1 >>> >>> >>> *Disclaimer* >>> >>> This email communication is CONFIDENTIAL. If you are not the intended recipient, >>> you may not use, copy or disclose to anyone the message or any information >>> contained in the message and I ask that you please notify me by return email and >>> delete this communication immediately. Thank you. >>> >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > From Jason at zx2c4.com Wed Mar 23 20:06:31 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 23 Mar 2022 14:06:31 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323091336.GL1566358@scaer> References: <20220323035233.140997-1-Jason@zx2c4.com> <20220323091336.GL1566358@scaer> Message-ID: Hi Yann, On Wed, Mar 23, 2022 at 3:13 AM Yann E. MORIN wrote: > > As a result of this behavior, which may be understandably surprising to > > you, writing a good seed file into /dev/urandom and then saving a new > > s/to you// > > (no "personal" address in a commit message) Ack. > > > seed file immediately after is dangerous, because the new seed file may > > wind up being entirely deterministic, even if the old seed file was > > quite good. > > > > I fixed this in systemd with > > s/I fixed this/This has been fixed/ Ack. > > As a final note, while this commit improves upon the status quo by > > removing a vulnerability, this shell script still does not actually > > initialize the RNG like it says it does. For initialization via a seed > > file, the RNDADDENTROPY ioctl must be used. > > Is there a way to do that within a shell script? If so, would you be > kind enough to send a followup patch, please? No, there isn't, at all. But I'm writing some code now that I hope to release as a standalone utility, and upstream into busybox/util-linux that should make it accessible. When that happens, I'll keep this mailing list informed, and we can move forward then. > Here's what I suggest instead: Your suggestion looks good, with a few small tweaks that I'll put in v2. > I do note that urandom should always return something, but this script > will also need to work on older kernels, sometimes way back to oldish > 3.x series, and my recollection of how urandom worked back then is a bit > fuzzy. Are we sure it will always have returned enough? If so, then we > can ditch the sanity check altogether. > > But then, if we failed to read anything from urandom, we'd just hash the > old seed, which should not decrease the entropy it had, as the hash has > the same size as the seed. Since this isn't crediting anything anyway, I don't think the sanity check matters. The randomness might be total junk. It might not. We might get enough. There might be a bug. We don't care, because there's nothing we can do if it fails from shell, and we're not crediting, so it's not a security risk so long as we don't regress. v2 coming up. Jason From Jason at zx2c4.com Wed Mar 23 20:07:31 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 23 Mar 2022 14:07:31 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: Message-ID: <20220323200731.170409-1-Jason@zx2c4.com> Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/S20urandom | 39 +++++++++++++----------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" -- 2.35.1 From arnout at mind.be Wed Mar 23 20:24:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:24:15 +0100 Subject: [Buildroot] [PATCH 1/2] Revert "package/ola: drop autoreconf" In-Reply-To: <20220313103737.751528-1-fontaine.fabrice@gmail.com> References: <20220313103737.751528-1-fontaine.fabrice@gmail.com> Message-ID: <84a7799a-3b41-3253-d5af-e664e68ee215@mind.be> On 13/03/2022 11:37, Fabrice Fontaine wrote: > This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because > for an unknown reason, the build fails if autoreconf is dropped: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > > Fixes: > - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 > Signed-off-by: Fabrice Fontaine Both applied to master. I also added a commit that adds a comment to AUTORECONF, as suggested by Thomas. Regards, Arnout > --- > package/ola/ola.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 1874350784..5090076175 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE > OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) > OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE > OLA_INSTALL_STAGING = YES > +OLA_AUTORECONF = YES > > # util-linux provides uuid lib > OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola From arnout at mind.be Wed Mar 23 20:24:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:24:47 +0100 Subject: [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <66140637-e996-c494-aab2-52fcd102eda0@mind.be> On 12/03/2022 21:16, Julien Olivain wrote: > This commit reorders dependencies and Kconfig package options > alphabetically for better maintainability. > > This commit does not change anything else. > > Signed-off-by: Julien Olivain All four applied to master, thanks! Nice series! Regards, Arnout > --- > package/poco/Config.in | 82 +++++++++++++++++++++--------------------- > package/poco/poco.mk | 28 +++++++-------- > 2 files changed, 55 insertions(+), 55 deletions(-) > > diff --git a/package/poco/Config.in b/package/poco/Config.in > index dd87ee36bb..df3d3cbc66 100644 > --- a/package/poco/Config.in > +++ b/package/poco/Config.in > @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO > > comment "poco components" > > +config BR2_PACKAGE_POCO_CPP_PARSER > + bool "cpp_parser" > + > +config BR2_PACKAGE_POCO_CRYPTO > + bool "crypto" > + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL > + select BR2_PACKAGE_OPENSSL > + > +config BR2_PACKAGE_POCO_DATA > + bool > + > +config BR2_PACKAGE_POCO_DATA_MYSQL > + bool "mysql" > + depends on BR2_USE_MMU # mysql > + select BR2_PACKAGE_MYSQL > + select BR2_PACKAGE_POCO_DATA > + > +config BR2_PACKAGE_POCO_DATA_SQLITE > + bool "sqlite" > + select BR2_PACKAGE_POCO_DATA > + select BR2_PACKAGE_SQLITE > + > config BR2_PACKAGE_POCO_JSON > bool "json" > > -config BR2_PACKAGE_POCO_XML > - bool "xml" > - select BR2_PACKAGE_EXPAT > +config BR2_PACKAGE_POCO_JWT > + bool "jwt" > + select BR2_PACKAGE_POCO_CRYPTO > + select BR2_PACKAGE_POCO_JSON > > -config BR2_PACKAGE_POCO_UTIL > - bool "util" > - select BR2_PACKAGE_POCO_XML > +config BR2_PACKAGE_POCO_MONGODB > + bool "mongodb" > + select BR2_PACKAGE_POCO_NET > > config BR2_PACKAGE_POCO_NET > bool "net" > > -config BR2_PACKAGE_POCO_CRYPTO > - bool "crypto" > - select BR2_PACKAGE_OPENSSL > - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL > - > config BR2_PACKAGE_POCO_NETSSL_OPENSSL > bool "netssl_openssl" > - select BR2_PACKAGE_POCO_NET > - select BR2_PACKAGE_POCO_CRYPTO > - select BR2_PACKAGE_POCO_UTIL > select BR2_PACKAGE_OPENSSL > - > -config BR2_PACKAGE_POCO_ZIP > - bool "zip" > - select BR2_PACKAGE_POCO_XML > + select BR2_PACKAGE_POCO_CRYPTO > select BR2_PACKAGE_POCO_NET > select BR2_PACKAGE_POCO_UTIL > > -config BR2_PACKAGE_POCO_CPP_PARSER > - bool "cpp_parser" > - > config BR2_PACKAGE_POCO_PDF > bool "pdf" > select BR2_PACKAGE_POCO_JSON > @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS > bool "redis" > select BR2_PACKAGE_POCO_NET > > -config BR2_PACKAGE_POCO_MONGODB > - bool "mongodb" > - select BR2_PACKAGE_POCO_NET > - > -config BR2_PACKAGE_POCO_DATA > - bool > - > -config BR2_PACKAGE_POCO_DATA_SQLITE > - bool "sqlite" > - select BR2_PACKAGE_POCO_DATA > - select BR2_PACKAGE_SQLITE > +config BR2_PACKAGE_POCO_UTIL > + bool "util" > + select BR2_PACKAGE_POCO_XML > > -config BR2_PACKAGE_POCO_DATA_MYSQL > - bool "mysql" > - depends on BR2_USE_MMU # mysql > - select BR2_PACKAGE_POCO_DATA > - select BR2_PACKAGE_MYSQL > +config BR2_PACKAGE_POCO_XML > + bool "xml" > + select BR2_PACKAGE_EXPAT > > -config BR2_PACKAGE_POCO_JWT > - bool "jwt" > - select BR2_PACKAGE_POCO_JSON > - select BR2_PACKAGE_POCO_CRYPTO > +config BR2_PACKAGE_POCO_ZIP > + bool "zip" > + select BR2_PACKAGE_POCO_NET > + select BR2_PACKAGE_POCO_UTIL > + select BR2_PACKAGE_POCO_XML > > endif # BR2_PACKAGE_POCO > > diff --git a/package/poco/poco.mk b/package/poco/poco.mk > index 857f215e3a..81409ffec4 100644 > --- a/package/poco/poco.mk > +++ b/package/poco/poco.mk > @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE > POCO_CPE_ID_VENDOR = pocoproject > POCO_INSTALL_STAGING = YES > > -POCO_DEPENDENCIES = zlib pcre \ > - $(if $(BR2_PACKAGE_POCO_XML),expat) \ > +POCO_DEPENDENCIES = pcre zlib \ > $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ > - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ > + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ > $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ > - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) > + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ > + $(if $(BR2_PACKAGE_POCO_XML),expat) > > POCO_OMIT = Data/ODBC PageCompiler \ > + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ > + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ > + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ > + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ > + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ > $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ > - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ > - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ > + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ > + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ > $(if $(BR2_PACKAGE_POCO_NET),,Net) \ > $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ > - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ > - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ > - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ > $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ > $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ > - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ > - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ > - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ > - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ > - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) > + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ > + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ > + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) > > ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) > POCO_CONF_OPTS += --no-fpenvironment --no-wstring From arnout at mind.be Wed Mar 23 20:25:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:25:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix CVE comments In-Reply-To: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> References: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> Message-ID: <9ce22670-b709-9046-2107-a475e763d43e@mind.be> On 13/03/2022 12:19, Fabrice Fontaine wrote: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE > comments > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5base/qt5base.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index a703481aed..f8edfe0847 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -14,8 +14,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > QT5BASE_INSTALL_STAGING = YES > QT5BASE_SYNC_QT_HEADERS = YES > > -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > > # A few comments: From arnout at mind.be Wed Mar 23 20:25:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build on sparc v8 In-Reply-To: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> References: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> Message-ID: On 13/03/2022 12:26, Fabrice Fontaine wrote: > Fix the following build failure on sparc v8 raised since commit > 5770a645a3a49a3f0f02972131a4ff5283b4c11e: > > ERROR: detected a std::atomic implementation that fails for function pointers. > Please apply the patch corresponding to your Standard Library vendor, found in > qtbase/config.tests/atomicfptr > > Fixes: > - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...figure.json-fix-atomicfptr-detection.patch | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch > > diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch > new file mode 100644 > index 0000000000..5f0f81a4bd > --- /dev/null > +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch > @@ -0,0 +1,48 @@ > +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 13 Mar 2022 12:05:04 +0100 > +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection > + > +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed > +to avoid the following build failure: > + > +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp > +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl > +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': > +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' > +> collect2: error: ld returned 1 exit status > +> make[1]: *** [Makefile:69: atomicfptr] Error 1 > + > +[...] > + > +ERROR: detected a std::atomic implementation that fails for function pointers. > +Please apply the patch corresponding to your Standard Library vendor, found in > + qtbase/config.tests/atomicfptr > + > +Fixes: > + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] > +--- > + src/corelib/configure.json | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/src/corelib/configure.json b/src/corelib/configure.json > +index 9b5d19d41b..ac88f5856c 100644 > +--- a/src/corelib/configure.json > ++++ b/src/corelib/configure.json > +@@ -309,7 +309,8 @@ > + "test(fptr);" > + ], > + "qmake": "CONFIG += c++11" > +- } > ++ }, > ++ "use": "libatomic" > + }, > + "clock-monotonic": { > + "label": "POSIX monotonic clock", > +-- > +2.34.1 > + From arnout at mind.be Wed Mar 23 20:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:26:02 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nbd: security bump to version 3.24 In-Reply-To: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> References: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> Message-ID: <29dfce7f-a6f5-415b-aaf0-3efca36fa8d8@mind.be> On 13/03/2022 12:33, Fabrice Fontaine wrote: > Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an > integer overflow with a resultant heap-based buffer overflow. A value of > 0xffffffff in the name length field will cause a zero-sized buffer to be > allocated for the name, resulting in a write to a dangling pointer. This > issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME > messages. > > Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a > stack-based buffer overflow. An attacker can cause a buffer overflow in > the parsing of the name field by sending a crafted NBD_OPT_INFO or > NBD_OPT_GO message with an large value as the length of the name. > > https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - Tag as a security bump and add CVEs > > package/nbd/nbd.hash | 8 ++++---- > package/nbd/nbd.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash > index f0df35bc27..f58a89bf9a 100644 > --- a/package/nbd/nbd.hash > +++ b/package/nbd/nbd.hash > @@ -1,7 +1,7 @@ > -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ > -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz > -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz > +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ > +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz > +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz > > # Locally calculated > -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz > +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk > index 0a7f08b2cf..f0fb23910e 100644 > --- a/package/nbd/nbd.mk > +++ b/package/nbd/nbd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NBD_VERSION = 3.21 > +NBD_VERSION = 3.24 > NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz > NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) > NBD_CONF_OPTS = --enable-lfs From arnout at mind.be Wed Mar 23 20:26:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:26:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 In-Reply-To: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> References: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> Message-ID: <89244aaa-9676-4dab-70ed-0be5e5ab5c8d@mind.be> On 13/03/2022 12:47, Fabrice Fontaine wrote: > Fix CVE-2022-21716: Twisted is an event-based framework for internet > applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH > client and server implement is able to accept an infinite amount of data > for the peer's SSH version identifier. This ends up with a buffer using > all the available memory. The attach is a simple as `nc -rv localhost 22 > < /dev/zero`. A patch is available in version 22.2.0. There are > currently no known workarounds. > > https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-twisted/python-twisted.hash | 4 ++-- > package/python-twisted/python-twisted.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash > index 8f0935e4f0..63da0125b8 100644 > --- a/package/python-twisted/python-twisted.hash > +++ b/package/python-twisted/python-twisted.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/twisted/json > -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz > -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz > +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz > +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz > # Locally computed sha256 > sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE > diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk > index 8e867cfb58..e5d643ec05 100644 > --- a/package/python-twisted/python-twisted.mk > +++ b/package/python-twisted/python-twisted.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TWISTED_VERSION = 22.1.0 > +PYTHON_TWISTED_VERSION = 22.2.0 > PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz > -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 > +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 > PYTHON_TWISTED_SETUP_TYPE = setuptools > PYTHON_TWISTED_LICENSE = MIT > PYTHON_TWISTED_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 23 20:26:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:26:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot: bump version to 2.3.18 In-Reply-To: <20220313125540.3017299-1-bernd.kuhls@t-online.de> References: <20220313125540.3017299-1-bernd.kuhls@t-online.de> Message-ID: On 13/03/2022 13:55, Bernd Kuhls wrote: > Release notes: > https://dovecot.org/pipermail/dovecot-news/2022-February/000470.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/dovecot/dovecot.hash | 2 +- > package/dovecot/dovecot.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash > index 0363b6e922..e70b266d92 100644 > --- a/package/dovecot/dovecot.hash > +++ b/package/dovecot/dovecot.hash > @@ -1,5 +1,5 @@ > # Locally computed after checking signature > -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz > +sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz > sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL > sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT > diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk > index fb299a8e45..053462c6dd 100644 > --- a/package/dovecot/dovecot.mk > +++ b/package/dovecot/dovecot.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > DOVECOT_VERSION_MAJOR = 2.3 > -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 > +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 > DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) > DOVECOT_INSTALL_STAGING = YES > DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From arnout at mind.be Wed Mar 23 20:08:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:08:58 +0100 Subject: [Buildroot] [git commit] package/poco: reorder options alphabetically Message-ID: <20220323201808.3AEF8854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39c3ad67401fadf8ebcb7d591649d821dc02411a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit reorders dependencies and Kconfig package options alphabetically for better maintainability. This commit does not change anything else. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 82 +++++++++++++++++++++++++------------------------- package/poco/poco.mk | 28 ++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index dd87ee36bb..df3d3cbc66 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_CPP_PARSER + bool "cpp_parser" + +config BR2_PACKAGE_POCO_CRYPTO + bool "crypto" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL + +config BR2_PACKAGE_POCO_DATA + bool + +config BR2_PACKAGE_POCO_DATA_MYSQL + bool "mysql" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_POCO_DATA + +config BR2_PACKAGE_POCO_DATA_SQLITE + bool "sqlite" + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_SQLITE + config BR2_PACKAGE_POCO_JSON bool "json" -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_JSON -config BR2_PACKAGE_POCO_UTIL - bool "util" - select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_MONGODB + bool "mongodb" + select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET bool "net" -config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL - config BR2_PACKAGE_POCO_NETSSL_OPENSSL bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML + select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL -config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" - config BR2_PACKAGE_POCO_PDF bool "pdf" select BR2_PACKAGE_POCO_JSON @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS bool "redis" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" - select BR2_PACKAGE_POCO_NET - -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE +config BR2_PACKAGE_POCO_UTIL + bool "util" + select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_XML + bool "xml" + select BR2_PACKAGE_EXPAT -config BR2_PACKAGE_POCO_JWT - bool "jwt" - select BR2_PACKAGE_POCO_JSON - select BR2_PACKAGE_POCO_CRYPTO +config BR2_PACKAGE_POCO_ZIP + bool "zip" + select BR2_PACKAGE_POCO_NET + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML endif # BR2_PACKAGE_POCO diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 857f215e3a..81409ffec4 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ +POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring From arnout at mind.be Wed Mar 23 20:09:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:01 +0100 Subject: [Buildroot] [git commit] package/poco: use poco component names in kconfig variables Message-ID: <20220323201808.439FD854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=386b0d6c5e9c6c9ece230ad63b25f126e249a37f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For clarity, use the same names used in documentation, and component selection in configure. Valid poco component names are defined in: https://github.com/pocoproject/poco/blob/poco-1.11.1-release/components Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index df3d3cbc66..79ffac741d 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -29,10 +29,10 @@ if BR2_PACKAGE_POCO comment "poco components" config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" + bool "CppParser" config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" + bool "Crypto" select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL @@ -40,58 +40,58 @@ config BR2_PACKAGE_POCO_DATA bool config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" + bool "Data/MySQL" depends on BR2_USE_MMU # mysql select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" + bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_SQLITE config BR2_PACKAGE_POCO_JSON - bool "json" + bool "JSON" config BR2_PACKAGE_POCO_JWT - bool "jwt" + bool "JWT" select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_JSON config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" + bool "MongoDB" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET - bool "net" + bool "Net" config BR2_PACKAGE_POCO_NETSSL_OPENSSL - bool "netssl_openssl" + bool "NetSSL_OpenSSL" select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL config BR2_PACKAGE_POCO_PDF - bool "pdf" + bool "PDF" select BR2_PACKAGE_POCO_JSON select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_REDIS - bool "redis" + bool "Redis" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_UTIL - bool "util" + bool "Util" select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_XML - bool "xml" + bool "XML" select BR2_PACKAGE_EXPAT config BR2_PACKAGE_POCO_ZIP - bool "zip" + bool "Zip" select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML From arnout at mind.be Wed Mar 23 20:23:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:46 +0100 Subject: [Buildroot] [git commit] package/dovecot: bump version to 2.3.18 Message-ID: <20220323201808.A3DFE854E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a46311b5e0680609d3432d4256fbe83558c3b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://dovecot.org/pipermail/dovecot-news/2022-February/000470.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 0363b6e922..e70b266d92 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz +sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fb299a8e45..053462c6dd 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: fix CVE comments Message-ID: <20220323201808.7CD81854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b2adbff1585b2581c76c9abcc8d5529134be60c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE comments Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef02edfc1d..4418f0d3ba 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,8 +12,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 # A few comments: From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/nbd: security bump to version 3.24 Message-ID: <20220323201808.92906854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf2e459bb9fc9fe57147313cda35f7022172e6e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs From arnout at mind.be Wed Mar 23 20:09:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:10 +0100 Subject: [Buildroot] [git commit] Revert "package/ola: drop autoreconf" Message-ID: <20220323201808.62D8B854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c494b5f22da88bae860221f23b494e221a47e44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because for an unknown reason, the build fails if autoreconf is dropped: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) Fixes: - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 1874350784..5090076175 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/ola: add comment to AUTORECONF Message-ID: <20220323201808.6B288854E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3c7e03e2ad9908e91246260b90c2dba175c7e3c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As explained in the previous commit, AUTORECONF is necessary to handle a build failure. Add a comment to make sure it doesn't get removed again in the future. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..557f454fe9 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES +# Bundled Makefile.in don't link correctly, regenerate with recent automake OLA_AUTORECONF = YES # util-linux provides uuid lib From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: fix build on sparc v8 Message-ID: <20220323201808.85584854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee6d734f08e772202320841208f11a1a239ea49b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on sparc v8 raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: ERROR: detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr Fixes: - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...b-configure.json-fix-atomicfptr-detection.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 0000000000..5f0f81a4bd --- /dev/null +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + From arnout at mind.be Wed Mar 23 20:23:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:46 +0100 Subject: [Buildroot] [git commit] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220323201808.9B4E9854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a3ca0932155498747c46d6f902a939d55c39f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/ola: fix build with libexecinfo Message-ID: <20220323201808.73A01854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=803bc68d59a46ea68540f437ced6334cf3335a7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: common/.libs/libolacommon.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/4362b20d786a0f44268ec32a689c23ac6d3b71c6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 557f454fe9..1b55ca440a 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -54,6 +54,11 @@ endef OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OLA_DEPENDENCIES += libexecinfo +OLA_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ## OLA Bindings and Interface selections ifeq ($(BR2_PACKAGE_OLA_WEB),y) From arnout at mind.be Wed Mar 23 20:09:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:04 +0100 Subject: [Buildroot] [git commit] package/poco: add Data/PostgreSQL support Message-ID: <20220323201808.4D2F7854E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fd31f073981a2cf586264bcde00ccd17ef9deb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PostgreSQL support was introduced in poco v1.10.0, in commit: https://github.com/pocoproject/poco/commit/8cec8f6451b9a0ead80f655eee986040863e3526 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 6 ++++++ package/poco/poco.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/package/poco/Config.in b/package/poco/Config.in index 79ffac741d..714e40f447 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -45,6 +45,12 @@ config BR2_PACKAGE_POCO_DATA_MYSQL select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA +config BR2_PACKAGE_POCO_DATA_PGSQL + bool "Data/PostgreSQL" + depends on BR2_USE_MMU # postgresql + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_POSTGRESQL + config BR2_PACKAGE_POCO_DATA_SQLITE bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 81409ffec4..119711f3fd 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -15,6 +15,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_POCO_XML),expat) @@ -24,6 +25,7 @@ POCO_OMIT = Data/ODBC PageCompiler \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),,Data/PostgreSQL) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ From arnout at mind.be Wed Mar 23 20:09:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:07 +0100 Subject: [Buildroot] [git commit] package/poco: bump to version 1.11.1 Message-ID: <20220323201808.58323854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5086d75cc8613a9730150662ca83dfa4592dfef0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit drop patches, as they are now included upstream or no longer needed. It also introduces a new patch to fix a build failure for nios2. MySQL include and library paths can now be provided in variables passed to the build command. Variables MYSQL_{INC,LIB}DIR are renamed to POCO_MYSQL_{INCLUDE,LIB}. For PostgreSQL support, variables POCO_PGSQL_{INCLUDE,LIB} are also passed the same way to the build command. This poco version 1.11.1 introduces a new ActiveRecord component. For changelog, see: https://raw.githubusercontent.com/pocoproject/poco/poco-1.11.1-release/CHANGELOG Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...OS2-double-conversion-detection-to-fix-co.patch | 36 +++++++++++++++++++ ...-poco-add-the-staging-path-to-search-path.patch | 40 ---------------------- .../poco/0002-Add-support-for-m68000-1856.patch | 32 ----------------- ...src-utils.h-backport-double-conversion-ch.patch | 34 ------------------ package/poco/Config.in | 4 +++ package/poco/poco.hash | 2 +- package/poco/poco.mk | 9 +++-- 7 files changed, 47 insertions(+), 110 deletions(-) diff --git a/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch new file mode 100644 index 0000000000..7b31729347 --- /dev/null +++ b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch @@ -0,0 +1,36 @@ +From d328829e9cb8b9fde9e70b07f2b991972cf474d1 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 12 Mar 2022 10:34:04 +0100 +Subject: [PATCH] Add back NIOS2 double conversion detection to fix compile + errors + +The commit +https://github.com/pocoproject/poco/commit/558324f672d824300498060aff63356bc6bb8097 + +removed the nios2 support, which was originally added in +https://github.com/pocoproject/poco/commit/e7b91e8125d6910b53f94de5be4bb53f38dc77c1 + +This commit add it back. + +Signed-off-by: Julien Olivain +--- + Foundation/src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 4328344d7..0a222c77d 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -102,7 +102,8 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__EMSCRIPTEN__) ++ defined(__EMSCRIPTEN__) || \ ++ defined(nios2) || defined(__nios2) || defined(__nios2__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) +-- +2.35.1 + diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch deleted file mode 100644 index fbabfc8f26..0000000000 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH] poco: add the staging path to search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach -[J??rg: Update to version 1.6.1 from github] -Signed-off-by: J??rg Krause -[Julien: Rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Data/MySQL/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 64a7d3f82..955fee2d4 100644 ---- a/Data/MySQL/Makefile -+++ b/Data/MySQL/Makefile -@@ -6,8 +6,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ --- -2.26.2 - diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch deleted file mode 100644 index bc04a9bf69..0000000000 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof -Date: Wed, 23 Aug 2017 16:50:51 +0200 -Subject: [PATCH] Add support for m68000 (#1856) - -Originally taken from - -https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da - -Signed-off-by: Thomas Petazzoni -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index c87cee13c..e891c0f10 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -66,6 +66,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. --- -2.26.2 - diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch deleted file mode 100644 index c06eebe8b0..0000000000 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 Jul 2018 15:37:47 +0200 -Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for - AArch64 BE support - -This commit, identical to upstream double-conversion commit -https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a -allows Poco to build on AArch64 big-endian. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/pocoproject/poco/pull/2378 -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index e891c0f10..892f7db18 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__riscv) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) --- -2.26.2 - diff --git a/package/poco/Config.in b/package/poco/Config.in index 714e40f447..699495a241 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,6 +28,10 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_ACTIVERECORD + bool "ActiveRecord" + select BR2_PACKAGE_POCO_XML + config BR2_PACKAGE_POCO_CPP_PARSER bool "CppParser" diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 2a2629733d..78d7d0b96e 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz +sha256 2412a5819a239ff2ee58f81033bcc39c40460d7a8b330013a687c8c0bd2b4ac0 poco-1.11.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 119711f3fd..fcf480c2a8 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.10.1 +POCO_VERSION = 1.11.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -20,6 +20,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \ $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ @@ -74,8 +75,10 @@ endef # Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25) define POCO_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ - MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ - MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_INCLUDE=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql \ + POCO_PGSQL_INCLUDE=$(STAGING_DIR)/usr/include/postgresql \ + POCO_PGSQL_LIB=$(STAGING_DIR)/usr/lib/postgresql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef From arnout at mind.be Wed Mar 23 20:43:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:43:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 In-Reply-To: <20220313130424.3046857-1-bernd.kuhls@t-online.de> References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> Message-ID: <535e8a72-f175-8c1b-9cb9-e8156143796c@mind.be> On 13/03/2022 14:04, Bernd Kuhls wrote: > Changelog: https://curl.se/changes.html > > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 > > Signed-off-by: Bernd Kuhls Applied to master, after dropping the NSS option entirely, and with an explanation in the commit message why we choose that rather than passing --with-nss-deprecated. Regards, Arnout > --- > package/libcurl/libcurl.hash | 6 +++--- > package/libcurl/libcurl.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash > index 63d6ba306c..4be245041c 100644 > --- a/package/libcurl/libcurl.hash > +++ b/package/libcurl/libcurl.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://curl.se/download/curl-7.81.0.tar.xz.asc > +# https://curl.se/download/curl-7.82.0.tar.xz.asc > # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 > -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz > -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING > +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz > +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 20ebb4f271..863cc268b4 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBCURL_VERSION = 7.81.0 > +LIBCURL_VERSION = 7.82.0 > LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz > LIBCURL_SITE = https://curl.se/download > LIBCURL_DEPENDENCIES = host-pkgconf \ From arnout at mind.be Wed Mar 23 20:44:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:44:00 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.82.0 Message-ID: <20220323203601.D784585538@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8afb945bf04816a0df594f8b310f5f9994b55104 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 The NSS crypto backend requires a special option now, without it configure errors out with: configure: error: NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md Since it will be removed entirely soon anyway, and since this version doesn't fix any CVEs so doesn't need to be backported to stable branches, drop the NSS option entirely. Since NSS is going to be removed soon, drop the --without-nss as well. It is never going to be enabled automatically. Signed-off-by: Bernd Kuhls [Arnout: drop NSS option entirely, as suggested by Baruch Siach.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 6 ++++++ package/libcurl/Config.in | 4 ---- package/libcurl/libcurl.hash | 6 +++--- package/libcurl/libcurl.mk | 10 +--------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3b066bbf72..48c5ebb81e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LIBCURL_LIBNSS + bool "libcurl NSS removed" + select BR2_LEGACY + help + NSS was deprecated in libcurl 7.82.0. + config BR2_PACKAGE_WESTON_DEFAULT_FBDEV bool "weston fbdev removed" select BR2_LEGACY diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index d8072c0afc..8c601c3a70 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -61,10 +61,6 @@ config BR2_PACKAGE_LIBCURL_GNUTLS bool "GnuTLS" depends on BR2_PACKAGE_GNUTLS -config BR2_PACKAGE_LIBCURL_LIBNSS - bool "NSS" - depends on BR2_PACKAGE_LIBNSS - config BR2_PACKAGE_LIBCURL_MBEDTLS bool "mbed TLS" depends on BR2_PACKAGE_MBEDTLS diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 63d6ba306c..4be245041c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.81.0.tar.xz.asc +# https://curl.se/download/curl-7.82.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 4b2e52829c..97857954db 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.81.0 +LIBCURL_VERSION = 7.82.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -68,14 +68,6 @@ else LIBCURL_CONF_OPTS += --without-gnutls endif -ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y) -LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr -LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" -LIBCURL_DEPENDENCIES += libnss -else -LIBCURL_CONF_OPTS += --without-nss -endif - ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y) LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr LIBCURL_DEPENDENCIES += mbedtls From peter at korsgaard.com Wed Mar 23 21:02:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:02:50 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x In-Reply-To: <20220310095602.2435745-2-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:55:59 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-2-kamel.bouhara@bootlin.com> Message-ID: <878rt0fklh.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > From: Thomas Petazzoni > Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix > build with gcc 11") already fixed some gcc 11.x issues, but not all of > them. This commit backports two upstream patches fixing the remaining > issues, ensuring host-odb can be built on a gcc 11.x machine. > Fixes: > http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ > Signed-off-by: Thomas Petazzoni > Signed-off-by: Kamel Bouhara > --- > Note: the above autobuilder issue has stopped appearing after > September 29, 2021, which initially sounded odd. However, on October > 3, we started rejecting build results from Xogium's autobuilder (for > other reasons), and all those issues were coming from Xogium's > autobuilder. And this is pretty logical: Xogium's autobuilder was > known to be running a very recent Arch Linux, and therefore was the > only autobuild machine running gcc 11.x as the host compiler. Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:03:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:03:01 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/libodb: add host variant In-Reply-To: <20220310095602.2435745-3-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:56:00 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-3-kamel.bouhara@bootlin.com> Message-ID: <874k3ofkl6.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > From: Thomas Petazzoni > Signed-off-by: Thomas Petazzoni > Signed-off-by: Kamel Bouhara Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:03:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:03:35 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <20220310095602.2435745-4-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:56:01 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-4-kamel.bouhara@bootlin.com> Message-ID: <87zglge5zs.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > Add host variant of libodb-boost required by the ODB compiler. > The libodb-boost headers are needed at compile time, and > therefore installed in $(HOST_DIR). > Signed-off-by: Kamel Bouhara Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:03:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:03:44 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/odb: add dependency on host-libodb In-Reply-To: <20220310095602.2435745-5-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:56:02 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-5-kamel.bouhara@bootlin.com> Message-ID: <87v8w4e5zj.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > From: Thomas Petazzoni > host-odb installs the ODB compiler, which when executed at runtime, > needs access to the libodb headers. In order to have them installed, > add a dependency on host-libodb. > Signed-off-by: Thomas Petazzoni > Signed-off-by: Kamel Bouhara > [Kamel: Add optional host-libodb-boost dependency] Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:10:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:10:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/bind: reorder openssl variables In-Reply-To: <20220313092148.353432-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 10:21:47 +0100") References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> Message-ID: <87r16se5nk.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > openssl is mandatory since bump to version 9.16.26 in commit > 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in > the beginning of bind.mk instead of keeping them in the middle of the > file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as > host-pkgconf is already mandatory > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:11:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:11:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/bind: fix libxml2 build In-Reply-To: <20220313092148.353432-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 10:21:48 +0100") References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> <20220313092148.353432-2-fontaine.fabrice@gmail.com> Message-ID: <87mthge5n5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with libxml2 raised since bump to > version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: > configure: error: Specifying libxml2 installation path is not > supported, adjust PKG_CONFIG_PATH instead > Fixes: > - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:27:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:27:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support In-Reply-To: <20220314185945.2823356-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Mon, 14 Mar 2022 19:59:45 +0100") References: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Message-ID: <87ils4e4vq.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Contrary to the helptext > https://github.com/curl/curl/blob/master/configure.ac#L152 > the configure option is called --with-libgsasl: > https://github.com/curl/curl/blob/master/configure.ac#L1989 > Signed-off-by: Bernd Kuhls Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:40:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:40:09 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: (Rutger Sassen's message of "Thu, 17 Mar 2022 11:06:22 +0000") References: Message-ID: <87ee2se4au.fsf@dell.be.48ers.dk> >>>>> "Sassen," == Sassen, Rutger writes: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > Signed-off-by: Rutger Sassen > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:01:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libodb: add host variant Message-ID: <20220323213117.05CF684F5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d78ea86f92ccfd6859acc2aff8147f624894405 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b9c81cc4eefd0972b91abced472e2bce8b53fa2) Signed-off-by: Peter Korsgaard --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:34:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:34:28 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rpi-firmware: fix missing files in overlays Message-ID: <20220323213117.31A7485583@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d5fd132f098026f36c64b0b0c52ab49c6519bd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da38cdead909aa133b9c468ddebf3f67c8d198f2) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 37bfa84eaf..230ba99372 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -23,6 +23,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 21:02:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:02:02 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libodb-boost: add host variant Message-ID: <20220323213117.0EEC785584@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a0d8e74b936ee8f500eb8805fe1d88ed784dbee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2f1f28efd4236431b333fabe6c75aceba9678bc) Signed-off-by: Peter Korsgaard --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:34:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:34:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rpi-firmware: convert dtb overlay install loop to make-level foreach loop Message-ID: <20220323213117.297EC85584@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3f87a7ba3678c9d863244c66bdfec5a4382508f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit d0350a6c023ccbe4450d68d28c3797b1320087ba) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f3d28ef825..37bfa84eaf 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -20,9 +20,9 @@ endif ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - for ovldtb in $(@D)/boot/overlays/*.dtbo; do \ - $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ - done + $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ + $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) + ) endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 21:02:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:02:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/odb: add dependency on host-libodb Message-ID: <20220323213117.185F685583@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e249f262afddc4ecbf2b857204667b6d70a9458b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88471fe4fdc3d25d81b5b6898415a0550d06b90b) Signed-off-by: Peter Korsgaard --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From peter at korsgaard.com Wed Mar 23 21:23:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:23:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libcurl: fix libgsasl support Message-ID: <20220323213117.207D685586@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3f38e420732533dd5643cf4864ddab72fe2bb0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b98d8bba7c1358938f8930a0167abe7a3f6c521) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a70ebe4113..4ff193d62e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From peter at korsgaard.com Wed Mar 23 20:55:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:55:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220323213116.F192F85583@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cce793940a09ce0ff0924c2e550734537cbc7173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2d6e5a8501ff509760dca5c1477281d3f3430ddf) Signed-off-by: Peter Korsgaard --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From peter at korsgaard.com Wed Mar 23 21:01:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libodb: add host variant Message-ID: <20220323213124.D0FCE85644@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4cf10bedd4d7efea98c4c926978aaa924d9c081 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b9c81cc4eefd0972b91abced472e2bce8b53fa2) Signed-off-by: Peter Korsgaard --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:18:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:18:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libcurl: fix libgsasl support Message-ID: <20220323213124.F26F685659@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75ecaa43e0bddb4d562378c33aec11c881a8cd99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b98d8bba7c1358938f8930a0167abe7a3f6c521) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a70ebe4113..4ff193d62e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From peter at korsgaard.com Wed Mar 23 20:55:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:55:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220323213124.C1B4185638@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aadba596b9c258f46b2c0e2ef5f1456d35364d1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2d6e5a8501ff509760dca5c1477281d3f3430ddf) Signed-off-by: Peter Korsgaard --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From peter at korsgaard.com Wed Mar 23 21:31:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:31:29 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rpi-firmware: fix missing files in overlays Message-ID: <20220323213125.0937F85638@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=813dec2b4236ab13d70f087ac9115fd6b485cd99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da38cdead909aa133b9c468ddebf3f67c8d198f2) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 3a4741a0ff..1921017291 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -48,6 +48,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 21:01:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libodb-boost: add host variant Message-ID: <20220323213124.DC37585638@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2702c4e8f5e073ca44db691487ab27e9ebbd4a52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2f1f28efd4236431b333fabe6c75aceba9678bc) Signed-off-by: Peter Korsgaard --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:01:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/odb: add dependency on host-libodb Message-ID: <20220323213124.E72F885644@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5997ee004d2c3c22e48dfeb7d18c4ead4f76c547 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88471fe4fdc3d25d81b5b6898415a0550d06b90b) Signed-off-by: Peter Korsgaard --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From peter at korsgaard.com Wed Mar 23 20:58:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:58:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libodb: add host variant Message-ID: <20220323213134.10EEF856ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0dd4dd121735896e4875bf2527c032fc3c15bd4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b9c81cc4eefd0972b91abced472e2bce8b53fa2) Signed-off-by: Peter Korsgaard --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 20:59:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:59:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libodb-boost: add host variant Message-ID: <20220323213134.189CE856EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f331ffdaec10e9595d8e43f56e987d6861494eee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2f1f28efd4236431b333fabe6c75aceba9678bc) Signed-off-by: Peter Korsgaard --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:10:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:10:29 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bind: reorder openssl variables Message-ID: <20220323213134.296B2856ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f0dbbcbd34ad39834fcc83dc5991a315d4a793 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x openssl is mandatory since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in the beginning of bind.mk instead of keeping them in the middle of the file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as host-pkgconf is already mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b127b0c1b653b0e2ce3c1996a7eb370a258e712) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5b4c60b14c..72f1e4dcdc 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr \ + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes -BIND_DEPENDENCIES = libuv +BIND_DEPENDENCIES = host-pkgconf libuv openssl ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib -BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -69,13 +73,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes From peter at korsgaard.com Wed Mar 23 21:16:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:16:34 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libcurl: fix libgsasl support Message-ID: <20220323213134.3A2D0856EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de5f4568c015e2adc82eab3fc007802c3a87ed24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b98d8bba7c1358938f8930a0167abe7a3f6c521) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f271..4b2e52829c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From peter at korsgaard.com Wed Mar 23 21:00:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:00:39 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/odb: add dependency on host-libodb Message-ID: <20220323213134.2111B856EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb37f62dfe0a4da4377c84f943c0b4c81f190b82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88471fe4fdc3d25d81b5b6898415a0550d06b90b) Signed-off-by: Peter Korsgaard --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From peter at korsgaard.com Wed Mar 23 21:28:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:28:34 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rpi-firmware: fix missing files in overlays Message-ID: <20220323213134.426AA856ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b43b4f12773bf63bb3ba6f10498db5c9ac9e2cad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da38cdead909aa133b9c468ddebf3f67c8d198f2) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..d4d1d07b3f 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -48,6 +48,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 20:38:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:38:37 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220323213134.08E83856EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d29bacb3c8e8e5c8f852bdd4db5068d7828ebd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2d6e5a8501ff509760dca5c1477281d3f3430ddf) Signed-off-by: Peter Korsgaard --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From peter at korsgaard.com Wed Mar 23 21:10:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:10:38 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bind: fix libxml2 build Message-ID: <20220323213134.31AB0856EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9adf86d9b64c32acfb9e2a1b0c1567b06ab8fe6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure with libxml2 raised since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead Fixes: - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 33413b7e5326591dbfc29050a0d1136dcae868c7) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 72f1e4dcdc..a595baabc5 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -67,7 +67,7 @@ BIND_CONF_OPTS += --with-gssapi=no endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-libxml2 BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no From peter at korsgaard.com Wed Mar 23 21:41:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:42 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3 In-Reply-To: <20220315090209.206025-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:09 +0100") References: <20220315090209.206025-1-angelo@amarulasolutions.com> Message-ID: <87a6dge489.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:41:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:57 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3-rt3 In-Reply-To: <20220315090220.206426-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:20 +0100") References: <20220315090220.206426-1-angelo@amarulasolutions.com> Message-ID: <875yo4e47u.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:41:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:12 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] linux: bump CIP kernel to version 5.10.104-cip3 Message-ID: <20220323213305.A5717856F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=987c284d6a2b35965c42c3b23d570a2eb11c4bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard (cherry picked from commit 781a01c9f3d8c7d970d75ca56198161352a91d4b) Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 043e7c6574..c6590b31ee 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.104-cip3)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf856..18480a87bf 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz +sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes From peter at korsgaard.com Wed Mar 23 21:41:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] linux: bump CIP-RT kernel to version 5.10.104-cip3-rt3 Message-ID: <20220323213305.AD8FD856F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e5f4ae1f4737dcb392e9b32d5b5525e9b591d8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard (cherry picked from commit 2b6bd9b0de8c60f8acd87bb7ffaefc59be6d8dae) Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c6590b31ee..f21beb4222 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.104-cip3-rt3)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 18480a87bf..976f1d07c0 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From peter at korsgaard.com Wed Mar 23 21:46:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:46:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiec61850: security bump to version 1.5.1 In-Reply-To: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 18:34:29 +0100") References: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> Message-ID: <871qyse3zi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Retrieve official tarball > - Fix CVE-2021-45769: A NULL pointer dereference in > AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 > v1.5.0 can lead to a segmentation fault or application crash. > - Fix many other vulnerabilities: > https://libiec61850.com/new-release-1-5-1-of-libiec61850 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:47:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: security bump version to 2.4.53 In-Reply-To: <20220314184353.2639955-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Mon, 14 Mar 2022 19:43:53 +0100") References: <20220314184353.2639955-1-bernd.kuhls@t-online.de> Message-ID: <87wngkcpds.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 > Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. > Signed-off-by: Bernd Kuhls Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:42:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:42:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220323213850.58B7885735@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c4cfe71314a28f8d982148e7fa6b9966b97657f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 52c372446f034cf8277951ad083abe5e1c10f52d) Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 23 21:47:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/apache: security bump version to 2.4.53 Message-ID: <20220323213850.61586856F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44edd4bd14c54b401c27976406ab24062c353cbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit eaa8fcf546d84e38990566e49f4730c530d2577c) Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Wed Mar 23 21:42:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:42:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220323213856.C3072857B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83a15447c1a45802e1c15fcd0879f6d0f1c3694f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 52c372446f034cf8277951ad083abe5e1c10f52d) Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 23 21:47:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/apache: security bump version to 2.4.53 Message-ID: <20220323213856.CC1EB857B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3106b412be4d70d4f8e6b7b2c81a6aa5a7eb8eff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit eaa8fcf546d84e38990566e49f4730c530d2577c) Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 5fcb887fbc..24d17364bb 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,7 +17,7 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define APACHE_FIXUP_APR_LIBTOOL @@ -29,7 +29,7 @@ endif APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -43,7 +43,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Wed Mar 23 21:47:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/apache: security bump version to 2.4.53 Message-ID: <20220323213901.E11EB85A7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9f936b16763c9074434249960337be4c25b501d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit eaa8fcf546d84e38990566e49f4730c530d2577c) Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 3b518795be..d5eb65db43 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,7 +17,7 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define APACHE_FIXUP_APR_LIBTOOL @@ -29,7 +29,7 @@ endif APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -43,7 +43,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Wed Mar 23 21:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:43:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220323213901.D84D585A7C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ad69d4363ad871e6637d9930f49f3efbdff349b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 52c372446f034cf8277951ad083abe5e1c10f52d) Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 23 21:42:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:42:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libiec61850: bump to version 1.5.0 Message-ID: <20220323213901.CFEC085A7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd7058a0c1802a969f8d5d32d949d382b19749b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Remove all upstream patches Remove IGNORE_CVES for CVE-2020-15158 Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/309037705 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a42e0e4600be785fa750c6b481c41a76d041df03) Signed-off-by: Peter Korsgaard --- .../0001-use-poll.h-instead-of-sys-poll.h.patch | 33 ---------------------- ...port_linux-Add-missing-include-sys-time.h.patch | 32 --------------------- ...eap-buffer-overflow-when-handling-message.patch | 27 ------------------ package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 5 +--- 5 files changed, 2 insertions(+), 97 deletions(-) diff --git a/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch b/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index a04473d218..0000000000 --- a/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4cad505fc98240eb66eaabfae61a9694f8158dda Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 7 Apr 2020 20:58:37 +0200 -Subject: [PATCH] use instead of - -The manpage of poll(2) states that the prototype of poll is defined -in . Use that header file instead of to allow -compilation against musl-libc. - -Upstream status: Pending -https://github.com/mz-automation/libiec61850/pull/228 - -Signed-off-by: Romain Naour ---- - hal/ethernet/linux/ethernet_linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c -index c3ab2e2..9aa5c28 100644 ---- a/hal/ethernet/linux/ethernet_linux.c -+++ b/hal/ethernet/linux/ethernet_linux.c -@@ -23,7 +23,7 @@ - - #include - #include --#include -+#include - #include - #include - #include --- -2.21.1 - diff --git a/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch b/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch deleted file mode 100644 index e1b8ca15b3..0000000000 --- a/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 661405eb6066b67dfe51d5ff9635e29f86bdd238 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 7 Apr 2020 21:02:54 +0200 -Subject: [PATCH] serial_port_linux: Add missing include sys/time.h - -POSIX says `struct timeval` is defined if is included. - -Adding this header allow to build against musl-libc. - -Upstream status: Pending -https://github.com/mz-automation/libiec61850/pull/228 - -Signed-off-by: Romain Naour ---- - hal/serial/linux/serial_port_linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c -index e6308c0..15e5794 100644 ---- a/hal/serial/linux/serial_port_linux.c -+++ b/hal/serial/linux/serial_port_linux.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include "hal_serial.h" - #include "hal_time.h" --- -2.21.1 - diff --git a/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch b/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch deleted file mode 100644 index 88048555b7..0000000000 --- a/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 033ab5b6488250c8c3b838f25a7cbc3e099230bb Mon Sep 17 00:00:00 2001 -From: Michael Zillgith -Date: Wed, 12 Aug 2020 07:25:37 +0200 -Subject: [PATCH] - COTP: fixed possible heap buffer overflow when handling - message with invalid (zero) value in length field (#250) - -[Retrieved from: -https://github.com/mz-automation/libiec61850/commit/033ab5b6488250c8c3b838f25a7cbc3e099230bb] -Signed-off-by: Fabrice Fontaine ---- - src/mms/iso_cotp/cotp.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/mms/iso_cotp/cotp.c b/src/mms/iso_cotp/cotp.c -index cbb34b36..8c37d262 100644 ---- a/src/mms/iso_cotp/cotp.c -+++ b/src/mms/iso_cotp/cotp.c -@@ -720,6 +720,9 @@ CotpConnection_readToTpktBuffer(CotpConnection* self) - goto exit_waiting; - } - -+ if (self->packetSize <= bufPos) -+ goto exit_error; -+ - readBytes = readFromSocket(self, buffer + bufPos, self->packetSize - bufPos); - - if (readBytes < 0) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 5739a5d8c9..3a024be7c6 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0630cd5b7ac67a2d286b0ad574ff1c9074c96be33b9d5a300cd69e89429abbe libiec61850-1.4.2.1.tar.gz +sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 4f82451eb8..6da782ad39 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.4.2.1 +LIBIEC61850_VERSION = 1.5.0 LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ @@ -12,7 +12,4 @@ LIBIEC61850_LICENSE_FILES = COPYING LIBIEC61850_CPE_ID_VENDOR = mz-automation LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF -# 0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch -LIBIEC61850_IGNORE_CVES += CVE-2020-15158 - $(eval $(cmake-package)) From Jason at zx2c4.com Thu Mar 24 02:41:44 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 23 Mar 2022 20:41:44 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323035233.140997-1-Jason@zx2c4.com> <20220323091336.GL1566358@scaer> Message-ID: Hi Yann, On Wed, Mar 23, 2022 at 2:06 PM Jason A. Donenfeld wrote: > > > As a final note, while this commit improves upon the status quo by > > > removing a vulnerability, this shell script still does not actually > > > initialize the RNG like it says it does. For initialization via a seed > > > file, the RNDADDENTROPY ioctl must be used. > > > > Is there a way to do that within a shell script? If so, would you be > > kind enough to send a followup patch, please? > > No, there isn't, at all. But I'm writing some code now that I hope to > release as a standalone utility, and upstream into busybox/util-linux > that should make it accessible. When that happens, I'll keep this > mailing list informed, and we can move forward then. Initial draft is here: https://git.zx2c4.com/seedrng/about/ https://git.zx2c4.com/seedrng/tree/seedrng.c I'll probably play with that for a few more days to make sure it's solid. Probably the long term solution here is putting something like that into busybox, and having scripts call that instead. Jason From james.hilliard1 at gmail.com Thu Mar 24 04:30:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 23 Mar 2022 22:30:06 -0600 Subject: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> Message-ID: On Sat, Feb 12, 2022 at 5:55 AM Arnout Vandecappelle wrote: > > > > On 02/02/2022 20:39, James Hilliard wrote: > > On Mon, Jan 31, 2022 at 4:36 AM Romain Naour wrote: > >> > >> Hello James, Thomas, All, > >> > >> Le 31/01/2022 ? 10:45, Thomas Petazzoni via buildroot a ?crit : > >>> On Sun, 30 Jan 2022 18:59:37 -0700 > >>> James Hilliard wrote: > >>> > >>>> This appears to be the latest version that has a working lld build. > >>>> > >>>> Version 12.0.0 and newer have broken lld stand-alone builds: > >>>> https://bugs.llvm.org/show_bug.cgi?id=49228 > >>>> > >>>> Signed-off-by: James Hilliard > >>> > >>> Is this really enough? I remember seeing patches a long time ago doing > >>> bumps on LLVM/Clang and that was much more involved, which I think > >>> explains why we're still at version 9.x. > >>> > >>> Romain, any comments on this? > >> > >> Adding Matt in Cc: > >> > >> IIRC, there is an issue with libclc package which is part of the llvm project. > >> > >> Due to the gap between the two version, all CMake options must be reviewed (long > >> and boring task I agree). > > > > Oh, I guess there was already a series here with more changes: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= > > Given the discussion in both these threads, I've marked the patch as Changes > Requested. I think I managed to fix the blockers with libclc in Matt's series which I've sent as a v12: https://patchwork.ozlabs.org/project/buildroot/list/?series=291585&submitter=&state=*&q=&archive=both&delegate= > > Regards, > Arnout > From snathicktechno at gmail.com Thu Mar 24 04:49:46 2022 From: snathicktechno at gmail.com (snathick) Date: Thu, 24 Mar 2022 10:19:46 +0530 Subject: [Buildroot] Python package integration Message-ID: Hi, I am trying to add the below python package to buildroot https://github.com/richteel/TeelSys_Python_SHT .mk file as follows ################################################################################ # # python-sht21 # ################################################################################ PYTHON_SHT21_VERSION = 1.0 PYTHON_SHT21_SOURCE = pysht21-$(PYTHON_SHT21_VERSION).tar.gz PYTHON_SHT21_SITE = https://github.com/richteel/TeelSys_Python_SHT PYTHON_SHT21_LICENSE = BSD PYTHON_SHT21_LICENSE_FILES = LICENSE PYTHON_SHT21_SETUP_TYPE = setuptools $(eval $(python-package)) make command giving following error wget --passive-ftp -nd -t 3 -O '/home/snathick/buildroot/output/build/.pysht21-1.0.uyWYsC/output' ' http://sources.buildroot.net/pysht21-1.0' --2022-03-24 08:57:12-- http://sources.buildroot.net/pysht21-1.0 Resolving sources.buildroot.net (sources.buildroot.net)... 172.67.72.56, 104.26.0.37, 104.26.1.37, ... Connecting to sources.buildroot.net (sources.buildroot.net)|172.67.72.56|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2022-03-24 08:57:13 ERROR 404: Not Found. package/pkg-generic.mk:185: recipe for target '/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded' failed make[1]: *** [/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded] Error 1 Makefile:84: recipe for target '_all' failed make: *** [_all] Error 2 Any suggestions to resolve the issue -- Thanks & Regards, Snathick -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Thu Mar 24 05:56:02 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 23 Mar 2022 23:56:02 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: add cmake dependency support Message-ID: <20220324055602.3021498-1-james.hilliard1@gmail.com> Meson dependencies and variables can be provided by cmake similar to how they can be provided by pkgconfig, for this to work we need to ensure that cmake_prefix_path is set for both cross and native targets along with the cmake binary path. See: https://mesonbuild.com/Dependencies.html#cmake https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways https://mesonbuild.com/Machine-files.html#meson-builtin-options Signed-off-by: James Hilliard --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a..9e70d49b60 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e..1977a83501 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,7 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true -- 2.25.1 From foss+buildroot at 0leil.net Thu Mar 24 06:38:08 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 24 Mar 2022 07:38:08 +0100 Subject: [Buildroot] Python package integration In-Reply-To: References: Message-ID: <4470C393-DAE8-4385-A817-9895CF2CFECC@0leil.net> Hi, On March 24, 2022 5:49:46 AM GMT+01:00, snathick wrote: >Hi, > >I am trying to add the below python package to buildroot > >https://github.com/richteel/TeelSys_Python_SHT > > >.mk file as follows > >################################################################################ ># ># python-sht21 ># >################################################################################ > >PYTHON_SHT21_VERSION = 1.0 >PYTHON_SHT21_SOURCE = pysht21-$(PYTHON_SHT21_VERSION).tar.gz >PYTHON_SHT21_SITE = https://github.com/richteel/TeelSys_Python_SHT I think this is one of the issues. The documentation (https://buildroot.org/downloads/manual/manual.html#github-download-url) states that you should use: PYTHON_SHT21_SITE = $(call github,richteel,TeelSys_Python_SHT,$(PYTHON_SHT21_VERSION)) I also don't think there's a need for PYTHON_SHT21_SOURCE since Buildroot will figure it out from _SITE variable here. Finally, I couldn't see tags or releases on this github repo, so you want to pass a commit id to PYTHON_SHT21_VERSION, e.g. 84398b3267158d15e2322878294c0d7e0e6fa78d for the last commit in master branch. >PYTHON_SHT21_LICENSE = BSD It's actually MIT. Cheers, Quentin >PYTHON_SHT21_LICENSE_FILES = LICENSE >PYTHON_SHT21_SETUP_TYPE = setuptools > >$(eval $(python-package)) > >make command giving following error > >wget --passive-ftp -nd -t 3 -O >'/home/snathick/buildroot/output/build/.pysht21-1.0.uyWYsC/output' ' >http://sources.buildroot.net/pysht21-1.0' >--2022-03-24 08:57:12-- http://sources.buildroot.net/pysht21-1.0 >Resolving sources.buildroot.net (sources.buildroot.net)... 172.67.72.56, >104.26.0.37, 104.26.1.37, ... >Connecting to sources.buildroot.net (sources.buildroot.net)|172.67.72.56|:80... >connected. >HTTP request sent, awaiting response... 404 Not Found >2022-03-24 08:57:13 ERROR 404: Not Found. > >package/pkg-generic.mk:185: recipe for target >'/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded' >failed >make[1]: *** >[/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded] >Error 1 >Makefile:84: recipe for target '_all' failed >make: *** [_all] Error 2 > > >Any suggestions to resolve the issue > > > > From james.hilliard1 at gmail.com Thu Mar 24 06:39:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 00:39:28 -0600 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 Message-ID: <20220324063928.3448755-1-james.hilliard1@gmail.com> CONTRIBUTING.md hash changed due to various style updates. Set new default wifi backend config option to iwd when enabled in cases where the default wpa_supplicant is not enabled. Signed-off-by: James Hilliard --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index d25f0e8194..26bcf843c2 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992c..3479bb3794 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.34 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.36 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES @@ -53,8 +53,15 @@ endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_CONF_OPTS += --with-iwd +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +endif +else +NETWORK_MANAGER_CONF_OPTS += \ + --without-iwd \ + --with-config-wifi-backend-default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) -- 2.25.1 From james.hilliard1 at gmail.com Thu Mar 24 07:18:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 01:18:17 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-txaio: bump to version 22.2.1 Message-ID: <20220324071817.1270488-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-txaio/python-txaio.hash | 4 ++-- package/python-txaio/python-txaio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 5e05f02d3a..f06c14b21f 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 750d9e3d3d..1a8a888963 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 21.2.1 +PYTHON_TXAIO_VERSION = 22.2.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools -- 2.25.1 From yann.morin.1998 at free.fr Thu Mar 24 08:22:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 09:22:47 +0100 Subject: [Buildroot] [git commit] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220324081411.4381E85637@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0986de551f46e72268857fd817986e9be697cd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used but there's currently no way to do that from a shell script for now. Signed-off-by: Jason A. Donenfeld Signed-off-by: Yann E. MORIN --- package/urandom-scripts/S20urandom | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" From yann.morin.1998 at free.fr Thu Mar 24 08:24:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 09:24:33 +0100 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323200731.170409-1-Jason@zx2c4.com> References: <20220323200731.170409-1-Jason@zx2c4.com> Message-ID: <20220324082433.GA3649946@scaer> Jason, All, +Peter: candidate for backporting as a security fix On 2022-03-23 14:07 -0600, Jason A. Donenfeld spake thusly: > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. > > As a result of this behavior, which may be understandably surprising, > writing a good seed file into /dev/urandom and then saving a new seed > file immediately after is dangerous, because the new seed file may wind > up being entirely deterministic, even if the old seed file was quite > good. > > This has been fixed in systemd with > , > and fortunately it's possible to do the same thing in shell script here. > Specifically, instead of just saving new /dev/urandom output straight > up, we hash the new /dev/urandom together with the old seed, in order to > produce the new seed. This way the amount of entropy in the new seed > will stay the same or get better, but not appreciably regress. > > At the same time, the pool size check in this script is useless. Writing > to /dev/urandom never credits bits anyway, so no matter what, writing > into /dev/urandom is useful and not harmful. There's also not much of a > point in seeding with more than 256 bits, which is what the hashing > operation above produces. So this commit removes the file size check. > > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. > > Signed-off-by: Jason A. Donenfeld Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/urandom-scripts/S20urandom | 39 +++++++++++++----------------- > 1 file changed, 17 insertions(+), 22 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..c6b2ebd48f 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -17,43 +17,38 @@ else > pool_size=512 > fi > > -check_file_size() { > - [ -f "$URANDOM_SEED" ] || return 1 > - # Try to read two blocks but exactly one will be read if the file has > - # the correct size. > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > - test "$size" -eq "$pool_size" > -} > - > init_rng() { > - if check_file_size; then > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > + printf 'Initializing random number generator: ' > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > fi > + return "$status" > } > > save_random_seed() { > printf 'Saving random seed: ' > - if touch "$URANDOM_SEED" 2> /dev/null; then > + status=1 > + if touch "$URANDOM_SEED.new" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > - status=$? > + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > + | sha256sum \ > + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > + rm -f "$URANDOM_SEED.tmp" > umask "$old_umask" > if [ "$status" -eq 0 ]; then > echo "OK" > else > echo "FAIL" > fi > + > else > - status=$? > echo "SKIP (read-only file system detected)" > fi > return "$status" > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Thu Mar 24 08:32:07 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Mar 2022 08:32:07 +0000 Subject: [Buildroot] [Bug 14686] genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14686 --- Comment #2 from Roman --- My bad, thank you for your time :-) -- You are receiving this mail because: You are on the CC list for the bug. From David.Laight at ACULAB.COM Thu Mar 24 09:15:09 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 09:15:09 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324082433.GA3649946@scaer> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: From: Yann E. MORIN > Sent: 24 March 2022 08:25 > > +Peter: candidate for backporting as a security fix Probably not - the security fix is the code that actually initialises the RNG. David > On 2022-03-23 14:07 -0600, Jason A. Donenfeld spake thusly: > > Writing into /dev/urandom doesn't actually credit any entropy bits. And > > while it adds that data to the entropy pool, it won't actually be > > immediately used when reading from /dev/urandom subsequently. This is > > how the kernel's /dev/urandom has always worked, unfortunately. > > > > As a result of this behavior, which may be understandably surprising, > > writing a good seed file into /dev/urandom and then saving a new seed > > file immediately after is dangerous, because the new seed file may wind > > up being entirely deterministic, even if the old seed file was quite > > good. > > > > This has been fixed in systemd with > > , > > and fortunately it's possible to do the same thing in shell script here. > > Specifically, instead of just saving new /dev/urandom output straight > > up, we hash the new /dev/urandom together with the old seed, in order to > > produce the new seed. This way the amount of entropy in the new seed > > will stay the same or get better, but not appreciably regress. > > > > At the same time, the pool size check in this script is useless. Writing > > to /dev/urandom never credits bits anyway, so no matter what, writing > > into /dev/urandom is useful and not harmful. There's also not much of a > > point in seeding with more than 256 bits, which is what the hashing > > operation above produces. So this commit removes the file size check. > > > > As a final note, while this commit improves upon the status quo by > > removing a vulnerability, this shell script still does not actually > > initialize the RNG like it says it does. For initialization via a seed > > file, the RNDADDENTROPY ioctl must be used. > > > > Signed-off-by: Jason A. Donenfeld > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/urandom-scripts/S20urandom | 39 +++++++++++++----------------- > > 1 file changed, 17 insertions(+), 22 deletions(-) > > > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > > index e4fd125721..c6b2ebd48f 100644 > > --- a/package/urandom-scripts/S20urandom > > +++ b/package/urandom-scripts/S20urandom > > @@ -17,43 +17,38 @@ else > > pool_size=512 > > fi > > > > -check_file_size() { > > - [ -f "$URANDOM_SEED" ] || return 1 > > - # Try to read two blocks but exactly one will be read if the file has > > - # the correct size. > > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > > - test "$size" -eq "$pool_size" > > -} > > - > > init_rng() { > > - if check_file_size; then > > - printf 'Initializing random number generator: ' > > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > > - status=$? > > - if [ "$status" -eq 0 ]; then > > - echo "OK" > > - else > > - echo "FAIL" > > - fi > > - return "$status" > > + printf 'Initializing random number generator: ' > > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > > + status=$? > > + if [ "$status" -eq 0 ]; then > > + echo "OK" > > + else > > + echo "FAIL" > > fi > > + return "$status" > > } > > > > save_random_seed() { > > printf 'Saving random seed: ' > > - if touch "$URANDOM_SEED" 2> /dev/null; then > > + status=1 > > + if touch "$URANDOM_SEED.new" 2> /dev/null; then > > old_umask=$(umask) > > umask 077 > > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > > - status=$? > > + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > > + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > > + | sha256sum \ > > + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > > + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > > + rm -f "$URANDOM_SEED.tmp" > > umask "$old_umask" > > if [ "$status" -eq 0 ]; then > > echo "OK" > > else > > echo "FAIL" > > fi > > + > > else > > - status=$? > > echo "SKIP (read-only file system detected)" > > fi > > return "$status" > > -- > > 2.35.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From yann.morin.1998 at free.fr Thu Mar 24 10:09:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 11:09:06 +0100 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: <20220324100906.GC3649946@scaer> David, All, On 2022-03-24 09:15 +0000, David Laight spake thusly: > From: Yann E. MORIN > > Sent: 24 March 2022 08:25 > > > > +Peter: candidate for backporting as a security fix > Probably not - the security fix is the code that actually > initialises the RNG. Not sure I understood... As Jason explained, we have so far been saving a seed from an RNG that is probably partially deterministic; that is the security issue. The way we are seeding the RNG fundamentally does not change, because we are not crediting any entropy with whatever we put in there. So, whether we write something, anything, or nothing at all, has no impact on the strength of the RNG. As far as I understood it, at least. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From David.Laight at ACULAB.COM Thu Mar 24 10:25:13 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 10:25:13 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324100906.GC3649946@scaer> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <20220324100906.GC3649946@scaer> Message-ID: From: Yann E. MORIN > Sent: 24 March 2022 10:09 > > David, All, > > On 2022-03-24 09:15 +0000, David Laight spake thusly: > > From: Yann E. MORIN > > > Sent: 24 March 2022 08:25 > > > > > > +Peter: candidate for backporting as a security fix > > Probably not - the security fix is the code that actually > > initialises the RNG. > > Not sure I understood... As Jason explained, we have so far been saving > a seed from an RNG that is probably partially deterministic; that is the > security issue. I'm pretty sure the seed is also saved during shutdown. So a normal startup doesn't rely on the seed saved by the startup script. (Although is would be better to use a background script to save after (say) 30 minutes of operation.) > The way we are seeding the RNG fundamentally does not change, because > we are not crediting any entropy with whatever we put in there. So, > whether we write something, anything, or nothing at all, has no impact > on the strength of the RNG. Right - the problem is that RNG isn't being given any entropy at boot time. So it is very weak. The only point in saving/loading a seed is to give the RNG some entropy at boot time. Otherwise programs run from startup scripts that read the RNG to get session keys don't get very good values at all. That is the real security problem. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From yann.morin.1998 at free.fr Thu Mar 24 10:39:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 11:39:39 +0100 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <20220324100906.GC3649946@scaer> Message-ID: <20220324103939.GD3649946@scaer> David, All, On 2022-03-24 10:25 +0000, David Laight spake thusly: > From: Yann E. MORIN > > On 2022-03-24 09:15 +0000, David Laight spake thusly: > > > From: Yann E. MORIN > > > > +Peter: candidate for backporting as a security fix > > > Probably not - the security fix is the code that actually > > > initialises the RNG. > > Not sure I understood... As Jason explained, we have so far been saving > > a seed from an RNG that is probably partially deterministic; that is the > > security issue. > I'm pretty sure the seed is also saved during shutdown. > So a normal startup doesn't rely on the seed saved by the startup script. > (Although is would be better to use a background script > to save after (say) 30 minutes of operation.) The problem is that a lot, if not most, embedded devices are never properly shut-down; instead, they are, intentionally or not, brutally electrically powered off. In that case, the seed that is saved at boot is what is going to be reused on the next boot. And currently, that seed is weak, because the output of the RNG at boot is mostly predicatble. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From David.Laight at ACULAB.COM Thu Mar 24 13:06:53 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 13:06:53 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324103939.GD3649946@scaer> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <20220324100906.GC3649946@scaer> <20220324103939.GD3649946@scaer> Message-ID: <5ee688669a3c451696590ba855660465@AcuMS.aculab.com> From: Yann E. MORIN > Sent: 24 March 2022 10:40 > > David, All, > > On 2022-03-24 10:25 +0000, David Laight spake thusly: > > From: Yann E. MORIN > > > On 2022-03-24 09:15 +0000, David Laight spake thusly: > > > > From: Yann E. MORIN > > > > > +Peter: candidate for backporting as a security fix > > > > Probably not - the security fix is the code that actually > > > > initialises the RNG. > > > Not sure I understood... As Jason explained, we have so far been saving > > > a seed from an RNG that is probably partially deterministic; that is the > > > security issue. > > I'm pretty sure the seed is also saved during shutdown. > > So a normal startup doesn't rely on the seed saved by the startup script. > > (Although is would be better to use a background script > > to save after (say) 30 minutes of operation.) > > The problem is that a lot, if not most, embedded devices are never > properly shut-down; instead, they are, intentionally or not, brutally > electrically powered off. > > In that case, the seed that is saved at boot is what is going to be > reused on the next boot. And currently, that seed is weak, because the > output of the RNG at boot is mostly predicatble. Maybe, but what you are saving at boot is also very weak. Even if the code worked as intended it is almost entirely completely dependant on the previous value. So you might as well just count the number of times the system has been booted. There really is little point saving a new block of 'entropy' until the system has had some chance to locate some. The embedded device's system software also needs to find somewhere non-volatile to save the entropy. If the system is likely to just get powered off then none of the filesystems are actually likely to be mounted rw. Things like /, /etc, /var and /tmp are very likely to be ramdisk (or ramdisk overlays) to avoid trashing the actual filesystems [1]. So saving the entropy may not be as simple as just writing to a file - the filesystem might need (re)mounting first. [1] Of course, if you are using a flash disk it might decide to do 'wear levelling' at the time the power is cut. In that case you can lose 'big time'. I've seen a completely trashed FAT filesystem. Nothing was in the right place at all. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From Jason at zx2c4.com Thu Mar 24 13:54:28 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 24 Mar 2022 07:54:28 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: Hi David, On Thu, Mar 24, 2022 at 3:15 AM David Laight wrote: > > From: Yann E. MORIN > > Sent: 24 March 2022 08:25 > > > > +Peter: candidate for backporting as a security fix > > Probably not - the security fix is the code that actually > initialises the RNG. No. The security fix here is that the old and new seeds are hashed together so that the new one doesn't regress in entropy. Yann is correct. Jason From David.Laight at ACULAB.COM Thu Mar 24 14:31:35 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 14:31:35 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: <859deab97eb947eb9114cf491c871a00@AcuMS.aculab.com> From: Jason A. Donenfeld > Sent: 24 March 2022 13:54 > > On Thu, Mar 24, 2022 at 3:15 AM David Laight wrote: > > > > From: Yann E. MORIN > > > Sent: 24 March 2022 08:25 > > > > > > +Peter: candidate for backporting as a security fix > > > > Probably not - the security fix is the code that actually > > initialises the RNG. > > No. The security fix here is that the old and new seeds are hashed > together so that the new one doesn't regress in entropy. Yann is > correct. But there is no entropy, you've never let the system collect any. It is still completely broken. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From nealf at xilinx.com Thu Mar 24 14:36:46 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Mar 2022 14:36:46 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <70D87B9E-978A-49CE-BECE-500C876CE13D@benettiengineering.com> References: <20220322110313.4061782-1-neal.frager@amd.com> <70D87B9E-978A-49CE-BECE-500C876CE13D@benettiengineering.com> Message-ID: Hi Giulio, > Il giorno 22 mar 2022, alle ore 12:03, Neal Frager ha scritto: > > ?This patch migrates Xilinx Linux kernel and U-Boot from git:// to > https:// because git:// is no longer supported. > > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > > Signed-off-by: Neal Frager > --- > DEVELOPERS | 2 +- > configs/zynqmp_zcu102_defconfig | 4 ++-- > configs/zynqmp_zcu106_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 942bb8fe9c..58ed4f81cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2089,7 +2089,7 @@ F: package/libevdev/ > F: package/pkg-qmake.mk > F: package/qt5/qt5opcua/ > > -N: Neal Frager > +N: Neal Frager > F: board/zynqmp/ > F: configs/zynqmp_zcu102_defconfig > This ^^^ should be splitted into another patch. Done. > > diff --git a/configs/zynqmp_zcu102_defconfig > b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" > -- > 2.17.1 > Best regards, Neal Frager AMD From Jason at zx2c4.com Thu Mar 24 14:39:44 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 24 Mar 2022 08:39:44 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <859deab97eb947eb9114cf491c871a00@AcuMS.aculab.com> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <859deab97eb947eb9114cf491c871a00@AcuMS.aculab.com> Message-ID: Hi David, On Thu, Mar 24, 2022 at 8:31 AM David Laight wrote: > > From: Jason A. Donenfeld > > Sent: 24 March 2022 13:54 > > > > On Thu, Mar 24, 2022 at 3:15 AM David Laight wrote: > > > > > > From: Yann E. MORIN > > > > Sent: 24 March 2022 08:25 > > > > > > > > +Peter: candidate for backporting as a security fix > > > > > > Probably not - the security fix is the code that actually > > > initialises the RNG. > > > > No. The security fix here is that the old and new seeds are hashed > > together so that the new one doesn't regress in entropy. Yann is > > correct. > > But there is no entropy, you've never let the system collect any. > > It is still completely broken. You misunderstand the problem. An initial seed might be derived from some external source and be high quality. The goal is for the next seed, generated on-device, to be not lower quality. Prior to this patch, it might become lower quality. With this patch, it now doesn't regress in quality. Jason From dambrosio at outrider.ai Thu Mar 24 15:38:04 2022 From: dambrosio at outrider.ai (Dan Ambrosio) Date: Thu, 24 Mar 2022 09:38:04 -0600 Subject: [Buildroot] Suspected ccache Issue With wireshark Message-ID: Hello, I recently upgraded my buildroot project from 2021.02.6 to the latest LTS (2022.02) and ran into a compilation error with the wireshark package when BR2_CCACHE is enabled. It seems like a cmake argument is being passed through to ccache. >>> wireshark 3.4.12 Building PATH="/home/builder/output/oc_general/host/bin:/home/builder/output/oc_general/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j17 -C /home/builder/output/oc_general/build/wireshark-3.4.12/ [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o /home/builder/output/oc_general/host/bin/ccache: invalid option -- 'D' Usage: ccache [options] ccache compiler [compiler options] compiler [compiler options] (via symbolic link) Common options: -c, --cleanup delete old files and recalculate size counters (normally not needed as this is done automatically) -C, --clear clear the cache completely (except configuration) -F, --max-files=N set maximum number of files in cache to N (use 0 for no limit) -M, --max-size=SIZE set maximum size of cache to SIZE (use 0 for no limit); available suffixes: k, M, G, T (decimal) and Ki, Mi, Gi, Ti (binary); default suffix: G -p, --show-config show current configuration options in human-readable format -s, --show-stats show summary of configuration and statistics counters in human-readable format -z, --zero-stats zero statistics counters -h, --help print this help text -V, --version print version and copyright information Options for scripting or debugging: --dump-manifest=PATH dump manifest file at PATH in text format -k, --get-config=K print the value of configuration key K --hash-file=PATH print the hash (-) of the file at PATH --print-stats print statistics counter IDs and corresponding values in machine-parsable format -o, --set-config=K=V set configuration item K to value V See also . [ 0%] Built target cli_main make[4]: *** [tools/lemon/CMakeFiles/lemon.dir/build.make:66: tools/lemon/CMakeFiles/lemon.dir/lemon.c.o] Error 1 make[3]: *** [CMakeFiles/Makefile2:10914: tools/lemon/CMakeFiles/lemon.dir/all] Error 2 FYI, 2021.02.6 did not exhibit this behavior. Thanks, Dan Ambrosio From luca at lucaceresoli.net Thu Mar 24 15:59:31 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 24 Mar 2022 16:59:31 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220324123117.2369981-1-neal.frager@amd.com> References: <20220324123117.2369981-1-neal.frager@amd.com> Message-ID: Hi Neal, On 24/03/22 13:31, Neal Frager wrote: > This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// > The git:// location is no longer supported. > > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > > Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli -- Luca From peter at korsgaard.com Thu Mar 24 17:10:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 18:10:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220324123117.2369981-1-neal.frager@amd.com> (Neal Frager's message of "Thu, 24 Mar 2022 06:31:17 -0600") References: <20220324123117.2369981-1-neal.frager@amd.com> Message-ID: <87sfr7cm3h.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// > The git:// location is no longer supported. > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > Signed-off-by: Neal Frager > --- V1-> V2: > -separated DEVELOPERS file update to make stand alone patch Committed, thanks. We have a few more packages using git://github.com, I'll take care of those. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 24 17:11:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 18:11:18 +0100 Subject: [Buildroot] [git commit] configs/zynqmp_zcu10x: change git to https Message-ID: <20220324170250.403AE85ADB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f653c24057065a4964f83e9ed70e868eac0f89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The git:// location is no longer supported by github, so change to https:// For more details: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 4 ++-- configs/zynqmp_zcu106_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" From ps.report at gmx.net Thu Mar 24 19:35:15 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 24 Mar 2022 20:35:15 +0100 Subject: [Buildroot] Suspected ccache Issue With wireshark In-Reply-To: References: Message-ID: <20220324203515.5eeb9584@gmx.net> Hello Dan, On Thu, 24 Mar 2022 09:38:04 -0600, Dan Ambrosio via buildroot wrote: > Hello, > I recently upgraded my buildroot project from 2021.02.6 to the latest > LTS (2022.02) and ran into a compilation error with the wireshark > package when BR2_CCACHE is enabled. > > It seems like a cmake argument is being passed through to ccache. > > >>> wireshark 3.4.12 Building > PATH="/home/builder/output/oc_general/host/bin:/home/builder/output/oc_general/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" > /usr/bin/make -j17 -C > /home/builder/output/oc_general/build/wireshark-3.4.12/ > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > /home/builder/output/oc_general/host/bin/ccache: invalid option -- 'D' > Usage: > ccache [options] > ccache compiler [compiler options] > compiler [compiler options] (via symbolic link) > > Common options: > -c, --cleanup delete old files and recalculate size counters > (normally not needed as this is done > automatically) > -C, --clear clear the cache completely (except configuration) > -F, --max-files=N set maximum number of files in cache to N (use 0 > for no limit) > -M, --max-size=SIZE set maximum size of cache to SIZE (use 0 for no > limit); available suffixes: k, M, G, T (decimal) > and Ki, Mi, Gi, Ti (binary); default suffix: G > -p, --show-config show current configuration options in > human-readable format > -s, --show-stats show summary of configuration and statistics > counters in human-readable format > -z, --zero-stats zero statistics counters > > -h, --help print this help text > -V, --version print version and copyright information > > Options for scripting or debugging: > --dump-manifest=PATH dump manifest file at PATH in text format > -k, --get-config=K print the value of configuration key K > --hash-file=PATH print the hash (-) of the file at PATH > --print-stats print statistics counter IDs and corresponding > values in machine-parsable format > -o, --set-config=K=V set configuration item K to value V > > See also . > [ 0%] Built target cli_main > make[4]: *** [tools/lemon/CMakeFiles/lemon.dir/build.make:66: > tools/lemon/CMakeFiles/lemon.dir/lemon.c.o] Error 1 > make[3]: *** [CMakeFiles/Makefile2:10914: > tools/lemon/CMakeFiles/lemon.dir/all] Error 2 > > FYI, 2021.02.6 did not exhibit this behavior. Seems this comes form the configure step: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc [...] With --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER="$(HOSTCC)" ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) this changes to [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER="/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...] but the build fails this time with [...] cd .../build/wireshark-3.4.12/tools/lemon && "/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...]lemon.c /bin/sh: line 1: .../host/bin/ccache /usr/bin/gcc: No such file or directory With --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=/usr/bin/gcc ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) The build succeeds... Regards, Peter > > Thanks, > > Dan Ambrosio > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Thu Mar 24 19:39:32 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 24 Mar 2022 20:39:32 +0100 Subject: [Buildroot] Suspected ccache Issue With wireshark In-Reply-To: <20220324203515.5eeb9584@gmx.net> References: <20220324203515.5eeb9584@gmx.net> Message-ID: <20220324203932.73119c70@gmx.net> Hello Dan, On Thu, 24 Mar 2022 20:35:15 +0100, Peter Seiderer wrote: > Hello Dan, > > On Thu, 24 Mar 2022 09:38:04 -0600, Dan Ambrosio via buildroot wrote: > > > Hello, > > I recently upgraded my buildroot project from 2021.02.6 to the latest > > LTS (2022.02) and ran into a compilation error with the wireshark > > package when BR2_CCACHE is enabled. > > > > It seems like a cmake argument is being passed through to ccache. > > > > >>> wireshark 3.4.12 Building > > PATH="/home/builder/output/oc_general/host/bin:/home/builder/output/oc_general/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" > > /usr/bin/make -j17 -C > > /home/builder/output/oc_general/build/wireshark-3.4.12/ > > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > > /home/builder/output/oc_general/host/bin/ccache: invalid option -- 'D' > > Usage: > > ccache [options] > > ccache compiler [compiler options] > > compiler [compiler options] (via symbolic link) > > > > Common options: > > -c, --cleanup delete old files and recalculate size counters > > (normally not needed as this is done > > automatically) > > -C, --clear clear the cache completely (except configuration) > > -F, --max-files=N set maximum number of files in cache to N (use 0 > > for no limit) > > -M, --max-size=SIZE set maximum size of cache to SIZE (use 0 for no > > limit); available suffixes: k, M, G, T (decimal) > > and Ki, Mi, Gi, Ti (binary); default suffix: G > > -p, --show-config show current configuration options in > > human-readable format > > -s, --show-stats show summary of configuration and statistics > > counters in human-readable format > > -z, --zero-stats zero statistics counters > > > > -h, --help print this help text > > -V, --version print version and copyright information > > > > Options for scripting or debugging: > > --dump-manifest=PATH dump manifest file at PATH in text format > > -k, --get-config=K print the value of configuration key K > > --hash-file=PATH print the hash (-) of the file at PATH > > --print-stats print statistics counter IDs and corresponding > > values in machine-parsable format > > -o, --set-config=K=V set configuration item K to value V > > > > See also . > > [ 0%] Built target cli_main > > make[4]: *** [tools/lemon/CMakeFiles/lemon.dir/build.make:66: > > tools/lemon/CMakeFiles/lemon.dir/lemon.c.o] Error 1 > > make[3]: *** [CMakeFiles/Makefile2:10914: > > tools/lemon/CMakeFiles/lemon.dir/all] Error 2 > > > > FYI, 2021.02.6 did not exhibit this behavior. > > Seems this comes form the configure step: > > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc [...] > > > With > > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ > -DENABLE_ILBC=OFF \ > -DENABLE_PCAP=ON \ > -DENABLE_SMI=OFF \ > - -DLEMON_C_COMPILER=$(HOSTCC) > + -DLEMON_C_COMPILER="$(HOSTCC)" > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > > this changes to > > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER="/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...] > > but the build fails this time with > > [...] > cd .../build/wireshark-3.4.12/tools/lemon && "/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...]lemon.c > > /bin/sh: line 1: .../host/bin/ccache /usr/bin/gcc: No such file or directory > > > With > > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ > -DENABLE_ILBC=OFF \ > -DENABLE_PCAP=ON \ > -DENABLE_SMI=OFF \ > - -DLEMON_C_COMPILER=$(HOSTCC) > + -DLEMON_C_COMPILER=/usr/bin/gcc > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > The build succeeds... Or better: --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic Regards, Peter > > Regards, > Peter > > > > > > Thanks, > > > > Dan Ambrosio > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Thu Mar 24 19:40:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:40:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-txdbus: drop python2 support Message-ID: <20220324193927.0D6EC85BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fed11362152e8d302b5895c2a3f5c0cbc187a932 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Txdbus is built on top of twisted, which is python3 only since commit f1db1922e460d4f (package/python-twisted: Needs python 3), so propagate the python3 dependency. Signed-off-by: Peter Korsgaard --- package/python-txdbus/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index f38bbf93f0..df77a1f573 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" + depends on BR2_PACKAGE_PYTHON3 # python-twisted select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help From peter at korsgaard.com Thu Mar 24 19:36:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:36:24 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-treq: drop python2 support Message-ID: <20220324193927.03F2A85BA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=294b6e050d2aaf164770d05ececc270da845088f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: http://autobuild.buildroot.net/results/94e/94e009e322787bbcaac3704b64218cefe77b0f56/ Treq is built on top of twisted, which is python3 only since commit f1db1922e460d4f (package/python-twisted: Needs python 3), so propagate the python3 dependency. Signed-off-by: Peter Korsgaard --- package/python-treq/Config.in | 1 + support/testing/tests/package/test_python_treq.py | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 23056e72d2..6ca8be8ab7 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + depends on BR2_PACKAGE_PYTHON3 # python-twisted select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index e24ae845be..d7a23829ea 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -12,15 +12,6 @@ class TestPythonTreq(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Treq(TestPythonTreq): - __test__ = True - config = TestPythonTreq.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TREQ=y - """ - - class TestPythonPy3Treq(TestPythonTreq): __test__ = True config = TestPythonTreq.config + \ From peter at korsgaard.com Thu Mar 24 19:42:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:42:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-txtorcon: drop python2 support Message-ID: <20220324193927.1676385BB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a6448f1aaef2f1da7fa2016b5f473d5e9aeec64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Txtorcon is built on top of twisted, which is python3 only since commit f1db1922e460d4f (package/python-twisted: Needs python 3), so propagate the python3 dependency. Signed-off-by: Peter Korsgaard --- package/python-txtorcon/Config.in | 1 + support/testing/tests/package/test_python_txtorcon.py | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index 4f91e7b048..09166a26bb 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity + depends on BR2_PACKAGE_PYTHON3 # python-twisted select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 1ac2f6919a..8e74190ee1 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txtorcon(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TXTORCON=y - """ - sample_scripts = ["tests/package/sample_python_txtorcon.py"] - timeout = 30 - - class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ From peter at korsgaard.com Thu Mar 24 19:47:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:47:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-coherence: drop package Message-ID: <20220324193927.247DB85BA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be37df00dabf5155d7d9bd8ff7414ed2e44426fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The package does not work with python3, is unmaintained upstream and depends on twisted which no longer works with python2, so drop it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 ++++++ package/Config.in | 1 - .../0001-Fix-twisted-detection.patch | 29 ---------------------- package/python-coherence/Config.in | 10 -------- package/python-coherence/python-coherence.hash | 3 --- package/python-coherence/python-coherence.mk | 13 ---------- 6 files changed, 7 insertions(+), 56 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3f3b42a2a9..197fb4d899 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2021.02" +config BR2_PACKAGE_PYTHON_COHERENCE + bool "python-coherence package removed" + select BR2_LEGACY + help + This package has been removed as it does not work with + Python 3.x and is unmaintained. + config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d45e6d3a86..22ff876c62 100644 --- a/package/Config.in +++ b/package/Config.in @@ -935,7 +935,6 @@ menu "External python modules" source "package/python-cheroot/Config.in" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" - source "package/python-coherence/Config.in" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" diff --git a/package/python-coherence/0001-Fix-twisted-detection.patch b/package/python-coherence/0001-Fix-twisted-detection.patch deleted file mode 100644 index c0e51b9e31..0000000000 --- a/package/python-coherence/0001-Fix-twisted-detection.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3cf8d89cbb44b5c7a0693d0b5d665e68acc3927c Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 10 May 2016 00:14:33 +0200 -Subject: [PATCH] Fix twisted detection. - -Addresses https://github.com/coherence-project/Coherence/issues/25 - -Signed-off-by: Thomas Klausner -Signed-off-by: Yegor Yefremov ---- - coherence/__init__.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/coherence/__init__.py b/coherence/__init__.py -index 2e4e8f1..4c4d73d 100644 ---- a/coherence/__init__.py -+++ b/coherence/__init__.py -@@ -24,8 +24,6 @@ try: - if twisted_version < Version("twisted", 2, 5, 0): - raise ImportError("Twisted >= 2.5 is required. Please install it.") - -- if twisted_web_version < Version("twisted.web", 2, 5, 0): -- raise ImportError("Twisted.Web >= 2.5 is required. Please install it") - except ImportError, exc: - # log error to stderr, might be useful for debugging purpose - for arg in exc.args: --- -2.8.1 - diff --git a/package/python-coherence/Config.in b/package/python-coherence/Config.in deleted file mode 100644 index 0f50080e67..0000000000 --- a/package/python-coherence/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_COHERENCE - bool "python-coherence" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - select BR2_PACKAGE_PYTHON_PYASN1 - help - A DLNA/UPnP Media Server and Framework for the Digital Living. - - https://github.com/coherence-project/Coherence diff --git a/package/python-coherence/python-coherence.hash b/package/python-coherence/python-coherence.hash deleted file mode 100644 index 3c2d45b537..0000000000 --- a/package/python-coherence/python-coherence.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 97c8b700b3fe73d48eacb259008f410d6567e5d7d1b8e96386f8cc2422135ca5 python-coherence-b7856985fd496689ca1f9024925ae737297c00d1.tar.gz -sha256 7713ed8484b4d3364c7f6f2c02aed427b06a0159b1f77aecf907d47016812e81 LICENCE diff --git a/package/python-coherence/python-coherence.mk b/package/python-coherence/python-coherence.mk deleted file mode 100644 index 24da7f70a7..0000000000 --- a/package/python-coherence/python-coherence.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-coherence -# -################################################################################ - -PYTHON_COHERENCE_VERSION = b7856985fd496689ca1f9024925ae737297c00d1 -PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,$(PYTHON_COHERENCE_VERSION)) -PYTHON_COHERENCE_SETUP_TYPE = setuptools -PYTHON_COHERENCE_LICENSE = MIT -PYTHON_COHERENCE_LICENSE_FILES = LICENCE - -$(eval $(python-package)) From arnout at mind.be Thu Mar 24 20:02:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:02:06 +0100 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le In-Reply-To: <20220315130737.428449-1-joel@jms.id.au> References: <20220315130737.428449-1-joel@jms.id.au> Message-ID: On 15/03/2022 14:07, Joel Stanley wrote: > When generating a filesystem image on a power10 build machine running > Ubuntu, we see a segfault when fakeroot is running chmod. > > This has been reported and fixed upstream in Debian in version 1.26-1.2: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 > > Add the samae patch to resolve the segfault. > > Signed-off-by: Joel Stanley > --- > This isn't a commit in the fakeroot tree, rather a patch from the Debian > packaging. Normally we'd just bump fakeroot, but I guess the patch isn't there yet in 1.28. > > I would appreciate if this was added to the 2022.02 stable tree. Plus, that would make backporting iffy. Therefore, applied to master. However. > > Signed-off-by: Joel Stanley > --- > .../fakeroot/fix-prototype-generation.patch | 59 +++++++++++++++++++ > 1 file changed, 59 insertions(+) > create mode 100644 package/fakeroot/fix-prototype-generation.patch > > diff --git a/package/fakeroot/fix-prototype-generation.patch b/package/fakeroot/fix-prototype-generation.patch > new file mode 100644 > index 000000000000..38d32ff3b22c > --- /dev/null > +++ b/package/fakeroot/fix-prototype-generation.patch Patches should be named 0001-XXXX even if they are downloaded from upstream. Actually, if it can literally be downloaded, you could just as well have used FAKEROOT_PATCH = https://... > @@ -0,0 +1,59 @@ > +Subject: Fix prototype generation for openat > +Author: Christoph Biedl > +Date: 2021-12-30 > +Bug-Debian: https://bugs.debian.org/995393 > +Forwarded: Yes (implicitely) > + > + As jrtc27 pointed out in IRC, ppc64el is more strict than other > + architectures when it comes to va_arg handling: > + > + it's that ppc64le uses the elfv2 abi, and for variadic calls you > + must reserve space for a parameter save area > + > + So enhance wrapawk to create a proper prototype and argument > + handling although it's specific to the openat call. Also add the > + missing documentation for the sixth column to wrapfunc.inp. > + Missing Signed-off-by. Again, this needs to be added even if the patch is literally downloaded. Both problems are reported by check-package. Regards, Arnout > +--- a/wrapawk > ++++ b/wrapawk > +@@ -37,7 +37,25 @@ > + argtype=$3; > + argname=$4; > + MACRO=$5; > +- if(MACRO){ > ++ openat_extra=$6; > ++ if(openat_extra){ > ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; > ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; > ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; > ++ > ++ print ret " tmp_" name, openat_extra "{" > tmpffile; > ++ print " mode_t mode = 0;" > tmpffile; > ++ print " if (flags & O_CREAT) {" > tmpffile; > ++ print " va_list args;" > tmpffile; > ++ print " va_start(args, flags);" > tmpffile; > ++ print " mode = va_arg(args, int);" > tmpffile; > ++ print " va_end(args);" > tmpffile; > ++ print " }" > tmpffile; > ++ print " load_library_symbols();" > tmpffile; > ++ print " return next_" name, argname ";" > tmpffile; > ++ print "}" > tmpffile; > ++ print "" > tmpffile; > ++ } else if(MACRO){ > + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; > + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; > + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; > +--- a/wrapfunc.inp > ++++ b/wrapfunc.inp > +@@ -9,8 +9,10 @@ > + /**/ */ > + /* each line of this file lists 4 fields, seperated by a ";". */ > + /* The first field is the name of the wrapped function, then it's return */ > +-/* value. After that come the function arguments with types, and the last */ > ++/* value. After that come the function arguments with types, and the fifth */ > + /* field contains the function arguments without types. */ > ++/* A sixth field is a special needed when wrapping the openat syscall. */ > ++/* Otherwise it's like the third (function arguments with types). */ > + /**/ > + > + /* __*xstat are used on glibc systems instead of just *xstat. */ From arnout at mind.be Thu Mar 24 20:12:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:12:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220314181347.190747-2-thomas@ruschival.de> References: <20220312104402.33075-2-thomas@ruschival.de> <20220314181347.190747-1-thomas@ruschival.de> <20220314181347.190747-2-thomas@ruschival.de> Message-ID: On 14/03/2022 19:13, Thomas Ruschival wrote: > While upstream pistache has not yet released a stable 'tag' I don't think they ever will :-) > a lot has changed since June 2020: > > * project has moved to meson build system, cmake builds > do not install headers. > * patches in buildroot are no longer required > * project-implemented Pistache::Optional was replaced by > use of std::optional. This is only available in C++17 > * dependency to rapidjson has been introduced > > Signed-off-by: Thomas Ruschival > --- > ...-add-C-language-to-project-statement.patch | 70 -------------- > ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- > ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- > package/pistache/Config.in | 9 +- > package/pistache/pistache.hash | 2 +- > package/pistache/pistache.mk | 10 +- > 6 files changed, 12 insertions(+), 212 deletions(-) > delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > [snip] > diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk > index 4d6bd283ea..65d9b2412c 100644 > --- a/package/pistache/pistache.mk > +++ b/package/pistache/pistache.mk > @@ -4,18 +4,20 @@ > # > ################################################################################ > > -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d > +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 > PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) > PISTACHE_LICENSE = Apache-2.0 > PISTACHE_LICENSE_FILES = LICENSE > > PISTACHE_INSTALL_STAGING = YES > +PISTACHE_DEPENDENCIES += rapidjson > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > PISTACHE_DEPENDENCIES += openssl > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true > +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false I've applied to master as is, but this sounds like we would always want to disable it (we don't build tests if we can avoid it). Follow-up patch to move it out of the condition (if that's the right thing to do) welcome! Regards, Arnout > else > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false > endif > > -$(eval $(cmake-package)) > +$(eval $(meson-package)) From kris at embeddedTS.com Thu Mar 24 20:20:22 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:22 -0700 Subject: [Buildroot] [PATCH 0/4] Pull in WILC Wi-Fi updates Message-ID: <20220324202026.5688-1-kris@embeddedTS.com> This series bumps WILC1000/3000 firmware to the latest available from Microchip, updates existing defconfig files to include both WILC1000 and WILC3000 blobs, and adds a package to build the wilc driver as an external kernel module. The previous wilc1000-firmware package was extremely outdated, no longer available on github, and installed the firmware files to the wrong location for the current upstream kernel wilc1000 driver and Microchip's separately maintained driver. Since the firmware change includes individual WILC1000 and WILC3000 config options, this package is renamed to wilc-firmware. The defconfigs of all platforms that used WILC1000 firmware were touched to also include WILC3000 firmware. They either natively have WILC3000 or can support either WILC1000/WILC3000 being connected to these platforms. I've attempted to test the firmware changes against microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig as this is a board I have in my possession. However, the defconfig appears broken (Microchip now maintains the evk in their own BR2_EXTERNAL repo): ... Kernel command line: console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw ... RAMDISK: Couldn't find valid RAM disk image starting at 0. mmc0: new ultra high speed DDR50 SDHC card at address aaaa List of all partitions: ... Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(1,0) CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.80-linux4microchip-2021.10 #1 Hardware name: Atmel SAMA5 Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Exception stack(0xc2c29fb0 to 0xc2c29ff8) 9fa0: 00000000 00000000 00000000 00000000 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(1,0) ]--- The firmware and driver changes have been thoroughly tested, however, on an embeddedTS platform (BR patch for this in the future, waiting on kernel accepting FDT) that includes the WILC3000 device. We have a number of platforms that all use this same device and are starting to push for better upstream support overall. So this patch series is us laying the groundwork for that. Kris Bahnsen (4): package/wilc1000-firmware: bump to 15.6 package/wilc-firmware: rename from wilc1000-firmware configs: add WILC3000_FIRMWARE to compatible devices package/wilc-driver: new package DEVELOPERS | 6 ++- configs/at91sam9x5ek_dev_defconfig | 1 + configs/at91sam9x5ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 1 + configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + .../microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + package/Config.in | 3 +- package/wilc-driver/Config.in | 58 ++++++++++++++++++++++ package/wilc-driver/wilc-driver.hash | 2 + package/wilc-driver/wilc-driver.mk | 29 +++++++++++ package/wilc-firmware/Config.in | 29 +++++++++++ package/wilc-firmware/wilc-firmware.hash | 2 + package/wilc-firmware/wilc-firmware.mk | 34 +++++++++++++ package/wilc1000-firmware/Config.in | 6 --- package/wilc1000-firmware/wilc1000-firmware.hash | 2 - package/wilc1000-firmware/wilc1000-firmware.mk | 24 --------- 23 files changed, 173 insertions(+), 34 deletions(-) create mode 100644 package/wilc-driver/Config.in create mode 100644 package/wilc-driver/wilc-driver.hash create mode 100644 package/wilc-driver/wilc-driver.mk create mode 100644 package/wilc-firmware/Config.in create mode 100644 package/wilc-firmware/wilc-firmware.hash create mode 100644 package/wilc-firmware/wilc-firmware.mk delete mode 100644 package/wilc1000-firmware/Config.in delete mode 100644 package/wilc1000-firmware/wilc1000-firmware.hash delete mode 100644 package/wilc1000-firmware/wilc1000-firmware.mk -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:26 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:26 -0700 Subject: [Buildroot] [PATCH 4/4] package/wilc-driver: new package In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-5-kris@embeddedTS.com> WILC1000/3000 driver pulled from at91-linux tree set-up to be built as an external module. Upstream Linux kernel does not support WILC3000 features at this time. This package is intended to bridge that gap until WILC1000/3000 is fully supported in kernel. Signed-off-by: Kris Bahnsen --- DEVELOPERS | 1 + package/Config.in | 1 + package/wilc-driver/Config.in | 58 ++++++++++++++++++++++++++++++++++++ package/wilc-driver/wilc-driver.hash | 2 ++ package/wilc-driver/wilc-driver.mk | 29 ++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 package/wilc-driver/Config.in create mode 100644 package/wilc-driver/wilc-driver.hash create mode 100644 package/wilc-driver/wilc-driver.mk diff --git a/DEVELOPERS b/DEVELOPERS index 17becfa189..acd341873d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1662,6 +1662,7 @@ F: configs/octavo_osd32mp1_red_defconfig N: Kris Bahnsen F: package/wilc-firmware/ +F: package/wilc-driver/ N: Kurt Van Dijck F: package/bcusdk/ diff --git a/package/Config.in b/package/Config.in index a175f105f3..ae3f13df5c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -610,6 +610,7 @@ endmenu source "package/usbutils/Config.in" source "package/w_scan/Config.in" source "package/wf111/Config.in" + source "package/wilc-driver/Config.in" source "package/wipe/Config.in" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" diff --git a/package/wilc-driver/Config.in b/package/wilc-driver/Config.in new file mode 100644 index 0000000000..caf46ae281 --- /dev/null +++ b/package/wilc-driver/Config.in @@ -0,0 +1,58 @@ +config BR2_PACKAGE_WILC_DRIVER + bool "wilc kernel module" + help + External kernel module for WILC1000/3000 devices. + + wilc kernel driver source as found in Microchip's at91-linux + kernel tree with added Kbuild file to be built as a generic + external module. + + The wilc1000 driver currently maintained in Linux kernel does + not support BLE of the WILC3000 hardware. This package is + meant to bridge that gap until Microchip can get WILC3000 + support upstream. + + Supports both SDIO and SPI modes. + + https://github.com/embeddedTS/wilc3000-external-module + +if BR2_PACKAGE_WILC_DRIVER + +config BR2_PACKAGE_WILC_DRIVER_SPI + bool "SPI" + help + This module adds support for the SPI interface of adapters + using WILC1000/3000 chipset. The WILC1000/3000 has a Serial + Peripheral Interface (SPI) that operates as an SPI slave. + This SPI interface can be used for control and for serial + I/O of 802.11 data. The SPI is a full-duplex slave + synchronous serial interface that is available immediately + following reset when pin 9 (SDIO_SPI_CFG) is tied to VDDIO. + Select this if your platform is using the SPI bus. + +config BR2_PACKAGE_WILC_DRIVER_SDIO + bool "SDIO" + help + This module adds support for the SDIO interface of adapters + using WILC1000/3000 chipset. The WILC1000/3000 SDIO is a full + speed interface. It meets SDIO card specification version 2.0. + The interface supports the 1-bit/4-bit SD transfer mode at the + clock range of 0-50 MHz. The host can use this interface to + read and write from any register within the chip as well as + configure the WILC1000/3000 for data DMA. To use this + interface, pin9 (SDIO_SPI_CFG) must be grounded. Select this + if your platform is using the SDIO bus. + +if BR2_PACKAGE_WILC_DRIVER_SDIO + +config BR2_PACKAGE_WILC_DRIVER_SDIO_OOB + bool "Enable out-of-band interrupt" + help + This option enables out-of-band interrupt support for the + WILC1000/3000 chipset. This OOB interrupt is intended to + provide a faster interrupt mechanism for SDIO host controllers + that don't support SDIO interrupt. Select this option If the + SDIO host controller in your platform doesn't support SDIO + time division interrupt. +endif +endif diff --git a/package/wilc-driver/wilc-driver.hash b/package/wilc-driver/wilc-driver.hash new file mode 100644 index 0000000000..bfd8eaebc4 --- /dev/null +++ b/package/wilc-driver/wilc-driver.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 62a03d1a4f6aa92f5ecae36b5c8798a121506e8b09a8a68192b664416bf6e745 wilc-driver-linux4microchip-2021.10.tar.gz diff --git a/package/wilc-driver/wilc-driver.mk b/package/wilc-driver/wilc-driver.mk new file mode 100644 index 0000000000..3b1fab8954 --- /dev/null +++ b/package/wilc-driver/wilc-driver.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# wilc-driver +# +################################################################################ + +WILC_DRIVER_VERSION = linux4microchip-2021.10 +WILC_DRIVER_SITE = $(call github,embeddedTS,wilc3000-external-module,$(WILC_DRIVER_VERSION)) + +WILC_DRIVER_LICENSE = GPL-2.0 +WILC_DRIVER_LICENSE_FILES = LICENSE + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SPI),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_SPI=m +endif + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_SDIO=m +endif + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO_OOB),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_HW_OOB_INTR=y +endif + +$(eval $(kernel-module)) +$(eval $(generic-package)) -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:25 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:25 -0700 Subject: [Buildroot] [PATCH 3/4] configs: add WILC3000_FIRMWARE to compatible devices In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-4-kris@embeddedTS.com> The update to wilc-firmware added firmware files for WILC3000 devices as a separate config option. All Atmel/Microchip defconfigs that previously only had WILC1000_FIRMWARE either have WILC3000 Wi-Fi hardware (WILC3000 is the same silicon but with BLE added) or have the capacity to have either WILC1000 or WILC3000 devices added to the system. Install all firmware blobs to these devices by default. Signed-off-by: Kris Bahnsen --- configs/at91sam9x5ek_dev_defconfig | 1 + configs/at91sam9x5ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 1 + configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + 12 files changed, 12 insertions(+) diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index bfa8e95941..8714463d89 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -47,6 +47,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 2e1a5c7f59..9481594716 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -50,6 +50,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index ba2fa46790..38618a5732 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -39,6 +39,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index a8b68ca0a2..1654408aa5 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -53,6 +53,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index cdfd9de17e..64455cb2e0 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -49,6 +49,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a2205aeefa..8f5724d631 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -52,6 +52,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index f8783f5652..fab91cf0b3 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -50,6 +50,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index b4e99f658a..f9074e9862 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -53,6 +53,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 06e03967c4..2b4e234297 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -36,6 +36,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 3bcd5f0200..f9aa6cdc05 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -39,6 +39,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 27d1d3409d..b1b22c1312 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -32,6 +32,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 6eb6c282e0..d68846e553 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -30,6 +30,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:24 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:24 -0700 Subject: [Buildroot] [PATCH 2/4] package/wilc-firmware: rename from wilc1000-firmware In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-3-kris@embeddedTS.com> Separates out WILC1000 and WILC3000 in to individual config options since in reality only one or the other set would be needed. Signed-off-by: Kris Bahnsen --- DEVELOPERS | 5 ++++- package/Config.in | 2 +- package/{wilc1000-firmware => wilc-firmware}/Config.in | 4 ++-- .../wilc-firmware.hash} | 2 +- .../wilc-firmware.mk} | 14 +++++++------- 5 files changed, 15 insertions(+), 12 deletions(-) rename package/{wilc1000-firmware => wilc-firmware}/Config.in (92%) rename package/{wilc1000-firmware/wilc1000-firmware.hash => wilc-firmware/wilc-firmware.hash} (62%) rename package/{wilc1000-firmware/wilc1000-firmware.mk => wilc-firmware/wilc-firmware.mk} (67%) diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..17becfa189 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1660,6 +1660,9 @@ F: board/octavo/osd32mp1-red/ F: configs/octavo_osd32mp1_brk_defconfig F: configs/octavo_osd32mp1_red_defconfig +N: Kris Bahnsen +F: package/wilc-firmware/ + N: Kurt Van Dijck F: package/bcusdk/ F: package/libpthsem/ @@ -1757,7 +1760,7 @@ F: package/python-json-schema-validator/ F: package/python-keyring/ F: package/python-simplejson/ F: package/python-versiontools/ -F: package/wilc1000-firmware/ +F: package/wilc-firmware/ N: Maeva Manuel F: board/freescale/imx8qmmek/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..a175f105f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -432,7 +432,7 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" - source "package/wilc1000-firmware/Config.in" + source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" endmenu diff --git a/package/wilc1000-firmware/Config.in b/package/wilc-firmware/Config.in similarity index 92% rename from package/wilc1000-firmware/Config.in rename to package/wilc-firmware/Config.in index 0734c7ad99..23abc88712 100644 --- a/package/wilc1000-firmware/Config.in +++ b/package/wilc-firmware/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WILC1000_FIRMWARE bool "wilc1000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE help Firmware for Microchip WILC1000 wireless device @@ -12,9 +13,9 @@ config BR2_PACKAGE_WILC1000_FIRMWARE https://github.com/linux4wilc/firmware -if BR2_PACKAGE_WILC1000_FIRMWARE config BR2_PACKAGE_WILC3000_FIRMWARE bool "wilc3000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE help Firmware for Microchip WILC3000 wireless device @@ -26,4 +27,3 @@ config BR2_PACKAGE_WILC3000_FIRMWARE These will be installed to /lib/firmware/mchp/ https://github.com/linux4wilc/firmware -endif diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc-firmware/wilc-firmware.hash similarity index 62% rename from package/wilc1000-firmware/wilc1000-firmware.hash rename to package/wilc-firmware/wilc-firmware.hash index 9d55be9edc..2f1fc9964d 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc1000-firmware-wilc_linux_15_6.tar.gz +sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc-firmware-wilc_linux_15_6.tar.gz diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc-firmware/wilc-firmware.mk similarity index 67% rename from package/wilc1000-firmware/wilc1000-firmware.mk rename to package/wilc-firmware/wilc-firmware.mk index 2bea9febe2..63fd100421 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -1,13 +1,13 @@ ################################################################################ # -# wilc1000-firmware +# wilc-firmware # ################################################################################ -WILC1000_FIRMWARE_VERSION = wilc_linux_15_6 -WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION)) +WILC_FIRMWARE_VERSION = wilc_linux_15_6 +WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) -WILC1000_FIRMWARE_LICENSE = PROPRIETARY +WILC_FIRMWARE_LICENSE = PROPRIETARY ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) WILC1000_FIRMWARE_FILES += \ @@ -20,15 +20,15 @@ WILC1000_FIRMWARE_FILES += \ wilc3000_wifi_firmware.bin endif -define WILC1000_FIRMWARE_INSTALL_FILES +define WILC_FIRMWARE_INSTALL_FILES cd $(@D) && \ $(TAR) cf install.tar $(sort $(WILC1000_FIRMWARE_FILES)) && \ $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp endef -define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS +define WILC_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ - $(WILC1000_FIRMWARE_INSTALL_FILES) + $(WILC_FIRMWARE_INSTALL_FILES) endef $(eval $(generic-package)) -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:23 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:23 -0700 Subject: [Buildroot] [PATCH 1/4] package/wilc1000-firmware: bump to 15.6 In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-2-kris@embeddedTS.com> Supports both WILC1000 (Wi-Fi only) and WILC3000 (Wi-Fi/BLE) hardware To support WILC3000 this commit adds a separate config option, the original config option from this package is still valid. Signed-off-by: Kris Bahnsen --- package/wilc1000-firmware/Config.in | 27 +++++++++++++++++++++-- package/wilc1000-firmware/wilc1000-firmware.hash | 2 +- package/wilc1000-firmware/wilc1000-firmware.mk | 28 ++++++++++++++++-------- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/package/wilc1000-firmware/Config.in b/package/wilc1000-firmware/Config.in index df8a7a6b60..0734c7ad99 100644 --- a/package/wilc1000-firmware/Config.in +++ b/package/wilc1000-firmware/Config.in @@ -1,6 +1,29 @@ config BR2_PACKAGE_WILC1000_FIRMWARE bool "wilc1000-firmware" help - Firmware for Atmel Wilc1000 wireless device + Firmware for Microchip WILC1000 wireless device - https://github.com/linux4sc/wireless-firmware.git + These binary blobs are provided directly from Microchip. + Ideally, the firmware version should match driver version. + Generally, the latest firmware would be acceptible regardless + of driver version. + + These will be installed to /lib/firmware/mchp/ + + https://github.com/linux4wilc/firmware + +if BR2_PACKAGE_WILC1000_FIRMWARE +config BR2_PACKAGE_WILC3000_FIRMWARE + bool "wilc3000-firmware" + help + Firmware for Microchip WILC3000 wireless device + + These binary blobs are provided directly from Microchip. + Ideally, the firmware version should match driver version. + Generally, the latest firmware would be acceptible regardless + of driver version. + + These will be installed to /lib/firmware/mchp/ + + https://github.com/linux4wilc/firmware +endif diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc1000-firmware/wilc1000-firmware.hash index 5344efe517..9d55be9edc 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.hash +++ b/package/wilc1000-firmware/wilc1000-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a2e7a327dd545ba2051946f7613005cbde88fdd952afb8eecdd1dacda7e767d2 v14.1_Firmware.zip +sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc1000-firmware-wilc_linux_15_6.tar.gz diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc1000-firmware/wilc1000-firmware.mk index 6f504d67a0..2bea9febe2 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ b/package/wilc1000-firmware/wilc1000-firmware.mk @@ -4,21 +4,31 @@ # ################################################################################ -WILC1000_FIRMWARE_VERSION = 14.1 -WILC1000_FIRMWARE_SITE = https://github.com/linux4sc/wireless-firmware/archive -WILC1000_FIRMWARE_SOURCE = v$(WILC1000_FIRMWARE_VERSION)_Firmware.zip +WILC1000_FIRMWARE_VERSION = wilc_linux_15_6 +WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION)) WILC1000_FIRMWARE_LICENSE = PROPRIETARY -define WILC1000_FIRMWARE_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(WILC1000_FIRMWARE_DL_DIR)/$(WILC1000_FIRMWARE_SOURCE) - mv $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware/* $(@D) - rmdir $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware +ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) +WILC1000_FIRMWARE_FILES += \ + wilc1000_wifi_firmware.bin +endif + +ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y) +WILC1000_FIRMWARE_FILES += \ + wilc3000_ble_firmware.bin \ + wilc3000_wifi_firmware.bin +endif + +define WILC1000_FIRMWARE_INSTALL_FILES + cd $(@D) && \ + $(TAR) cf install.tar $(sort $(WILC1000_FIRMWARE_FILES)) && \ + $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp endef define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/wilc1003_firmware.bin \ - $(TARGET_DIR)/lib/firmware/atmel/wilc1003_firmware.bin + $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ + $(WILC1000_FIRMWARE_INSTALL_FILES) endef $(eval $(generic-package)) -- 2.11.0 From arnout at mind.be Thu Mar 24 20:37:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:37:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <20220313175615.406390-1-james.hilliard1@gmail.com> References: <20220313175615.406390-1-james.hilliard1@gmail.com> Message-ID: <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> On 13/03/2022 18:56, James Hilliard wrote: > There are a number of flit toolchain dependencies currently in the > process of deprecating distutils based fallbacks. > > This will be needed in order to update tomli. > > We need to migrate these to use a new bootstrap based build+install > sequence which relies on flit's bootstrap wheel build+install > features to build and install host-python-pypa-build and > host-python-installer which gives us a full pep517 toolchain. > > Note that one can run host-python-flit-core commands for building > and installing itself since the package build directory is the cwd. > > For host-python-installer to do this we need to add the package src > directory to PYTHONPATH as we need to run it from the source directory > for installing itself. This is due to a directory structure that does > not let us run directly from the top level. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - formatting/cleanup > - add comments > --- > package/pkg-python.mk | 45 ++++++++++++++++++-- > package/python-flit-core/python-flit-core.mk | 2 +- > package/python-installer/python-installer.mk | 3 +- > package/python-pep517/python-pep517.mk | 2 +- > package/python-tomli/python-tomli.mk | 2 +- > 5 files changed, 46 insertions(+), 8 deletions(-) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..f08d8ce04c 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --scripts=$(HOST_DIR)/usr/bin \ > --data=$(HOST_DIR)/usr > > +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ > + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > + > ################################################################################ > # inner-python-package -- defines how the configuration, compilation > # and installation of a Python package should be done, implements a > @@ -211,8 +214,25 @@ $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $ > $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) > else > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > -$(2)_BASE_BUILD_CMD = -m build -n -w > -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > +# Use flit built in wheel builder for packages that are host-python-pypa-build dependencies. > +# This is needed to avoid a circular with host-python-pypa-build and those dependencies. > +# > +$(2)_BASE_BUILD_CMD = $$(if \ > + $$(filter \ > + host-python-flit-core host-python-installer host-python-pep517 host-python-tomli, \ > + $(1)) \ > + , \ > + -m flit_core.wheel, \ > + -m build -n -w \ This is adding way too much complexity to the infra just to support these four packages. I think there a a couple of better options: - don't use python infra at all for these packages; or - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or - add a fifth SETUP_TYPE "generic" or "custom" or something, which requires $(2)_BASE_* to be set by the python-flit-core.mk; - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which only gets used by the problematic packages. The latter two options have my preference because I think they are the cleanest, but any of them is OK for me. The "generic" setup type and the overridable _BASE_BUILD_CMD would also require an update in the manual. > + ) > +# Use flit built in bootstrap_install for installing host-python-flit-core. > +# This is due to host-python-installer depending on host-python-flit-core. > +# > +$(2)_BASE_INSTALL_CMD = $$(if \ > + $$(filter host-python-flit-core,$(1)), \ > + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS), \ > + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) \ > + ) > endif > else > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") > @@ -235,9 +255,26 @@ endif # ($(4),target) > ifeq ($$($(2)_SETUP_TYPE),setuptools) > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > +# Filter out host-python-pypa-build and any of its dependencies that need a flit based build. > +# > +$(2)_DEPENDENCIES += $$(if \ > + $$(filter \ > + host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ > + $(1)) \ > + ,, \ > + host-python-pypa-build \ With the "generic" or "flit-bootstrap" setup types, this would no longer be needed. For the other solutions, we will indeed still need this ugly thing. > + ) > +# Filter out host-python-installer and any of its dependencies that need a flit based build. > +# > +$(2)_DEPENDENCIES += $$(if \ > + $$(filter \ > + host-python-flit-core host-python-installer, \ > + $(1)) \ > + ,, \ > + host-python-installer \ > + ) > ifeq ($$($(2)_SETUP_TYPE),flit) > -$(2)_DEPENDENCIES += host-python-flit-core > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) > endif > endif # SETUP_TYPE > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > index 0e058a1f17..d206a72f82 100644 > --- a/package/python-flit-core/python-flit-core.mk > +++ b/package/python-flit-core/python-flit-core.mk > @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > +PYTHON_FLIT_CORE_SETUP_TYPE = flit This means there's no package any more that uses pep517 setup type. Do you think it's ever going to be used again? Or can we remove it altogether? (Removing it is not urgent at all even if it's unused. But if it's really not likely to be used again, I'd prefer to get rid of it by 2022.05.) > > $(eval $(host-python-package)) > diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk > index 862a251415..97a158b738 100644 > --- a/package/python-installer/python-installer.mk > +++ b/package/python-installer/python-installer.mk > @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz > PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 > PYTHON_INSTALLER_LICENSE = MIT > PYTHON_INSTALLER_LICENSE_FILES = LICENSE > -PYTHON_INSTALLER_SETUP_TYPE = distutils > +PYTHON_INSTALLER_SETUP_TYPE = flit > +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src You said that all these packages have to be converted in a single patch, but that's not true: it's perfectly possible to change the infra and keep using distutils for this package. The infra changes don't affect distutils setup type at all. Only the change in flit-core really needs to be in the same patch. BTW, when someone reviews a patch (i.e. Yann), it's nice to put them in Cc of later iterations. Regards, Arnout > > $(eval $(host-python-package)) > diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk > index 99aa62d51d..1ca1bc4e35 100644 > --- a/package/python-pep517/python-pep517.mk > +++ b/package/python-pep517/python-pep517.mk > @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz > PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 > PYTHON_PEP517_LICENSE = MIT > PYTHON_PEP517_LICENSE_FILES = LICENSE > -PYTHON_PEP517_SETUP_TYPE = distutils > +PYTHON_PEP517_SETUP_TYPE = flit > HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli > > $(eval $(host-python-package)) > diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk > index b8c20ca736..3539a505be 100644 > --- a/package/python-tomli/python-tomli.mk > +++ b/package/python-tomli/python-tomli.mk > @@ -7,7 +7,7 @@ > PYTHON_TOMLI_VERSION = 1.2.0 > PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz > PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa > -PYTHON_TOMLI_SETUP_TYPE = distutils > +PYTHON_TOMLI_SETUP_TYPE = flit > PYTHON_TOMLI_LICENSE = MIT > PYTHON_TOMLI_LICENSE_FILES = LICENSE > From arnout at mind.be Thu Mar 24 20:38:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:38:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: switch to autotools-package In-Reply-To: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> References: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> Message-ID: <5a93d9b6-0db2-4613-c0a4-c7304f19236e@mind.be> On 13/03/2022 18:39, Fabrice Fontaine wrote: > Switch to autotools-package to avoid the following static build failure Usually cmake is more future-safe, but here it seems both really are fully maintained. Applied to master, thanks. Regards, Arnout > since commit d661740201405970f65c16c39a79f4148705af30: > > [ 56%] Linking C executable rtl_biast > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' > collect2: error: ld returned 1 exit status > > Drop both cmake-related patches > > Fixes: > - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 > > Signed-off-by: Fabrice Fontaine > --- > ...pect-DESTDIR-with-install-udev-rules.patch | 31 +++++ > ...sable_shared_library_target_in_build.patch | 130 ------------------ > ...rsion.cmake-don-t-use-Git-version-if.patch | 47 ------- > package/librtlsdr/librtlsdr.mk | 26 ++-- > 4 files changed, 42 insertions(+), 192 deletions(-) > create mode 100644 package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch > delete mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch > delete mode 100644 package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch > > diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch > new file mode 100644 > index 0000000000..1aec8166cc > --- /dev/null > +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch > @@ -0,0 +1,31 @@ > +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 19 Feb 2022 22:29:45 +0100 > +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] > +--- > + Makefile.am | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index 65b2f21..6b8691a 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -14,10 +14,10 @@ dist-hook: > + echo $(VERSION) > $(distdir)/.tarball-version > + > + install-udev-rules: > +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d > ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d > + > + uninstall-udev-rules: > +- rm -rf /etc/udev/rules.d/rtl-sdr.rules > ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules > + > + EXTRA_DIST = git-version-gen .version > + > +-- > +2.34.1 > + > diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch > deleted file mode 100644 > index 2fb63465de..0000000000 > --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch > +++ /dev/null > @@ -1,130 +0,0 @@ > -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 > -From: Gwenhael Goavec-Merou > -Date: Fri, 15 May 2020 16:14:48 +0200 > -Subject: [PATCH] disable shared library target in build > - > -Disable shared library target if BUILD_SHARED_LIBS if OFF. > - > -Patch retrieved from > -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x > - > -Patch has been updated to work with master and to be able to keep current > -behavior of building shared and static version of library if > -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. > -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library > -will be install. > - > -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] > - > -Signed-off-by: Yuvaraj Patil > -Signed-off-by: Fabrice Fontaine > -Signed-off-by: Gwenhael Goavec-Merou > -Signed-off-by: Titouan Christophe > ---- > - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- > - 1 file changed, 21 insertions(+), 9 deletions(-) > - > -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > -index de93044..13b7b1a 100644 > ---- a/src/CMakeLists.txt > -+++ b/src/CMakeLists.txt > -@@ -18,6 +18,8 @@ > - ######################################################################## > - # Setup shared library variant > - ######################################################################## > -+option(BUILD_SHARED_LIBS "Build shared library" ON) > -+if(BUILD_SHARED_LIBS) > - add_library(rtlsdr SHARED librtlsdr.c > - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) > - target_link_libraries(rtlsdr PkgConfig::LIBUSB) > -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) > - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) > - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) > - generate_export_header(rtlsdr) > -+list(APPEND rtlsdr_lib rtlsdr) > -+endif() > - > - ######################################################################## > - # Setup static library variant > - ######################################################################## > -+option(BUILD_STATIC_LIBS "Build static library" ON) > -+if(BUILD_STATIC_LIBS) > - add_library(rtlsdr_static STATIC librtlsdr.c > - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) > - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) > -@@ -47,6 +53,8 @@ if(NOT WIN32) > - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) > - endif() > - generate_export_header(rtlsdr_static) > -+list(APPEND rtlsdr_lib rtlsdr_static) > -+endif() > - > - ######################################################################## > - # Set up Windows DLL resource files > -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) > - add_executable(rtl_adsb rtl_adsb.c) > - add_executable(rtl_power rtl_power.c) > - add_executable(rtl_biast rtl_biast.c) > --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) > -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) > - > --target_link_libraries(rtl_sdr rtlsdr convenience_static > -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_tcp rtlsdr convenience_static > -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_test rtlsdr convenience_static > -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_fm rtlsdr convenience_static > -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_eeprom rtlsdr convenience_static > -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_adsb rtlsdr convenience_static > -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_power rtlsdr convenience_static > -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_biast rtlsdr convenience_static > -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > -@@ -156,12 +164,16 @@ endif() > - ######################################################################## > - # Install built library files & utilities > - ######################################################################## > -+if(BUILD_SHARED_LIBS) > - install(TARGETS rtlsdr EXPORT RTLSDR-export > - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file > - ) > -+endif() > -+if(BUILD_STATIC_LIBS) > - install(TARGETS rtlsdr_static EXPORT RTLSDR-export > - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file > - ) > -+endif() > - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast > - DESTINATION ${CMAKE_INSTALL_BINDIR} > - ) > --- > -2.25.3 > - > diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch > deleted file mode 100644 > index 9c808edd41..0000000000 > --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Tue, 11 Aug 2020 23:07:08 +0200 > -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in > - a Git repo > - > -If the librtlsdr code comes from a tarball, it doesn't have any .git/ > -metadata, and therefore even if Git (as a tool) is found, the logic in > -cmake/Modules/Version.cmake fails finding a version through Git: > - > --- Extracting version information from git describe... > -fatal: Not a git repository (or any of the parent directories): .git > - > -As a consequence, the VERSION variable is empty, which later causes > -cmake to bail out with: > - > -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): > - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() > -Call Stack (most recent call first): > - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) > - CMakeLists.txt:173 (write_basic_package_version_file) > - > -To avoid this, we only use Git to determine the version if the cmake > -project top-level source directory has a .git/ folder. > - > -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 > -Signed-off-by: Thomas Petazzoni > ---- > - cmake/Modules/Version.cmake | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake > -index 2d4e76d..6f67fa4 100644 > ---- a/cmake/Modules/Version.cmake > -+++ b/cmake/Modules/Version.cmake > -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) > - ######################################################################## > - find_package(Git QUIET) > - > --if(GIT_FOUND) > -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) > - message(STATUS "Extracting version information from git describe...") > - execute_process( > - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long > --- > -2.26.2 > - > diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk > index 7796d1096a..908be158b1 100644 > --- a/package/librtlsdr/librtlsdr.mk > +++ b/package/librtlsdr/librtlsdr.mk > @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) > LIBRTLSDR_LICENSE = GPL-2.0+ > LIBRTLSDR_LICENSE_FILES = COPYING > LIBRTLSDR_INSTALL_STAGING = YES > -LIBRTLSDR_DEPENDENCIES = libusb > - > -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable > -ifeq ($(BR2_STATIC_LIBS),y) > -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON > -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON > -else ifeq ($(BR2_SHARED_LIBS),y) > -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF > -endif > +# From git > +LIBRTLSDR_AUTORECONF = YES > +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb > +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install > > ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON > +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules > endif > > ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) > -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 > +LIBRTLSDR_CONF_OPTS += --enable-driver-detach > +else > +LIBRTLSDR_CONF_OPTS += --disable-driver-detach > endif > > ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) > -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON > +LIBRTLSDR_CONF_OPTS += --enable-zerocopy > else > -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF > +LIBRTLSDR_CONF_OPTS += --disable-zerocopy > endif > > -$(eval $(cmake-package)) > +$(eval $(autotools-package)) From arnout at mind.be Thu Mar 24 20:41:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:41:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.3 In-Reply-To: <20220314183014.2173419-1-james.hilliard1@gmail.com> References: <20220314183014.2173419-1-james.hilliard1@gmail.com> Message-ID: <186f7501-bf1e-c896-07e9-e7d439b2a044@mind.be> On 14/03/2022 19:30, James Hilliard wrote: > Signed-off-by: James Hilliard There's not really much point bumping a host-only package unless it actually does something for the build. Still: applied to master, thanks. Regards, Arnout > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index c2d53519d4..d909709b24 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc > -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc > +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 125488dd46..4615e839fe 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 0.61.1 > +MESON_VERSION = 0.61.3 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING From arnout at mind.be Thu Mar 24 20:42:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:42:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: bump to version 0.14.0 In-Reply-To: <20220314181634.2155997-1-james.hilliard1@gmail.com> References: <20220314181634.2155997-1-james.hilliard1@gmail.com> Message-ID: On 14/03/2022 19:16, James Hilliard wrote: > Drop patches that are now upstream. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > ...d-check-user-xenv.sh-for-systemd-se.patch} | 0 > ...treamer-check-1.0-unless-tests-are-e.patch | 33 ---------------- > ...on-python-module-for-python-install.patch} | 0 > ...tive-symlink-for-gstd-gst-client-exe.patch | 38 ------------------- > package/gstreamer1/gstd/gstd.hash | 2 +- > package/gstreamer1/gstd/gstd.mk | 2 +- > 6 files changed, 2 insertions(+), 73 deletions(-) > rename package/gstreamer1/gstd/{0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch => 0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch} (100%) > delete mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch > rename package/gstreamer1/gstd/{0005-Use-native-meson-python-module-for-python-install.patch => 0003-Use-native-meson-python-module-for-python-install.patch} (100%) > delete mode 100644 package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch > > diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch > similarity index 100% > rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch > rename to package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch > diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch > deleted file mode 100644 > index 495fbfc3fa..0000000000 > --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 > -From: James Hilliard > -Date: Tue, 14 Sep 2021 01:49:49 -0600 > -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. > - > -Signed-off-by: James Hilliard > -[Upstream status: > -https://github.com/RidgeRun/gstd-1.x/pull/248] > ---- > - meson.build | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 1d9ce9d..76990a0 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') > - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') > - libd_dep = dependency('libdaemon', version : '>=0.14') > - jansson_dep = dependency('jansson', version : '>=2.7') > --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') > - thread_dep = dependency('threads') > - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') > - > -+gst_check_required = get_option('enable-tests').enabled() > -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') > -+ > - systemd_required = get_option('enable-systemd').enabled() > - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') > - > --- > -2.25.1 > - > diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch > similarity index 100% > rename from package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch > rename to package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch > diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch > deleted file mode 100644 > index 265ea8d8c3..0000000000 > --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 > -From: James Hilliard > -Date: Tue, 14 Sep 2021 02:49:10 -0600 > -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. > - > -This should fix the symlink path when cross compiling. > - > -Signed-off-by: James Hilliard > -[Upstream status: > -https://github.com/RidgeRun/gstd-1.x/pull/249] > ---- > - gst_client/gst_client_symbolic_link.sh | 2 +- > - gstd/gstd_symbolic_link.sh | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh > -index d8d7617..b87dd12 100755 > ---- a/gst_client/gst_client_symbolic_link.sh > -+++ b/gst_client/gst_client_symbolic_link.sh > -@@ -4,4 +4,4 @@ > - # $1: target > - # $2: link name > - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh > -index d8d7617..b87dd12 100755 > ---- a/gstd/gstd_symbolic_link.sh > -+++ b/gstd/gstd_symbolic_link.sh > -@@ -4,4 +4,4 @@ > - # $1: target > - # $2: link name > - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > --- > -2.25.1 > - > diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash > index 6ec84bd58d..20c821a27f 100644 > --- a/package/gstreamer1/gstd/gstd.hash > +++ b/package/gstreamer1/gstd/gstd.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz > +sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk > index 959e277272..08a29f26ff 100644 > --- a/package/gstreamer1/gstd/gstd.mk > +++ b/package/gstreamer1/gstd/gstd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GSTD_VERSION = 0.13.0 > +GSTD_VERSION = 0.14.0 > GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) > GSTD_LICENSE_FILES = COPYING > GSTD_LICENSE = GPL-2.0+ From arnout at mind.be Thu Mar 24 20:42:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:42:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.1 In-Reply-To: <20220314183234.2174325-1-james.hilliard1@gmail.com> References: <20220314183234.2174325-1-james.hilliard1@gmail.com> Message-ID: <1a211258-0573-2218-c4a2-7a658e0f61b6@mind.be> On 14/03/2022 19:32, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aioconsole/python-aioconsole.hash | 4 ++-- > package/python-aioconsole/python-aioconsole.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash > index 39ce16f8b2..af8b5c4de9 100644 > --- a/package/python-aioconsole/python-aioconsole.hash > +++ b/package/python-aioconsole/python-aioconsole.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aioconsole/json > -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz > -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz > +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz > +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz > # Locally computed sha256 checksums > sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE > diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk > index 44857054d4..a58fd33a61 100644 > --- a/package/python-aioconsole/python-aioconsole.mk > +++ b/package/python-aioconsole/python-aioconsole.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOCONSOLE_VERSION = 0.4.0 > +PYTHON_AIOCONSOLE_VERSION = 0.4.1 > PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz > -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df > +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac > PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools > PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 > PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 24 20:42:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:42:56 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Add some more entries for Thomas Huth In-Reply-To: <20220314203226.4481-1-huth@tuxfamily.org> References: <20220314203226.4481-1-huth@tuxfamily.org> Message-ID: On 14/03/2022 21:32, Thomas Huth wrote: > I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU > machine, so I could help to have a look on these files, too. > > Signed-off-by: Thomas Huth Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 70d71186ed..4083e87d30 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2753,8 +2753,11 @@ F: utils/size-stats-compare > F: toolchain/ > > N: Thomas Huth > +F: board/qemu/m68k-mcf5208/ > +F: configs/qemu_m68k_mcf5208_defconfig > F: package/ascii-invaders/ > F: package/frotz/ > +F: package/kvm-unit-tests/ > F: package/xorcurses/ > > N: Thomas Petazzoni From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gstd: bump to version 0.14.0 Message-ID: <20220324203416.B8E8E85C13@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a334b9a7668ba412cb2da79b75a019cd89985145 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches that are now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...e-gstd-check-user-xenv.sh-for-systemd-se.patch} | 0 ...re-gstreamer-check-1.0-unless-tests-are-e.patch | 33 ------------------- ...e-meson-python-module-for-python-install.patch} | 0 ...-relative-symlink-for-gstd-gst-client-exe.patch | 38 ---------------------- package/gstreamer1/gstd/gstd.hash | 2 +- package/gstreamer1/gstd/gstd.mk | 2 +- 6 files changed, 2 insertions(+), 73 deletions(-) diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch deleted file mode 100644 index 495fbfc3fa..0000000000 --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:49:49 -0600 -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/248] ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1d9ce9d..76990a0 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') - libd_dep = dependency('libdaemon', version : '>=0.14') - jansson_dep = dependency('jansson', version : '>=2.7') --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') - thread_dep = dependency('threads') - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') - -+gst_check_required = get_option('enable-tests').enabled() -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') -+ - systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch similarity index 100% rename from package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch rename to package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch deleted file mode 100644 index 265ea8d8c3..0000000000 --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 02:49:10 -0600 -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. - -This should fix the symlink path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/249] ---- - gst_client/gst_client_symbolic_link.sh | 2 +- - gstd/gstd_symbolic_link.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gst_client/gst_client_symbolic_link.sh -+++ b/gst_client/gst_client_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gstd/gstd_symbolic_link.sh -+++ b/gstd/gstd_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 6ec84bd58d..20c821a27f 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz +sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 959e277272..08a29f26ff 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTD_VERSION = 0.13.0 +GSTD_VERSION = 0.14.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING GSTD_LICENSE = GPL-2.0+ From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220324203416.D421285C13@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3396e945dfc1482cb21b65e5451abc5ec96a796b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 58ed4f81cd..a66b9d7eee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2759,8 +2759,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.3 Message-ID: <20220324203416.C2B3285C11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffb0c357397a67ceaadd215669bf00dcb27bd558 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d4..d909709b24 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd46..4615e839fe 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 0.61.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/pistache: bump version & switch to meson build Message-ID: <20220324203416.AFA2D82AFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f3218567953185008ec862f814bebecb9d6ed82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While upstream pistache has not yet released a stable 'tag' a lot has changed since June 2020: * project has moved to meson build system, cmake builds do not install headers. * patches in buildroot are no longer required * project-implemented Pistache::Optional was replaced by use of std::optional. This is only available in C++17 * dependency to rapidjson has been introduced Signed-off-by: Thomas Ruschival Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...s.txt-add-C-language-to-project-statement.patch | 70 ---------------- ...-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ---------------------- ...include-pistache-typeid.h-include-cstddef.patch | 38 --------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 10 ++- 6 files changed, 12 insertions(+), 212 deletions(-) diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d..0000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ???__atomic_load_8??? [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ???CHECK_FUNCTION_EXISTS??? - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec..0000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a..0000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210a..806c27077a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,23 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_RAPIDJSON depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7..9a2cd1d1f9 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea..65d9b2412c 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,18 +4,20 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE PISTACHE_INSTALL_STAGING = YES +PISTACHE_DEPENDENCIES += rapidjson ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) From arnout at mind.be Thu Mar 24 19:44:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 20:44:13 +0100 Subject: [Buildroot] [git commit] package/librtlsdr: switch to autotools-package Message-ID: <20220324203416.A696385C11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26a16ed9d84cbd934fbad4d6042dfd10dc8063b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to autotools-package to avoid the following static build failure since commit d661740201405970f65c16c39a79f4148705af30: [ 56%] Linking C executable rtl_biast /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' collect2: error: ld returned 1 exit status Drop both cmake-related patches Fixes: - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...m-respect-DESTDIR-with-install-udev-rules.patch | 31 +++++ ...01-disable_shared_library_target_in_build.patch | 130 --------------------- ...es-Version.cmake-don-t-use-Git-version-if.patch | 47 -------- package/librtlsdr/librtlsdr.mk | 26 ++--- 4 files changed, 42 insertions(+), 192 deletions(-) diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 0000000000..1aec8166cc --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465de..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41..0000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a..908be158b1 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.4.1 Message-ID: <20220324203416.CBB3B85C12@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3a1593b74048eec038cd351b06a6654e8bba0c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b2..af8b5c4de9 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d4..a58fd33a61 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.4.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] fakeroot: Fix segfault on ppc64le Message-ID: <20220324203416.DC70085C11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a38c6827dba0a5ccee5504167344ea6bba44e9d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When generating a filesystem image on a power10 build machine running Ubuntu, we see a segfault when fakeroot is running chmod. This has been reported and fixed upstream in Debian in version 1.26-1.2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 Add the same patch to resolve the segfault. Signed-off-by: Joel Stanley [Arnout: add patch signoff and give proper name (check-package)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../fakeroot/0001-fix-prototype-generation.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/fakeroot/0001-fix-prototype-generation.patch b/package/fakeroot/0001-fix-prototype-generation.patch new file mode 100644 index 0000000000..960bad2129 --- /dev/null +++ b/package/fakeroot/0001-fix-prototype-generation.patch @@ -0,0 +1,61 @@ +Subject: Fix prototype generation for openat +Author: Christoph Biedl +Date: 2021-12-30 +Bug-Debian: https://bugs.debian.org/995393 +Forwarded: Yes (implicitely) + + As jrtc27 pointed out in IRC, ppc64el is more strict than other + architectures when it comes to va_arg handling: + + it's that ppc64le uses the elfv2 abi, and for variadic calls you + must reserve space for a parameter save area + + So enhance wrapawk to create a proper prototype and argument + handling although it's specific to the openat call. Also add the + missing documentation for the sixth column to wrapfunc.inp. + +Signed-off-by: Joel Stanley + +--- a/wrapawk ++++ b/wrapawk +@@ -37,7 +37,25 @@ + argtype=$3; + argname=$4; + MACRO=$5; +- if(MACRO){ ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -9,8 +9,10 @@ + /**/ */ + /* each line of this file lists 4 fields, seperated by a ";". */ + /* The first field is the name of the wrapped function, then it's return */ +-/* value. After that come the function arguments with types, and the last */ ++/* value. After that come the function arguments with types, and the fifth */ + /* field contains the function arguments without types. */ ++/* A sixth field is a special needed when wrapping the openat syscall. */ ++/* Otherwise it's like the third (function arguments with types). */ + /**/ + + /* __*xstat are used on glibc systems instead of just *xstat. */ From arnout at mind.be Thu Mar 24 21:11:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:11:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls In-Reply-To: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> References: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> Message-ID: <2a0a7ee7-386c-6f47-df79-cde409cbfa4c@mind.be> On 15/03/2022 21:59, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 0.40.2 in > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > FAILED: src/librygel-core/RygelCore-2.6.typelib > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > > Fixes: > - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > > Signed-off-by: Fabrice Fontaine > --- > ...-meson.build-fix-g_ir_compiler-calls.patch | 84 +++++++++++++++++++ > 1 file changed, 84 insertions(+) > create mode 100644 package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > new file mode 100644 > index 0000000000..3961ad0564 > --- /dev/null > +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > @@ -0,0 +1,84 @@ > +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 15 Mar 2022 19:20:33 +0100 > +Subject: [PATCH] meson.build: fix g_ir_compiler calls > + > +Fix the following build failure when cross-compiling which is raised > +because rygel is using a custom_target target instead of the standard > +gnome.generate_gir: > + > +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > +FAILED: src/librygel-core/RygelCore-2.6.typelib > +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > + > +Indeed, the custom_target command is unable to retrieve the correct > +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls > + > +Fixes: > + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: probably not upstreamable] > +--- > + src/librygel-core/meson.build | 4 +++- > + src/librygel-renderer-gst/meson.build | 1 + > + src/librygel-renderer/meson.build | 1 + > + src/librygel-server/meson.build | 1 + > + 4 files changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build > +index fd43bebe..e6be2b5e 100644 > +--- a/src/librygel-core/meson.build > ++++ b/src/librygel-core/meson.build > +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', > + # so we depend on the custom_target from that step and pass the input through > + # commandline. > + custom_target('RygelCore-2.6.typelib', > +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > ++ command: [g_ir_compiler, '--output', '@OUTPUT@', > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, I don't understand why this isn't needed for any other g-ir-compiler calls. It can't be that rygel is the only package that has any GIR dependencies? If more packages need something like this, then we should probably create a wrapper around g-ir-compiler that adds the --includedir automatically. [Adam in Cc as the GOI specialist - poor guy.] Anyway, for now, applied to master, thanks. Regards, Arnout > ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > + output: 'RygelCore-2.6.typelib', > + depends: [ core_lib, core_gir ], > + install: true, > +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build > +index ad98a3a7..e8baefe1 100644 > +--- a/src/librygel-renderer-gst/meson.build > ++++ b/src/librygel-renderer-gst/meson.build > +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', > + '--output', '@OUTPUT@', > + '--includedir', core_girdir, > + '--includedir', renderer_girdir, > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], > + output: 'RygelRendererGst-2.6.typelib', > + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], > +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build > +index 5f401527..821273ff 100644 > +--- a/src/librygel-renderer/meson.build > ++++ b/src/librygel-renderer/meson.build > +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', > + command: [g_ir_compiler, > + '--output', '@OUTPUT@', > + '--includedir', core_girdir, > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], > + output: 'RygelRenderer-2.6.typelib', > + depends: [ renderer_lib, renderer_gir, core_gir ], > +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build > +index a3bd77d9..6b084eb6 100644 > +--- a/src/librygel-server/meson.build > ++++ b/src/librygel-server/meson.build > +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', > + command: [g_ir_compiler, > + '--output', '@OUTPUT@', > + '--includedir', core_girdir, > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], > + output: 'RygelServer-2.6.typelib', > + depends: [ server_lib, server_gir, core_gir ], > +-- > +2.35.1 > + From arnout at mind.be Thu Mar 24 21:12:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:12:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpi-gpio: enable package on aarch64 In-Reply-To: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> References: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> Message-ID: <117dc4de-5528-0f46-f77a-f3923ea9b6fa@mind.be> On 15/03/2022 15:26, Mirza Kapetanovic wrote: > Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested > this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. > > Signed-off-by: Mirza Kapetanovic Applied to master, thanks. Regards, Arnout > --- > package/python-rpi-gpio/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in > index 4f59ebdb06..f3c0928c62 100644 > --- a/package/python-rpi-gpio/Config.in > +++ b/package/python-rpi-gpio/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_PYTHON_RPI_GPIO > bool "python-rpi-gpio" > - depends on BR2_arm > + depends on BR2_arm || BR2_aarch64 > help > A Python module to control the GPIO on a Raspberry Pi. > From arnout at mind.be Thu Mar 24 21:12:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:12:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> Message-ID: On 15/03/2022 18:32, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > reintroduction of the package in commit > 16ff948444c3978d63f483344a3d92d994c64312: > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/grpc/grpc.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index 23b92f1750..9138b4ea59 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf > # which doesn't do this. These CARES settings trick the gRPC cmake code into > # not looking for c-ares at all and yet still linking with the library. > GRPC_CONF_OPTS = \ > + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ > -DgRPC_ABSL_PROVIDER=package \ > -D_gRPC_CARES_LIBRARIES=cares \ > -DgRPC_CARES_PROVIDER=none \ > @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ > -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +GRPC_DEPENDENCIES += libexecinfo > +GRPC_EXE_LINKER_FLAGS += -lexecinfo > +endif > + > # grpc can use __atomic builtins, so we need to link with > # libatomic when available > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > +GRPC_EXE_LINKER_FLAGS += -latomic > endif > > GRPC_CFLAGS = $(TARGET_CFLAGS) From arnout at mind.be Thu Mar 24 21:12:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:12:57 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.1 In-Reply-To: <20220315173324.1113174-1-francois.perrad@gadz.org> References: <20220315173324.1113174-1-francois.perrad@gadz.org> Message-ID: <78306b4a-a95d-e666-3d86-917abc38989a@mind.be> On 15/03/2022 18:33, Francois Perrad wrote: > diff README: > -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Larry Wall and others. > +2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 > +by Larry Wall and others. > > Signed-off-by: Francois Perrad Applied to master, thanks. Thanks for explaining the README diff! Regards, Arnout > --- > package/perl/perl.hash | 14 +++++++------- > package/perl/perl.mk | 4 ++-- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/perl/perl.hash b/package/perl/perl.hash > index b0f60ef6f..d8344d975 100644 > --- a/package/perl/perl.hash > +++ b/package/perl/perl.hash > @@ -1,12 +1,12 @@ > -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt > -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz > -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz > -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz > +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt > +md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz > +sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz > +sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz > > -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash > -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz > +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.hash > +sha256 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335 perl-cross-1.3.7.tar.gz > > # Locally calculated > sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic > sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying > -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README > +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README > diff --git a/package/perl/perl.mk b/package/perl/perl.mk > index d7f9c58dd..392fb8b6e 100644 > --- a/package/perl/perl.mk > +++ b/package/perl/perl.mk > @@ -6,7 +6,7 @@ > > # When updating the version here, also update utils/scancpan > PERL_VERSION_MAJOR = 34 > -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 > +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 > PERL_SITE = https://www.cpan.org/src/5.0 > PERL_SOURCE = perl-$(PERL_VERSION).tar.xz > PERL_LICENSE = Artistic or GPL-1.0+ > @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl > PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > PERL_INSTALL_STAGING = YES > > -PERL_CROSS_VERSION = 1.3.6 > +PERL_CROSS_VERSION = 1.3.7 > # DO NOT refactor with the github helper (the result is not the same) > PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) > PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From arnout at mind.be Thu Mar 24 21:13:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:13:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-avro: renumber patch In-Reply-To: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> References: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Message-ID: <8a6e08bc-1832-0be0-2d68-189330b0b6e2@mind.be> On 15/03/2022 22:16, Fabrice Fontaine wrote: > Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber > patch > > Signed-off-by: Fabrice Fontaine A bit useless if you're anyway removing it in the next patch, but OK. For backporting, I guess. Applied both to master, thanks. Regards, Arnout > --- > ...h => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 > 1 file changed, 0 insertions(+), 0 deletions(-) > rename package/python-avro/{0002-drop-install-time-linting-and-imports-sorting.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} (100%) > > diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch > similarity index 100% > rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch > rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From arnout at mind.be Thu Mar 24 21:13:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:13:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbdplus: bump to version 0.2.0 In-Reply-To: <20220315214113.2322315-1-fontaine.fabrice@gmail.com> References: <20220315214113.2322315-1-fontaine.fabrice@gmail.com> Message-ID: On 15/03/2022 22:41, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://code.videolan.org/videolan/libbdplus/-/blob/0.2.0/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libbdplus/libbdplus.hash | 6 +++--- > package/libbdplus/libbdplus.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash > index 6abc0e4970..2445af6e82 100644 > --- a/package/libbdplus/libbdplus.hash > +++ b/package/libbdplus/libbdplus.hash > @@ -1,5 +1,5 @@ > -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 > -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 > +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 > +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 > > # Hash for license file: > -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING > +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING > diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk > index b0e8b1488d..600cb6b545 100644 > --- a/package/libbdplus/libbdplus.mk > +++ b/package/libbdplus/libbdplus.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBDPLUS_VERSION = 0.1.2 > +LIBBDPLUS_VERSION = 0.2.0 > LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) > LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 > LIBBDPLUS_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:14:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:14:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbluray: bump to version 1.3.1 In-Reply-To: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> References: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> Message-ID: <52993c0b-1955-f1e0-6aa8-49fa2d984132@mind.be> On 15/03/2022 23:03, Fabrice Fontaine wrote: > https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libbluray/libbluray.hash | 4 ++-- > package/libbluray/libbluray.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash > index 4ab8c85866..6e62bb49a1 100644 > --- a/package/libbluray/libbluray.hash > +++ b/package/libbluray/libbluray.hash > @@ -1,4 +1,4 @@ > -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 > -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 > +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 > +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 > # Locally computed > sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING > diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk > index 233797f38d..a9eb3c67c6 100644 > --- a/package/libbluray/libbluray.mk > +++ b/package/libbluray/libbluray.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBLURAY_VERSION = 1.3.0 > +LIBBLURAY_VERSION = 1.3.1 > LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) > LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 > LIBBLURAY_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 21:14:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:14:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/dav1d: use official tarball In-Reply-To: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> References: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> Message-ID: On 15/03/2022 23:10, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/dav1d/dav1d.hash | 3 ++- > package/dav1d/dav1d.mk | 4 ++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash > index b0f163bae7..5e838b0951 100644 > --- a/package/dav1d/dav1d.hash > +++ b/package/dav1d/dav1d.hash > @@ -1,3 +1,4 @@ > +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 > +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz > # Locally computed > -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 > sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING > diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk > index d7224625c8..ecc4cc55c3 100644 > --- a/package/dav1d/dav1d.mk > +++ b/package/dav1d/dav1d.mk > @@ -5,8 +5,8 @@ > ################################################################################ > > DAV1D_VERSION = 0.9.2 > -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 > -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) > +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz > +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) > DAV1D_LICENSE = BSD-2-Clause > DAV1D_LICENSE_FILES = COPYING > DAV1D_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 20:51:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:33 +0100 Subject: [Buildroot] [git commit] package/python-avro: renumber patch Message-ID: <20220324210619.C51D985C5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a23f6b7b011fee47812bb70a11c21b9d68844b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ing.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From arnout at mind.be Thu Mar 24 20:51:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:20 +0100 Subject: [Buildroot] [git commit] package/python-rpi-gpio: enable package on aarch64 Message-ID: <20220324210619.A0CC185C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45f2609ca2eb5577ec5e6e204aec5a3eb2e80253 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. Signed-off-by: Mirza Kapetanovic Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-rpi-gpio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb06..f3c0928c62 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. From arnout at mind.be Thu Mar 24 20:51:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:23 +0100 Subject: [Buildroot] [git commit] package/grpc: fix build with libexecinfo Message-ID: <20220324210619.AA88285C5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3aa82ea44462862d56f6e54889741d95684dc84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/grpc/grpc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 23b92f1750..9138b4ea59 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +GRPC_DEPENDENCIES += libexecinfo +GRPC_EXE_LINKER_FLAGS += -lexecinfo +endif + # grpc can use __atomic builtins, so we need to link with # libatomic when available ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +GRPC_EXE_LINKER_FLAGS += -latomic endif GRPC_CFLAGS = $(TARGET_CFLAGS) From arnout at mind.be Thu Mar 24 20:51:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:26 +0100 Subject: [Buildroot] [git commit] package/perl: bump to version 5.34.1 Message-ID: <20220324210619.B369085C5F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74dbc305b28de4b73499eb76878503a71b381bd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master diff README: -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Larry Wall and others. +2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 +by Larry Wall and others. Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl/perl.hash | 14 +++++++------- package/perl/perl.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b0f60ef6f8..d8344d9754 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt +md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz +sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz +sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.hash +sha256 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335 perl-cross-1.3.7.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index d7f9c58ddd..392fb8b6e2 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.6 +PERL_CROSS_VERSION = 1.3.7 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From arnout at mind.be Thu Mar 24 20:51:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:40 +0100 Subject: [Buildroot] [git commit] package/libbdplus: bump to version 0.2.0 Message-ID: <20220324210619.D647585C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f318c729f0776a8a51c9832e9d431c57edfd7990 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://code.videolan.org/videolan/libbdplus/-/blob/0.2.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbdplus/libbdplus.hash | 6 +++--- package/libbdplus/libbdplus.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash index 6abc0e4970..2445af6e82 100644 --- a/package/libbdplus/libbdplus.hash +++ b/package/libbdplus/libbdplus.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk index b0e8b1488d..600cb6b545 100644 --- a/package/libbdplus/libbdplus.mk +++ b/package/libbdplus/libbdplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBDPLUS_VERSION = 0.1.2 +LIBBDPLUS_VERSION = 0.2.0 LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 LIBBDPLUS_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 20:51:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:30 +0100 Subject: [Buildroot] [git commit] package/rygel: fix g_ir_compiler calls Message-ID: <20220324210619.BC55385C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94515b902c74d51aeb32654a4795ca92d6dd7279 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command FAILED: src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-meson.build-fix-g_ir_compiler-calls.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 0000000000..3961ad0564 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + From arnout at mind.be Thu Mar 24 20:51:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:46 +0100 Subject: [Buildroot] [git commit] package/dav1d: use official tarball Message-ID: <20220324210619.E715585C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bdf40b1b0a36212fefef0b19632545f94c06423 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dav1d/dav1d.hash | 3 ++- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae7..5e838b0951 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8..ecc4cc55c3 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -5,8 +5,8 @@ ################################################################################ DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 20:51:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:36 +0100 Subject: [Buildroot] [git commit] package/{avro-c, python-avro}: bump to version 1.11.0 Message-ID: <20220324210619.CE1F085C5F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f617bbbf9fff6e436ae1b86f8af4d127e17fa08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop avro-c patch (already in version) - Drop python-avro patch (not needed anymore) https://github.com/apache/avro/releases/tag/release-1.11.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-Build-failure-without-a-C-compiler-again.patch | 34 ---------------- package/avro-c/avro-c.hash | 4 +- package/avro-c/avro-c.mk | 2 +- ...-install-time-linting-and-imports-sorting.patch | 46 ---------------------- package/python-avro/python-avro.hash | 4 +- package/python-avro/python-avro.mk | 5 ++- 6 files changed, 8 insertions(+), 87 deletions(-) diff --git a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch b/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch deleted file mode 100644 index 8f7e59cf62..0000000000 --- a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Jul 2020 09:35:09 +0200 -Subject: [PATCH] cmake: Build failure without a C++ compiler (again) - -avro-c fails to build (again) without a C++ compiler because commit -664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by -commit 414a51fdc1856083bb16851f09a4c61a48796132 - -Fixes: - - http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c8d7aaf..aa923e18 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # under the License. - # - cmake_minimum_required(VERSION 3.1) --project(AvroC) -+project(AvroC C) - enable_testing() - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) --- -2.27.0 - diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index c4fd7d3f57..7a4a6f7aca 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 -sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/c/avro-c-1.11.0.tar.gz.sha512 +sha512 5369ec11832e0ce1aa0181d594f657bae82ab5fb317ec1bee5ba190de9ed42956b425a5bf7e423940e8f871a54ae1246b92db2ce8562f270b4a05523ec4b60ae avro-c-1.11.0.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index ee6e864161..262a0fee5f 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRO_C_VERSION = 1.10.0 +AVRO_C_VERSION = 1.11.0 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch deleted file mode 100644 index 41231e923d..0000000000 --- a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Mon, 17 Feb 2020 15:12:13 +0100 -Subject: [PATCH] drop install time linting and imports sorting - -Since the 1.9.2 release, the setup script is also performing code linting -tasks, which require additional python libraries. - -These linting tasks are not needed anyway, since they are intended to prepare -the code for distribution, but the Buildroot package is already using a -distributed version. We therefore simply remove them. - -Signed-off-by: Titouan Christophe ---- - setup.cfg | 2 -- - setup.py | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 7b5de18..d46a36e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -25,8 +25,6 @@ package_dir = - include_package_data = true - packages = avro - setup_requires = -- isort -- pycodestyle - install_requires = - zip_safe = true - scripts = -diff --git a/setup.py b/setup.py -index f6297bb..91d3287 100755 ---- a/setup.py -+++ b/setup.py -@@ -164,7 +164,6 @@ def main(): - setuptools.setup(cmdclass={ - "clean": CleanCommand, - "generate_interop_data": GenerateInteropDataCommand, -- "lint": LintCommand, - }) - - --- -2.24.1 - diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index 2428be96e5..d752fa8ae6 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 -sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/py/avro-1.11.0.tar.gz.sha512 +sha512 8af67deb33b9990b74ffd7ab5c3c55e13a649070b4623c7bbe2b278287fd0929e57ed6d0344f9e93f3eb79663b43f75891d0810812349dfaecce65fdd9b44e93 avro-1.11.0.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index dd6008b1ba..0c4c431777 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -5,8 +5,9 @@ ################################################################################ PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) -PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3 -PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz +PYTHON_AVRO_SITE = \ + https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py +PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE PYTHON_AVRO_SETUP_TYPE = setuptools From arnout at mind.be Thu Mar 24 20:51:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:43 +0100 Subject: [Buildroot] [git commit] package/libbluray: bump to version 1.3.1 Message-ID: <20220324210619.DEC7F85C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49413c6d97b72ef5f44341a3dc720b902a88279b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c85866..6e62bb49a1 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38d..a9eb3c67c6 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 21:23:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:23:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix default device behaviour In-Reply-To: <20220316092200.66623-1-theo.lebrun@bootlin.com> References: <20220316092200.66623-1-theo.lebrun@bootlin.com> Message-ID: On 16/03/2022 10:22, Th?o Lebrun wrote: > This patch has been applied upstream and is required to allow having > default devices on non x86_64 platforms with WirePlumber v0.4.8. > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 > > Signed-off-by: Th?o Lebrun Applied to master with the changes I commented earlier, thanks. Regards, Arnout > --- > .../0001-fix-non-x86_64-architectures.patch | 212 ++++++++++++++++++ > 1 file changed, 212 insertions(+) > create mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch > > diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > new file mode 100644 > index 0000000000..27b6f034b2 > --- /dev/null > +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > @@ -0,0 +1,212 @@ > +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 > +From: Julian Bouzas > +Date: Wed, 9 Feb 2022 07:59:59 -0500 > +Subject: [PATCH] spa-json: fix va_list APIs for different architectures > + > +The va_list type might not always be a pointer in some architectures, so we > +cannot guarantee it will be modified after using it for a second time in another > +function. This fixes the issue by using macros so args does not get copied, and > +always gets modified when using it more than once. > +--- > + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- > + 1 file changed, 80 insertions(+), 76 deletions(-) > + > +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c > +index f14f395d..c5e59a3e 100644 > +--- a/lib/wp/spa-json.c > ++++ b/lib/wp/spa-json.c > +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) > + wp_spa_json_builder_new_formatted ("\"%s\"", value)); > + } > + > +-static void > +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- wp_spa_json_builder_add_null (self); > +- break; > +- case 'b': > +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); > +- break; > +- case 'i': > +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); > +- break; > +- case 'f': > +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); > +- break; > +- case 's': > +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); > +- break; > +- case 'J': > +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); > +- break; > +- default: > +- return; > +- } > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_builder_add_value(self,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ wp_spa_json_builder_add_null (self); \ > ++ break; \ > ++ case 'b': \ > ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ > ++ break; \ > ++ case 'i': \ > ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ > ++ break; \ > ++ case 'f': \ > ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ > ++ break; \ > ++ case 's': \ > ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ > ++ break; \ > ++ case 'J': \ > ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ > ++ break; \ > ++ default: \ > ++ break; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Creates a spa json of type array > +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) > + return res; > + } > + > +-static gboolean > +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- if (!spa_json_is_null (data, len)) > +- return FALSE; > +- break; > +- case 'b': > +- if (!wp_spa_json_parse_boolean_internal (data, len, > +- va_arg(args, gboolean *))) > +- return FALSE; > +- break; > +- case 'i': > +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) > +- return FALSE; > +- break; > +- case 'f': > +- if (spa_json_parse_float (data, len, > +- (float *)va_arg(args, double *)) < 0) > +- return FALSE; > +- break; > +- case 's': { > +- gchar *str = wp_spa_json_parse_string_internal (data, len); > +- if (!str) > +- return FALSE; > +- *va_arg(args, gchar **) = str; > +- break; > +- } > +- case 'J': { > +- WpSpaJson *j = wp_spa_json_new (data, len); > +- if (!j) > +- return FALSE; > +- *va_arg(args, WpSpaJson **) = j; > +- break; > +- } > +- default: > +- return FALSE; > +- } > +- return TRUE; > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_parse_value(data,len,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ if (!spa_json_is_null (data, len)) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'b': \ > ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ > ++ va_arg(args, gboolean *))) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'i': \ > ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'f': \ > ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 's': { \ > ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ > ++ if (!str) \ > ++ return FALSE; \ > ++ *va_arg(args, gchar **) = str; \ > ++ break; \ > ++ } \ > ++ case 'J': { \ > ++ WpSpaJson *j = wp_spa_json_new (data, len); \ > ++ if (!j) \ > ++ return FALSE; \ > ++ *va_arg(args, WpSpaJson **) = j; \ > ++ break; \ > ++ } \ > ++ default: \ > ++ return FALSE; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Parses the object property values of a spa json object > +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) > + value = g_value_get_boxed (&item); > + > + if (g_strcmp0 (key_str, lookup_key) == 0) { > +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) > +- return FALSE; > ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); > + lookup_key = va_arg(args, const gchar *); > + if (!lookup_key) > + return TRUE; > +@@ -1366,9 +1363,12 @@ gboolean > + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, > + va_list args) > + { > +- return wp_spa_json_parser_advance (self) && > +- wp_spa_json_parse_value (self->curr.cur, > +- self->curr.end - self->curr.cur, fmt, args); > ++ if (wp_spa_json_parser_advance (self)) { > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ fmt, args); > ++ return TRUE; > ++ } > ++ return FALSE; > + } > + > + /*! > +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) > + if (!format) > + return TRUE; > + > +- /* parse value */ > +- if (!wp_spa_json_parser_get_value (self, format, args)) > ++ /* advance */ > ++ if (!wp_spa_json_parser_advance (self)) > + return FALSE; > ++ > ++ /* parse value */ > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ format, args); > + } while (TRUE); > + > + return FALSE; > +-- > +GitLab > + From arnout at mind.be Thu Mar 24 21:22:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:22:33 +0100 Subject: [Buildroot] [git commit] package/wireplumber: fix default device behaviour Message-ID: <20220324211439.67E7185C63@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe9f465036f80382d7fbc2e65d29e5c366dbe472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch has been applied upstream and is required to allow having default devices on non x86_64 platforms with WirePlumber v0.4.8. https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 Signed-off-by: Th??o Lebrun Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-fix-non-x86_64-architectures.patch | 215 +++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch new file mode 100644 index 0000000000..19c34e4e1a --- /dev/null +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch @@ -0,0 +1,215 @@ +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 9 Feb 2022 07:59:59 -0500 +Subject: [PATCH] spa-json: fix va_list APIs for different architectures + +The va_list type might not always be a pointer in some architectures, so we +cannot guarantee it will be modified after using it for a second time in another +function. This fixes the issue by using macros so args does not get copied, and +always gets modified when using it more than once. + +Signed-off-by: Th??o Lebrun +Upstream: https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 +--- + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- + 1 file changed, 80 insertions(+), 76 deletions(-) + +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c +index f14f395d..c5e59a3e 100644 +--- a/lib/wp/spa-json.c ++++ b/lib/wp/spa-json.c +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) + wp_spa_json_builder_new_formatted ("\"%s\"", value)); + } + +-static void +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- wp_spa_json_builder_add_null (self); +- break; +- case 'b': +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); +- break; +- case 'i': +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); +- break; +- case 'f': +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); +- break; +- case 's': +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); +- break; +- case 'J': +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); +- break; +- default: +- return; +- } +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_builder_add_value(self,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ wp_spa_json_builder_add_null (self); \ ++ break; \ ++ case 'b': \ ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ ++ break; \ ++ case 'i': \ ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ ++ break; \ ++ case 'f': \ ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ ++ break; \ ++ case 's': \ ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ ++ break; \ ++ case 'J': \ ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ ++ break; \ ++ default: \ ++ break; \ ++ } \ ++} while(false) + + /*! + * \brief Creates a spa json of type array +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) + return res; + } + +-static gboolean +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- if (!spa_json_is_null (data, len)) +- return FALSE; +- break; +- case 'b': +- if (!wp_spa_json_parse_boolean_internal (data, len, +- va_arg(args, gboolean *))) +- return FALSE; +- break; +- case 'i': +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) +- return FALSE; +- break; +- case 'f': +- if (spa_json_parse_float (data, len, +- (float *)va_arg(args, double *)) < 0) +- return FALSE; +- break; +- case 's': { +- gchar *str = wp_spa_json_parse_string_internal (data, len); +- if (!str) +- return FALSE; +- *va_arg(args, gchar **) = str; +- break; +- } +- case 'J': { +- WpSpaJson *j = wp_spa_json_new (data, len); +- if (!j) +- return FALSE; +- *va_arg(args, WpSpaJson **) = j; +- break; +- } +- default: +- return FALSE; +- } +- return TRUE; +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_parse_value(data,len,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ if (!spa_json_is_null (data, len)) \ ++ return FALSE; \ ++ break; \ ++ case 'b': \ ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ ++ va_arg(args, gboolean *))) \ ++ return FALSE; \ ++ break; \ ++ case 'i': \ ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 'f': \ ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 's': { \ ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ ++ if (!str) \ ++ return FALSE; \ ++ *va_arg(args, gchar **) = str; \ ++ break; \ ++ } \ ++ case 'J': { \ ++ WpSpaJson *j = wp_spa_json_new (data, len); \ ++ if (!j) \ ++ return FALSE; \ ++ *va_arg(args, WpSpaJson **) = j; \ ++ break; \ ++ } \ ++ default: \ ++ return FALSE; \ ++ } \ ++} while(false) + + /*! + * \brief Parses the object property values of a spa json object +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) + value = g_value_get_boxed (&item); + + if (g_strcmp0 (key_str, lookup_key) == 0) { +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) +- return FALSE; ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); + lookup_key = va_arg(args, const gchar *); + if (!lookup_key) + return TRUE; +@@ -1366,9 +1363,12 @@ gboolean + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, + va_list args) + { +- return wp_spa_json_parser_advance (self) && +- wp_spa_json_parse_value (self->curr.cur, +- self->curr.end - self->curr.cur, fmt, args); ++ if (wp_spa_json_parser_advance (self)) { ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ fmt, args); ++ return TRUE; ++ } ++ return FALSE; + } + + /*! +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) + if (!format) + return TRUE; + +- /* parse value */ +- if (!wp_spa_json_parser_get_value (self, format, args)) ++ /* advance */ ++ if (!wp_spa_json_parser_advance (self)) + return FALSE; ++ ++ /* parse value */ ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ format, args); + } while (TRUE); + + return FALSE; +-- +GitLab + From arnout at mind.be Thu Mar 24 21:31:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:31:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: bump to version 4.3.1 In-Reply-To: <20220317075909.3705760-1-johannes.agricola@work-microwave.com> References: <20220317075909.3705760-1-johannes.agricola@work-microwave.com> Message-ID: On 17/03/2022 08:59, Johannes Agricola wrote: > Signed-off-by: Johannes Agricola > --- > package/libwebsockets/libwebsockets.hash | 2 +- > package/libwebsockets/libwebsockets.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash > index 1761a7658a..f92c66018f 100644 > --- a/package/libwebsockets/libwebsockets.hash > +++ b/package/libwebsockets/libwebsockets.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz > +sha256 8fdb1454a1b34cd9a6351beaab237a485e6853806101de7e62bd2bc250bb50af libwebsockets-4.3.1.tar.gz > sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE Hash of the license file changed. Could you check what changed - in particular, if anything changed about the license itself (usually, however, it's just an update of the copyright year). Document your findings in the commit message. And of course, update the hash of the LICENSE file. Until then, I've marked your patch as Changes Requested. Thanks! Regards, Arnout > diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk > index c25686d385..152659cee6 100644 > --- a/package/libwebsockets/libwebsockets.mk > +++ b/package/libwebsockets/libwebsockets.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBWEBSOCKETS_VERSION = 4.0.21 > +LIBWEBSOCKETS_VERSION = 4.3.1 > LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) > LIBWEBSOCKETS_LICENSE = MIT with exceptions > LIBWEBSOCKETS_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 24 21:35:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:35:54 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5base: security bump In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <305c203d-e5f4-cbdd-036a-4c996bf802f1@mind.be> On 17/03/2022 17:38, Quentin Schulz wrote: > From: Quentin Schulz > > This fixes CVE-2022-25255 and CVE-2022-25634. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz > --- > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 1b9ff43ab2..c031f71c77 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef02edfc1d..8fd5800822 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > @@ -15,6 +15,10 @@ QT5BASE_SYNC_QT_HEADERS = YES > # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 FYI, this no longer applies cleanly to master. Regards, Arnout > +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" > +QT5BASE_IGNORE_CVES += CVE-2022-25634 > > # A few comments: > # * -no-pch to workaround the issue described at From arnout at mind.be Thu Mar 24 21:42:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:42:51 +0100 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5base: remove leftover patch In-Reply-To: <20220317163823.2913753-2-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> <20220317163823.2913753-2-foss+buildroot@0leil.net> Message-ID: <0f660a9a-f182-05e6-b4a8-143dbb4665a5@mind.be> On 17/03/2022 17:38, Quentin Schulz wrote: > From: Quentin Schulz > > CVE-2021-38593 fixes originally missed a usecase that was covered by the > to-be-removed patch. However, this patch was incorrect and added some > issues on its own, which was then fixed by now-removed > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. > > Unfortunately for us, the to-be-removed patch (fixed by > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually > be applied (with fuzz; by `patch` only) on top of the now-removed patch. > When the move to KDE Qt fork was made, some patches were removed as they > were already part of the new git fork. However, the to-be-removed patch > was not. This means the > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually > undone when Buildroot patched qt5base. > > Let's remove this patch to fix this oversight. > > As a reference: > e7ea2ed27c Improve fix for avoiding huge number of tiny dashes > fixed by > 65b3aa6a1c Refix for avoiding huge number of tiny dashes > in the git repo. > > Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied to master, thanks. I've also renumbered patches 7 and 8. Regards, Arnout > --- > ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ------------------- > 1 file changed, 37 deletions(-) > delete mode 100644 package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > > diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > deleted file mode 100644 > index 16e0f20200..0000000000 > --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 > -From: Eirik Aavitsland > -Date: Fri, 23 Jul 2021 15:53:56 +0200 > -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Some pathological cases were not caught by the previous fix. > - > -Fixes: QTBUG-95239 > -Pick-to: 6.2 6.1 5.15 > -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 > -Reviewed-by: Robert L?hning > -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) > -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] > -Signed-off-by: Quentin Schulz > ---- > - src/gui/painting/qpaintengineex.cpp | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > -index 55fdb0c2a0..19e4b23423 100644 > ---- a/src/gui/painting/qpaintengineex.cpp > -+++ b/src/gui/painting/qpaintengineex.cpp > -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > - patternLength *= pen.widthF(); > - if (qFuzzyIsNull(patternLength)) { > - pen.setStyle(Qt::NoPen); > -- } else if (extent / patternLength > 10000) { > -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { > - // approximate stream of tiny dashes with semi-transparent solid line > - pen.setStyle(Qt::SolidLine); > - QColor color(pen.color()); > --- > -2.34.1 > - From arnout at mind.be Thu Mar 24 21:43:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:43:42 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix eglconvenience compile (missing QList include) In-Reply-To: <20220316182440.17393-1-ps.report@gmx.net> References: <20220316182440.17393-1-ps.report@gmx.net> Message-ID: <9c7a1a58-eb12-bbf7-74c0-c11a245c87e1@mind.be> On 16/03/2022 19:24, Peter Seiderer wrote: > - add 0008-eglconvenience-add-missing-QList-include.patch to fix > eglconvenience compile (missing QList include) > > Fixes: > > qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type > 418 | QList extensions = > | ^~~~~~~~~~ > qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? > 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); > | ^ > > Signed-off-by: Peter Seiderer > --- > ...onvenience-add-missing-QList-include.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch > > diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch > new file mode 100644 > index 0000000000..c7127291e4 > --- /dev/null > +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch There was already a patch 0008. However, I merged another commit that removed patch 0006, and renumbered them, so no your patch is 0008 :-) Applied to master, thanks. Regards, Arnout > @@ -0,0 +1,37 @@ > +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Wed, 16 Mar 2022 19:08:55 +0100 > +Subject: [PATCH] eglconvenience: add missing QList include > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes: > + > + qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type > + 418 | QList extensions = > + | ^~~~~~~~~~ > + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? > + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); > + | ^ > + > +Signed-off-by: Peter Seiderer > +--- > + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp > +index 5303d37c..daceeb8b 100644 > +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp > ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp > +@@ -38,6 +38,7 @@ > + ****************************************************************************/ > + > + #include > ++#include > + #include > + > + #ifdef Q_OS_LINUX > +-- > +2.35.1 > + From arnout at mind.be Thu Mar 24 21:44:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:44:36 +0100 Subject: [Buildroot] [PATCH] package/unbound: use system libevent In-Reply-To: <20220317162530.427876-1-kyle@balena.io> References: <20220317162530.427876-1-kyle@balena.io> Message-ID: <898e1009-dbc1-9f4b-9cdf-ae3edfb1d299@mind.be> On 17/03/2022 17:25, Kyle Harding via buildroot wrote: > The file descriptor limit when using the builtin mini-event > cannot handle more than 1024 file descriptors. It was already the intention to use the system libevent, so I've extended the commit message to clarify that a bit. Applied to master, thanks. Regards, Arnout > > https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent > > Signed-off-by: Kyle Harding > --- > package/unbound/unbound.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk > index 1e6e0d99d7..782ed2b049 100644 > --- a/package/unbound/unbound.mk > +++ b/package/unbound/unbound.mk > @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ > --with-pidfile=/var/run/unbound.pid \ > --with-rootkey-file=/etc/unbound/root.key \ > --enable-tfo-server \ > + --with-libevent=$(STAGING_DIR)/usr \ > --with-libexpat=$(STAGING_DIR)/usr \ > --with-ssl=$(STAGING_DIR)/usr > From arnout at mind.be Thu Mar 24 21:46:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:46:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 In-Reply-To: <20220316190545.3618918-1-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> Message-ID: <97a25507-2a9c-4928-eb14-388693a3766b@mind.be> On 16/03/2022 20:05, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. As Peter said, a changelog would be nice (so Peter K. knows if it needs to be backported to the stable branches), but I've applied as-is anyway. Regards, Arnout > --- > 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz > +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 267b44e5f0..9735865eae 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.48 > +ELL_VERSION = 0.49 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:40:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:40:17 +0100 Subject: [Buildroot] [git commit] package/unbound: use system libevent Message-ID: <20220324213751.D8B1385C9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=929df7c483d19cf08badc36ef19a56735896b5d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Without explicit --with-libevent, it uses the builtin mini-event. Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 1e6e0d99d7..782ed2b049 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr From arnout at mind.be Thu Mar 24 21:40:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:40:17 +0100 Subject: [Buildroot] [git commit] package/ell: bump to version 0.49 Message-ID: <20220324213751.C38EA85C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7af2589a72db1764e2d889fbc6144b54e0f496a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 267b44e5f0..9735865eae 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.48 +ELL_VERSION = 0.49 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:40:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:40:17 +0100 Subject: [Buildroot] [git commit] package/iwd: bump to version 1.25 Message-ID: <20220324213751.CDE3D85C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc5bc235990073233df6352d1208624034a6b6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 1a58ec88e8..1c34aa0a90 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 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz +sha256 3f138e03301beb2afc7b385a62f56db17059137857ab579f269c4e441783e760 iwd-1.25.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 548b508edb..fc10c5f1d4 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.24 +IWD_VERSION = 1.25 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:41:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:41:41 +0100 Subject: [Buildroot] [git commit] package/qt5base: fix eglconvenience compile (missing QList include) Message-ID: <20220324213751.ED03485C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68159373d1a1fcb542a1ad411141dc910b8e1d49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add 0008-eglconvenience-add-missing-QList-include.patch to fix eglconvenience compile (missing QList include) Fixes: qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | ^ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-eglconvenience-add-missing-QList-include.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 0000000000..c7127291e4 --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + From arnout at mind.be Thu Mar 24 21:41:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:41:12 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: remove leftover patch Message-ID: <20220324213751.E35CF85C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3857bccca5e59dfe90fc5b5823bfe672a1847cd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: renumber patches 0007 and 0008] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...scv32.patch => 0006-Fix-build-on-riscv32.patch} | 0 ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 ---------------------- ...-configure.json-fix-atomicfptr-detection.patch} | 0 3 files changed, 37 deletions(-) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch similarity index 100% rename from package/qt5/qt5base/0007-Fix-build-on-riscv32.patch rename to package/qt5/qt5base/0006-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert L??hning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch similarity index 100% rename from package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch rename to package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch From peter at korsgaard.com Thu Mar 24 21:51:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 22:51:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Update for 2021.11.3 Message-ID: <20220324214238.D52D585CA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d30542dde748f4d3b04ac5d1a238c8280de611fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 29b7f2159a..72a4fabd37 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2021.11.3, released March 24th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, boinc, dbus, + directfb, docker-engine, exempi, expat, flac, gdb, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libvirt, libxml2, libxslt, lxc, mariadb, minidlna, + odb, openblas, openvpn, oprofile, php, pppd, python-ipython, + python-twisted, raptor, rpi-firmware, samba4, seatd, + timescaledb, usbguard, util-linux, vim, wavpack, + wireless-regdb, wireplumber, wireshark, wolfssl, xscreensaver, + xterm, zsh + + New packages: gdk-pixbuf-xlib + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.11.2, released February 28th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 09bf835b05..2493c8acfb 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.11.2 +export BR2_VERSION := 2021.11.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646080000 +BR2_VERSION_EPOCH = 1648158600 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 37981d7932..9101b8ea49 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.2' +RELEASE='2021.11.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Thu Mar 24 22:20:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 23:20:37 +0100 Subject: [Buildroot] Buildroot 2021.11.3 released, 2021.11.x now EOL Message-ID: <87lewzc7re.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.11.3 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.11.3.tar.gz or http://buildroot.org/downloads/buildroot-2021.11.3.tar.xz Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.11.3 is a bugfix release, fixing a number of important / security related issues discovered since the 2021.11.2 release. - Security fixes for apache, exempi, expat, flac, gnutls, go, libiec61850, libopenssl, libpjsip, libressl, libxml2, libxslt, mariadb, minidlna, openvpn, php, python-ipython, python-twisted, raptor, samba4, seatd, timescaledb, util-linux, vim, wavpack, wireshark, wolfssl, xterm, zsh - Fixes for download/compilation/runtime/license issues in azure-iot-sdk, boinc, dbus, directfb, docker-engine, gdb, gdk-pixbuf, haproxy, libcurl, libminiupnpc, libodb, libodb-boost, librsvg, libsrtp, libvirt, lxc, odb, openblas, oprofile, pppd, rpi-firmware, usbguard, wireless-regdb, wireplumber, xscreensaver For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.11.3 Users of the affected packages are strongly encouraged to upgrade. Notice that the 2021.11.x series is now END OF LIFE. Please migrate to the 2022.02.x series instead which will be supported until April 2023. Many thanks to all the people contributing to this release: git shortlog -sn 2021.11.2.. 39 Fabrice Fontaine 6 Bernd Kuhls 6 Peter Korsgaard 5 Thomas Petazzoni 3 Francois Perrad 3 Peter Seiderer 2 Julien Olivain 1 Adrian Perez de Castro 1 Andrei Gherghescu 1 Arnout Vandecappelle (Essensium/Mind) 1 Christian Stewart 1 John Keeping 1 Kamel Bouhara 1 Kris Bahnsen 1 Maxim Kochetkov 1 Romain Naour 1 Sassen, Rutger 1 Simon Doppler 1 TIAN Yuanhao 1 Th?o Lebrun 1 Yannick Brosseau -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Thu Mar 24 22:23:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Mar 2022 23:23:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls In-Reply-To: <2a0a7ee7-386c-6f47-df79-cde409cbfa4c@mind.be> References: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> <2a0a7ee7-386c-6f47-df79-cde409cbfa4c@mind.be> Message-ID: Le jeu. 24 mars 2022 ? 22:11, Arnout Vandecappelle a ?crit : > > > > On 15/03/2022 21:59, Fabrice Fontaine wrote: > > Fix the following build failure raised since bump to version 0.40.2 in > > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > > > [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > > FAILED: src/librygel-core/RygelCore-2.6.typelib > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > > Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > > error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > > > > Fixes: > > - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...-meson.build-fix-g_ir_compiler-calls.patch | 84 +++++++++++++++++++ > > 1 file changed, 84 insertions(+) > > create mode 100644 package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > > > diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > new file mode 100644 > > index 0000000000..3961ad0564 > > --- /dev/null > > +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > @@ -0,0 +1,84 @@ > > +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 > > +From: Fabrice Fontaine > > +Date: Tue, 15 Mar 2022 19:20:33 +0100 > > +Subject: [PATCH] meson.build: fix g_ir_compiler calls > > + > > +Fix the following build failure when cross-compiling which is raised > > +because rygel is using a custom_target target instead of the standard > > +gnome.generate_gir: > > + > > +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > > +FAILED: src/librygel-core/RygelCore-2.6.typelib > > +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > > +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > > +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > > + > > +Indeed, the custom_target command is unable to retrieve the correct > > +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls > > + > > +Fixes: > > + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > > + > > +Signed-off-by: Fabrice Fontaine > > +[Upstream status: probably not upstreamable] > > +--- > > + src/librygel-core/meson.build | 4 +++- > > + src/librygel-renderer-gst/meson.build | 1 + > > + src/librygel-renderer/meson.build | 1 + > > + src/librygel-server/meson.build | 1 + > > + 4 files changed, 6 insertions(+), 1 deletion(-) > > + > > +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build > > +index fd43bebe..e6be2b5e 100644 > > +--- a/src/librygel-core/meson.build > > ++++ b/src/librygel-core/meson.build > > +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', > > + # so we depend on the custom_target from that step and pass the input through > > + # commandline. > > + custom_target('RygelCore-2.6.typelib', > > +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > > ++ command: [g_ir_compiler, '--output', '@OUTPUT@', > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > I don't understand why this isn't needed for any other g-ir-compiler calls. It > can't be that rygel is the only package that has any GIR dependencies? To my knowledge, rygel is the only package that makes g-ir-compiler calls through the meson custom_target command. The other meson packages use the standard meson gnome.generate_gir which has been "fixed" by commit b094f88a4d501101bfba9b65491209e6a0fe0397. The autotools packages use Makefile.introspection which has been fixed by commit 8dda79970661090f202e1f20e5982ba53fdaeb95. > > If more packages need something like this, then we should probably create a > wrapper around g-ir-compiler that adds the --includedir automatically. > > [Adam in Cc as the GOI specialist - poor guy.] > > Anyway, for now, applied to master, thanks. > > Regards, > Arnout > > > > ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > > + output: 'RygelCore-2.6.typelib', > > + depends: [ core_lib, core_gir ], > > + install: true, > > +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build > > +index ad98a3a7..e8baefe1 100644 > > +--- a/src/librygel-renderer-gst/meson.build > > ++++ b/src/librygel-renderer-gst/meson.build > > +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', > > + '--output', '@OUTPUT@', > > + '--includedir', core_girdir, > > + '--includedir', renderer_girdir, > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], > > + output: 'RygelRendererGst-2.6.typelib', > > + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], > > +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build > > +index 5f401527..821273ff 100644 > > +--- a/src/librygel-renderer/meson.build > > ++++ b/src/librygel-renderer/meson.build > > +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', > > + command: [g_ir_compiler, > > + '--output', '@OUTPUT@', > > + '--includedir', core_girdir, > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], > > + output: 'RygelRenderer-2.6.typelib', > > + depends: [ renderer_lib, renderer_gir, core_gir ], > > +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build > > +index a3bd77d9..6b084eb6 100644 > > +--- a/src/librygel-server/meson.build > > ++++ b/src/librygel-server/meson.build > > +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', > > + command: [g_ir_compiler, > > + '--output', '@OUTPUT@', > > + '--includedir', core_girdir, > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], > > + output: 'RygelServer-2.6.typelib', > > + depends: [ server_lib, server_gir, core_gir ], > > +-- > > +2.35.1 > > + Best Regards, Fabrice From peter at korsgaard.com Thu Mar 24 22:31:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 23:31:52 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.11.3 Message-ID: <20220324222320.3328785CB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a7a2c761745357379d42ee907bd738ed2309db3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 3b7234b307..146a64d034 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

    News

      +
    • +
      +
      +
      +

      2021.11.3 released, 2021.11.x series EOL

      +

      24 March 2022

      +
      +
      +

      The 2021.11.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.11.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.11.3 release.

      + +

      Notice that the 2021.11.x series is now end of life. Please migrate to + the 2022.02 series instead which will be supported until April 2023.

      +
      +
      +
      • +
    • From peter at korsgaard.com Thu Mar 24 22:29:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 23:29:17 +0100 Subject: [Buildroot] [git commit] Update for 2021.11.3 Message-ID: <20220324222320.226D385CB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c6b750201e27cfdf3e0ce23f0bd45b1c62f18c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit d30542dde748f4d3b04ac5d1a238c8280de611fb) [Peter: drop Makefile/Vagrantfile change] Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGES b/CHANGES index 59ae8f15ce..981c4c08ec 100644 --- a/CHANGES +++ b/CHANGES @@ -131,6 +131,29 @@ #14501: lttng-modules v2.11 package fails to build #14531: Package EFL - build error +2021.11.3, released March 24th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, boinc, dbus, + directfb, docker-engine, exempi, expat, flac, gdb, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libvirt, libxml2, libxslt, lxc, mariadb, minidlna, + odb, openblas, openvpn, oprofile, php, pppd, python-ipython, + python-twisted, raptor, rpi-firmware, samba4, seatd, + timescaledb, usbguard, util-linux, vim, wavpack, + wireless-regdb, wireplumber, wireshark, wolfssl, xscreensaver, + xterm, zsh + + New packages: gdk-pixbuf-xlib + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.11.2, released February 28th, 2022 Important / security related fixes. From fontaine.fabrice at gmail.com Thu Mar 24 22:32:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Mar 2022 23:32:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy Message-ID: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Fix the following build failure if clang-tidy is found on host (and protobuf is built before protozero) which is raised since tests are disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: CMake Error at CMakeLists.txt:77 (add_dependencies): The dependency target "writer_tests" of target "clang-tidy" does not exist. Fixes: - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e Signed-off-by: Fabrice Fontaine --- ...xt-protobuf-is-only-needed-for-tests.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 0000000000..3033e24aa2 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + -- 2.35.1 From dpb at corrigendum.ru Thu Mar 24 22:28:16 2022 From: dpb at corrigendum.ru (=?UTF-8?B?0KDQvtC80LDQvSDQlNC+0L3Rh9C10L3QutC+?=) Date: Fri, 25 Mar 2022 01:28:16 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> Message-ID: <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Hi, 24.03.2022 23:37, Arnout Vandecappelle ?????: >> ? else >> ? $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) >> -$(2)_BASE_BUILD_CMD = -m build -n -w >> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py >> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) >> +# Use flit built in wheel builder for packages that are >> host-python-pypa-build dependencies. >> +# This is needed to avoid a circular with host-python-pypa-build and >> those dependencies. >> +# >> +$(2)_BASE_BUILD_CMD = $$(if \ >> +??????? $$(filter \ >> +??????????? host-python-flit-core host-python-installer >> host-python-pep517 host-python-tomli, \ >> +??????????? $(1)) \ >> +??????? , \ >> +??????? -m flit_core.wheel, \ >> +??????? -m build -n -w \ > > ?This is adding way too much complexity to the infra just to support > these four packages. I think there a a couple of better options: > > - don't use python infra at all for these packages; or > - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or > - add a fifth SETUP_TYPE "generic" or "custom" or something, which > requires $(2)_BASE_* to be set by the python-flit-core.mk; > - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set > HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or > - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which > only gets used by the problematic packages. > > > ?The latter two options have my preference because I think they are the > cleanest, but any of them is OK for me. The "generic" setup type and the > overridable _BASE_BUILD_CMD would also require an update in the manual. IMO, the simplest implementation would be: 1. For host-python-flit-core and host-python-installer, use host-generic-package and define the build and install commands manually. 2. For every other package whose SETUP_TYPE is "flit", have it depend on just host-python-flit-core and host-python-installer, and build with "python -m flit_core.wheel". In other words, don't use host-python-pypa-build. I don't think there are any advantages in using pypa-build over just running flit_core.wheel directly, and dropping it would reduce the number of packages that need special handling and simplify the dependency tree. >> diff --git a/package/python-flit-core/python-flit-core.mk >> b/package/python-flit-core/python-flit-core.mk >> index 0e058a1f17..d206a72f82 100644 >> --- a/package/python-flit-core/python-flit-core.mk >> +++ b/package/python-flit-core/python-flit-core.mk >> @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 >> ? PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz >> ? PYTHON_FLIT_CORE_SITE = >> https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 >> >> ? PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause >> -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 >> +PYTHON_FLIT_CORE_SETUP_TYPE = flit > > ?This means there's no package any more that uses pep517 setup type. Do > you think it's ever going to be used again? Or can we remove it altogether? I think python-setuptools could be a potential user of this, if python-pypa-build ever becomes buildable without setuptools (which it very well might). -Roman. From james.hilliard1 at gmail.com Thu Mar 24 22:37:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 16:37:15 -0600 Subject: [Buildroot] [PATCH v3 1/1] package/pkg-python: migrate flit to new bootstrapping sequence Message-ID: <20220324223715.1961461-1-james.hilliard1@gmail.com> There are a number of flit toolchain dependencies currently in the process of deprecating distutils based fallbacks. This will be needed in order to update tomli. We need to migrate these to use a new bootstrap based build+install sequence which relies on flit's bootstrap wheel build+install features to build and install host-python-pypa-build and host-python-installer which gives us a full pep517 toolchain. Note that one can run host-python-flit-core commands for building and installing itself since the package build directory is the cwd. We need to add a special flit-bootstrap SETUP_TYPE for dependencies of host-python-pypa-build and host-python-installer which can not use the normal flit SETUP_TYPE which would cause a circular dependency issue. We need to special case dependency exclusions for host-python-flit-core and host-python-installer to avoid circular dependencies in the flit-bootstrap SETUP_TYPE. We also need to special case the installation command for host-python-flit-core since it can not depend on host-python-installer due to host-python-installer requiring host-python-flit-core. Signed-off-by: James Hilliard Cc: "Yann E. MORIN" Cc: Arnout Vandecappelle --- Changes v2 -> v3: - add special flit-bootstrap SETUP_TYPE - don't change package SETUP_TYPE's yet Changes v1 -> v2: - formatting/cleanup - add comments --- package/pkg-python.mk | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..353bbada65 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -203,7 +206,7 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif -else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +else ifneq ($$(filter flit flit-bootstrap pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) $(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) $(2)_BASE_BUILD_CMD = -m build -n -w @@ -211,9 +214,24 @@ $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +# Use flit built in wheel builder for packages that are flit-bootstrap packages. +# This is needed to avoid a circular with host-python-pypa-build and those dependencies. +# +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +$(2)_BASE_BUILD_CMD = -m flit_core.wheel +ifeq ($(1),host-python-flit-core) +# Use flit built in bootstrap_install for installing host-python-flit-core. +# This is due to host-python-installer depending on host-python-flit-core. +# +$(2)_BASE_INSTALL_CMD = -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS) +else +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif +else $(2)_BASE_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif +endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif @@ -239,6 +257,12 @@ $(2)_DEPENDENCIES += host-python-pypa-build host-python-installer ifeq ($$($(2)_SETUP_TYPE),flit) $(2)_DEPENDENCIES += host-python-flit-core endif +else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifneq ($$(filter host-python-flit-core host-python-installer,$(1)),) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) +else +$(2)_DEPENDENCIES += host-python-flit-core host-python-installer +endif endif # SETUP_TYPE # Python interpreter to use for building the package. -- 2.25.1 From james.hilliard1 at gmail.com Thu Mar 24 22:47:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 16:47:20 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Message-ID: On Thu, Mar 24, 2022 at 4:28 PM ????? ???????? wrote: > > Hi, > > 24.03.2022 23:37, Arnout Vandecappelle ?????: > > >> else > >> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > >> -$(2)_BASE_BUILD_CMD = -m build -n -w > >> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py > >> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > >> +# Use flit built in wheel builder for packages that are > >> host-python-pypa-build dependencies. > >> +# This is needed to avoid a circular with host-python-pypa-build and > >> those dependencies. > >> +# > >> +$(2)_BASE_BUILD_CMD = $$(if \ > >> + $$(filter \ > >> + host-python-flit-core host-python-installer > >> host-python-pep517 host-python-tomli, \ > >> + $(1)) \ > >> + , \ > >> + -m flit_core.wheel, \ > >> + -m build -n -w \ > > > > This is adding way too much complexity to the infra just to support > > these four packages. I think there a a couple of better options: > > > > - don't use python infra at all for these packages; or > > - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or > > - add a fifth SETUP_TYPE "generic" or "custom" or something, which > > requires $(2)_BASE_* to be set by the python-flit-core.mk; > > - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set > > HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or > > - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which > > only gets used by the problematic packages. I added a flit-bootstrap SETUP_TYPE and isolated the special casing logic to that: https://patchwork.ozlabs.org/project/buildroot/patch/20220324223715.1961461-1-james.hilliard1 at gmail.com/ > > > > > > The latter two options have my preference because I think they are the > > cleanest, but any of them is OK for me. The "generic" setup type and the > > overridable _BASE_BUILD_CMD would also require an update in the manual. > > IMO, the simplest implementation would be: > > 1. For host-python-flit-core and host-python-installer, use > host-generic-package and define the build and install commands manually. This is more complex since we only need to special case a few things. > > 2. For every other package whose SETUP_TYPE is "flit", have it depend on > just host-python-flit-core and host-python-installer, and build with > "python -m flit_core.wheel". In other words, don't use > host-python-pypa-build. This is not recommended by upstream AFAIU, "python -m flit_core.wheel" is only supposed to be used for initial toolchain bootstrapping as it's not a generic pep517 build frontend. > > I don't think there are any advantages in using pypa-build over just > running flit_core.wheel directly, and dropping it would reduce the > number of packages that need special handling and simplify the > dependency tree. We will need a full pep517 build frontend anyways so this wouldn't simplify anything IMO. > > > >> diff --git a/package/python-flit-core/python-flit-core.mk > >> b/package/python-flit-core/python-flit-core.mk > >> index 0e058a1f17..d206a72f82 100644 > >> --- a/package/python-flit-core/python-flit-core.mk > >> +++ b/package/python-flit-core/python-flit-core.mk > >> @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > >> PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > >> PYTHON_FLIT_CORE_SITE = > >> https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > >> > >> PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > >> -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > >> +PYTHON_FLIT_CORE_SETUP_TYPE = flit > > > > This means there's no package any more that uses pep517 setup type. Do > > you think it's ever going to be used again? Or can we remove it altogether? > > I think python-setuptools could be a potential user of this, if > python-pypa-build ever becomes buildable without setuptools (which it > very well might). >From my understanding upstream intends to migrate python-pypa-build to a flit based build in the future. At that point setuptools could itself use the generic pep517 SETUP_TYPE since it uses a local pep517 build backend. > > -Roman. From dpb at corrigendum.ru Thu Mar 24 23:32:49 2022 From: dpb at corrigendum.ru (=?UTF-8?B?0KDQvtC80LDQvSDQlNC+0L3Rh9C10L3QutC+?=) Date: Fri, 25 Mar 2022 02:32:49 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Message-ID: 25.03.2022 1:47, James Hilliard ?????: > On Thu, Mar 24, 2022 at 4:28 PM ????? ???????? wrote: >> >> Hi, >> >> 24.03.2022 23:37, Arnout Vandecappelle ?????: >> >>>> else >>>> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) >>>> -$(2)_BASE_BUILD_CMD = -m build -n -w >>>> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py >>>> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) >>>> +# Use flit built in wheel builder for packages that are >>>> host-python-pypa-build dependencies. >>>> +# This is needed to avoid a circular with host-python-pypa-build and >>>> those dependencies. >>>> +# >>>> +$(2)_BASE_BUILD_CMD = $$(if \ >>>> + $$(filter \ >>>> + host-python-flit-core host-python-installer >>>> host-python-pep517 host-python-tomli, \ >>>> + $(1)) \ >>>> + , \ >>>> + -m flit_core.wheel, \ >>>> + -m build -n -w \ >>> >>> This is adding way too much complexity to the infra just to support >>> these four packages. I think there a a couple of better options: >>> >>> - don't use python infra at all for these packages; or >>> - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or >>> - add a fifth SETUP_TYPE "generic" or "custom" or something, which >>> requires $(2)_BASE_* to be set by the python-flit-core.mk; >>> - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set >>> HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or >>> - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which >>> only gets used by the problematic packages. > > I added a flit-bootstrap SETUP_TYPE and isolated the special casing > logic to that: > https://patchwork.ozlabs.org/project/buildroot/patch/20220324223715.1961461-1-james.hilliard1 at gmail.com/ > >>> >>> >>> The latter two options have my preference because I think they are the >>> cleanest, but any of them is OK for me. The "generic" setup type and the >>> overridable _BASE_BUILD_CMD would also require an update in the manual. >> >> IMO, the simplest implementation would be: >> >> 1. For host-python-flit-core and host-python-installer, use >> host-generic-package and define the build and install commands manually. > > This is more complex since we only need to special case a few things. Is it really that complex, though? Admittedly, I'm not hugely familiar with buildroot, but I wrote a test version of the makefile for flit-core, and I just had to define PYTHON_FLIT_CORE_DEPENDENCIES (= host-python), HOST_PYTHON_FLIT_CORE_BUILD_CMDS and HOST_PYTHON_FLIT_CORE_INSTALL_CMDS. I think it's easier to understand that than to track all the special cases in pkg-python.mk. >> >> 2. For every other package whose SETUP_TYPE is "flit", have it depend on >> just host-python-flit-core and host-python-installer, and build with >> "python -m flit_core.wheel". In other words, don't use >> host-python-pypa-build. > > This is not recommended by upstream AFAIU, "python -m flit_core.wheel" is > only supposed to be used for initial toolchain bootstrapping as it's > not a generic > pep517 build frontend. Yes, but we don't need a generic build frontend. We already know that these packages use flit as the backend, and the build dependencies are installed by Buildroot, so the function of the frontend is reduced to just calling the backend - so you might as well remove the frontend and call the backend directly. Also, you can see that flit_core.wheel uses the same underlying code as Flit's PEP 517 backend, so I don't think there can be cases where the latter will work, but the former won't: https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/wheel.py#L235 https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/buildapi.py#L70 > >> >> I don't think there are any advantages in using pypa-build over just >> running flit_core.wheel directly, and dropping it would reduce the >> number of packages that need special handling and simplify the >> dependency tree. > > We will need a full pep517 build frontend anyways so this wouldn't simplify > anything IMO. The simplification is in not having two different flit-based SETUP_TYPEs. -Roman. From neal.frager at amd.com Thu Mar 24 12:31:17 2022 From: neal.frager at amd.com (Neal Frager) Date: Thu, 24 Mar 2022 06:31:17 -0600 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https Message-ID: <20220324123117.2369981-1-neal.frager@amd.com> This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// The git:// location is no longer supported. For more details: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Neal Frager --- V1->V2: -separated DEVELOPERS file update to make stand alone patch --- configs/zynqmp_zcu102_defconfig | 4 ++-- configs/zynqmp_zcu106_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" -- 2.17.1 From james.hilliard1 at gmail.com Fri Mar 25 00:18:40 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 18:18:40 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Message-ID: On Thu, Mar 24, 2022 at 5:32 PM ????? ???????? wrote: > > > > 25.03.2022 1:47, James Hilliard ?????: > > On Thu, Mar 24, 2022 at 4:28 PM ????? ???????? wrote: > >> > >> Hi, > >> > >> 24.03.2022 23:37, Arnout Vandecappelle ?????: > >> > >>>> else > >>>> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > >>>> -$(2)_BASE_BUILD_CMD = -m build -n -w > >>>> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py > >>>> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > >>>> +# Use flit built in wheel builder for packages that are > >>>> host-python-pypa-build dependencies. > >>>> +# This is needed to avoid a circular with host-python-pypa-build and > >>>> those dependencies. > >>>> +# > >>>> +$(2)_BASE_BUILD_CMD = $$(if \ > >>>> + $$(filter \ > >>>> + host-python-flit-core host-python-installer > >>>> host-python-pep517 host-python-tomli, \ > >>>> + $(1)) \ > >>>> + , \ > >>>> + -m flit_core.wheel, \ > >>>> + -m build -n -w \ > >>> > >>> This is adding way too much complexity to the infra just to support > >>> these four packages. I think there a a couple of better options: > >>> > >>> - don't use python infra at all for these packages; or > >>> - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or > >>> - add a fifth SETUP_TYPE "generic" or "custom" or something, which > >>> requires $(2)_BASE_* to be set by the python-flit-core.mk; > >>> - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set > >>> HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or > >>> - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which > >>> only gets used by the problematic packages. > > > > I added a flit-bootstrap SETUP_TYPE and isolated the special casing > > logic to that: > > https://patchwork.ozlabs.org/project/buildroot/patch/20220324223715.1961461-1-james.hilliard1 at gmail.com/ > > > >>> > >>> > >>> The latter two options have my preference because I think they are the > >>> cleanest, but any of them is OK for me. The "generic" setup type and the > >>> overridable _BASE_BUILD_CMD would also require an update in the manual. > >> > >> IMO, the simplest implementation would be: > >> > >> 1. For host-python-flit-core and host-python-installer, use > >> host-generic-package and define the build and install commands manually. > > > > This is more complex since we only need to special case a few things. > > Is it really that complex, though? Admittedly, I'm not hugely familiar > with buildroot, but I wrote a test version of the makefile for > flit-core, and I just had to define PYTHON_FLIT_CORE_DEPENDENCIES (= > host-python), HOST_PYTHON_FLIT_CORE_BUILD_CMDS and > HOST_PYTHON_FLIT_CORE_INSTALL_CMDS. > I think it's easier to understand that than to track all the special > cases in pkg-python.mk. It's harder to maintain IMO since you'd then have to manually sync generic fixes in pkg-python.mk with multiple package makefiles. There's really not that much special casing needed in pkg-python.mk IMO and it's easier to do there since the special casing needs to apply to a few packages. > > >> > >> 2. For every other package whose SETUP_TYPE is "flit", have it depend on > >> just host-python-flit-core and host-python-installer, and build with > >> "python -m flit_core.wheel". In other words, don't use > >> host-python-pypa-build. > > > > This is not recommended by upstream AFAIU, "python -m flit_core.wheel" is > > only supposed to be used for initial toolchain bootstrapping as it's > > not a generic > > pep517 build frontend. > > Yes, but we don't need a generic build frontend. We already know that > these packages use flit as the backend, and the build dependencies are > installed by Buildroot, so the function of the frontend is reduced to > just calling the backend - so you might as well remove the frontend and > call the backend directly. Setuptools for example would be a non-flit pep517 package. The goal here is not just to provide flit support but rather to bring up the necessary infrastructure for installing different types of pep517 packages that may use different pep517 backends. > > Also, you can see that flit_core.wheel uses the same underlying code as > Flit's PEP 517 backend, so I don't think there can be cases where the > latter will work, but the former won't: > > https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/wheel.py#L235 > https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/buildapi.py#L70 The main issue is that flit_core.wheel isn't a generic pep517 frontend and it's recommended to move to pypa-build once bootstrapped: https://github.com/pypa/flit/blob/3.7.1/doc/bootstrap.rst I'm also wary of using the python -m flit_core.wheel bootstrapping frontend for packages that aren't needed for bootstrapping as it's unlikely to be tested much in general compared with a full pep517 frontend like pypa-build. > > > > >> > >> I don't think there are any advantages in using pypa-build over just > >> running flit_core.wheel directly, and dropping it would reduce the > >> number of packages that need special handling and simplify the > >> dependency tree. > > > > We will need a full pep517 build frontend anyways so this wouldn't simplify > > anything IMO. > > The simplification is in not having two different flit-based SETUP_TYPEs. I mean, I'm trying to share the pypa-build frontend across all pep517 based package builds other than those where it's not possible, bringing up build here will simplify adding support for non-flit pep517 based packages down the line as we will already have a functional generic pep517 build frontend then. The regular flit SETUP_TYPE is basically identical to the pep517 SETUP_TYPE except that it has a host-python-flit-core dependency so there's very little extra code actually needed for the non-bootstrap flit SETUP_TYPE. > > -Roman. From fido_max at inbox.ru Fri Mar 25 05:38:37 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 25 Mar 2022 08:38:37 +0300 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy In-Reply-To: <20220324223218.27767-1-fontaine.fabrice@gmail.com> References: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Message-ID: <944e8eb8-c4a6-f009-00a9-8b273b947cef@inbox.ru> On 25.03.2022 01:32, Fabrice Fontaine wrote: > Fix the following build failure if clang-tidy is found on host (and > protobuf is built before protozero) which is raised since tests are > disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: > > CMake Error at CMakeLists.txt:77 (add_dependencies): > The dependency target "writer_tests" of target "clang-tidy" does not exist. > > Fixes: > - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From etienne.carriere at linaro.org Fri Mar 25 10:17:00 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Fri, 25 Mar 2022 11:17:00 +0100 Subject: [Buildroot] [PATCH] boot/optee-os: fix version choice In-Reply-To: <20220319094939.1588302-1-yann.morin.1998@free.fr> References: <20220319094939.1588302-1-yann.morin.1998@free.fr> Message-ID: Hello Yann, On Sat, 19 Mar 2022 at 10:49, Yann E. MORIN wrote: > > Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to > propagate the rustc arch dependency from the new version, to the default > clause of the choice. > > This leaves only the custom git tree as a posible source for building nit: s/posible/possible/ > OP-TEE OS in case the host can't have a rustc compiler. > > Signed-off-by: Yann E. MORIN > Reported-by: Thomas Petazzoni > Cc: Cl?ment L?ger > Cc: Etienne Carriere > --- > boot/optee-os/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 18e1efee55..30b6f62434 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS > > choice > prompt "OP-TEE OS version" > - default BR2_TARGET_OPTEE_OS_LATEST > + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > help > Select the version of OP-TEE OS you want to use LGTM. Acked-by: Etienne Carriere br, etienne > > -- > 2.25.1 > From peter at korsgaard.com Fri Mar 25 11:08:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 12:08:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Update for 2021.02.11 Message-ID: <20220325105935.ED86B85CC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a78c830a49b19425de5d1df407c2ba8c302cb7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard --- CHANGES | 24 ++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ee01f12a3c..c9822cdf80 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,27 @@ +2021.02.11, released March 25th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, dbus, + directfb, docker-engine, exempi, expat, flac, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libxml2, libxslt, lxc, mariadb, odbm openblas, + openvpn, oprofile, php, pppd, python-ipython, python-treq, + python-twisted, python-txbus, python-txtorcon, raptor, + rpi-firmware, samba4, timescaledb, util-linux, vim, wavpack, + wireless-regdb, wireshark, wolfssl, xscreensaver, xterm, zsh + + New packages: gdk-pixbuf-xlib + + Removed packages: python-coherence + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.02.10, released February 28th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 9dc0a8673c..a3c5802d55 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.10 +export BR2_VERSION := 2021.02.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646081600 +BR2_VERSION_EPOCH = 1648206000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 85aa167efc..7e97a277ea 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.10' +RELEASE='2021.02.11' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Fri Mar 25 13:02:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 14:02:16 +0100 Subject: [Buildroot] Buildroot 2021.02.11 released Message-ID: <87fsn6chif.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.02.11 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.02.11.tar.gz or http://buildroot.org/downloads/buildroot-2021.02.11.tar.bz2 Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.02.11 is a bugfix release on the current long term release, fixing a number of important / security related issues discovered since the 2021.02.10 release. - Security fixes for apache, exempi, expat, flac, gnutls, go, libiec61850, libopenssl, libpjsip, libressl, libxml2, libxslt, mariadb, minidlna, openvpn, php, python-ipython, python-twisted, raptor, samba4, timescaledb, util-linux, vim, wavpack, wireshark, wolfssl, xterm, zsh - Fixes for download/compilation/runtime/license issues in azure-iot-sdk-c, dbus, directfb, docker-engine, gdk-pixbuf, haproxy, libcurl, libminiupnpc, libodb, libodb-boost, librsvg, libsrtp, lxc, odb, openblas, oprofile, pppd, python-treq, python-txdbus, python-txtorcon, rpi-firmware, wireless-regdb, xscreensaver, - Removed packages: python-coherence For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.11 Users of the affected packages are strongly encouraged to upgrade. Many thanks to all the people contributing to this release: git shortlog -sn 2021.02.10.. 33 Fabrice Fontaine 15 Peter Korsgaard 7 Bernd Kuhls 6 Maxim Kochetkov 5 Francois Perrad 5 Thomas Petazzoni 4 Peter Seiderer 2 Adam Duskett 2 Julien Olivain 2 Romain Naour 1 Andrei Gherghescu 1 Arnout Vandecappelle (Essensium/Mind) 1 Kamel Bouhara 1 Kris Bahnsen 1 Sassen, Rutger 1 Simon Doppler 1 TIAN Yuanhao 1 Th?o Lebrun 1 Yannick Brosseau -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 25 13:14:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 14:14:31 +0100 Subject: [Buildroot] [git commit] Update for 2021.02.11 Message-ID: <20220325130832.5A4F085D2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7935ca44508a605a5bce73d4ad63cd7c18450c70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit 6a78c830a49b19425de5d1df407c2ba8c302cb7a) [Peter: drop Makefile/Vagrantfile change] Signed-off-by: Peter Korsgaard --- CHANGES | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGES b/CHANGES index 981c4c08ec..370f89aa6f 100644 --- a/CHANGES +++ b/CHANGES @@ -803,6 +803,30 @@ #13751: libopenssl (static): huge drop in performance in newer .. #13771: package htop has undeclared dependency on host python +2021.02.11, released March 25th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, dbus, + directfb, docker-engine, exempi, expat, flac, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libxml2, libxslt, lxc, mariadb, odbm openblas, + openvpn, oprofile, php, pppd, python-ipython, python-treq, + python-twisted, python-txbus, python-txtorcon, raptor, + rpi-firmware, samba4, timescaledb, util-linux, vim, wavpack, + wireless-regdb, wireshark, wolfssl, xscreensaver, xterm, zsh + + New packages: gdk-pixbuf-xlib + + Removed packages: python-coherence + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.02.10, released February 28th, 2022 Important / security related fixes. From peter at korsgaard.com Fri Mar 25 13:17:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 14:17:04 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.02.11 Message-ID: <20220325130832.6BA7685D30@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16008ee1c01c80c5b802e66acd139c6705d901f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/news.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 146a64d034..4e153aebb0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2021.02.11 released

        +

        25 March 2022

        +
        +
        +

        The 2021.02.11 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.02.10 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.02.11 release.

        +
        +
        +
        • +
      • From peter at korsgaard.com Fri Mar 25 16:43:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 17:43:59 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220325163503.E4EBC85D3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607c5986a9b3bde0cacdbe38eeaea2ab456a6e80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f21beb4222..f25b662aa5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.30" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 976f1d07c0..87a0f0465b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 cca7d6e053e33f44af1b39f7becec73a387911d81ede5a84ecf671692533138f linux-5.16.16.tar.xz +sha256 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132 linux-5.15.30.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831..479f64b72e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -381,13 +381,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 + default "5.15.30" if BR2_KERNEL_HEADERS_5_15 + default "5.16.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Fri Mar 25 16:44:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 17:44:10 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series In-Reply-To: <20220322082939.2153092-1-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 22 Mar 2022 09:29:38 +0100") References: <20220322082939.2153092-1-peter@korsgaard.com> Message-ID: <87bkxuc78l.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.4.x is now EOL, so no more updates for that series. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Fri Mar 25 19:09:34 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 25 Mar 2022 20:09:34 +0100 Subject: [Buildroot] [PATCH v1] package/wireshark: fix compile with ccache enabled Message-ID: <20220325190934.24982-1-ps.report@gmx.net> - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73..1a549f7037 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:05:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:05:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/iwd: fix uclibc build Message-ID: <20220325210554.526198-1-fontaine.fabrice@gmail.com> Fix the following uclibc build failure raised since bump to version 1.25 in commit 0fc5bc235990073233df6352d1208624034a6b6e and https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=01cd8587606bf2da1af245163150589834126c1: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' Fixes: - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 Signed-off-by: Fabrice Fontaine --- ...-src-storage.c-fix-build-with-uclibc.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch diff --git a/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch new file mode 100644 index 0000000000..55fdaa86fd --- /dev/null +++ b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch @@ -0,0 +1,37 @@ +From 99e74ade2ea892e6d0b070bec1df6a135ce2c8b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Mar 2022 16:35:49 +0100 +Subject: [PATCH] src/storage.c: fix build with uclibc + +explicit_bzero is used in src/storage.c since commit +01cd8587606bf2da1af245163150589834126c1c but src/missing.h is not +included, as a result build with uclibc fails on: + +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': +storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' + +Fixes: + - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/WB2XXRBUDHC5IVFDEOJBK23JHPURL427] +--- + src/storage.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/storage.c b/src/storage.c +index 82a72443..aa8066b1 100644 +--- a/src/storage.c ++++ b/src/storage.c +@@ -44,6 +44,7 @@ + #include + #include "ell/useful.h" + ++#include "src/missing.h" + #include "src/common.h" + #include "src/storage.h" + #include "src/crypto.h" +-- +2.35.1 + -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:17:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:17:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/atk: bump to version 2.38.0 Message-ID: <20220325211725.612796-1-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/atk/-/tags/2.38.0 Signed-off-by: Fabrice Fontaine --- package/atk/atk.hash | 4 ++-- package/atk/atk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 2e7c3b5fec..d8cd69ff1f 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz # Hash for license file sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index dfeb4de8b2..2820fb486d 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.36 +ATK_VERSION_MAJOR = 2.38 ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) -- 2.35.1 From james.hilliard1 at gmail.com Fri Mar 25 21:24:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 25 Mar 2022 15:24:05 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 Message-ID: <20220325212405.25243-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index d909709b24..8389adb243 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 4615e839fe..e9c3145183 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.3 +MESON_VERSION = 0.61.4 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:28:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:28:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: bump to version 8.2.2 Message-ID: <20220325212852.713531-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://frrouting.org/release/8.2.2 Signed-off-by: Fabrice Fontaine --- ...001-configure.ac-fix-enable_bmp-typo.patch | 29 ----------------- ...-lib-fix-elf_py-TLS-section-handling.patch | 31 ------------------- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 4 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 package/frr/0001-configure.ac-fix-enable_bmp-typo.patch delete mode 100644 package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch deleted file mode 100644 index c8ce500dfc..0000000000 --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 16 Dec 2021 20:10:26 +0100 -Subject: [PATCH] configure.ac: fix enable_bmp typo - -enable_bmp doesn't exist, use enable_bgp_bmp - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FRRouting/frr/pull/10236] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1bcc42ef8..c7a5f1286 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then - fi - - bgpd_bmp=false --case "${enable_bmp}" in -+case "${enable_bgp_bmp}" in - no) - ;; - yes) --- -2.33.0 - diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch deleted file mode 100644 index d491cb1a7d..0000000000 --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Wed, 10 Nov 2021 15:30:07 +0100 -Subject: [PATCH] lib: fix elf_py TLS section handling - -... need to ignore TLS sections, their address is effectively -meaningless but can overlap other sections we actually need to access. - -Signed-off-by: David Lamparter - -[Retrieved from: -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] -Signed-off-by: Fabrice Fontaine ---- - lib/elf_py.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/elf_py.c b/lib/elf_py.c -index 1c306893ad8..f230add6957 100644 ---- a/lib/elf_py.c -+++ b/lib/elf_py.c -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) - Elf_Scn *scn = elf_getscn(ef->elf, i); - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); - -+ /* virtual address is kinda meaningless for TLS sections */ -+ if (shdr->sh_flags & SHF_TLS) -+ continue; - if (addr < shdr->sh_addr || - addr >= shdr->sh_addr + shdr->sh_size) - continue; diff --git a/package/frr/frr.hash b/package/frr/frr.hash index bb6c32b7bb..9bb2b75b8f 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz +sha256 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f frr-8.2.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 0e6ab7a815..aa36387a3a 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.1 +FRR_VERSION = 8.2.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:35:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:35:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump to version 5.16.2 Message-ID: <20220325213557.757894-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES Signed-off-by: Fabrice Fontaine --- ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ---------------- ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 ------------------- ...ocal-definition-for-alignment-macros.patch | 46 ----------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 5 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch delete mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch delete mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch deleted file mode 100644 index b6c1a42456..0000000000 --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 30 Dec 2021 15:23:59 +0200 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Signed-off-by: Bruce Ashfield -[remove invalid OE Upstream-status] -Signed-off-by: Stijn Tintel -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6c..2503d1afa 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch deleted file mode 100644 index 7473fe67cb..0000000000 --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 Jan 2022 22:44:44 +0100 -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl - -Make inclusion of sys/sysinfo.h conditional to avoid the following build -failure on musl: - -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from ./kerncompat.h:31, - from common/utils.c:42: -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - 7 | struct sysinfo { - | ^~~~~~~ -In file included from common/utils.c:27: -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - 10 | struct sysinfo { - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc - -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, -while both must not be included at the same time. Stop including -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and -causes the double definition for some reason. As we now include -linux/const.h directly, there's no other effective change. - -Pull-request: #433 -Signed-off-by: Fabrice Fontaine -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] ---- - kerncompat.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 2503d1afa..6ca1526e2 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch deleted file mode 100644 index 86c63edc30..0000000000 --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 6ca1526e2..f0a6e196e 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - { diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 339eab02aa..14eeb1ca07 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 54922df839..9bf50ccfda 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.15.1 +BTRFS_PROGS_VERSION = 5.16.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib -- 2.35.1 From thomas.petazzoni at bootlin.com Sat Mar 26 07:15:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Mar 2022 07:15:10 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-25 Message-ID: <20220326071514.7303C60C01@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-03-25 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 46 | 7 | 1 | 54 | 2022.02.x | 13 | 4 | 0 | 17 | master | 64 | 27 | 0 | 91 | Classification of failures by reason for master ----------------------------------------------- pango-1.50.5 | 8 dhcp-4.4.2-P1 | 5 unknown | 3 mongodb-4.2.18 | 2 wavemon-0.9.4 | 2 exempi-2.6.1 | 1 host-delve-1.8.0 | 1 host-pango-1.50.5 | 1 iwd-1.25 | 1 liquid-dsp-1.4.0 | 1 mesa3d-21.3.8 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/230dc26c61f4a29cc755248285f7f938916f7649 | ORPH arc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/86a0c2ab55fc2404b77107c403767b12042eced8 | ORPH s390x | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/e4df4f72e3782b712528fab4f33c0f48fc8c50e4 | ORPH arm | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/4d06e811ca90d48772a01cb83f172a1c5b7c9cfc | ORPH microblazeel | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/f9d3525e4cb3706b94317e747c70741a38051fb7 | ORPH arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/26e51513bbbf43b949da227d97ad1ad290c6a303 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/b59458266d09a1a1e6c82428cb48170cc0c95828 | arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/54369fff25c34e4fc01ba99943fac0b4520c93ed | ORPH powerpc | iwd-1.25 | NOK | http://autobuild.buildroot.net/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 | arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/881826b4b6c141e59a0da2d7d1ad55d3709fdb95 | mips | mesa3d-21.3.8 | NOK | http://autobuild.buildroot.net/results/9b50c992567cc5d46dadb42ed5a72d27cd019388 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/c23bb2884dfb54ec29db151bd8d6d3183de035ab | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/1211fe407e413742813c94dc2a7738ce5fd04735 | arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/1cc8efe0895137828693f3059c22c139ff5295eb | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/f52f6b3ed62d8a8e43b7db2c5b36c585e94adeea | ORPH powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/b18da16d29022eb27549d9aa431790259ae589d8 | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/127875183c97e7bf70515eb1f3d2c0506200e149 | ORPH sparc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/3ff6bb98beecb72ef405563fa5341da2f140d57a | ORPH i586 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/85e2aa2c8e2e490ce613da58b02ab7e8e7b0305c | ORPH s390x | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/4acc36c6dc50a009bedd184cdf0343e375308dd6 | ORPH powerpc | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/1a78659b9f975913902c0a0d3bfc6467c9d2b0b4 | ORPH i686 | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/89dd546426d045c42814b0378949d958e7b1a6df | m68k | unknown | NOK | http://autobuild.buildroot.net/results/a3f177a4e5cd93d188ae14b0cf0fa8bfaabb8474 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/d4f4e03841ae902b59a13e849ba0b679959be2f9 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/774ae837717eb4bfc333877b66fae4a207b31a06 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d8fe28ad85df5415f15409285e601c39c36f557a | i686 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1102aa675d4b959c590f95439a9c20c253d273af | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 glib-networking-2.66.0 | 1 host-nodejs-12.22.9 | 1 hwloc-1.11.13 | 1 python-lxml | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/ea89da41f8ac6d77775e3ae1dd52228eb682e5ff | ORPH arm | host-nodejs-12.22.9 | NOK | http://autobuild.buildroot.net/results/0f24e44353f34fea25644d97d7bc586bb386d884 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5c235348081cf917ab8b942f62bf3950ad66c105 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c644605b7356269da97156577d5f0bc4a474f0fd | s390x | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6079f06f494d970d8cdac4b7d3e7034a32738dc4 | microblazeel | hwloc-1.11.13 | NOK | http://autobuild.buildroot.net/results/ddc57a897ed3b4c69c5a25dc18cb4f2fb6b82bdf | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/78c501c1499c7f093910dce4c5ddc793d0d4cb2b | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/86cc0dca02deb81354568f998b52f61f51059490 | Classification of failures by reason for 2022.02.x -------------------------------------------------- bind-9.16.26 | 1 bluez5_utils-5.63 | 1 dhcp-4.4.2-P1 | 1 exempi-2.6.1 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nds32le | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/36293589d7bafdf29d542489240145a7a36eaa59 | ORPH arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4aa68100c0becc4b0344fa5b5e8c39d6c784b120 | riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/4b036e9e687490ff78383ceff4e59a6b108199e4 | ORPH arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/c5544a44e85fcbec25a2f45d9d175110a22bed2b | Gitlab CI results for 2022-03-25 ================================ Detail of runtime-test failures for 2021.11.3 --------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566655 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566682 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566765 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566610 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566855 | ORPH Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853884 | andes_ae350_45 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853897 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853955 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853957 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853958 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853962 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853985 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854014 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854039 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854059 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854065 | ORPH friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854082 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854084 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854086 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854091 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854146 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854148 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854164 | minnowboard_max-graphical | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854190 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854335 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854355 | ORPH orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854370 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854482 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854507 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854538 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854592 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854593 | -- http://autobuild.buildroot.net From bernd.kuhls at t-online.de Sat Mar 26 14:20:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 26 Mar 2022 15:20:07 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/intel-mediasdk: bump version to 22.3.0 In-Reply-To: <20220326142007.864294-1-bernd.kuhls@t-online.de> References: <20220326142007.864294-1-bernd.kuhls@t-online.de> Message-ID: <20220326142007.864294-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- v2: no changes package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d9acf49637..802131a772 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz +sha256 e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 intel-mediasdk-22.3.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 698d2348b2..b90d252b4f 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.2 +INTEL_MEDIASDK_VERSION = 22.3.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Sat Mar 26 14:20:05 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 26 Mar 2022 15:20:05 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/intel-mediadriver: bump version to 22.3.0 Message-ID: <20220326142007.864294-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- v2: no changes package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 044b9d7013..57499830b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 84eda811ae..c22aeecc77 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_VERSION = 22.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.30.2 From bernd.kuhls at t-online.de Sat Mar 26 14:20:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 26 Mar 2022 15:20:06 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/intel-gmmlib: bump version to 22.1.2 In-Reply-To: <20220326142007.864294-1-bernd.kuhls@t-online.de> References: <20220326142007.864294-1-bernd.kuhls@t-online.de> Message-ID: <20220326142007.864294-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- v2: bump version to 22.1.2 package/intel-gmmlib/0001-Drop-hardening-related-flags.patch | 2 +- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch index 581afd9066..c429df6581 100644 --- a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch +++ b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch @@ -15,7 +15,7 @@ diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake index 1a09bc4..b28fc1b 100644 --- a/Source/GmmLib/Linux.cmake +++ b/Source/GmmLib/Linux.cmake -@@ -62,7 +62,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON +@@ -99,7 +99,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON -DUSE_SSE3 -DUSE_SSSE3 # Other common flags diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index beb3cfd6ae..5e48238448 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz +sha256 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334 intel-gmmlib-22.1.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 06628132a2..25cc733e0c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.3 +INTEL_GMMLIB_VERSION = 22.1.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From snathicktechno at gmail.com Sat Mar 26 16:52:13 2022 From: snathicktechno at gmail.com (snathick) Date: Sat, 26 Mar 2022 09:52:13 -0700 Subject: [Buildroot] Python package integration In-Reply-To: References: <4470C393-DAE8-4385-A817-9895CF2CFECC@0leil.net> Message-ID: Hi, I am working with integrating below package to buildroot https://github.com/richteel/TeelSys_Python_SHT locally computed sha256 and .hash as follows sha256 d62efb2207390e623cf7c6067606f300a68cb2d0a448c93368302d3fa0d50b87 python-sht21-84398b3267158d15e2322878294c0d7e0e6fa78d.tar.gz sha256 5979e787d347e88357e5e8d70c446e9b082c40c32014ec632942aaed0a218e73 LICENSE when building error with hash mismatch ERROR: python-sht21-84398b3267158d15e2322878294c0d7e0e6fa78d.tar.gz has wrong sha256 hash ERROR: expected: d62efb2207390e623cf7c6067606f300a68cb2d0a448c93368302d3fa0d50b87 ERROR: got : 88696f8d6961cda3c52676607dde37ae7825ab0567364dc4a0162d964ad6266e ERROR: Incomplete download, or man-in-the-middle (MITM) attack hash generated was perfect, but how it got generated hash 88696f8d6961cda3c52676607dde37ae7825ab0567364dc4a0162d964ad6266e not understanding Any suggestions to resolve this issue? Thanks, Snathick On Thu, Mar 24, 2022 at 1:35 PM snathick wrote: > Hi quentin, > > Thanks for the response and suggestions. > > As per your suggestion modified .mk as follows > > ################################################################################ > # > # python-sht21 > # > > ################################################################################ > > PYTHON_SHT21_SITE = $(call > github,richteel,TeelSys_Python_SHT,84398b3267158d15e2322878294c0d7e0e6fa78d)) > PYTHON_SHT21_LICENSE = MIT > PYTHON_SHT21_LICENSE_FILES = LICENSE > PYTHON_SHT21_SETUP_TYPE = setuptools > > $(eval $(python-package)) > > observed that package is not downloading make is failing informing that > output/build/python-sht21 no setup.py is present > > Any suggestions > > > On Thu, Mar 24, 2022 at 12:08 PM Quentin Schulz > wrote: > >> Hi, >> >> On March 24, 2022 5:49:46 AM GMT+01:00, snathick < >> snathicktechno at gmail.com> wrote: >> >Hi, >> > >> >I am trying to add the below python package to buildroot >> > >> >https://github.com/richteel/TeelSys_Python_SHT >> > >> > >> >.mk file as follows >> > >> >> >################################################################################ >> ># >> ># python-sht21 >> ># >> >> >################################################################################ >> > >> >PYTHON_SHT21_VERSION = 1.0 >> >PYTHON_SHT21_SOURCE = pysht21-$(PYTHON_SHT21_VERSION).tar.gz >> >PYTHON_SHT21_SITE = https://github.com/richteel/TeelSys_Python_SHT >> >> I think this is one of the issues. >> >> The documentation ( >> https://buildroot.org/downloads/manual/manual.html#github-download-url) >> states that you should use: >> PYTHON_SHT21_SITE = $(call >> github,richteel,TeelSys_Python_SHT,$(PYTHON_SHT21_VERSION)) >> >> I also don't think there's a need for PYTHON_SHT21_SOURCE since Buildroot >> will figure it out from _SITE variable here. >> >> Finally, I couldn't see tags or releases on this github repo, so you want >> to pass a commit id to PYTHON_SHT21_VERSION, e.g. >> 84398b3267158d15e2322878294c0d7e0e6fa78d for the last commit in master >> branch. >> >> >PYTHON_SHT21_LICENSE = BSD >> >> It's actually MIT. >> >> Cheers, >> Quentin >> >> >PYTHON_SHT21_LICENSE_FILES = LICENSE >> >PYTHON_SHT21_SETUP_TYPE = setuptools >> > >> >$(eval $(python-package)) >> > >> >make command giving following error >> > >> >wget --passive-ftp -nd -t 3 -O >> >'/home/snathick/buildroot/output/build/.pysht21-1.0.uyWYsC/output' ' >> >http://sources.buildroot.net/pysht21-1.0' >> >--2022-03-24 08:57:12-- http://sources.buildroot.net/pysht21-1.0 >> >Resolving sources.buildroot.net (sources.buildroot.net)... 172.67.72.56, >> >104.26.0.37, 104.26.1.37, ... >> >Connecting to sources.buildroot.net (sources.buildroot.net >> )|172.67.72.56|:80... >> >connected. >> >HTTP request sent, awaiting response... 404 Not Found >> >2022-03-24 08:57:13 ERROR 404: Not Found. >> > >> >package/pkg-generic.mk:185: recipe for target >> >> >'/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded' >> >failed >> >make[1]: *** >> >> >[/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded] >> >Error 1 >> >Makefile:84: recipe for target '_all' failed >> >make: *** [_all] Error 2 >> > >> > >> >Any suggestions to resolve the issue >> > >> > >> > >> > >> > > > -- > Thanks & Regards, > Snathick > -- Thanks & Regards, Snathick -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Sat Mar 26 19:27:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 26 Mar 2022 20:27:05 +0100 Subject: [Buildroot] [PATCH v1 1/1] DEVELOPERS: update email address In-Reply-To: <20220323170235.GO1566358@scaer> (Yann E. MORIN's message of "Wed, 23 Mar 2022 18:02:35 +0100") References: <20220323072029.260340-1-neal.frager@amd.com> <20220323170235.GO1566358@scaer> Message-ID: <874k3kcy5y.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Neal, All, > On 2022-03-23 01:20 -0600, Neal Frager via buildroot spake thusly: >> This patch updates my email address in the DEVELOPERS file. >> >> Signed-off-by: Neal Frager > Applied to master, thanks. Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 26 19:25:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 26 Mar 2022 20:25:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: update email address Message-ID: <20220326192052.0495B848DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2366533fd1be0bea767ef68fe2d8d45e676a4f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This patch updates my email address in the DEVELOPERS file. Signed-off-by: Neal Frager Signed-off-by: Yann E. MORIN (cherry picked from commit ae1deebb9e78b5338f5f30fe4765e3eb9e5be3d7) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index b5183711b5..c3d7c4a6fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2082,7 +2082,7 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager F: board/zynqmp/ F: configs/zynqmp_zcu102_defconfig From fontaine.fabrice at gmail.com Sat Mar 26 20:49:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Mar 2022 21:49:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4632 Message-ID: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.35.1 From angelo at amarulasolutions.com Sat Mar 26 22:07:27 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Sat, 26 Mar 2022 23:07:27 +0100 Subject: [Buildroot] [PATCH v2] package/libdill: new package Message-ID: <20220326220727.827332-1-angelo@amarulasolutions.com> Libdill is a C library that makes writing structured concurrent programs easy. Signed-off-by: Angelo Compagnucci --- v1-v2: Better configuration options handling: libdill build can actually be customized only when using configure indeed cmake doesn't offer the same configuration option, DEVELOPERS | 1 + package/Config.in | 1 + package/libdill/Config.in | 7 +++++++ package/libdill/libdill.hash | 3 +++ package/libdill/libdill.mk | 25 +++++++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/libdill/Config.in create mode 100644 package/libdill/libdill.hash create mode 100644 package/libdill/libdill.mk diff --git a/DEVELOPERS b/DEVELOPERS index 70d71186ed..9410944584 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -167,6 +167,7 @@ F: package/i2c-tools/ F: package/jq/ F: package/libapparmor/ F: package/libb64/ +F: package/libdill/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..47f84a08dc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdill/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdill/Config.in b/package/libdill/Config.in new file mode 100644 index 0000000000..0e6757b809 --- /dev/null +++ b/package/libdill/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDILL + bool "libdill" + help + Libdill is a C library that makes writing structured concurrent + programs easy. + + http://libdill.org diff --git a/package/libdill/libdill.hash b/package/libdill/libdill.hash new file mode 100644 index 0000000000..4a1fb91a57 --- /dev/null +++ b/package/libdill/libdill.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 6df7527e8f1e91f5106c21c5bfeaa69eee470bec476c74585143e3e439864404 libdill-fa01648cf2a8d06e53c965b45eeacfb3ac57bd04.tar.gz +sha256 3f78d9c42c8919cb6dc63e51de17b9eb40a49d9cdd876ce59e77392721e8c2c6 COPYING diff --git a/package/libdill/libdill.mk b/package/libdill/libdill.mk new file mode 100644 index 0000000000..8efe1ff356 --- /dev/null +++ b/package/libdill/libdill.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# libdill +# +################################################################################ + +LIBDILL_VERSION = fa01648cf2a8d06e53c965b45eeacfb3ac57bd04 +LIBDILL_SITE = $(call github,sustrik,libdill,$(LIBDILL_VERSION)) +LIBDILL_LICENSE = MIT +LIBDILL_LICENSE_FILES = COPYING +LIBDILL_CPE_ID_VENDOR = libdill +LIBDILL_CPE_ID_PRODUCT = libdill +LIBDILL_INSTALL_STAGING = YES +LIBDILL_AUTORECONF = YES + +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBDILL_CONF_OPTS += --disable-threads +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBDILL_DEPENDENCIES = openssl +LIBDILL_CONF_OPTS += --enable-tls +endif + +$(eval $(autotools-package)) -- 2.25.1 From Jason at zx2c4.com Sun Mar 27 05:48:14 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sat, 26 Mar 2022 23:48:14 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng Message-ID: <20220327054814.942198-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 55 +-- package/urandom-scripts/seedrng.c | 445 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 10 + 4 files changed, 464 insertions(+), 50 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..f248089a0f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -6,63 +6,26 @@ # Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -URANDOM_SEED="/var/lib/random-seed" +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng. +#export SEEDRNG_SKIP_CREDIT=false +# You can also place this line into /etc/default/urandom. # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in start|restart|reload) # Carry a random seed from start-up to start-up # Load and then save the whole entropy pool - init_rng && save_random_seed;; + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; stop) # Carry a random seed from shut-down to start-up # Save the whole entropy pool - save_random_seed;; + seedrng;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..a77365d406 --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,445 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + +#ifndef LOCALSTATEDIR +#define LOCALSTATEDIR "/var/lib" +#endif +#ifndef RUNSTATEDIR +#define RUNSTATEDIR "/var/run" +#endif + +#define SEED_DIR LOCALSTATEDIR "/seedrng" +#define CREDITABLE_SEED SEED_DIR "/seed.credit" +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + return 1; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + close(fd); + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..a5cbb95feb 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,17 @@ # ################################################################################ +define URANDOM_SCRIPTS_EXTRACT_CMDS + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) +endef + +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(@D)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From fperrad at gmail.com Sun Mar 27 14:20:23 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 27 Mar 2022 16:20:23 +0200 Subject: [Buildroot] [PATCH] package/lua-basexx: bump to version 0.4.1 Message-ID: <20220327142023.1477251-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/lua-basexx/lua-basexx.hash | 4 ++-- package/lua-basexx/lua-basexx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash index aee636c32..447ec60ba 100644 --- a/package/lua-basexx/lua-basexx.hash +++ b/package/lua-basexx/lua-basexx.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk index 5aa5ecf21..22b5a3771 100644 --- a/package/lua-basexx/lua-basexx.mk +++ b/package/lua-basexx/lua-basexx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_BASEXX_VERSION = 0.4.0-1 +LUA_BASEXX_VERSION = 0.4.1-1 LUA_BASEXX_NAME_UPSTREAM = basexx LUA_BASEXX_LICENSE = MIT LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE -- 2.32.0 From fperrad at gmail.com Sun Mar 27 14:20:48 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 27 Mar 2022 16:20:48 +0200 Subject: [Buildroot] [PATCH] package/luasec: bump to version 1.0.2 Message-ID: <20220327142048.1477306-1-francois.perrad@gadz.org> diff LICENSE: -LuaSec 1.0 license +LuaSec 1.0.2 license Signed-off-by: Francois Perrad --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9..1e381612b 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14da..4ace94d16 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.0.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE -- 2.32.0 From arnout at mind.be Sun Mar 27 15:34:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:34:48 +0200 Subject: [Buildroot] [PATCH v2, 1/1] package/libminiupnpc: drop dependencies In-Reply-To: <20220317185615.179351-1-fontaine.fabrice@gmail.com> References: <20220317185615.179351-1-fontaine.fabrice@gmail.com> Message-ID: <5bf8ccc2-820e-763d-03a5-7633f91658bb@mind.be> On 17/03/2022 19:56, Fabrice Fontaine wrote: > libminiupnpc can be statically built with or without binfmt flat since > version 1.7 and > https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Rebase patch on current master > > package/libminiupnpc/Config.in | 6 ------ > package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in > index a3410a0225..51f4b43bbb 100644 > --- a/package/libminiupnpc/Config.in > +++ b/package/libminiupnpc/Config.in > @@ -1,7 +1,5 @@ > config BR2_PACKAGE_LIBMINIUPNPC > bool "libminiupnpc" > - depends on !BR2_BINFMT_FLAT > - depends on !BR2_STATIC_LIBS > help > The UPnP protocol is supported by most home adsl/cable routers > and Microsoft Windows 2K/XP. The aim of the MiniUPnP project > @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC > ANSI C. > > http://miniupnp.free.fr > - > -comment "libminiupnpc needs a toolchain w/ dynamic library" > - depends on BR2_STATIC_LIBS > - depends on !BR2_BINFMT_FLAT > diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk > index 0633ccd234..52fe9849f2 100644 > --- a/package/libminiupnpc/libminiupnpc.mk > +++ b/package/libminiupnpc/libminiupnpc.mk > @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) > LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) > LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF > > +ifeq ($(BR2_STATIC_LIBS),y) > +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON > +else ifeq ($(BR2_SHARED_LIBS),y) > +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF > +else > +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON > +endif > + > $(eval $(cmake-package)) From arnout at mind.be Sun Mar 27 15:35:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:35:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/ola: usbpro needs gcc >= 4.9 In-Reply-To: <20220317185842.183700-1-fontaine.fabrice@gmail.com> References: <20220317185842.183700-1-fontaine.fabrice@gmail.com> Message-ID: <3567fd8c-8c60-874d-2137-df028cf22b62@mind.be> On 17/03/2022 19:58, Fabrice Fontaine wrote: > Fix the following build failure with usbpro raised since re-introduction > of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: > > configure: error: compiler with C11 support is required to build libusb > > Fixes: > - http://autobuild.buildroot.org/results/e9239403bb13d3468db01a952da8c695c0e5ea30 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/ola/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/ola/Config.in b/package/ola/Config.in > index 36b175138f..e59637b57f 100644 > --- a/package/ola/Config.in > +++ b/package/ola/Config.in > @@ -164,8 +164,12 @@ config BR2_PACKAGE_OLA_PLUGIN_USBDMX > > config BR2_PACKAGE_OLA_PLUGIN_USBPRO > bool "usbpro" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb > select BR2_PACKAGE_LIBUSB > help > Build UsbPro plugin for OLA. > > +comment "usbpro needs a toolchain w/ gcc >= 4.9" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > + > endif From arnout at mind.be Sun Mar 27 15:35:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:35:21 +0200 Subject: [Buildroot] [PATCH 1/1] package/libgee: needs gcc >= 4.9 In-Reply-To: <20220317190027.183976-1-fontaine.fabrice@gmail.com> References: <20220317190027.183976-1-fontaine.fabrice@gmail.com> Message-ID: On 17/03/2022 20:00, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 0.20.5 > in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and > https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: > > task.c:59:1: error: initializer element is not constant > static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/granite/Config.in | 6 ++++-- > package/libgee/Config.in | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/granite/Config.in b/package/granite/Config.in > index 726bde1b2d..9519e16d45 100644 > --- a/package/granite/Config.in > +++ b/package/granite/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee > depends on BR2_PACKAGE_LIBGTK3 > select BR2_PACKAGE_LIBGEE > select BR2_PACKAGE_LIBGLIB2 > @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE > > https://github.com/elementary/granite > > -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" > +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" > depends on BR2_USE_MMU > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ > - || !BR2_TOOLCHAIN_HAS_THREADS > + || !BR2_TOOLCHAIN_HAS_THREADS \ > + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/libgee/Config.in b/package/libgee/Config.in > index 07c387c985..cb33ec9ec2 100644 > --- a/package/libgee/Config.in > +++ b/package/libgee/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > select BR2_PACKAGE_LIBGLIB2 > help > Libgee is an utility library providing GObject-based > @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE > > https://wiki.gnome.org/Projects/Libgee > > -comment "libgee needs a toolchain w/ wchar, threads" > +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" > depends on BR2_USE_MMU > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Sun Mar 27 15:36:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:36:28 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/spidev_test: fix spidev_test.c version in Config.in help text In-Reply-To: <20220318082446.18552-1-ps.report@gmx.net> References: <20220318082446.18552-1-ps.report@gmx.net> Message-ID: On 18/03/2022 09:24, Peter Seiderer wrote: > - fix spidev_test.c version in Config.in help text, version update to 4.10 > (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) > > [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 > > Signed-off-by: Peter Seiderer > --- > package/spidev_test/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in > index 44990c66b6..2f3fcf4090 100644 > --- a/package/spidev_test/Config.in > +++ b/package/spidev_test/Config.in > @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST > proper operation of 'spidev_test'. > > The version used is based on your toolchain headers version, > - if it's older than 3.15 then 3.0 is used, otherwise 3.15 > + if it's older than 3.15 then 3.0 is used, otherwise 4.10 There was an EOL whitespace here (which gets removed again in the next commit). Not a big deal, but annoying for me because I automatically run check-package on each individual commit. Anyway, both applied to master, thanks. Regards, Arnout > is used. > This means you won't have quad-pumped SPI support if your > toolchain is too old. From arnout at mind.be Sun Mar 27 15:36:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:36:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/tpm2-tss: bump version to 3.2.0 In-Reply-To: References: Message-ID: <41c83efd-fef0-2462-befa-de14a47dc5e7@mind.be> On 18/03/2022 10:03, Yair Ben-Avraham via buildroot wrote: > Signed-off-by: Yair Ben-Avraham Applied to master, thanks. Regards, Arnout > --- > package/tpm2-tss/tpm2-tss.hash | 2 +- > package/tpm2-tss/tpm2-tss.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash > index b6eb3c1f97..db6b3b7ad0 100644 > --- a/package/tpm2-tss/tpm2-tss.hash > +++ b/package/tpm2-tss/tpm2-tss.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz > +sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz > sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE > diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk > index 060883c377..568ac35c8f 100644 > --- a/package/tpm2-tss/tpm2-tss.mk > +++ b/package/tpm2-tss/tpm2-tss.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TPM2_TSS_VERSION = 3.1.0 > +TPM2_TSS_VERSION = 3.2.0 > TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) > TPM2_TSS_LICENSE = BSD-2-Clause > TPM2_TSS_LICENSE_FILES = LICENSE > -- > 2.30.2 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sun Mar 27 15:37:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:37:03 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/libcamera-apps: X11 support needs libdrm In-Reply-To: <20220318131058.32240-1-ps.report@gmx.net> References: <20220318131058.32240-1-ps.report@gmx.net> Message-ID: On 18/03/2022 14:10, Peter Seiderer wrote: > - X11 support needs libdrm (optional libdrm dependency already > present in libcamera-apps.mk) > > Fixes: > > http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e > > .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 18 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/libcamera-apps/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > index a1affc2d23..492a99cf55 100644 > --- a/package/libcamera-apps/Config.in > +++ b/package/libcamera-apps/Config.in > @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS > select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_TIFF > select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 From arnout at mind.be Sun Mar 27 15:40:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:40:07 +0200 Subject: [Buildroot] [PATCH v1 2/2] package/libcamera-apps: add '-fpermissive' (fixes X11 preview compile) In-Reply-To: <20220318131058.32240-2-ps.report@gmx.net> References: <20220318131058.32240-1-ps.report@gmx.net> <20220318131058.32240-2-ps.report@gmx.net> Message-ID: <912d932f-0aed-0c9c-b35f-935b7177e812@mind.be> On 18/03/2022 14:10, Peter Seiderer wrote: > - add patch to add '-fpermissive' compiler command line option to fix > egl_preview.cpp compile > > Fixes: > > .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] > 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); > | ^~~~~~~ > | | > | Window {aka long unsigned int} > > Signed-off-by: Peter Seiderer > --- > ...missive-compiler-command-line-option.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch > > diff --git a/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch > new file mode 100644 > index 0000000000..0bfc7e1ad4 > --- /dev/null > +++ b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch > @@ -0,0 +1,37 @@ > +From b04777e6b386ed0c6b1036d4c1178b4b8a1c88d5 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 18 Mar 2022 12:39:27 +0100 > +Subject: [PATCH] cmake: add -fpermissive compiler command line option > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes (with bootlin arm toolchain): > + > + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] > + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); > + | ^~~~~~~ > + | | > + | Window {aka long unsigned int} > + > +Signed-off-by: Peter Seiderer > +--- > + CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 1ca1e39..eddda1f 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -11,7 +11,7 @@ endif() > + > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > + set (CMAKE_CXX_STANDARD 17) > +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) > ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -fpermissive) This patch is most likely not upstreamable (and I indeed can't find your upstream PR). It would be much better to simply fix the underlying issue and upstream that. Should be simple enough, just add a cast. Regards, Arnout > + add_definitions(-D_FILE_OFFSET_BITS=64) > + > + if (CMAKE_COMPILER_IS_GNUCXX) > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 15:40:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:40:34 +0200 Subject: [Buildroot] [PATCH 1/1] package/luv: bump to version 1.43.0-0 In-Reply-To: <20220318173347.68409-1-joerg.krause@embedded.rocks> References: <20220318173347.68409-1-joerg.krause@embedded.rocks> Message-ID: <9657bb80-5111-136b-7148-7793eb088dab@mind.be> On 18/03/2022 18:33, J?rg Krause wrote: > Signed-off-by: J?rg Krause Applied to master, thanks. Regards, Arnout > --- > package/luv/luv.hash | 2 +- > package/luv/luv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/luv/luv.hash b/package/luv/luv.hash > index 2fb2b5c4fc..4cdb91729f 100644 > --- a/package/luv/luv.hash > +++ b/package/luv/luv.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz > +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/luv/luv.mk b/package/luv/luv.mk > index 2dc9af3b7a..36fcdc742e 100644 > --- a/package/luv/luv.mk > +++ b/package/luv/luv.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUV_VERSION = 1.42.0-1 > +LUV_VERSION = 1.43.0-0 > LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) > LUV_LICENSE = Apache-2.0 > LUV_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sun Mar 27 15:40:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:40:41 +0200 Subject: [Buildroot] [PATCH 1/1] package/luvi: bump to version 2.13.0 In-Reply-To: <20220318173427.68776-1-joerg.krause@embedded.rocks> References: <20220318173427.68776-1-joerg.krause@embedded.rocks> Message-ID: <7a2fe806-f522-354a-30a6-0e96c4f016d9@mind.be> On 18/03/2022 18:34, J?rg Krause wrote: > Signed-off-by: J?rg Krause Applied to master, thanks. Regards, Arnout > --- > package/luvi/luvi.hash | 2 +- > package/luvi/luvi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash > index fcc81430db..9621ef4d03 100644 > --- a/package/luvi/luvi.hash > +++ b/package/luvi/luvi.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz > +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk > index 5daa3c1793..5266281ffc 100644 > --- a/package/luvi/luvi.mk > +++ b/package/luvi/luvi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUVI_VERSION = 2.12.0 > +LUVI_VERSION = 2.13.0 > LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz > LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) > LUVI_LICENSE = Apache-2.0 From arnout at mind.be Sun Mar 27 15:41:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:41:33 +0200 Subject: [Buildroot] [PATCH 1/1] package/libscrypt: fix CFLAGS In-Reply-To: <20220318173507.10160-1-fontaine.fabrice@gmail.com> References: <20220318173507.10160-1-fontaine.fabrice@gmail.com> Message-ID: <26ccbc4c-2654-4ce8-66b8-bfea5718890b@mind.be> On 18/03/2022 18:35, Fabrice Fontaine wrote: > Don't pass TARGET_CONFIGURE_OPTS in LIBSCRYPT_MAKE_OPTS to avoid > overriding CFLAGS (and so loossing -fPIC). This will fix the following > build failure raised since bump to version 1.22 in commit > 4542c6714d3951070c31739d24e4bd42b446fbae: > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.36.1 assertion fail elf32-microblaze.c:1534 > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: sha256.o: probably compiled without -fPIC? > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value > > Fixes: > - http://autobuild.buildroot.org/results/ba4234ad305badb5ce815080ddcad6727e8d51c4 > > Signed-off-by: Fabrice Fontaine > --- > package/libscrypt/libscrypt.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk > index d28bd4e900..193c963f76 100644 > --- a/package/libscrypt/libscrypt.mk > +++ b/package/libscrypt/libscrypt.mk > @@ -11,7 +11,7 @@ LIBSCRYPT_LICENSE_FILES = LICENSE > LIBSCRYPT_INSTALL_STAGING = YES > > LIBSCRYPT_MAKE_OPTS = \ > - $(TARGET_CONFIGURE_OPTS) \ > + CC=$(TARGET_CC) \ We'd normally instead pass TARGET_CONFIGURE_OPTS in the environment, but even that doesn't work since the Makefile use ?=. So applied to master as-is, thanks. Regards, Arnout > CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ > LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ > PREFIX=/usr From arnout at mind.be Sun Mar 27 15:44:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:44:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body In-Reply-To: <20220318180713.19051-1-fontaine.fabrice@gmail.com> References: <20220318180713.19051-1-fontaine.fabrice@gmail.com> Message-ID: <52e0a19f-3d46-7c31-a59a-50abfac8f572@mind.be> On 18/03/2022 19:07, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 1.50.5 in > commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75: > > ../utils/viewer-cairo.c: In function 'cairo_vector_view_create': > ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] > ; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/dee/dee3d631474f83b345f22eb26c59a305c32258f8/build-end.log > > Signed-off-by: Fabrice Fontaine > --- > ...1-meson.build-drop-Werror-empty-body.patch | 47 +++++++++++++++++++ > 1 file changed, 47 insertions(+) > create mode 100644 package/pango/0001-meson.build-drop-Werror-empty-body.patch > > diff --git a/package/pango/0001-meson.build-drop-Werror-empty-body.patch b/package/pango/0001-meson.build-drop-Werror-empty-body.patch > new file mode 100644 > index 0000000000..98b6828a63 > --- /dev/null > +++ b/package/pango/0001-meson.build-drop-Werror-empty-body.patch > @@ -0,0 +1,47 @@ > +From 1d0f3a8abcb2bb8931d02c136ae957ee2d60094e Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 18 Mar 2022 18:55:56 +0100 > +Subject: [PATCH] meson.build: drop -Werror=empty-body > + > +Drop -Werror=empty-body to avoid the following build failure raised > +since version 1.50.5 and > +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e: > + > +../utils/viewer-cairo.c: In function 'cairo_vector_view_create': > +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] > + ; > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.gnome.org/GNOME/pango/-/merge_requests/604] As noted in the MR: the patch is not upstreamable. Instead, the underlying error should be fixed. Which is trivial: simply replace the lone ';' with '{}'. Regards, Arnout > +--- > + meson.build | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 0f79bff7..c48fe01f 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' > + '-Wunused', > + '-Werror=address', > + '-Werror=array-bounds', > +- '-Werror=empty-body', > + '-Werror=implicit', > + '-Werror=implicit-fallthrough', > + '-Werror=init-self', > +@@ -135,7 +134,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' > + '-Werror=write-strings', > + '-Werror=address', > + '-Werror=int-to-pointer-cast', > +- '-Werror=empty-body', > + '-Werror=write-strings', > + '-Werror=unused-but-set-variable', > + '-Wundef', # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=792481 > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 15:45:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:45:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/pugixml: bump to version 1.12.1 In-Reply-To: <20220318175156.186854-1-joerg.krause@embedded.rocks> References: <20220318175156.186854-1-joerg.krause@embedded.rocks> Message-ID: <1ebb6766-2a49-1452-87e9-73b7bddd4353@mind.be> On 18/03/2022 18:51, J?rg Krause wrote: > The license file has updated the copyright year to 2022, therefore > update the hash of the license file as well. > > Signed-off-by: J?rg Krause Applied to master, thanks. Regards, Arnout > --- > package/pugixml/pugixml.hash | 4 ++-- > package/pugixml/pugixml.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash > index 5c629ac66f..190dfb6a6e 100644 > --- a/package/pugixml/pugixml.hash > +++ b/package/pugixml/pugixml.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz > -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md > +sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz > +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md > diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk > index bc018180ef..9137f04630 100644 > --- a/package/pugixml/pugixml.mk > +++ b/package/pugixml/pugixml.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PUGIXML_VERSION = 1.11.4 > +PUGIXML_VERSION = 1.12.1 > PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) > PUGIXML_LICENSE = MIT > PUGIXML_LICENSE_FILES = LICENSE.md From arnout at mind.be Sun Mar 27 15:45:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:45:35 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: update to version 0.23.6 In-Reply-To: <20220319061115.1641-1-br015@umbiko.net> References: <20220319061115.1641-1-br015@umbiko.net> Message-ID: <11ba0b58-3127-0d3d-7d40-d6a63877deeb@mind.be> On 19/03/2022 07:11, Andreas Ziegler wrote: > Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part > of this release > > Change log: > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS > > Signed-off-by: Andreas Ziegler Applied to master, thanks. Regards, Arnout > --- > ...2-lib-alsa-Error-add-missing-include.patch | 25 ------------------- > package/mpd/mpd.hash | 2 +- > package/mpd/mpd.mk | 2 +- > 3 files changed, 2 insertions(+), 27 deletions(-) > delete mode 100644 package/mpd/0002-lib-alsa-Error-add-missing-include.patch > > diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch > deleted file mode 100644 > index c45a087a54..0000000000 > --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 > -From: aeolio > -Date: Tue, 14 Dec 2021 09:01:23 +0100 > -Subject: [PATCH] lib/alsa/Error: add missing #include > - > -Downloaded from upstream commit: > -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 > - > -Signed-off-by: Bernd Kuhls > ---- > - src/lib/alsa/Error.cxx | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx > -index cd351f37d1..8ceb4417ca 100644 > ---- a/src/lib/alsa/Error.cxx > -+++ b/src/lib/alsa/Error.cxx > -@@ -29,6 +29,7 @@ > - > - #include "Error.hxx" > - > -+#include > - #include > - > - namespace Alsa { > diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash > index 56f88490cf..b09140abf5 100644 > --- a/package/mpd/mpd.hash > +++ b/package/mpd/mpd.hash > @@ -1,3 +1,3 @@ > # Locally calculated after checking pgp signature > -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz > +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index a55e4adde2..12da36098f 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > MPD_VERSION_MAJOR = 0.23 > -MPD_VERSION = $(MPD_VERSION_MAJOR).5 > +MPD_VERSION = $(MPD_VERSION_MAJOR).6 > MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz > MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) > MPD_DEPENDENCIES = host-pkgconf boost fmt From arnout at mind.be Sun Mar 27 15:45:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:45:56 +0200 Subject: [Buildroot] [PATCH] boot/optee-os: fix version choice In-Reply-To: <20220319094939.1588302-1-yann.morin.1998@free.fr> References: <20220319094939.1588302-1-yann.morin.1998@free.fr> Message-ID: <217207ff-69d0-5f8c-6fa0-8139f38bee63@mind.be> On 19/03/2022 10:49, Yann E. MORIN wrote: > Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to > propagate the rustc arch dependency from the new version, to the default > clause of the choice. > > This leaves only the custom git tree as a posible source for building > OP-TEE OS in case the host can't have a rustc compiler. > > Signed-off-by: Yann E. MORIN > Reported-by: Thomas Petazzoni > Cc: Cl?ment L?ger > Cc: Etienne Carriere Applied to master, thanks. Regards, Arnout > --- > boot/optee-os/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 18e1efee55..30b6f62434 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS > > choice > prompt "OP-TEE OS version" > - default BR2_TARGET_OPTEE_OS_LATEST > + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > help > Select the version of OP-TEE OS you want to use > From arnout at mind.be Sun Mar 27 14:53:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:53:15 +0200 Subject: [Buildroot] [git commit] package/ola: usbpro needs gcc >= 4.9 Message-ID: <20220327153711.EA55F85D39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87674334dd8a8c9094a806d26f2683f9fca782f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with usbpro raised since re-introduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: compiler with C11 support is required to build libusb Fixes: - http://autobuild.buildroot.org/results/e9239403bb13d3468db01a952da8c695c0e5ea30 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ola/Config.in b/package/ola/Config.in index 36b175138f..e59637b57f 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -164,8 +164,12 @@ config BR2_PACKAGE_OLA_PLUGIN_USBDMX config BR2_PACKAGE_OLA_PLUGIN_USBPRO bool "usbpro" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Build UsbPro plugin for OLA. +comment "usbpro needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + endif From arnout at mind.be Sun Mar 27 14:53:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:53:12 +0200 Subject: [Buildroot] [git commit] package/libminiupnpc: drop dependencies Message-ID: <20220327153711.E2ADC85D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffcb5ded44e932ca6c7d03a8a33c051d94d47b2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libminiupnpc can be statically built with or without binfmt flat since version 1.7 and https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libminiupnpc/Config.in | 6 ------ package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225..51f4b43bbb 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 0633ccd234..52fe9849f2 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif + $(eval $(cmake-package)) From arnout at mind.be Sun Mar 27 14:53:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:53:18 +0200 Subject: [Buildroot] [git commit] package/libgee: needs gcc >= 4.9 Message-ID: <20220327153712.0123B85D67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de59a62af68593303bf420338e719a17e1a5e243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.20.5 in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: task.c:59:1: error: initializer element is not constant static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; ^ Fixes: - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/granite/Config.in | 6 ++++-- package/libgee/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d..9519e16d45 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985..cb33ec9ec2 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/luvi: bump to version 2.13.0 Message-ID: <20220327153712.390C185D66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6d6c2f6a41442fe1905dc51b7cef15c683bff65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luvi/luvi.hash | 2 +- package/luvi/luvi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index fcc81430db..9621ef4d03 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5daa3c1793..5266281ffc 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.12.0 +LUVI_VERSION = 2.13.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 From arnout at mind.be Sun Mar 27 15:01:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:01:37 +0200 Subject: [Buildroot] [git commit] package/tpm2-tss: bump version to 3.2.0 Message-ID: <20220327153712.1D98A85D67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed13a65a08cfe315aed9344abc609f5f2b92c782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yair Ben-Avraham Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f97..db6b3b7ad0 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377..568ac35c8f 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 14:54:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:54:28 +0200 Subject: [Buildroot] [git commit] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220327153712.09D4685D66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53da16e3786cbf4c7637dacfddeef58c315cce66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..aa57b5edbf 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/luv: bump to version 1.43.0-0 Message-ID: <20220327153712.3084985D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6c7772df9ada2782336e4e47209e2cc039252a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 2fb2b5c4fc..4cdb91729f 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 2dc9af3b7a..36fcdc742e 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.42.0-1 +LUV_VERSION = 1.43.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sun Mar 27 15:01:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:01:15 +0200 Subject: [Buildroot] [git commit] package/spidev_test: bump to version in Linux 5.8 Message-ID: <20220327153712.1471C85D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=407c6e62996b7bfff475330a6ac28a96292b1d73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - bump to version in Linux 5.8 (depends on SPI_TX_OCTAL/SPI_RX_OCTAL available since Linux 5.0) Changelog (since 4.10): 9006a7b3220e spi: spidev_test: add option to continuously transfer data 35386dfd13b7 spi: spidev_test: Improve decoded text part of hex dump 84a14ae8c44f treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178 020bd6c48ebd spi: spidev_test: Remove break after exit statement 1f3c36328a48 spi: spidev_test: Check input_tx and input_file first after parse options 470a072e1220 spi: spidev_test: Use perror() only if errno is not 0 896fa735084e spi: spidev_test: Add support for Octal mode data transfers 9ec8ade81224 spi: spidev_test: Use %u to format unsigned numbers bd2077915bfe spi: tools: Make default_tx/rx and input_tx static - update Config.in help text - indent hashes by 2 spaces Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/spidev_test/Config.in | 4 ++-- package/spidev_test/spidev_test.hash | 5 +++-- package/spidev_test/spidev_test.mk | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index aa57b5edbf..81386adf7a 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 4.10 - is used. + if it's older than 3.15 then 3.0 is used, up to headers 4.20 + version 4.10 is used and otherwise version 5.8. This means you won't have quad-pumped SPI support if your toolchain is too old. diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash index 7bc4a27e45..867920fc78 100644 --- a/package/spidev_test/spidev_test.hash +++ b/package/spidev_test/spidev_test.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 -sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 +sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 87329094ea3010eae9e65ad7ea2d2309e044845942414aa0ca8f1a7095b80178 spidev_test.c?id=v5.8 diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk index bd2fcf6db3..6c5a9495a4 100644 --- a/package/spidev_test/spidev_test.mk +++ b/package/spidev_test/spidev_test.mk @@ -10,7 +10,10 @@ # If you need quad-pumped spi support you need to upgrade your toolchain. # Note that the location of spidev_test.c changes from v4.5 onwards. -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y) +SPIDEV_TEST_VERSION = 5.8 +SPIDEV_TEST_PATH = tools/spi +else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) SPIDEV_TEST_VERSION = 4.10 SPIDEV_TEST_PATH = tools/spi else From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/libscrypt: fix CFLAGS Message-ID: <20220327153712.4196385D67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f5c5703464514e4b3773ac5590556ba301a2754 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Don't pass TARGET_CONFIGURE_OPTS in LIBSCRYPT_MAKE_OPTS to avoid overriding CFLAGS (and so loossing -fPIC). This will fix the following build failure raised since bump to version 1.22 in commit 4542c6714d3951070c31739d24e4bd42b446fbae: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.36.1 assertion fail elf32-microblaze.c:1534 /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: sha256.o: probably compiled without -fPIC? /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value Fixes: - http://autobuild.buildroot.org/results/ba4234ad305badb5ce815080ddcad6727e8d51c4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libscrypt/libscrypt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index d28bd4e900..193c963f76 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -11,7 +11,7 @@ LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES LIBSCRYPT_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) \ CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ PREFIX=/usr From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/mpd: update to version 0.23.6 Message-ID: <20220327153712.5408985D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8974c6fa26f626021aa170678989c57fa81e8faf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part of this release Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-lib-alsa-Error-add-missing-include.patch | 25 ---------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54..0000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf..b09140abf5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..12da36098f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From arnout at mind.be Sun Mar 27 15:01:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:01:39 +0200 Subject: [Buildroot] [git commit] package/libcamera-apps: X11 support needs libdrm Message-ID: <20220327153712.26FE885D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2bc5e916beedc1965da2a7bf9a86e74b24a5562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - X11 support needs libdrm (optional libdrm dependency already present in libcamera-apps.mk) Fixes: http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libcamera-apps/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d23..492a99cf55 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/pugixml: bump to version 1.12.1 Message-ID: <20220327153712.4AE9E85D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92dfa760ad556e16340305e94fe1ed1e0dbc1798 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The license file has updated the copyright year to 2022, therefore update the hash of the license file as well. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pugixml/pugixml.hash | 4 ++-- package/pugixml/pugixml.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 5c629ac66f..190dfb6a6e 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md +sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef..9137f04630 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.11.4 +PUGIXML_VERSION = 1.12.1 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] boot/optee-os: fix version choice Message-ID: <20220327153712.5C7CE85D66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=945f8a788f8b30983aa6b2ce7275551a8a60efc8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to propagate the rustc arch dependency from the new version, to the default clause of the choice. This leaves only the custom git tree as a posible source for building OP-TEE OS in case the host can't have a rustc compiler. Signed-off-by: Yann E. MORIN Reported-by: Thomas Petazzoni Cc: Cl??ment L??ger Cc: Etienne Carriere Acked-by: Etienne Carriere Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/optee-os/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 18e1efee55..30b6f62434 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS choice prompt "OP-TEE OS version" - default BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of OP-TEE OS you want to use From arnout at mind.be Sun Mar 27 15:55:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:55:48 +0200 Subject: [Buildroot] [PATCH 1/1] package/usbguard: bump to version 1.1.1 In-Reply-To: <20220319193422.1148509-1-fontaine.fabrice@gmail.com> References: <20220319193422.1148509-1-fontaine.fabrice@gmail.com> Message-ID: On 19/03/2022 20:34, Fabrice Fontaine wrote: > - This bump fixes unauthorized access via D-Bus (CVE-2019-25058): > https://github.com/advisories/GHSA-p5wh-m4gj-x2mr > but dbus is disabled on buildroot > - musl is supported since > https://github.com/USBGuard/usbguard/commit/b04e8deacac4f3f4a82a10b219c2d555e1b2aa24 > - C++17 is now mandatory: > https://github.com/USBGuard/usbguard/commit/8c86264986685bf646c65228abce2432e08e3c4c > - Update hash of license file (use license file from gnu.org: > https://github.com/USBGuard/usbguard/commit/3292511ab164ce0bdf6d58f0369ce3993dded9ad) > > https://github.com/USBGuard/usbguard/blob/usbguard-1.1.1/CHANGELOG.md > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/usbguard/Config.in | 8 +++----- > package/usbguard/usbguard.hash | 6 ++++-- > package/usbguard/usbguard.mk | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in > index e97d0e729c..4c3dc7f2c2 100644 > --- a/package/usbguard/Config.in > +++ b/package/usbguard/Config.in > @@ -3,9 +3,8 @@ config BR2_PACKAGE_USBGUARD > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf > depends on BR2_INSTALL_LIBSTDCPP # protobuf > depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 > depends on !BR2_STATIC_LIBS # libqb, protobuf > - depends on !BR2_TOOLCHAIN_USES_MUSL > depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future > select BR2_PACKAGE_PROTOBUF > select BR2_PACKAGE_LIBQB > @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD > > https://usbguard.github.io/ > > -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" > +comment "usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ > - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ > - || BR2_TOOLCHAIN_USES_MUSL > + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > > comment "usbguard needs a toolchain not affected by GCC bug 64735" > diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash > index fd77acc75a..a69240b3f9 100644 > --- a/package/usbguard/usbguard.hash > +++ b/package/usbguard/usbguard.hash > @@ -1,3 +1,5 @@ > +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.1/usbguard-1.1.1.tar.gz.sum > +sha256 460ebfb4ffc5609739a202a3a1d9fda1c30de033b634845b8baa136352bfb432 usbguard-1.1.1.tar.gz > + > # Locally calculated > -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz > -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk > index 54a4031056..614b7d655d 100644 > --- a/package/usbguard/usbguard.mk > +++ b/package/usbguard/usbguard.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -USBGUARD_VERSION = 1.0.0 > +USBGUARD_VERSION = 1.1.1 > USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) > USBGUARD_LICENSE = GPL-2.0+ > USBGUARD_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 15:57:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:57:08 +0200 Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd In-Reply-To: <20220320114138.433796-1-br015@umbiko.net> References: <20211227074056.13882-1-br015@umbiko.net> <20220320114138.433796-1-br015@umbiko.net> Message-ID: On 20/03/2022 12:41, Andreas Ziegler wrote: > The current released version of zziplib copies static libraries with appended > major version, but omits creating the necessary links to the base file names. > This prevents the linker to find the libraries via the search path. > > The issue (https://github.com/gdraheim/zziplib/issues/117) has been > fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. > > This resolves the following autobuild issues: > > http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 > http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 > http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 > > Signed-off-by: Andreas Ziegler > --- > Changes v1 -> v2: > - extract link creation from commit 0e8d35f > Changes v2 -> v3: > - update failure list > > ...-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 78 +++++++++++++++++++ > 1 file changed, 78 insertions(+) > create mode 100644 package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch > > diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch > new file mode 100644 > index 0000000000..50380861bc > --- /dev/null > +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch > @@ -0,0 +1,78 @@ > +Extract link creation for versioned libraries from commit > +0e8d35f92efb680c81f6ec1fca9f11d173dce389. > + > +Signed-off-by: Andreas Ziegler > + > +--- > +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 > +From: Guido Draheim > +Date: Sat, 22 May 2021 15:13:28 +0200 > +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib I've moved the part that you added down here, so it stays as a git-formatted patch. [Andreas: Extract link creation for versioned libraries from commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389.] Signed-off-by: Andreas Ziegler Applied to master, thanks. Regards, Arnout > + > +--- > + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- > + 1 file changed, 45 insertions(+), 12 deletions(-) > + > +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt > +index a966d5f..ccd08b6 100644 > +--- a/zzip/CMakeLists.txt > ++++ b/zzip/CMakeLists.txt > +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) > + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) > + endif() > + > ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) > ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) > ++else() > ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) > ++endif() > ++ > + # used in zzip/_config.h > + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") > + set(ZZIP_VERSION "${PROJECT_VERSION}") > +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) > + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) > + endif(ZZIP_LIBTOOL) > + > ++if(ZZIP_LIBLATEST) > ++ if(BUILD_SHARED_LIBS) > ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) > ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) > ++ else() > ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) > ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) > ++ endif() > ++ get_target_property(libname libzzip OUTPUT_NAME) > ++ get_target_property(librelease libzzip RELEASE_POSTFIX) > ++ add_custom_target(libzzip_latest ALL > ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} > ++ ) > ++ install(FILES > ++ ${outdir}/${lib}${libname}${dll} > ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) > ++ if(ZZIPFSEEKO) > ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) > ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) > ++ add_custom_target(libzzipfseeko_latest ALL > ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} > ++ ) > ++ install(FILES > ++ ${outdir}/${lib}${libname}${dll} > ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) > ++ endif(ZZIPFSEEKO) > ++ if(ZZIPMMAPPED) > ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) > ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) > ++ add_custom_target(libzzipmmaped_latest ALL > ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} > ++ ) > ++ install(FILES > ++ ${outdir}/${lib}${libname}${dll} > ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) > ++ endif(ZZIPMMAPPED) > ++endif(ZZIP_LIBLATEST) > ++ > ++ > + ## messages ############################################## > + > + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From arnout at mind.be Sun Mar 27 15:57:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:57:28 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads In-Reply-To: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> References: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> Message-ID: <8cec0c22-baa7-c9b5-6185-dcb7da137938@mind.be> On 20/03/2022 16:47, Fabrice Fontaine wrote: > Fix the following build failure without threads and openvpn raised since > commit 0199dc161769e5f28e9aebc634230ece08ff5008: > > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' > > Fixes: > - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...h-core.c-fix-build-without-slotevent.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch > > diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch > new file mode 100644 > index 0000000000..5b2829c5ca > --- /dev/null > +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch > @@ -0,0 +1,37 @@ > +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 20 Mar 2022 08:50:15 +0100 > +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent > + > +Fix the following build failure with --disable-slotevent: > + > +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' > + > +Fixes: > + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] > +--- > + lib/pkcs11h-core.c | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c > +index d7bb4cd..0bf11e8 100644 > +--- a/lib/pkcs11h-core.c > ++++ b/lib/pkcs11h-core.c > +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( > + > + switch (property) { > + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: > ++#if defined(ENABLE_PKCS11H_SLOTEVENT) > + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { > + goto cleanup; > + } > ++#endif > + break; > + } > + cleanup: > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 15:58:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:58:01 +0200 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: hid and hog needs headers >= 3.18 In-Reply-To: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> References: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> Message-ID: <020967d3-bcea-3192-6532-4a8b3d64e298@mind.be> On 20/03/2022 17:20, Fabrice Fontaine wrote: > Fix the following build failure with hid and hog raised since their > addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd > because UHID_GET_REPORT is only available since kernel 3.18 and > https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: > > profiles/input/device.c: In function 'uhid_send_get_report_reply': > profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' > if (size > sizeof(ev.u.get_report_reply.data)) > ^ > profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' > size = sizeof(ev.u.get_report_reply.data); > ^ > profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) > ev.type = UHID_GET_REPORT_REPLY; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/bluez5_utils/Config.in | 16 ++++++++++++++++ > package/brltty/Config.in | 2 +- > package/cwiid/Config.in | 6 +++--- > package/kodi/Config.in | 6 +++--- > package/supertuxkart/Config.in | 2 +- > 5 files changed, 24 insertions(+), 8 deletions(-) > > diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in > index 2eea8c7ced..49bb719102 100644 > --- a/package/bluez5_utils/Config.in > +++ b/package/bluez5_utils/Config.in > @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH > > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID > bool "build hid plugin" > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG > help > Build plugin for HID (input) profiles. > > +comment "hid plugin needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG > bool "build hog plugin" > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > help > Build plugin for HoG (input) profiles. > > +comment "hog plugin needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH > bool "build mesh plugin" > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell > @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS > bool "build sixaxis plugin" > depends on BR2_PACKAGE_HAS_UDEV > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime > help > Build sixaxis plugin (support Sony Dualshock > controller) > > +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > comment "sixaxis plugin needs udev /dev management" > depends on !BR2_PACKAGE_HAS_UDEV > > @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST > config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI > bool "build hid2hci tool" > depends on BR2_PACKAGE_HAS_UDEV > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime > select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS > help > Build hid2hci tool > > +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > comment "hid2hci tool needs udev /dev management" > depends on !BR2_PACKAGE_HAS_UDEV > > diff --git a/package/brltty/Config.in b/package/brltty/Config.in > index c728cb7e20..3527df6161 100644 > --- a/package/brltty/Config.in > +++ b/package/brltty/Config.in > @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > depends on BR2_USE_MMU # fork() > - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime > + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime > help > A daemon providing access to the Linux console for a blind > person using a refreshable braille display. > diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in > index 6ae2ac9405..7e8cdc3086 100644 > --- a/package/cwiid/Config.in > +++ b/package/cwiid/Config.in > @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID > depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 > depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 > depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils > select BR2_PACKAGE_BLUEZ5_UTILS > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime > @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI > select BR2_PACKAGE_LIBGTK2 > endif > > -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" > +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !BR2_TOOLCHAIN_HAS_THREADS || \ > - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > depends on !BR2_USE_MMU > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index c8e1e5d0ed..4c6e01745c 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI > > config BR2_PACKAGE_KODI_BLUEZ > bool "bluetooth" > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils > select BR2_PACKAGE_BLUEZ5_UTILS > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO > @@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ > help > Enable bluetooth support > > -comment "bluetooth support needs a toolchain w/ headers >= 3.4" > +comment "bluetooth support needs a toolchain w/ headers >= 3.18" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > > config BR2_PACKAGE_KODI_DBUS > bool "dbus" > diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in > index 1dd5dcf058..319415754a 100644 > --- a/package/supertuxkart/Config.in > +++ b/package/supertuxkart/Config.in > @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART > select BR2_PACKAGE_SDL2 > select BR2_PACKAGE_XLIB_LIBXRANDR > select BR2_PACKAGE_ZLIB > - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime > + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime > help > Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart > racer with multiple karts, tracks and modes you can play. From arnout at mind.be Sun Mar 27 15:58:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:58:18 +0200 Subject: [Buildroot] [PATCH 1/1] package/json-glib: bump to version 1.6.6 In-Reply-To: <20220320171259.1591428-1-fontaine.fabrice@gmail.com> References: <20220320171259.1591428-1-fontaine.fabrice@gmail.com> Message-ID: <92f06b08-13dd-5124-982a-a17faf3d4158@mind.be> On 20/03/2022 18:12, Fabrice Fontaine wrote: > - Update introspection option: > https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 > - Disable docs (enabled by default since > https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) > - Disable tests (added by: > https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) > - Update indentation in hash file (two spaces) > > https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/json-glib/json-glib.hash | 6 +++--- > package/json-glib/json-glib.mk | 9 +++++---- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash > index b68794db37..680d404a4b 100644 > --- a/package/json-glib/json-glib.hash > +++ b/package/json-glib/json-glib.hash > @@ -1,5 +1,5 @@ > -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum > -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz > +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum > +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz > > # Hash for license file: > -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING > +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING > diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk > index accdb4f888..52ca47e906 100644 > --- a/package/json-glib/json-glib.mk > +++ b/package/json-glib/json-glib.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -JSON_GLIB_VERSION_MAJOR = 1.4 > -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 > +JSON_GLIB_VERSION_MAJOR = 1.6 > +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 > JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) > JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz > JSON_GLIB_LICENSE = LGPL-2.1+ > JSON_GLIB_LICENSE_FILES = COPYING > JSON_GLIB_INSTALL_STAGING = YES > +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false > > JSON_GLIB_DEPENDENCIES = \ > $(TARGET_NLS_DEPENDENCIES) \ > @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ > libglib2 > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -JSON_GLIB_CONF_OPTS += -Dintrospection=true > +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled > JSON_GLIB_DEPENDENCIES += gobject-introspection > else > -JSON_GLIB_CONF_OPTS += -Dintrospection=false > +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled > endif > > JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) From arnout at mind.be Sun Mar 27 15:58:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:58:39 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack1: libsamplerate is optional, not mandatory In-Reply-To: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> Message-ID: On 20/03/2022 22:18, Fabrice Fontaine wrote: > libsamplerate is only needed to build the NetJack backend and internal > client > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/jack1/Config.in | 1 - > package/jack1/jack1.mk | 6 +++++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/jack1/Config.in b/package/jack1/Config.in > index 1c67f10332..625afdf8c1 100644 > --- a/package/jack1/Config.in > +++ b/package/jack1/Config.in > @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 > select BR2_PACKAGE_ALSA_LIB_RAWMIDI > select BR2_PACKAGE_ALSA_LIB_SEQ > select BR2_PACKAGE_BERKELEYDB > - select BR2_PACKAGE_LIBSAMPLERATE > select BR2_PACKAGE_LIBSNDFILE > help > JACK Audio Connection Kit (JACK 1 implementation). > diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk > index 311f7c9ba0..39183826a4 100644 > --- a/package/jack1/jack1.mk > +++ b/package/jack1/jack1.mk > @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) > JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL > JACK1_INSTALL_STAGING = YES > > -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile > +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile > + > +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) > +JACK1_DEPENDENCIES += libsamplerate > +endif > > ifeq ($(BR2_PACKAGE_READLINE),y) > JACK1_DEPENDENCIES += readline From arnout at mind.be Sun Mar 27 15:59:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:59:09 +0200 Subject: [Buildroot] [PATCH 1/2] packages/guile: bump to version 3.0.8 In-Reply-To: <20220320221445.10259-1-paguilar@paguilar.org> References: <20220320221445.10259-1-paguilar@paguilar.org> Message-ID: <8c69827f-53b8-eec1-f235-a45e8e313af6@mind.be> On 20/03/2022 23:14, Pedro Aguilar wrote: > Signed-off-by: Pedro Aguilar Applied to master after squashing the two patches as suggested by Yann, thanks. Regards, Arnout > --- > package/guile/guile.hash | 2 +- > package/guile/guile.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/guile/guile.hash b/package/guile/guile.hash > index c2719fa7f2..e9ae5b6e51 100644 > --- a/package/guile/guile.hash > +++ b/package/guile/guile.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -sha256 f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz > +sha256 daa7060a56f2804e9b74c8d7e7fe8beed12b43aab2789a38585183fcc17b8a13 guile-3.0.8.tar.xz > # Locally computed > sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 859d7ec96f..9478e75b41 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GUILE_VERSION = 3.0.7 > +GUILE_VERSION = 3.0.8 > GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz > GUILE_SITE = $(BR2_GNU_MIRROR)/guile > GUILE_INSTALL_STAGING = YES From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/jack1: libsndfile is optional, not mandatory Message-ID: <20220327155020.4260E85DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a78a756134831da20c471dee575f3e8108f62a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsndfile is only needed to build jackrec example client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 625afdf8c1..5b3116e2f1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 39183826a4..6dca56001f 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,12 +11,16 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK1_DEPENDENCIES += libsndfile +endif + ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline endif From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/zziplib: fix static build failure with mpd Message-ID: <20220327155020.13D0D85DB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f3d6d2e6a924b9075accb27cf5d7351a30d8f17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..780d990ab7 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From arnout at mind.be Sun Mar 27 15:47:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:47:13 +0200 Subject: [Buildroot] [git commit] package/usbguard: bump to version 1.1.1 Message-ID: <20220327155020.09E2785DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad21d84a589458fd4542993912891daa503d72dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - This bump fixes unauthorized access via D-Bus (CVE-2019-25058): https://github.com/advisories/GHSA-p5wh-m4gj-x2mr but dbus is disabled on buildroot - musl is supported since https://github.com/USBGuard/usbguard/commit/b04e8deacac4f3f4a82a10b219c2d555e1b2aa24 - C++17 is now mandatory: https://github.com/USBGuard/usbguard/commit/8c86264986685bf646c65228abce2432e08e3c4c - Update hash of license file (use license file from gnu.org: https://github.com/USBGuard/usbguard/commit/3292511ab164ce0bdf6d58f0369ce3993dded9ad) https://github.com/USBGuard/usbguard/blob/usbguard-1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbguard/Config.in | 8 +++----- package/usbguard/usbguard.hash | 6 ++++-- package/usbguard/usbguard.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index ca6d52034b..ce7a3b8bc4 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,9 +3,8 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on !BR2_STATIC_LIBS # libqb, protobuf - depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD https://usbguard.github.io/ -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS comment "usbguard needs a toolchain not affected by GCC bug 64735" diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash index fd77acc75a..a69240b3f9 100644 --- a/package/usbguard/usbguard.hash +++ b/package/usbguard/usbguard.hash @@ -1,3 +1,5 @@ +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.1/usbguard-1.1.1.tar.gz.sum +sha256 460ebfb4ffc5609739a202a3a1d9fda1c30de033b634845b8baa136352bfb432 usbguard-1.1.1.tar.gz + # Locally calculated -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index d2b03eeb2a..26dc40d15b 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBGUARD_VERSION = 1.0.0 +USBGUARD_VERSION = 1.1.1 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/json-glib: bump to version 1.6.6 Message-ID: <20220327155020.3087585DB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a960dbc5d5f68c7ffdded79e34f6739b0d90940e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update introspection option: https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 - Disable docs (enabled by default since https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) - Disable tests (added by: https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) - Update indentation in hash file (two spaces) https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-glib/json-glib.hash | 6 +++--- package/json-glib/json-glib.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index b68794db37..680d404a4b 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz # Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index accdb4f888..52ca47e906 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,13 +4,14 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 +JSON_GLIB_VERSION_MAJOR = 1.6 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ JSON_GLIB_LICENSE_FILES = COPYING JSON_GLIB_INSTALL_STAGING = YES +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false JSON_GLIB_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection else -JSON_GLIB_CONF_OPTS += -Dintrospection=false +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] packages/guile: bump to version 3.0.8 Message-ID: <20220327155020.60D8785DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3eb888ce3959860dce8e4aa25fb2633a40b074f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Pedro Aguilar Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...le-system-base-target.scm-support-riscv32.patch | 33 - ...-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 ------------------- package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- 4 files changed, 2 insertions(+), 13965 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/jack1: libsamplerate is optional, not mandatory Message-ID: <20220327155020.394D285DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05bbdfa382ec8b26d9b2f98b1696cb884ed7c2ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsamplerate is only needed to build the NetJack backend and internal client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f10332..625afdf8c1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba0..39183826a4 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate +endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/pkcs11-helper: fix build without threads Message-ID: <20220327155020.1C33885DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d76b7564f1bb61762181ecd1fc69c72a925ed25c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without threads and openvpn raised since commit 0199dc161769e5f28e9aebc634230ece08ff5008: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' Fixes: - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...kcs11h-core.c-fix-build-without-slotevent.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch new file mode 100644 index 0000000000..5b2829c5ca --- /dev/null +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch @@ -0,0 +1,37 @@ +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Mar 2022 08:50:15 +0100 +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent + +Fix the following build failure with --disable-slotevent: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' + +Fixes: + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] +--- + lib/pkcs11h-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c +index d7bb4cd..0bf11e8 100644 +--- a/lib/pkcs11h-core.c ++++ b/lib/pkcs11h-core.c +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( + + switch (property) { + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: ++#if defined(ENABLE_PKCS11H_SLOTEVENT) + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { + goto cleanup; + } ++#endif + break; + } + cleanup: +-- +2.35.1 + From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/bluez5_utils: hid and hog needs headers >= 3.18 Message-ID: <20220327155020.2682A85DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=328516a5add9e6f260d3a8e0d372c474ae30b2c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with hid and hog raised since their addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd because UHID_GET_REPORT is only available since kernel 3.18 and https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: profiles/input/device.c: In function 'uhid_send_get_report_reply': profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' if (size > sizeof(ev.u.get_report_reply.data)) ^ profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' size = sizeof(ev.u.get_report_reply.data); ^ profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) ev.type = UHID_GET_REPORT_REPLY; ^ Fixes: - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bluez5_utils/Config.in | 16 ++++++++++++++++ package/brltty/Config.in | 2 +- package/cwiid/Config.in | 6 +++--- package/kodi/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced..49bb719102 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e20..3527df6161 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac9405..7e8cdc3086 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on !BR2_USE_MMU diff --git a/package/kodi/Config.in b/package/kodi/Config.in index c8e1e5d0ed..4c6e01745c 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf058..319415754a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. From arnout at mind.be Sun Mar 27 16:07:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:07:47 +0200 Subject: [Buildroot] [PATCH] package/busybox: fix udhcpc options in minimal config In-Reply-To: <20220321145322.23881-1-vincent.stehle@laposte.net> References: <20220321145322.23881-1-vincent.stehle@laposte.net> Message-ID: <3615aca5-6be5-5cee-a4b2-172ee3505fa1@mind.be> On 21/03/2022 15:53, Vincent Stehl? via buildroot wrote: > The busybox-minimal.config, which is used by systems without an MMU, specifies > the "-b" command line option for udhcpc. However, this option is not supported > by BusyBox udhcpc anymore since version 1.27.0 when building for systems > without an MMU. > > Remove the "-b" option from busybox-minimal.config to repair network > initialization on systems without an MMU. > > This fixes the following network initialization failure: > > udhcpc: invalid option -- b > FAIL > > Signed-off-by: Vincent Stehl? Applied to master, thanks. Regards, Arnout > --- > > > Hi, > > I have verified on qemu that this patch does fix the network initialization for > qemu_arm_versatile_nommu_defconfig and qemu_m68k_mcf5208_defconfig. > > I could only verify the build for stm32f429_disco_xip_defconfig, > stm32f469_disco_sd_defconfig and stm32f469_disco_xip_defconfig. > > Best regards, > Vincent. > > > package/busybox/busybox-minimal.config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config > index 9eae0f51f4..1fb4e39e21 100644 > --- a/package/busybox/busybox-minimal.config > +++ b/package/busybox/busybox-minimal.config > @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 > CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 > # CONFIG_FEATURE_UDHCP_RFC3397 is not set > # CONFIG_FEATURE_UDHCP_8021Q is not set > -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" > +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" > > # > # Print Utilities From arnout at mind.be Sun Mar 27 16:08:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:08:01 +0200 Subject: [Buildroot] [PATCH v3] package/wget: bump version to 1.21.3 In-Reply-To: <20220321192947.20712-1-ps.report@gmx.net> References: <20220321192947.20712-1-ps.report@gmx.net> Message-ID: On 21/03/2022 20:29, Peter Seiderer wrote: > - bump version to 1.21.3 (for details see [1]) > > - remove legacy --with-libidn option (see [2]), replace with > --enable-iri option in case locale support and libidn2 are available > > [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - split out from original patch > - fix iri option enable dependency > > Changes v2 -> v3: > - fix libiconv handling > --- > package/wget/wget.hash | 4 ++-- > package/wget/wget.mk | 9 +++++---- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/package/wget/wget.hash b/package/wget/wget.hash > index 7f89bedb88..22674650a2 100644 > --- a/package/wget/wget.hash > +++ b/package/wget/wget.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig > +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig > # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 > -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz > +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz > # Locally calculated > sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 8a73c33699..455faaed12 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WGET_VERSION = 1.21.2 > +WGET_VERSION = 1.21.3 > WGET_SOURCE = wget-$(WGET_VERSION).tar.lz > WGET_SITE = $(BR2_GNU_MIRROR)/wget > WGET_DEPENDENCIES = host-pkgconf > @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) > WGET_DEPENDENCIES += libiconv > endif > > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > -WGET_CONF_OPTS += --with-libidn > +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive > +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) > +WGET_CONF_OPTS += --enable-iri > WGET_DEPENDENCIES += libidn2 > else > -WGET_CONF_OPTS += --without-libidn > +WGET_CONF_OPTS += --disable-iri > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From arnout at mind.be Sun Mar 27 16:08:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:08:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/ola: fix host build In-Reply-To: <20220321230452.1901382-1-fontaine.fabrice@gmail.com> References: <20220321230452.1901382-1-fontaine.fabrice@gmail.com> Message-ID: On 22/03/2022 00:04, Fabrice Fontaine wrote: > host-bison and host-flex are mandatory dependencies of host-ola since > the reintroduction of the package in commit > 16ff948444c3978d63f483344a3d92d994c64312: > > configure: error: bison not found, please install it > > Fixes: > - http://autobuild.buildroot.org/results/ac089629a58d55ec5d1aa83fd77bd487bc9d76de > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/ola/ola.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 471ae8ed9b..cde90dbd5b 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -25,7 +25,7 @@ OLA_CONF_OPTS = \ > --disable-unittests \ > --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin > > -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf > +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex > > # When building the host part, disable as much as possible to speed up > # the configure step and avoid missing host dependencies. From arnout at mind.be Sun Mar 27 16:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:08:55 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack2: fix build with libexecinfo In-Reply-To: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Message-ID: <946cbedd-3b59-97d0-888d-6f974bdab57f@mind.be> On 22/03/2022 18:48, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': > sigsegv.c:(.text+0x98): undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/jack2/jack2.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk > index 2e55169984..127c99eed1 100644 > --- a/package/jack2/jack2.mk > +++ b/package/jack2/jack2.mk > @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES > > JACK2_CONF_OPTS = --alsa > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +JACK2_DEPENDENCIES += libexecinfo > +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" > +endif > + > ifeq ($(BR2_PACKAGE_OPUS),y) > JACK2_DEPENDENCIES += opus > endif From arnout at mind.be Sun Mar 27 16:09:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:09:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 2.1.1 In-Reply-To: <20220322182946.2446236-1-fontaine.fabrice@gmail.com> References: <20220322182946.2446236-1-fontaine.fabrice@gmail.com> Message-ID: On 22/03/2022 19:29, Fabrice Fontaine wrote: > - Switch to new active fork: > https://github.com/enzo1982/mp4v2/discussions/1 > https://github.com/TechSmith/mp4v2/commit/461abd2b1365e14ba28dd0e4a0cb6c3bee1bab41 > - C++11 is not needed anymore thanks to > https://github.com/enzo1982/mp4v2/commit/5a57bc2ce8948f6ffa96761286921ab3e2ebe467 > - Drop patch (not needed since > https://github.com/enzo1982/mp4v2/commit/23f8b907d4a221e1dae9e8b859cb6b1161206866) > - Update license (minor fix: > https://github.com/enzo1982/mp4v2/commit/0c37402d9d3644ea0b7d55db1d901bfad9723dfc) > - Version 2.1.1 was never released before so no issue is expected > (except a misunderstanding of users but new upstream is aware of this: > https://github.com/enzo1982/mp4v2/discussions/1#discussioncomment-2399344) > > https://github.com/enzo1982/mp4v2/releases/tag/v2.1.1 > https://github.com/enzo1982/mp4v2/releases/tag/v2.1.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...tatic-cast-to-unsigned-int-for-cases.patch | 99 ------------------- > package/mp4v2/Config.in | 8 +- > package/mp4v2/mp4v2.hash | 4 +- > package/mp4v2/mp4v2.mk | 5 +- > 4 files changed, 8 insertions(+), 108 deletions(-) > delete mode 100644 package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > > diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > deleted file mode 100644 > index 6c9b13bed8..0000000000 > --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > +++ /dev/null > @@ -1,99 +0,0 @@ > -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 > -From: "Jason A. Donenfeld" > -Date: Thu, 6 Aug 2020 15:22:04 +0200 > -Subject: [PATCH] Static cast to unsigned int for cases > - > -Signed-off-by: Jason A. Donenfeld > -[Retrieved from: > -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] > -Signed-off-by: Fabrice Fontaine > ---- > - libutil/Utility.cpp | 2 +- > - util/mp4art.cpp | 2 +- > - util/mp4chaps.cpp | 2 +- > - util/mp4file.cpp | 2 +- > - util/mp4subtitle.cpp | 2 +- > - util/mp4track.cpp | 2 +- > - 6 files changed, 6 insertions(+), 6 deletions(-) > - > -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp > -index 76cdd12..d6739d4 100644 > ---- a/libutil/Utility.cpp > -+++ b/libutil/Utility.cpp > -@@ -493,7 +493,7 @@ Utility::process_impl() > - if( codes.find( code ) == codes.end() ) > - continue; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case 'z': > - _optimize = true; > - break; > -diff --git a/util/mp4art.cpp b/util/mp4art.cpp > -index add935e..6e7f531 100644 > ---- a/util/mp4art.cpp > -+++ b/util/mp4art.cpp > -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast ( code ) ) { > - case LC_ART_ANY: > - _artFilter = numeric_limits::max(); > - break; > -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp > -index 98400f8..ccc8b70 100644 > ---- a/util/mp4chaps.cpp > -+++ b/util/mp4chaps.cpp > -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast ( code ) ) { > - case 'A': > - case LC_CHPT_ANY: > - _ChapterType = MP4ChapterTypeAny; > -diff --git a/util/mp4file.cpp b/util/mp4file.cpp > -index c27844b..b127cd1 100644 > ---- a/util/mp4file.cpp > -+++ b/util/mp4file.cpp > -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case LC_LIST: > - _action = &FileUtility::actionList; > - break; > -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp > -index 7462153..19d977d 100644 > ---- a/util/mp4subtitle.cpp > -+++ b/util/mp4subtitle.cpp > -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case LC_LIST: > - _action = &SubtitleUtility::actionList; > - break; > -diff --git a/util/mp4track.cpp b/util/mp4track.cpp > -index d550506..cd63d7e 100644 > ---- a/util/mp4track.cpp > -+++ b/util/mp4track.cpp > -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case LC_TRACK_WILDCARD: > - _trackMode = TM_WILDCARD; > - break; > --- > -2.28.0 > - > diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in > index 00e80cd358..705a8c9d24 100644 > --- a/package/mp4v2/Config.in > +++ b/package/mp4v2/Config.in > @@ -1,12 +1,11 @@ > config BR2_PACKAGE_MP4V2 > bool "mp4v2" > depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 > help > The MP4v2 library provides functions to read, create, and > modify mp4 files. > > - https://github.com/TechSmith/mp4v2/ > + https://mp4v2.org/ > > if BR2_PACKAGE_MP4V2 > > @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL > > endif > > -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" > - depends on !BR2_INSTALL_LIBSTDCPP || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > +comment "mp4v2 needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash > index 7aa5402c8f..d3f0243650 100644 > --- a/package/mp4v2/mp4v2.hash > +++ b/package/mp4v2/mp4v2.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz > -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING > +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 > +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING > diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk > index 6d29228a13..7de837c170 100644 > --- a/package/mp4v2/mp4v2.mk > +++ b/package/mp4v2/mp4v2.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -MP4V2_VERSION = 5.0.1 > +MP4V2_VERSION = 2.1.1 > MP4V2_SITE = \ > - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) > + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) > +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 > MP4V2_INSTALL_STAGING = YES > MP4V2_LICENSE = MPL-1.1 > MP4V2_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:09:31 +0200 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix target loaders.cache In-Reply-To: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> References: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> Message-ID: <53e0f0fd-8db9-c324-ba12-fdfd75d7b258@mind.be> On 22/03/2022 20:00, Fabrice Fontaine wrote: > As reported by Rutger Sassen in > https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, > target loaders.cache is broken since commit > 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ > to relative host paths > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk > index 6eaf023789..69bb34b0cb 100644 > --- a/package/gdk-pixbuf/gdk-pixbuf.mk > +++ b/package/gdk-pixbuf/gdk-pixbuf.mk > @@ -70,14 +70,14 @@ endif > # gdk-pixbuf requires the loaders.cache file populated to work properly > # Rather than doing so at runtime, since the fs can be read-only, do so > # here after building and installing to target. > -# And since the cache file will contain absolute host directory names we > -# need to sanitize (strip) them. > +# And since the cache file will contain relative host directory names we > +# need to prepend them with /usr/. > ifeq ($(BR2_STATIC_LIBS),) > define GDK_PIXBUF_UPDATE_CACHE > GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ > $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ > + $(SED) 's,^"lib,"/usr/lib,g' \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > endef > GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From arnout at mind.be Sun Mar 27 15:59:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:41 +0200 Subject: [Buildroot] [git commit] package/busybox: fix udhcpc options in minimal config Message-ID: <20220327160039.4C89585E09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3de486f8b052b25c8e29a82903b334ca90f25735 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The busybox-minimal.config, which is used by systems without an MMU, specifies the "-b" command line option for udhcpc. However, this option is not supported by BusyBox udhcpc anymore since version 1.27.0 when building for systems without an MMU. Remove the "-b" option from busybox-minimal.config to repair network initialization on systems without an MMU. This fixes the following network initialization failure: udhcpc: invalid option -- b FAIL Signed-off-by: Vincent Stehl?? Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox-minimal.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4..1fb4e39e21 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities From arnout at mind.be Sun Mar 27 15:59:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:47 +0200 Subject: [Buildroot] [git commit] package/ola: fix host build Message-ID: <20220327160039.6497485E0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b38d3d22718270610639c9078476ac31ceeaa34d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-bison and host-flex are mandatory dependencies of host-ola since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: bison not found, please install it Fixes: - http://autobuild.buildroot.org/results/ac089629a58d55ec5d1aa83fd77bd487bc9d76de Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 1b55ca440a..1fd6d6a592 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -26,7 +26,7 @@ OLA_CONF_OPTS = \ --disable-unittests \ --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex # When building the host part, disable as much as possible to speed up # the configure step and avoid missing host dependencies. From arnout at mind.be Sun Mar 27 15:59:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:50 +0200 Subject: [Buildroot] [git commit] package/jack2: fix build with libexecinfo Message-ID: <20220327160039.714FA85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=930db465d9d9f2fd558e67bd808914309c2d4619 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': sigsegv.c:(.text+0x98): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack2/jack2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 2e55169984..127c99eed1 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif From arnout at mind.be Sun Mar 27 15:59:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:44 +0200 Subject: [Buildroot] [git commit] package/wget: bump version to 1.21.3 Message-ID: <20220327160039.585CF85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5f82a4a5a6f14b4d178a4d662784d7bd6f7fada branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From arnout at mind.be Sun Mar 27 15:59:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:58 +0200 Subject: [Buildroot] [git commit] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220327160039.92C4685E0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39ceb94fdb96da47a350b92e86513ddc57a657eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9..329c05520e 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From arnout at mind.be Sun Mar 27 15:59:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:55 +0200 Subject: [Buildroot] [git commit] package/mp4v2: bump to version 2.1.1 Message-ID: <20220327160039.87AB485DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a324bbcf7e44d819fce8584595ca49bde7077e33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to new active fork: https://github.com/enzo1982/mp4v2/discussions/1 https://github.com/TechSmith/mp4v2/commit/461abd2b1365e14ba28dd0e4a0cb6c3bee1bab41 - C++11 is not needed anymore thanks to https://github.com/enzo1982/mp4v2/commit/5a57bc2ce8948f6ffa96761286921ab3e2ebe467 - Drop patch (not needed since https://github.com/enzo1982/mp4v2/commit/23f8b907d4a221e1dae9e8b859cb6b1161206866) - Update license (minor fix: https://github.com/enzo1982/mp4v2/commit/0c37402d9d3644ea0b7d55db1d901bfad9723dfc) - Version 2.1.1 was never released before so no issue is expected (except a misunderstanding of users but new upstream is aware of this: https://github.com/enzo1982/mp4v2/discussions/1#discussioncomment-2399344) https://github.com/enzo1982/mp4v2/releases/tag/v2.1.1 https://github.com/enzo1982/mp4v2/releases/tag/v2.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...001-Static-cast-to-unsigned-int-for-cases.patch | 99 ---------------------- package/mp4v2/Config.in | 8 +- package/mp4v2/mp4v2.hash | 4 +- package/mp4v2/mp4v2.mk | 5 +- 4 files changed, 8 insertions(+), 108 deletions(-) diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch deleted file mode 100644 index 6c9b13bed8..0000000000 --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Thu, 6 Aug 2020 15:22:04 +0200 -Subject: [PATCH] Static cast to unsigned int for cases - -Signed-off-by: Jason A. Donenfeld -[Retrieved from: -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] -Signed-off-by: Fabrice Fontaine ---- - libutil/Utility.cpp | 2 +- - util/mp4art.cpp | 2 +- - util/mp4chaps.cpp | 2 +- - util/mp4file.cpp | 2 +- - util/mp4subtitle.cpp | 2 +- - util/mp4track.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp -index 76cdd12..d6739d4 100644 ---- a/libutil/Utility.cpp -+++ b/libutil/Utility.cpp -@@ -493,7 +493,7 @@ Utility::process_impl() - if( codes.find( code ) == codes.end() ) - continue; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case 'z': - _optimize = true; - break; -diff --git a/util/mp4art.cpp b/util/mp4art.cpp -index add935e..6e7f531 100644 ---- a/util/mp4art.cpp -+++ b/util/mp4art.cpp -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case LC_ART_ANY: - _artFilter = numeric_limits::max(); - break; -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp -index 98400f8..ccc8b70 100644 ---- a/util/mp4chaps.cpp -+++ b/util/mp4chaps.cpp -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case 'A': - case LC_CHPT_ANY: - _ChapterType = MP4ChapterTypeAny; -diff --git a/util/mp4file.cpp b/util/mp4file.cpp -index c27844b..b127cd1 100644 ---- a/util/mp4file.cpp -+++ b/util/mp4file.cpp -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &FileUtility::actionList; - break; -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp -index 7462153..19d977d 100644 ---- a/util/mp4subtitle.cpp -+++ b/util/mp4subtitle.cpp -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &SubtitleUtility::actionList; - break; -diff --git a/util/mp4track.cpp b/util/mp4track.cpp -index d550506..cd63d7e 100644 ---- a/util/mp4track.cpp -+++ b/util/mp4track.cpp -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_TRACK_WILDCARD: - _trackMode = TM_WILDCARD; - break; --- -2.28.0 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 00e80cd358..705a8c9d24 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,12 +1,11 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. - https://github.com/TechSmith/mp4v2/ + https://mp4v2.org/ if BR2_PACKAGE_MP4V2 @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 +comment "mp4v2 needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 7aa5402c8f..d3f0243650 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 6d29228a13..7de837c170 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,9 +4,10 @@ # ################################################################################ -MP4V2_VERSION = 5.0.1 +MP4V2_VERSION = 2.1.1 MP4V2_SITE = \ - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 15:59:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:52 +0200 Subject: [Buildroot] [git commit] package/jack2: explicitly {dis, en}able opus and readline Message-ID: <20220327160039.7C2E685E0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=618a23100fe5ff54b90ada1a8f23453f6c5a77dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 127c99eed1..6939aac9a6 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -21,10 +21,16 @@ endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) From arnout at mind.be Sun Mar 27 16:23:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:23:18 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: <20220325212405.25243-1-james.hilliard1@gmail.com> References: <20220325212405.25243-1-james.hilliard1@gmail.com> Message-ID: <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> On 25/03/2022 22:24, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Although honestly, there's not much point updating a host-only package unless it actually fixes an issue. Regards, Arnout > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index d909709b24..8389adb243 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc > -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc > +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 4615e839fe..e9c3145183 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 0.61.3 > +MESON_VERSION = 0.61.4 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:23:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:23:31 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: add cmake dependency support In-Reply-To: <20220324055602.3021498-1-james.hilliard1@gmail.com> References: <20220324055602.3021498-1-james.hilliard1@gmail.com> Message-ID: On 24/03/2022 06:56, James Hilliard wrote: > Meson dependencies and variables can be provided by cmake similar to > how they can be provided by pkgconfig, for this to work we need to > ensure that cmake_prefix_path is set for both cross and native > targets along with the cmake binary path. > > See: > https://mesonbuild.com/Dependencies.html#cmake > https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways > https://mesonbuild.com/Machine-files.html#meson-builtin-options > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/pkg-meson.mk | 2 ++ > support/misc/cross-compilation.conf.in | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 85de98e03a..9e70d49b60 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED > -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ > -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ > -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ > + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ > -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ > -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ > -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ > @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS > -Db_pie=false \ > -Dstrip=false \ > -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ > + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ > $$($$(PKG)_CONF_OPTS) \ > $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build > endef > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index 18cf258a8e..1977a83501 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -8,6 +8,7 @@ c = '@TARGET_CC@' > cpp = '@TARGET_CXX@' > ar = '@TARGET_AR@' > strip = '@TARGET_STRIP@' > +cmake = '@BR2_CMAKE@' > pkgconfig = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] > cpp_args = [@TARGET_CXXFLAGS@] > cpp_link_args = [@TARGET_LDFLAGS@] > wrap_mode = 'nodownload' > +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' > > [properties] > needs_exe_wrapper = true From arnout at mind.be Sun Mar 27 16:27:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:27:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 In-Reply-To: <20220324063928.3448755-1-james.hilliard1@gmail.com> References: <20220324063928.3448755-1-james.hilliard1@gmail.com> Message-ID: <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> On 24/03/2022 07:39, James Hilliard wrote: > CONTRIBUTING.md hash changed due to various style updates. > > Set new default wifi backend config option to iwd when enabled in > cases where the default wpa_supplicant is not enabled. Applied to master, thanks. However, I would like to challenge the order of preference here. If you select network-manager, iwd and wpa_supplicant, and network-manager uses wpa_supplicant, then you end up not using iwd at all, so that was probably not the intention of the user. However, there is a good reason to still have wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant is also used for 802.1X authentication over Ethernet. Either way, it's pretty hard to guess the intention of the user. So maybe a Config.in choice is appropriate? > > Signed-off-by: James Hilliard > --- > package/network-manager/network-manager.hash | 6 +++--- > package/network-manager/network-manager.mk | 13 ++++++++++--- > 2 files changed, 13 insertions(+), 6 deletions(-) > > diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash > index d25f0e8194..26bcf843c2 100644 > --- a/package/network-manager/network-manager.hash > +++ b/package/network-manager/network-manager.hash > @@ -1,6 +1,6 @@ > -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum > -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz > +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum > +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz > # Locally computed > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL > -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md > +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index a90228992c..3479bb3794 100644 > --- a/package/network-manager/network-manager.mk > +++ b/package/network-manager/network-manager.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -NETWORK_MANAGER_VERSION_MAJOR = 1.34 > -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 > +NETWORK_MANAGER_VERSION_MAJOR = 1.36 > +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > NETWORK_MANAGER_INSTALL_STAGING = YES > @@ -53,8 +53,15 @@ endif > ifeq ($(BR2_PACKAGE_IWD),y) > NETWORK_MANAGER_DEPENDENCIES += iwd > NETWORK_MANAGER_CONF_OPTS += --with-iwd > +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant > else > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd > +endif > +else > +NETWORK_MANAGER_CONF_OPTS += \ > + --without-iwd \ > + --with-config-wifi-backend-default=wpa_supplicant This is set regardless of whether wpa_supplicant is enabled or not. Are you sure that's OK? Regards, Arnout > endif > > ifeq ($(BR2_PACKAGE_LIBCURL),y) From arnout at mind.be Sun Mar 27 16:28:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:28:10 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-txaio: bump to version 22.2.1 In-Reply-To: <20220324071817.1270488-1-james.hilliard1@gmail.com> References: <20220324071817.1270488-1-james.hilliard1@gmail.com> Message-ID: <0463edce-bf9b-ecd1-2f6d-cc728a64409d@mind.be> On 24/03/2022 08:18, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-txaio/python-txaio.hash | 4 ++-- > package/python-txaio/python-txaio.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash > index 5e05f02d3a..f06c14b21f 100644 > --- a/package/python-txaio/python-txaio.hash > +++ b/package/python-txaio/python-txaio.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/txaio/json > -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz > -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz > +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz > +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz > # Locally computed sha256 checksums > sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE > diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk > index 750d9e3d3d..1a8a888963 100644 > --- a/package/python-txaio/python-txaio.mk > +++ b/package/python-txaio/python-txaio.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TXAIO_VERSION = 21.2.1 > +PYTHON_TXAIO_VERSION = 22.2.1 > PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz > -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 > +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 > PYTHON_TXAIO_LICENSE = MIT > PYTHON_TXAIO_LICENSE_FILES = LICENSE > PYTHON_TXAIO_SETUP_TYPE = setuptools From arnout at mind.be Sun Mar 27 16:28:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:28:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy In-Reply-To: <20220324223218.27767-1-fontaine.fabrice@gmail.com> References: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Message-ID: <6e6b1d54-a96f-1115-be91-7349e652043f@mind.be> On 24/03/2022 23:32, Fabrice Fontaine wrote: > Fix the following build failure if clang-tidy is found on host (and > protobuf is built before protozero) which is raised since tests are > disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: > > CMake Error at CMakeLists.txt:77 (add_dependencies): > The dependency target "writer_tests" of target "clang-tidy" does not exist. > > Fixes: > - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...xt-protobuf-is-only-needed-for-tests.patch | 35 +++++++++++++++++++ > 1 file changed, 35 insertions(+) > create mode 100644 package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch > > diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch > new file mode 100644 > index 0000000000..3033e24aa2 > --- /dev/null > +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch > @@ -0,0 +1,35 @@ > +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Wed, 16 Feb 2022 00:11:38 +0100 > +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests > + > +Don't check for protobuf if tests are disabled. As a side effect, this > +will avoid a build failure if clang-tidy and protobuf are found but > +tests are disabled > + > +Fix #109 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/mapbox/protozero/pull/110] > +--- > + CMakeLists.txt | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index b975d49..df2ca15 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -52,7 +52,9 @@ endif() > + # > + #----------------------------------------------------------------------------- > + > +-find_package(Protobuf) > ++if(BUILD_TESTING) > ++ find_package(Protobuf) > ++endif() > + > + > + #----------------------------------------------------------------------------- > +-- > +2.34.1 > + From arnout at mind.be Sun Mar 27 16:28:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:28:46 +0200 Subject: [Buildroot] [PATCH v1] package/wireshark: fix compile with ccache enabled In-Reply-To: <20220325190934.24982-1-ps.report@gmx.net> References: <20220325190934.24982-1-ps.report@gmx.net> Message-ID: On 25/03/2022 20:09, Peter Seiderer wrote: > - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER > > Fixes: > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] > [...] > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > .../host/bin/ccache: invalid option -- 'D' > > Reported-by: Dan Ambrosio > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/wireshark/wireshark.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk > index a5ca4b1f73..1a549f7037 100644 > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ > -DENABLE_ILBC=OFF \ > -DENABLE_PCAP=ON \ > -DENABLE_SMI=OFF \ > - -DLEMON_C_COMPILER=$(HOSTCC) > + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From arnout at mind.be Sun Mar 27 16:29:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:03 +0200 Subject: [Buildroot] [PATCH 1/1] package/iwd: fix uclibc build In-Reply-To: <20220325210554.526198-1-fontaine.fabrice@gmail.com> References: <20220325210554.526198-1-fontaine.fabrice@gmail.com> Message-ID: On 25/03/2022 22:05, Fabrice Fontaine wrote: > Fix the following uclibc build failure raised since bump to version 1.25 > in commit 0fc5bc235990073233df6352d1208624034a6b6e and > https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=01cd8587606bf2da1af245163150589834126c1: > > /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': > storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' > > Fixes: > - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-src-storage.c-fix-build-with-uclibc.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch > > diff --git a/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch > new file mode 100644 > index 0000000000..55fdaa86fd > --- /dev/null > +++ b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch > @@ -0,0 +1,37 @@ > +From 99e74ade2ea892e6d0b070bec1df6a135ce2c8b3 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 25 Mar 2022 16:35:49 +0100 > +Subject: [PATCH] src/storage.c: fix build with uclibc > + > +explicit_bzero is used in src/storage.c since commit > +01cd8587606bf2da1af245163150589834126c1c but src/missing.h is not > +included, as a result build with uclibc fails on: > + > +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': > +storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' > + > +Fixes: > + - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/WB2XXRBUDHC5IVFDEOJBK23JHPURL427] > +--- > + src/storage.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/storage.c b/src/storage.c > +index 82a72443..aa8066b1 100644 > +--- a/src/storage.c > ++++ b/src/storage.c > +@@ -44,6 +44,7 @@ > + #include > + #include "ell/useful.h" > + > ++#include "src/missing.h" > + #include "src/common.h" > + #include "src/storage.h" > + #include "src/crypto.h" > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 16:29:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:25 +0200 Subject: [Buildroot] [PATCH 1/1] package/atk: bump to version 2.38.0 In-Reply-To: <20220325211725.612796-1-fontaine.fabrice@gmail.com> References: <20220325211725.612796-1-fontaine.fabrice@gmail.com> Message-ID: <8c605bb1-5f14-d29b-43fb-6ce9b44ad7f5@mind.be> On 25/03/2022 22:17, Fabrice Fontaine wrote: > https://gitlab.gnome.org/GNOME/atk/-/tags/2.38.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/atk/atk.hash | 4 ++-- > package/atk/atk.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/atk/atk.hash b/package/atk/atk.hash > index 2e7c3b5fec..d8cd69ff1f 100644 > --- a/package/atk/atk.hash > +++ b/package/atk/atk.hash > @@ -1,5 +1,5 @@ > -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum > -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz > +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum > +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz > > # Hash for license file > sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING > diff --git a/package/atk/atk.mk b/package/atk/atk.mk > index dfeb4de8b2..2820fb486d 100644 > --- a/package/atk/atk.mk > +++ b/package/atk/atk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ATK_VERSION_MAJOR = 2.36 > +ATK_VERSION_MAJOR = 2.38 > ATK_VERSION = $(ATK_VERSION_MAJOR).0 > ATK_SOURCE = atk-$(ATK_VERSION).tar.xz > ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) From arnout at mind.be Sun Mar 27 16:29:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:40 +0200 Subject: [Buildroot] [PATCH 1/1] package/frr: bump to version 8.2.2 In-Reply-To: <20220325212852.713531-1-fontaine.fabrice@gmail.com> References: <20220325212852.713531-1-fontaine.fabrice@gmail.com> Message-ID: <56dfbfb1-c67a-211f-55ce-00df980cfa9c@mind.be> On 25/03/2022 22:28, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://frrouting.org/release/8.2.2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...001-configure.ac-fix-enable_bmp-typo.patch | 29 ----------------- > ...-lib-fix-elf_py-TLS-section-handling.patch | 31 ------------------- > package/frr/frr.hash | 2 +- > package/frr/frr.mk | 2 +- > 4 files changed, 2 insertions(+), 62 deletions(-) > delete mode 100644 package/frr/0001-configure.ac-fix-enable_bmp-typo.patch > delete mode 100644 package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch > > diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch > deleted file mode 100644 > index c8ce500dfc..0000000000 > --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 16 Dec 2021 20:10:26 +0100 > -Subject: [PATCH] configure.ac: fix enable_bmp typo > - > -enable_bmp doesn't exist, use enable_bgp_bmp > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/FRRouting/frr/pull/10236] > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 1bcc42ef8..c7a5f1286 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then > - fi > - > - bgpd_bmp=false > --case "${enable_bmp}" in > -+case "${enable_bgp_bmp}" in > - no) > - ;; > - yes) > --- > -2.33.0 > - > diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch > deleted file mode 100644 > index d491cb1a7d..0000000000 > --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 > -From: David Lamparter > -Date: Wed, 10 Nov 2021 15:30:07 +0100 > -Subject: [PATCH] lib: fix elf_py TLS section handling > - > -... need to ignore TLS sections, their address is effectively > -meaningless but can overlap other sections we actually need to access. > - > -Signed-off-by: David Lamparter > - > -[Retrieved from: > -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] > -Signed-off-by: Fabrice Fontaine > ---- > - lib/elf_py.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/lib/elf_py.c b/lib/elf_py.c > -index 1c306893ad8..f230add6957 100644 > ---- a/lib/elf_py.c > -+++ b/lib/elf_py.c > -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) > - Elf_Scn *scn = elf_getscn(ef->elf, i); > - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); > - > -+ /* virtual address is kinda meaningless for TLS sections */ > -+ if (shdr->sh_flags & SHF_TLS) > -+ continue; > - if (addr < shdr->sh_addr || > - addr >= shdr->sh_addr + shdr->sh_size) > - continue; > diff --git a/package/frr/frr.hash b/package/frr/frr.hash > index bb6c32b7bb..9bb2b75b8f 100644 > --- a/package/frr/frr.hash > +++ b/package/frr/frr.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz > +sha256 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f frr-8.2.2.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/frr/frr.mk b/package/frr/frr.mk > index 0e6ab7a815..aa36387a3a 100644 > --- a/package/frr/frr.mk > +++ b/package/frr/frr.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FRR_VERSION = 8.1 > +FRR_VERSION = 8.2.2 > FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) > FRR_LICENSE = GPL-2.0 > FRR_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:29:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:53 +0200 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump to version 5.16.2 In-Reply-To: <20220325213557.757894-1-fontaine.fabrice@gmail.com> References: <20220325213557.757894-1-fontaine.fabrice@gmail.com> Message-ID: On 25/03/2022 22:35, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ---------------- > ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 ------------------- > ...ocal-definition-for-alignment-macros.patch | 46 ----------------- > package/btrfs-progs/btrfs-progs.hash | 2 +- > package/btrfs-progs/btrfs-progs.mk | 2 +- > 5 files changed, 2 insertions(+), 140 deletions(-) > delete mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > delete mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch > delete mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch > > diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > deleted file mode 100644 > index b6c1a42456..0000000000 > --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 > -From: Bruce Ashfield > -Date: Thu, 30 Dec 2021 15:23:59 +0200 > -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ > - headers > - > -btrfs-tools compile fails with mips, musl and 5.12+ headers. > - > -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we > -add an explicit include of const.h to pickup the macro: > - > - | make: *** [Makefile:595: mkfs.btrfs] Error 1 > - | make: *** Waiting for unfinished jobs.... > - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': > - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' > - | collect2: error: ld returned 1 exit status > - > -This is safe for older kernel's as well, since the header still > -exists, and is valid to include. > - > -Signed-off-by: Bruce Ashfield > -[remove invalid OE Upstream-status] > -Signed-off-by: Stijn Tintel > -Signed-off-by: David Sterba > -[Retrieved from: > -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] > -Signed-off-by: Fabrice Fontaine > ---- > - kerncompat.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/kerncompat.h b/kerncompat.h > -index df167fe6c..2503d1afa 100644 > ---- a/kerncompat.h > -+++ b/kerncompat.h > -@@ -29,6 +29,7 @@ > - #include > - #include > - #include > -+#include > - #include > - > - #include > diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch > deleted file mode 100644 > index 7473fe67cb..0000000000 > --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 8 Jan 2022 22:44:44 +0100 > -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl > - > -Make inclusion of sys/sysinfo.h conditional to avoid the following build > -failure on musl: > - > -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, > - from ./kerncompat.h:31, > - from common/utils.c:42: > -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' > - 7 | struct sysinfo { > - | ^~~~~~~ > -In file included from common/utils.c:27: > -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here > - 10 | struct sysinfo { > - | ^~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc > - > -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, > -while both must not be included at the same time. Stop including > -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and > -causes the double definition for some reason. As we now include > -linux/const.h directly, there's no other effective change. > - > -Pull-request: #433 > -Signed-off-by: Fabrice Fontaine > -Signed-off-by: David Sterba > -[Retrieved from: > -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] > ---- > - kerncompat.h | 1 - > - 1 file changed, 1 deletion(-) > - > -diff --git a/kerncompat.h b/kerncompat.h > -index 2503d1afa..6ca1526e2 100644 > ---- a/kerncompat.h > -+++ b/kerncompat.h > -@@ -28,7 +28,6 @@ > - #include > - #include > - #include > --#include > - #include > - #include > - > diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch > deleted file mode 100644 > index 86c63edc30..0000000000 > --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 > -From: David Sterba > -Date: Thu, 13 Jan 2022 14:47:08 +0100 > -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment > - macros > - > -There's still problem left with compilation on musl and kernel < 5.11, > -because __ALIGN_KERNEL is not defined anymore: > - > -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': > -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' > - > -Due to the entangled includes and unconditional definition of > -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it > -eventually (as kerncompat.h is the first include). Instead add local > -definitions of the macros and rename them to avoid name clashes. > - > -Pull-request: #433 > -Signed-off-by: David Sterba > -[Retrieved from: > -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] > -Signed-off-by: Fabrice Fontaine > ---- > - kerncompat.h | 9 ++++++++- > - 1 file changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/kerncompat.h b/kerncompat.h > -index 6ca1526e2..f0a6e196e 100644 > ---- a/kerncompat.h > -+++ b/kerncompat.h > -@@ -359,7 +359,14 @@ do { \ > - > - /* Alignment check */ > - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) > --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) > -+ > -+/* > -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around > -+ * issues caused by moving the definition in 5.12 > -+ */ > -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) > -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) > -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) > - > - static inline int is_power_of_2(unsigned long n) > - { > diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash > index 339eab02aa..14eeb1ca07 100644 > --- a/package/btrfs-progs/btrfs-progs.hash > +++ b/package/btrfs-progs/btrfs-progs.hash > @@ -1,5 +1,5 @@ > # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc > -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz > +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz > # Locally computed > sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 54922df839..9bf50ccfda 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BTRFS_PROGS_VERSION = 5.15.1 > +BTRFS_PROGS_VERSION = 5.16.2 > BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs > BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz > BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib From arnout at mind.be Sun Mar 27 16:30:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:30:27 +0200 Subject: [Buildroot] [PATCH v2 1/3] package/intel-mediadriver: bump version to 22.3.0 In-Reply-To: <20220326142007.864294-1-bernd.kuhls@t-online.de> References: <20220326142007.864294-1-bernd.kuhls@t-online.de> Message-ID: On 26/03/2022 15:20, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied all 3 to master, thanks. Regards, Arnout > --- > v2: no changes > > package/intel-mediadriver/intel-mediadriver.hash | 2 +- > package/intel-mediadriver/intel-mediadriver.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash > index 044b9d7013..57499830b1 100644 > --- a/package/intel-mediadriver/intel-mediadriver.hash > +++ b/package/intel-mediadriver/intel-mediadriver.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz > +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz > sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md > diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk > index 84eda811ae..c22aeecc77 100644 > --- a/package/intel-mediadriver/intel-mediadriver.mk > +++ b/package/intel-mediadriver/intel-mediadriver.mk > @@ -6,7 +6,7 @@ > > # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack > > -INTEL_MEDIADRIVER_VERSION = 22.2.2 > +INTEL_MEDIADRIVER_VERSION = 22.3.0 > INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive > INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz > INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sun Mar 27 16:30:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:30:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4632 In-Reply-To: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> References: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> Message-ID: <8d7d7ad2-26a7-bcf4-8124-5859243560ea@mind.be> On 26/03/2022 21:49, Fabrice Fontaine wrote: > Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub > repository vim/vim prior to 8.2.4563. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/vim/vim.hash | 2 +- > package/vim/vim.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/vim/vim.hash b/package/vim/vim.hash > index 8b60b7461f..d2c91dcfa5 100644 > --- a/package/vim/vim.hash > +++ b/package/vim/vim.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz > +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz > sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE > sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt > diff --git a/package/vim/vim.mk b/package/vim/vim.mk > index 28fd33c8ef..71aa735eff 100644 > --- a/package/vim/vim.mk > +++ b/package/vim/vim.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -VIM_VERSION = 8.2.4450 > +VIM_VERSION = 8.2.4632 > VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) > VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) > VIM_SUBDIR = src From arnout at mind.be Sun Mar 27 16:31:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:31:13 +0200 Subject: [Buildroot] [PATCH] package/lua-basexx: bump to version 0.4.1 In-Reply-To: <20220327142023.1477251-1-francois.perrad@gadz.org> References: <20220327142023.1477251-1-francois.perrad@gadz.org> Message-ID: <69a2a7a8-3f06-2779-b6f9-32f7d9345bfb@mind.be> On 27/03/2022 16:20, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/lua-basexx/lua-basexx.hash | 4 ++-- > package/lua-basexx/lua-basexx.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash > index aee636c32..447ec60ba 100644 > --- a/package/lua-basexx/lua-basexx.hash > +++ b/package/lua-basexx/lua-basexx.hash > @@ -1,3 +1,3 @@ > # computed by luarocks/buildroot > -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock > -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE > +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock > +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE > diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk > index 5aa5ecf21..22b5a3771 100644 > --- a/package/lua-basexx/lua-basexx.mk > +++ b/package/lua-basexx/lua-basexx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUA_BASEXX_VERSION = 0.4.0-1 > +LUA_BASEXX_VERSION = 0.4.1-1 > LUA_BASEXX_NAME_UPSTREAM = basexx > LUA_BASEXX_LICENSE = MIT > LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:31:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:31:35 +0200 Subject: [Buildroot] [PATCH] package/luasec: bump to version 1.0.2 In-Reply-To: <20220327142048.1477306-1-francois.perrad@gadz.org> References: <20220327142048.1477306-1-francois.perrad@gadz.org> Message-ID: <74c2bcf3-61df-6077-1609-f4867379ebb3@mind.be> On 27/03/2022 16:20, Francois Perrad wrote: > diff LICENSE: > -LuaSec 1.0 license > +LuaSec 1.0.2 license > > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/luasec/luasec.hash | 4 ++-- > package/luasec/luasec.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash > index 1ea422aa9..1e381612b 100644 > --- a/package/luasec/luasec.hash > +++ b/package/luasec/luasec.hash > @@ -1,3 +1,3 @@ > # computed by luarocks/buildroot > -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock > -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE > +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock > +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE > diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk > index 3ef0c14da..4ace94d16 100644 > --- a/package/luasec/luasec.mk > +++ b/package/luasec/luasec.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUASEC_VERSION = 1.0-1 > +LUASEC_VERSION = 1.0.2-1 > LUASEC_SUBDIR = luasec > LUASEC_LICENSE = MIT > LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:12:14 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:14 +0200 Subject: [Buildroot] [git commit] package/python-txaio: bump to version 22.2.1 Message-ID: <20220327162300.61D6785E92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cbe5a540f04ef29ecf00fb23bc26068c3a718ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-txaio/python-txaio.hash | 4 ++-- package/python-txaio/python-txaio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 5e05f02d3a..f06c14b21f 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 750d9e3d3d..1a8a888963 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 21.2.1 +PYTHON_TXAIO_VERSION = 22.2.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools From arnout at mind.be Sun Mar 27 16:12:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:20 +0200 Subject: [Buildroot] [git commit] package/wireshark: fix compile with ccache enabled Message-ID: <20220327162300.77F0785E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=082076ffc186392f2b794facaa0545529e4f5851 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73..1a549f7037 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From arnout at mind.be Sun Mar 27 16:12:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:25 +0200 Subject: [Buildroot] [git commit] package/atk: bump to version 2.38.0 Message-ID: <20220327162300.8B22485E92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc1ffa38ba7a47aea2b0ab5bb86e198607ee61b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/atk/-/tags/2.38.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/atk/atk.hash | 4 ++-- package/atk/atk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 2e7c3b5fec..d8cd69ff1f 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz # Hash for license file sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index dfeb4de8b2..2820fb486d 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.36 +ATK_VERSION_MAJOR = 2.38 ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) From arnout at mind.be Sun Mar 27 16:12:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:09 +0200 Subject: [Buildroot] [git commit] package/pkg-meson: add cmake dependency support Message-ID: <20220327162300.4B18485E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b848117699707390b6507e59e2e705c54acdc9fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Meson dependencies and variables can be provided by cmake similar to how they can be provided by pkgconfig, for this to work we need to ensure that cmake_prefix_path is set for both cross and native targets along with the cmake binary path. See: https://mesonbuild.com/Dependencies.html#cmake https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways https://mesonbuild.com/Machine-files.html#meson-builtin-options Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a..9e70d49b60 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e..1977a83501 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,7 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true From arnout at mind.be Sun Mar 27 16:12:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:42 +0200 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 22.3.0 Message-ID: <20220327162300.D582085E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4722ba7b6eee79c066cca79ec7196ef9c9a9dcda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d9acf49637..802131a772 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz +sha256 e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 intel-mediasdk-22.3.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 698d2348b2..b90d252b4f 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.2 +INTEL_MEDIASDK_VERSION = 22.3.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 16:12:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:17 +0200 Subject: [Buildroot] [git commit] package/protozero: fix build with clang-tidy Message-ID: <20220327162300.6B90C85E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e54b82306d005eeb4ed013a4cbd39e59e5ea8f19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure if clang-tidy is found on host (and protobuf is built before protozero) which is raised since tests are disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: CMake Error at CMakeLists.txt:77 (add_dependencies): The dependency target "writer_tests" of target "clang-tidy" does not exist. Fixes: - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...sts.txt-protobuf-is-only-needed-for-tests.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 0000000000..3033e24aa2 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + From arnout at mind.be Sun Mar 27 16:12:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:31 +0200 Subject: [Buildroot] [git commit] package/frr: bump to version 8.2.2 Message-ID: <20220327162300.A53D185E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f799da6f742ef284e6b342054a59cc81e5f07681 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://frrouting.org/release/8.2.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-configure.ac-fix-enable_bmp-typo.patch | 29 -------------------- .../0002-lib-fix-elf_py-TLS-section-handling.patch | 31 ---------------------- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 4 files changed, 2 insertions(+), 62 deletions(-) diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch deleted file mode 100644 index c8ce500dfc..0000000000 --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 16 Dec 2021 20:10:26 +0100 -Subject: [PATCH] configure.ac: fix enable_bmp typo - -enable_bmp doesn't exist, use enable_bgp_bmp - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FRRouting/frr/pull/10236] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1bcc42ef8..c7a5f1286 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then - fi - - bgpd_bmp=false --case "${enable_bmp}" in -+case "${enable_bgp_bmp}" in - no) - ;; - yes) --- -2.33.0 - diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch deleted file mode 100644 index d491cb1a7d..0000000000 --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Wed, 10 Nov 2021 15:30:07 +0100 -Subject: [PATCH] lib: fix elf_py TLS section handling - -... need to ignore TLS sections, their address is effectively -meaningless but can overlap other sections we actually need to access. - -Signed-off-by: David Lamparter - -[Retrieved from: -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] -Signed-off-by: Fabrice Fontaine ---- - lib/elf_py.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/elf_py.c b/lib/elf_py.c -index 1c306893ad8..f230add6957 100644 ---- a/lib/elf_py.c -+++ b/lib/elf_py.c -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) - Elf_Scn *scn = elf_getscn(ef->elf, i); - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); - -+ /* virtual address is kinda meaningless for TLS sections */ -+ if (shdr->sh_flags & SHF_TLS) -+ continue; - if (addr < shdr->sh_addr || - addr >= shdr->sh_addr + shdr->sh_size) - continue; diff --git a/package/frr/frr.hash b/package/frr/frr.hash index bb6c32b7bb..9bb2b75b8f 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz +sha256 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f frr-8.2.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 0e6ab7a815..aa36387a3a 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.1 +FRR_VERSION = 8.2.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:12:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:12 +0200 Subject: [Buildroot] [git commit] package/network-manager: bump to version 1.36.4 Message-ID: <20220327162300.5886C85E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83ab8cc0bdb3ff376d7c61ceeb0b749f8c142b8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CONTRIBUTING.md hash changed due to various style updates. Set new default wifi backend config option to iwd when enabled in cases where the default wpa_supplicant is not enabled. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index d25f0e8194..26bcf843c2 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992c..3479bb3794 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.34 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.36 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES @@ -53,8 +53,15 @@ endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_CONF_OPTS += --with-iwd +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +endif +else +NETWORK_MANAGER_CONF_OPTS += \ + --without-iwd \ + --with-config-wifi-backend-default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) From arnout at mind.be Sun Mar 27 16:12:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:37 +0200 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.3.0 Message-ID: <20220327162300.BEB7A85E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c75dc73de4b71084ce30f38c6b20068188e13bfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 044b9d7013..57499830b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index f0e9f46f07..3e53bc0a3d 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_VERSION = 22.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sun Mar 27 16:12:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:45 +0200 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4632 Message-ID: <20220327162300.E256185E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b66fdc55fa097d139590d979f24c15b694e8bc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From arnout at mind.be Sun Mar 27 16:12:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:48 +0200 Subject: [Buildroot] [git commit] package/lua-basexx: bump to version 0.4.1 Message-ID: <20220327162300.ED7E985E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b04d8ad4d2acfcea21f83b74f94feace6aa2ef04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lua-basexx/lua-basexx.hash | 4 ++-- package/lua-basexx/lua-basexx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash index aee636c32f..447ec60ba0 100644 --- a/package/lua-basexx/lua-basexx.hash +++ b/package/lua-basexx/lua-basexx.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk index 5aa5ecf218..22b5a3771e 100644 --- a/package/lua-basexx/lua-basexx.mk +++ b/package/lua-basexx/lua-basexx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_BASEXX_VERSION = 0.4.0-1 +LUA_BASEXX_VERSION = 0.4.1-1 LUA_BASEXX_NAME_UPSTREAM = basexx LUA_BASEXX_LICENSE = MIT LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:12:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:34 +0200 Subject: [Buildroot] [git commit] package/btrfs-progs: bump to version 5.16.2 Message-ID: <20220327162300.B341A85E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd651106fc87d2b22565d923217d315fcd537f0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ux-const-h-to-fix-build-with-5-12-headers.patch | 43 ------------------- ...clude-sys-sysinfo-h-conditionally-on-musl.patch | 49 ---------------------- ...add-local-definition-for-alignment-macros.patch | 46 -------------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 5 files changed, 2 insertions(+), 140 deletions(-) diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch deleted file mode 100644 index b6c1a42456..0000000000 --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 30 Dec 2021 15:23:59 +0200 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Signed-off-by: Bruce Ashfield -[remove invalid OE Upstream-status] -Signed-off-by: Stijn Tintel -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6c..2503d1afa 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch deleted file mode 100644 index 7473fe67cb..0000000000 --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 Jan 2022 22:44:44 +0100 -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl - -Make inclusion of sys/sysinfo.h conditional to avoid the following build -failure on musl: - -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from ./kerncompat.h:31, - from common/utils.c:42: -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - 7 | struct sysinfo { - | ^~~~~~~ -In file included from common/utils.c:27: -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - 10 | struct sysinfo { - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc - -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, -while both must not be included at the same time. Stop including -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and -causes the double definition for some reason. As we now include -linux/const.h directly, there's no other effective change. - -Pull-request: #433 -Signed-off-by: Fabrice Fontaine -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] ---- - kerncompat.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 2503d1afa..6ca1526e2 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch deleted file mode 100644 index 86c63edc30..0000000000 --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 6ca1526e2..f0a6e196e 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - { diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 339eab02aa..14eeb1ca07 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 54922df839..9bf50ccfda 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.15.1 +BTRFS_PROGS_VERSION = 5.16.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib From arnout at mind.be Sun Mar 27 16:12:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:51 +0200 Subject: [Buildroot] [git commit] package/luasec: bump to version 1.0.2 Message-ID: <20220327162301.05AA185E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b609e77bfab37ee71d31eeff24640a302946a44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master diff LICENSE: -LuaSec 1.0 license +LuaSec 1.0.2 license Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9b..1e381612bd 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14daf..4ace94d168 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.0.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:12:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:28 +0200 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.4 Message-ID: <20220327162300.965FA85E08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=148e2115c0359ce0e39a75012f36ce985472e57f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index d909709b24..8389adb243 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 4615e839fe..e9c3145183 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.3 +MESON_VERSION = 0.61.4 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:12:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:23 +0200 Subject: [Buildroot] [git commit] package/iwd: fix uclibc build Message-ID: <20220327162300.8165E85E08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f11f6ab6e62cb04e33487390f0f0d66d9ed2d950 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following uclibc build failure raised since bump to version 1.25 in commit 0fc5bc235990073233df6352d1208624034a6b6e and https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=01cd8587606bf2da1af245163150589834126c1: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' Fixes: - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-src-storage.c-fix-build-with-uclibc.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch new file mode 100644 index 0000000000..55fdaa86fd --- /dev/null +++ b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch @@ -0,0 +1,37 @@ +From 99e74ade2ea892e6d0b070bec1df6a135ce2c8b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Mar 2022 16:35:49 +0100 +Subject: [PATCH] src/storage.c: fix build with uclibc + +explicit_bzero is used in src/storage.c since commit +01cd8587606bf2da1af245163150589834126c1c but src/missing.h is not +included, as a result build with uclibc fails on: + +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': +storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' + +Fixes: + - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/WB2XXRBUDHC5IVFDEOJBK23JHPURL427] +--- + src/storage.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/storage.c b/src/storage.c +index 82a72443..aa8066b1 100644 +--- a/src/storage.c ++++ b/src/storage.c +@@ -44,6 +44,7 @@ + #include + #include "ell/useful.h" + ++#include "src/missing.h" + #include "src/common.h" + #include "src/storage.h" + #include "src/crypto.h" +-- +2.35.1 + From arnout at mind.be Sun Mar 27 16:12:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:40 +0200 Subject: [Buildroot] [git commit] package/intel-gmmlib: bump version to 22.1.2 Message-ID: <20220327162300.C94D085E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3dd0940081d5da5b5588fe3b4e9b5d20e4a4719e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-gmmlib/0001-Drop-hardening-related-flags.patch | 2 +- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch index 581afd9066..c429df6581 100644 --- a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch +++ b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch @@ -15,7 +15,7 @@ diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake index 1a09bc4..b28fc1b 100644 --- a/Source/GmmLib/Linux.cmake +++ b/Source/GmmLib/Linux.cmake -@@ -62,7 +62,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON +@@ -99,7 +99,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON -DUSE_SSE3 -DUSE_SSSE3 # Other common flags diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index beb3cfd6ae..5e48238448 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz +sha256 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334 intel-gmmlib-22.1.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 06628132a2..25cc733e0c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.3 +INTEL_GMMLIB_VERSION = 22.1.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From james.hilliard1 at gmail.com Sun Mar 27 17:12:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:12:31 -0600 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 In-Reply-To: <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> References: <20220324063928.3448755-1-james.hilliard1@gmail.com> <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> Message-ID: On Sun, Mar 27, 2022 at 10:27 AM Arnout Vandecappelle wrote: > > > > On 24/03/2022 07:39, James Hilliard wrote: > > CONTRIBUTING.md hash changed due to various style updates. > > > > Set new default wifi backend config option to iwd when enabled in > > cases where the default wpa_supplicant is not enabled. > > Applied to master, thanks. > > However, I would like to challenge the order of preference here. If you select > network-manager, iwd and wpa_supplicant, and network-manager uses > wpa_supplicant, then you end up not using iwd at all, so that was probably not > the intention of the user. However, there is a good reason to still have > wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant > is also used for 802.1X authentication over Ethernet. This just sets a somewhat sane default, which can be overridden by the config files as with previous versions by setting the network manager config setting: [device] wifi.backend=iwd Note that upstream considers the iwd wifi backend somewhat experimental and defaults to wpa_supplicant even when iwd backend support is enabled. > > Either way, it's pretty hard to guess the intention of the user. So maybe a > Config.in choice is appropriate? I figured overrides can be just done via overlay for this with a config file. > > > > > Signed-off-by: James Hilliard > > --- > > package/network-manager/network-manager.hash | 6 +++--- > > package/network-manager/network-manager.mk | 13 ++++++++++--- > > 2 files changed, 13 insertions(+), 6 deletions(-) > > > > diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash > > index d25f0e8194..26bcf843c2 100644 > > --- a/package/network-manager/network-manager.hash > > +++ b/package/network-manager/network-manager.hash > > @@ -1,6 +1,6 @@ > > -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum > > -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz > > +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum > > +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz > > # Locally computed > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL > > -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md > > +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index a90228992c..3479bb3794 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -4,8 +4,8 @@ > > # > > ################################################################################ > > > > -NETWORK_MANAGER_VERSION_MAJOR = 1.34 > > -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 > > +NETWORK_MANAGER_VERSION_MAJOR = 1.36 > > +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > NETWORK_MANAGER_INSTALL_STAGING = YES > > @@ -53,8 +53,15 @@ endif > > ifeq ($(BR2_PACKAGE_IWD),y) > > NETWORK_MANAGER_DEPENDENCIES += iwd > > NETWORK_MANAGER_CONF_OPTS += --with-iwd > > +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) > > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd > > +endif > > +else > > +NETWORK_MANAGER_CONF_OPTS += \ > > + --without-iwd \ > > + --with-config-wifi-backend-default=wpa_supplicant > > This is set regardless of whether wpa_supplicant is enabled or not. Are you > sure that's OK? > > Regards, > Arnout > > > endif > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) From james.hilliard1 at gmail.com Sun Mar 27 17:31:37 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:31:37 -0600 Subject: [Buildroot] [PATCH v3 1/1] package/network-manager: migrate autotools build system to meson Message-ID: <20220327173137.2575467-1-james.hilliard1@gmail.com> We need to add dbus as a build dependency since the meson build system uses dbus pkg-config to determine install locations. The meson build also requires mobile-broadband-info in order to get the database pkg-config variable. Signed-off-by: James Hilliard --- Changes v2 -> v3: - rebase on version 1.36.4 update Changes v1 -> v2: - add comments on new dependencies --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 106 ++++++++++----------- 2 files changed, 51 insertions(+), 56 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..da1a7d79b3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 3479bb3794..19f2eb3b59 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,136 +17,130 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) -NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=iwd endif else NETWORK_MANAGER_CONF_OPTS += \ - --without-iwd \ - --with-config-wifi-backend-default=wpa_supplicant + -Diwd=false \ + -Dconfig_wifi_backend_default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -159,4 +153,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 27 17:37:48 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:37:48 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> References: <20220325212405.25243-1-james.hilliard1@gmail.com> <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> Message-ID: On Sun, Mar 27, 2022 at 10:23 AM Arnout Vandecappelle wrote: > > > > On 25/03/2022 22:24, James Hilliard wrote: > > Signed-off-by: James Hilliard > > Applied to master, thanks. > > Although honestly, there's not much point updating a host-only package unless > it actually fixes an issue. There are usually minor fixes in each release with meson. Mostly I like to keep this updated since doing so helps catch upstream regressions. > > Regards, > Arnout > > > --- > > package/meson/meson.hash | 4 ++-- > > package/meson/meson.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > > index d909709b24..8389adb243 100644 > > --- a/package/meson/meson.hash > > +++ b/package/meson/meson.hash > > @@ -1,4 +1,4 @@ > > # Locally calculated after checking pgp signature > > -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc > > -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz > > +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc > > +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz > > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > > index 4615e839fe..e9c3145183 100644 > > --- a/package/meson/meson.mk > > +++ b/package/meson/meson.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -MESON_VERSION = 0.61.3 > > +MESON_VERSION = 0.61.4 > > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > > MESON_LICENSE = Apache-2.0 > > MESON_LICENSE_FILES = COPYING From james.hilliard1 at gmail.com Sun Mar 27 17:41:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:41:30 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.62.0 Message-ID: <20220327174130.2577520-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 8389adb243..38fa43f6dc 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc -sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz.asc +sha256 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb meson-0.62.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e9c3145183..13adc2f2b1 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.4 +MESON_VERSION = 0.62.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 27 18:01:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 12:01:25 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220327054814.942198-1-Jason@zx2c4.com> References: <20220327054814.942198-1-Jason@zx2c4.com> Message-ID: On Sat, Mar 26, 2022 at 11:48 PM Jason A. Donenfeld wrote: > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. > > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/Config.in | 4 - > package/urandom-scripts/S20urandom | 55 +-- > package/urandom-scripts/seedrng.c | 445 +++++++++++++++++++++ > package/urandom-scripts/urandom-scripts.mk | 10 + > 4 files changed, 464 insertions(+), 50 deletions(-) > create mode 100644 package/urandom-scripts/seedrng.c > > diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in > index 987e442e22..070ffa5e9a 100644 > --- a/package/urandom-scripts/Config.in > +++ b/package/urandom-scripts/Config.in > @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS > depends on !BR2_PACKAGE_SYSTEMD > help > Initscript to preserve the random seed between reboots. > - > - WARNING: this is a poor fit to try and get high-quality > - entropy at boot. There are better ways, like haveged, or > - rng-tools. > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index c6b2ebd48f..f248089a0f 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -6,63 +6,26 @@ > # Quietly do nothing if /dev/urandom does not exist > [ -c /dev/urandom ] || exit 0 > > -URANDOM_SEED="/var/lib/random-seed" > +# Set this to true only if you do not want seed files to actually credit the > +# RNG, for example if you plan to replicate this file system image and do not > +# have the wherewithal to first delete the contents of /var/lib/seedrng. > +#export SEEDRNG_SKIP_CREDIT=false > +# You can also place this line into /etc/default/urandom. > > # shellcheck source=/dev/null > [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" > > -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then > - pool_size=$((pool_bits/8)) > -else > - pool_size=512 > -fi > - > -init_rng() { > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > -} > - > -save_random_seed() { > - printf 'Saving random seed: ' > - status=1 > - if touch "$URANDOM_SEED.new" 2> /dev/null; then > - old_umask=$(umask) > - umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > - | sha256sum \ > - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > - rm -f "$URANDOM_SEED.tmp" > - umask "$old_umask" > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - > - else > - echo "SKIP (read-only file system detected)" > - fi > - return "$status" > -} > - > case "$1" in > start|restart|reload) > # Carry a random seed from start-up to start-up > # Load and then save the whole entropy pool > - init_rng && save_random_seed;; > + # Never fail, as this isn't worth making a fuss > + # over if it doesn't go as planned. > + seedrng || true;; > stop) > # Carry a random seed from shut-down to start-up > # Save the whole entropy pool > - save_random_seed;; > + seedrng;; > *) > echo "Usage: $0 {start|stop|restart|reload}" > exit 1 > diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c > new file mode 100644 > index 0000000000..a77365d406 > --- /dev/null > +++ b/package/urandom-scripts/seedrng.c > @@ -0,0 +1,445 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) > +/* > + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. > + * > + * This is based on code from . > + */ > + > +#define _GNU_SOURCE > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#ifndef GRND_INSECURE > +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ > +#endif > + > +#ifndef LOCALSTATEDIR > +#define LOCALSTATEDIR "/var/lib" > +#endif > +#ifndef RUNSTATEDIR > +#define RUNSTATEDIR "/var/run" > +#endif Might be a good idea to have runtime env overrides for these to allow easier path customization by only having to override the init script in a rootfs overlay: https://buildroot.org/downloads/manual/manual.html#rootfs-custom Maybe something similar to the SEEDRNG_SKIP_CREDIT env override would make sense for these paths. > + > +#define SEED_DIR LOCALSTATEDIR "/seedrng" > +#define CREDITABLE_SEED SEED_DIR "/seed.credit" > +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" > +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" > + > +enum blake2s_lengths { > + BLAKE2S_BLOCK_LEN = 64, > + BLAKE2S_HASH_LEN = 32, > + BLAKE2S_KEY_LEN = 32 > +}; > + > +enum seedrng_lengths { > + MAX_SEED_LEN = 512, > + MIN_SEED_LEN = BLAKE2S_HASH_LEN > +}; > + > +struct blake2s_state { > + uint32_t h[8]; > + uint32_t t[2]; > + uint32_t f[2]; > + uint8_t buf[BLAKE2S_BLOCK_LEN]; > + unsigned int buflen; > + unsigned int outlen; > +}; > + > +#define le32_to_cpup(a) le32toh(*(a)) > +#define cpu_to_le32(a) htole32(a) > +#ifndef ARRAY_SIZE > +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > +#endif > +#ifndef DIV_ROUND_UP > +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > +#endif > + > +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = cpu_to_le32(*buf); > + ++buf; > + } > +} > + > +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = le32_to_cpup(buf); > + ++buf; > + } > +} > + > +static inline uint32_t ror32(uint32_t word, unsigned int shift) > +{ > + return (word >> (shift & 31)) | (word << ((-shift) & 31)); > +} > + > +static const uint32_t blake2s_iv[8] = { > + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, > + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL > +}; > + > +static const uint8_t blake2s_sigma[10][16] = { > + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, > + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, > + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, > + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, > + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, > + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, > + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, > + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, > + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, > + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, > +}; > + > +static void blake2s_set_lastblock(struct blake2s_state *state) > +{ > + state->f[0] = -1; > +} > + > +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) > +{ > + state->t[0] += inc; > + state->t[1] += (state->t[0] < inc); > +} > + > +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) > +{ > + int i; > + > + memset(state, 0, sizeof(*state)); > + for (i = 0; i < 8; ++i) > + state->h[i] = blake2s_iv[i]; > + state->h[0] ^= param; > +} > + > +static void blake2s_init(struct blake2s_state *state, const size_t outlen) > +{ > + blake2s_init_param(state, 0x01010000 | outlen); > + state->outlen = outlen; > +} > + > +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) > +{ > + uint32_t m[16]; > + uint32_t v[16]; > + int i; > + > + while (nblocks > 0) { > + blake2s_increment_counter(state, inc); > + memcpy(m, block, BLAKE2S_BLOCK_LEN); > + le32_to_cpu_array(m, ARRAY_SIZE(m)); > + memcpy(v, state->h, 32); > + v[ 8] = blake2s_iv[0]; > + v[ 9] = blake2s_iv[1]; > + v[10] = blake2s_iv[2]; > + v[11] = blake2s_iv[3]; > + v[12] = blake2s_iv[4] ^ state->t[0]; > + v[13] = blake2s_iv[5] ^ state->t[1]; > + v[14] = blake2s_iv[6] ^ state->f[0]; > + v[15] = blake2s_iv[7] ^ state->f[1]; > + > +#define G(r, i, a, b, c, d) do { \ > + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > + d = ror32(d ^ a, 16); \ > + c += d; \ > + b = ror32(b ^ c, 12); \ > + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > + d = ror32(d ^ a, 8); \ > + c += d; \ > + b = ror32(b ^ c, 7); \ > +} while (0) > + > +#define ROUND(r) do { \ > + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > +} while (0) > + ROUND(0); > + ROUND(1); > + ROUND(2); > + ROUND(3); > + ROUND(4); > + ROUND(5); > + ROUND(6); > + ROUND(7); > + ROUND(8); > + ROUND(9); > + > +#undef G > +#undef ROUND > + > + for (i = 0; i < 8; ++i) > + state->h[i] ^= v[i] ^ v[i + 8]; > + > + block += BLAKE2S_BLOCK_LEN; > + --nblocks; > + } > +} > + > +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) > +{ > + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; > + const uint8_t *in = inp; > + > + if (!inlen) > + return; > + if (inlen > fill) { > + memcpy(state->buf + state->buflen, in, fill); > + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); > + state->buflen = 0; > + in += fill; > + inlen -= fill; > + } > + if (inlen > BLAKE2S_BLOCK_LEN) { > + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); > + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); > + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); > + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); > + } > + memcpy(state->buf + state->buflen, in, inlen); > + state->buflen += inlen; > +} > + > +static void blake2s_final(struct blake2s_state *state, uint8_t *out) > +{ > + blake2s_set_lastblock(state); > + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); > + blake2s_compress(state, state->buf, 1, state->buflen); > + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); > + memcpy(out, state->h, state->outlen); > +} > + > +static size_t determine_optimal_seed_len(void) > +{ > + size_t ret = 0; > + char poolsize_str[11] = { 0 }; > + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); > + > + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { > + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); > + ret = MIN_SEED_LEN; > + } else > + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); > + if (fd >= 0) > + close(fd); > + if (ret < MIN_SEED_LEN) > + ret = MIN_SEED_LEN; > + else if (ret > MAX_SEED_LEN) > + ret = MAX_SEED_LEN; > + return ret; > +} > + > +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) > +{ > + ssize_t ret; > + int urandom_fd; > + > + *is_creditable = false; > + ret = getrandom(seed, len, GRND_NONBLOCK); > + if (ret == (ssize_t)len) { > + *is_creditable = true; > + return 0; > + } else if (ret < 0 && errno == ENOSYS) { > + struct pollfd random_fd = { > + .fd = open("/dev/random", O_RDONLY), > + .events = POLLIN > + }; > + if (random_fd.fd < 0) > + return -errno; > + *is_creditable = poll(&random_fd, 1, 0) == 1; > + close(random_fd.fd); > + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) > + return 0; > + urandom_fd = open("/dev/urandom", O_RDONLY); > + if (urandom_fd < 0) > + return -errno; > + ret = read(urandom_fd, seed, len); > + if (ret == (ssize_t)len) > + ret = 0; > + else > + ret = -errno ? -errno : -EIO; > + close(urandom_fd); > + return ret; > +} > + > +static int seed_rng(uint8_t *seed, size_t len, bool credit) > +{ > + struct { > + int entropy_count; > + int buf_size; > + uint8_t buffer[MAX_SEED_LEN]; > + } req = { > + .entropy_count = credit ? len * 8 : 0, > + .buf_size = len > + }; > + int random_fd, ret; > + > + if (len > sizeof(req.buffer)) > + return -EFBIG; > + memcpy(req.buffer, seed, len); > + > + random_fd = open("/dev/random", O_RDWR); > + if (random_fd < 0) > + return -errno; > + ret = ioctl(random_fd, RNDADDENTROPY, &req); > + if (ret) > + ret = -errno ? -errno : -EIO; > + close(random_fd); > + return ret; > +} > + > +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) > +{ > + uint8_t seed[MAX_SEED_LEN]; > + ssize_t seed_len; > + int fd, dfd, ret = 0; > + > + fd = open(filename, O_RDONLY); > + if (fd < 0 && errno == ENOENT) > + return 0; > + else if (fd < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); > + return ret; > + } > + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); > + if (dfd < 0) { > + ret = -errno; > + close(fd); > + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); > + return ret; > + } > + seed_len = read(fd, seed, sizeof(seed)); > + if (seed_len < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); > + } > + close(fd); > + if (ret) { > + close(dfd); > + return ret; > + } > + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); > + } > + close(dfd); > + if (ret) > + return ret; > + if (!seed_len) > + return 0; > + > + blake2s_update(hash, &seed_len, sizeof(seed_len)); > + blake2s_update(hash, seed, seed_len); > + > + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); > + ret = seed_rng(seed, seed_len, credit); > + if (ret < 0) > + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); > + return ret; > +} > + > +static bool skip_credit(void) > +{ > + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); > + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || > + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); > +} > + > +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) > +{ > + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; > + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; > + int ret, fd, lock, program_ret = 0; > + uint8_t new_seed[MAX_SEED_LEN]; > + size_t new_seed_len; > + bool new_seed_creditable; > + struct timespec realtime = { 0 }, boottime = { 0 }; > + struct blake2s_state hash; > + > + umask(0077); > + if (getuid()) { > + fprintf(stderr, "ERROR: This program requires root\n"); > + return 1; > + } > + > + blake2s_init(&hash, BLAKE2S_HASH_LEN); > + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); > + clock_gettime(CLOCK_REALTIME, &realtime); > + clock_gettime(CLOCK_BOOTTIME, &boottime); > + blake2s_update(&hash, &realtime, sizeof(realtime)); > + blake2s_update(&hash, &boottime, sizeof(boottime)); > + > + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { > + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); > + return 1; > + } > + > + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); > + if (lock < 0 || flock(lock, LOCK_EX) < 0) { > + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); > + return 1; > + } > + > + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); > + if (ret < 0) > + program_ret |= 1 << 1; > + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); > + if (ret < 0) > + program_ret |= 1 << 2; > + > + new_seed_len = determine_optimal_seed_len(); > + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); > + if (ret < 0) { > + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); > + new_seed_len = BLAKE2S_HASH_LEN; > + strncpy((char *)new_seed, seedrng_failure, new_seed_len); > + program_ret |= 1 << 3; > + } > + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); > + blake2s_update(&hash, new_seed, new_seed_len); > + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); > + > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > + if (fd < 0) { > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > + program_ret |= 1 << 4; > + goto out; > + } > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > + program_ret |= 1 << 5; > + goto out; > + } > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > + program_ret |= 1 << 6; > + } > +out: > + close(fd); > + close(lock); > + return program_ret; > +} > diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk > index 2c09728c46..a5cbb95feb 100644 > --- a/package/urandom-scripts/urandom-scripts.mk > +++ b/package/urandom-scripts/urandom-scripts.mk > @@ -4,7 +4,17 @@ > # > ################################################################################ > > +define URANDOM_SCRIPTS_EXTRACT_CMDS > + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) > +endef > + > +define URANDOM_SCRIPTS_BUILD_CMDS > + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ > + $(@D)/seedrng.c -o $(@D)/seedrng > +endef > + > define URANDOM_SCRIPTS_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng > $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ > $(TARGET_DIR)/etc/init.d/S20urandom > endef > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Mar 27 19:26:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 21:26:13 +0200 Subject: [Buildroot] [PATCH 1/1] package/jack1: bump to version 0.126 Message-ID: <20220327192613.1239929-1-fontaine.fabrice@gmail.com> - Switch site to get latest release - libsndfile and readline are not a dependency since removal of example-clients and tools with https://github.com/jackaudio/jack1/commit/ca3af4b0d8a8a8fd6c4ae72c24e4df6e18f83af9 - Update indentation in hash file (two spaces) https://jackaudio.org/news/2022/01/15/jack1-v01260-and-jack2-v1920-releases.html Signed-off-by: Fabrice Fontaine --- package/jack1/jack1.hash | 8 ++++---- package/jack1/jack1.mk | 14 +++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash index d7787ac2ad..d82b9daffd 100644 --- a/package/jack1/jack1.hash +++ b/package/jack1/jack1.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 6dca56001f..4e16d7e96e 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -4,9 +4,9 @@ # ################################################################################ -JACK1_VERSION = 0.125.0 -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz -JACK1_SITE = http://jackaudio.org/downloads +JACK1_VERSION = 0.126.0 +JACK1_SITE = \ + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES @@ -17,14 +17,6 @@ ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -JACK1_DEPENDENCIES += libsndfile -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK1_DEPENDENCIES += readline -endif - JACK1_CONF_OPTS = --without-html-dir --disable-oss $(eval $(autotools-package)) -- 2.35.1 From arnout at mind.be Sun Mar 27 19:32:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 21:32:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: References: <20220325212405.25243-1-james.hilliard1@gmail.com> <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> Message-ID: <8a31bb3a-8530-ad05-08df-4589a01cb7ae@mind.be> On 27/03/2022 19:37, James Hilliard wrote: > On Sun, Mar 27, 2022 at 10:23 AM Arnout Vandecappelle wrote: >> >> >> >> On 25/03/2022 22:24, James Hilliard wrote: >>> Signed-off-by: James Hilliard >> >> Applied to master, thanks. >> >> Although honestly, there's not much point updating a host-only package unless >> it actually fixes an issue. > > There are usually minor fixes in each release with meson. > > Mostly I like to keep this updated since doing so helps catch upstream > regressions. But the updates are coming somewhat ridiculously fast... We're almost tracking master :-) Regards, Arnout > >> >> Regards, >> Arnout >> >>> --- >>> package/meson/meson.hash | 4 ++-- >>> package/meson/meson.mk | 2 +- >>> 2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/package/meson/meson.hash b/package/meson/meson.hash >>> index d909709b24..8389adb243 100644 >>> --- a/package/meson/meson.hash >>> +++ b/package/meson/meson.hash >>> @@ -1,4 +1,4 @@ >>> # Locally calculated after checking pgp signature >>> -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc >>> -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz >>> +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc >>> +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz >>> sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING >>> diff --git a/package/meson/meson.mk b/package/meson/meson.mk >>> index 4615e839fe..e9c3145183 100644 >>> --- a/package/meson/meson.mk >>> +++ b/package/meson/meson.mk >>> @@ -4,7 +4,7 @@ >>> # >>> ################################################################################ >>> >>> -MESON_VERSION = 0.61.3 >>> +MESON_VERSION = 0.61.4 >>> MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) >>> MESON_LICENSE = Apache-2.0 >>> MESON_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 19:32:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 21:32:54 +0200 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 In-Reply-To: References: <20220324063928.3448755-1-james.hilliard1@gmail.com> <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> Message-ID: <93bae11b-fdd9-dd11-ad47-2a6f09362d3c@mind.be> On 27/03/2022 19:12, James Hilliard wrote: > On Sun, Mar 27, 2022 at 10:27 AM Arnout Vandecappelle wrote: >> >> >> >> On 24/03/2022 07:39, James Hilliard wrote: >>> CONTRIBUTING.md hash changed due to various style updates. >>> >>> Set new default wifi backend config option to iwd when enabled in >>> cases where the default wpa_supplicant is not enabled. >> >> Applied to master, thanks. >> >> However, I would like to challenge the order of preference here. If you select >> network-manager, iwd and wpa_supplicant, and network-manager uses >> wpa_supplicant, then you end up not using iwd at all, so that was probably not >> the intention of the user. However, there is a good reason to still have >> wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant >> is also used for 802.1X authentication over Ethernet. > > This just sets a somewhat sane default, which can be overridden by the config > files as with previous versions by setting the network manager config setting: > [device] > wifi.backend=iwd > > Note that upstream considers the iwd wifi backend somewhat experimental and > defaults to wpa_supplicant even when iwd backend support is enabled. Good reasons. > >> >> Either way, it's pretty hard to guess the intention of the user. So maybe a >> Config.in choice is appropriate? > > I figured overrides can be just done via overlay for this with a config file. Yes, I agree, better like that than adding an explicit Config.in option which anyway only sets a default. Thanks for the explanation! Regards, Arnout > >> >>> >>> Signed-off-by: James Hilliard >>> --- >>> package/network-manager/network-manager.hash | 6 +++--- >>> package/network-manager/network-manager.mk | 13 ++++++++++--- >>> 2 files changed, 13 insertions(+), 6 deletions(-) >>> >>> diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash >>> index d25f0e8194..26bcf843c2 100644 >>> --- a/package/network-manager/network-manager.hash >>> +++ b/package/network-manager/network-manager.hash >>> @@ -1,6 +1,6 @@ >>> -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum >>> -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz >>> +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum >>> +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz >>> # Locally computed >>> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING >>> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL >>> -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md >>> +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md >>> diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk >>> index a90228992c..3479bb3794 100644 >>> --- a/package/network-manager/network-manager.mk >>> +++ b/package/network-manager/network-manager.mk >>> @@ -4,8 +4,8 @@ >>> # >>> ################################################################################ >>> >>> -NETWORK_MANAGER_VERSION_MAJOR = 1.34 >>> -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 >>> +NETWORK_MANAGER_VERSION_MAJOR = 1.36 >>> +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 >>> NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz >>> NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) >>> NETWORK_MANAGER_INSTALL_STAGING = YES >>> @@ -53,8 +53,15 @@ endif >>> ifeq ($(BR2_PACKAGE_IWD),y) >>> NETWORK_MANAGER_DEPENDENCIES += iwd >>> NETWORK_MANAGER_CONF_OPTS += --with-iwd >>> +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) >>> +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant >>> else >>> -NETWORK_MANAGER_CONF_OPTS += --without-iwd >>> +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd >>> +endif >>> +else >>> +NETWORK_MANAGER_CONF_OPTS += \ >>> + --without-iwd \ >>> + --with-config-wifi-backend-default=wpa_supplicant >> >> This is set regardless of whether wpa_supplicant is enabled or not. Are you >> sure that's OK? >> >> Regards, >> Arnout >> >>> endif >>> >>> ifeq ($(BR2_PACKAGE_LIBCURL),y) From arnout at mind.be Sun Mar 27 19:36:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 21:36:41 +0200 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> Message-ID: <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> On 27/03/2022 20:01, James Hilliard wrote: > On Sat, Mar 26, 2022 at 11:48 PM Jason A. Donenfeld wrote: >> >> The RNG can't actually be seeded from a shell script, due to the >> reliance on ioctls. For this reason, the seedrng project provides a >> basic script meant to be copy and pasted into projects like buildroot >> and tweaked as needed: . >> >> This commit imports it into buildroot and wires up the init scripts to >> call it. This also is a significant improvement over the current init >> script, which doesn't credit entropy and whose hashing in shell scripts >> is sort of fragile. >> >> As seedrng.c is a short tiny C program, we include this here in the >> package, like a few other packages do. Later we'll investigate adding >> this to busybox, but for now, this is a good start and a positive step >> in the right direction. >> >> Signed-off-by: Jason A. Donenfeld [snip] >> +#ifndef GRND_INSECURE >> +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ >> +#endif >> + >> +#ifndef LOCALSTATEDIR >> +#define LOCALSTATEDIR "/var/lib" >> +#endif >> +#ifndef RUNSTATEDIR >> +#define RUNSTATEDIR "/var/run" >> +#endif > > Might be a good idea to have runtime env overrides for these to allow easier > path customization by only having to override the init script in a > rootfs overlay: > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > Maybe something similar to the SEEDRNG_SKIP_CREDIT env override would > make sense for these paths. I don't know if that makes sense. Dozens of buildroot packages hardocde these paths already. Regards, Arnout > >> + >> +#define SEED_DIR LOCALSTATEDIR "/seedrng" >> +#define CREDITABLE_SEED SEED_DIR "/seed.credit" >> +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" >> +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" >> + >> +enum blake2s_lengths { >> + BLAKE2S_BLOCK_LEN = 64, >> + BLAKE2S_HASH_LEN = 32, >> + BLAKE2S_KEY_LEN = 32 >> +}; >> + >> +enum seedrng_lengths { >> + MAX_SEED_LEN = 512, >> + MIN_SEED_LEN = BLAKE2S_HASH_LEN >> +}; >> + >> +struct blake2s_state { >> + uint32_t h[8]; >> + uint32_t t[2]; >> + uint32_t f[2]; >> + uint8_t buf[BLAKE2S_BLOCK_LEN]; >> + unsigned int buflen; >> + unsigned int outlen; >> +}; >> + >> +#define le32_to_cpup(a) le32toh(*(a)) >> +#define cpu_to_le32(a) htole32(a) >> +#ifndef ARRAY_SIZE >> +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) >> +#endif >> +#ifndef DIV_ROUND_UP >> +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) >> +#endif >> + >> +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) >> +{ >> + while (words--) { >> + *buf = cpu_to_le32(*buf); >> + ++buf; >> + } >> +} >> + >> +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) >> +{ >> + while (words--) { >> + *buf = le32_to_cpup(buf); >> + ++buf; >> + } >> +} >> + >> +static inline uint32_t ror32(uint32_t word, unsigned int shift) >> +{ >> + return (word >> (shift & 31)) | (word << ((-shift) & 31)); >> +} >> + >> +static const uint32_t blake2s_iv[8] = { >> + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, >> + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL >> +}; >> + >> +static const uint8_t blake2s_sigma[10][16] = { >> + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, >> + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, >> + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, >> + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, >> + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, >> + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, >> + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, >> + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, >> + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, >> + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, >> +}; >> + >> +static void blake2s_set_lastblock(struct blake2s_state *state) >> +{ >> + state->f[0] = -1; >> +} >> + >> +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) >> +{ >> + state->t[0] += inc; >> + state->t[1] += (state->t[0] < inc); >> +} >> + >> +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) >> +{ >> + int i; >> + >> + memset(state, 0, sizeof(*state)); >> + for (i = 0; i < 8; ++i) >> + state->h[i] = blake2s_iv[i]; >> + state->h[0] ^= param; >> +} >> + >> +static void blake2s_init(struct blake2s_state *state, const size_t outlen) >> +{ >> + blake2s_init_param(state, 0x01010000 | outlen); >> + state->outlen = outlen; >> +} >> + >> +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) >> +{ >> + uint32_t m[16]; >> + uint32_t v[16]; >> + int i; >> + >> + while (nblocks > 0) { >> + blake2s_increment_counter(state, inc); >> + memcpy(m, block, BLAKE2S_BLOCK_LEN); >> + le32_to_cpu_array(m, ARRAY_SIZE(m)); >> + memcpy(v, state->h, 32); >> + v[ 8] = blake2s_iv[0]; >> + v[ 9] = blake2s_iv[1]; >> + v[10] = blake2s_iv[2]; >> + v[11] = blake2s_iv[3]; >> + v[12] = blake2s_iv[4] ^ state->t[0]; >> + v[13] = blake2s_iv[5] ^ state->t[1]; >> + v[14] = blake2s_iv[6] ^ state->f[0]; >> + v[15] = blake2s_iv[7] ^ state->f[1]; >> + >> +#define G(r, i, a, b, c, d) do { \ >> + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ >> + d = ror32(d ^ a, 16); \ >> + c += d; \ >> + b = ror32(b ^ c, 12); \ >> + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ >> + d = ror32(d ^ a, 8); \ >> + c += d; \ >> + b = ror32(b ^ c, 7); \ >> +} while (0) >> + >> +#define ROUND(r) do { \ >> + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ >> + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ >> + G(r, 2, v[2], v[ 6], v[10], v[14]); \ >> + G(r, 3, v[3], v[ 7], v[11], v[15]); \ >> + G(r, 4, v[0], v[ 5], v[10], v[15]); \ >> + G(r, 5, v[1], v[ 6], v[11], v[12]); \ >> + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ >> + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ >> +} while (0) >> + ROUND(0); >> + ROUND(1); >> + ROUND(2); >> + ROUND(3); >> + ROUND(4); >> + ROUND(5); >> + ROUND(6); >> + ROUND(7); >> + ROUND(8); >> + ROUND(9); >> + >> +#undef G >> +#undef ROUND >> + >> + for (i = 0; i < 8; ++i) >> + state->h[i] ^= v[i] ^ v[i + 8]; >> + >> + block += BLAKE2S_BLOCK_LEN; >> + --nblocks; >> + } >> +} >> + >> +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) >> +{ >> + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; >> + const uint8_t *in = inp; >> + >> + if (!inlen) >> + return; >> + if (inlen > fill) { >> + memcpy(state->buf + state->buflen, in, fill); >> + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); >> + state->buflen = 0; >> + in += fill; >> + inlen -= fill; >> + } >> + if (inlen > BLAKE2S_BLOCK_LEN) { >> + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); >> + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); >> + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); >> + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); >> + } >> + memcpy(state->buf + state->buflen, in, inlen); >> + state->buflen += inlen; >> +} >> + >> +static void blake2s_final(struct blake2s_state *state, uint8_t *out) >> +{ >> + blake2s_set_lastblock(state); >> + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); >> + blake2s_compress(state, state->buf, 1, state->buflen); >> + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); >> + memcpy(out, state->h, state->outlen); >> +} >> + >> +static size_t determine_optimal_seed_len(void) >> +{ >> + size_t ret = 0; >> + char poolsize_str[11] = { 0 }; >> + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); >> + >> + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { >> + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); >> + ret = MIN_SEED_LEN; >> + } else >> + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); >> + if (fd >= 0) >> + close(fd); >> + if (ret < MIN_SEED_LEN) >> + ret = MIN_SEED_LEN; >> + else if (ret > MAX_SEED_LEN) >> + ret = MAX_SEED_LEN; >> + return ret; >> +} >> + >> +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) >> +{ >> + ssize_t ret; >> + int urandom_fd; >> + >> + *is_creditable = false; >> + ret = getrandom(seed, len, GRND_NONBLOCK); >> + if (ret == (ssize_t)len) { >> + *is_creditable = true; >> + return 0; >> + } else if (ret < 0 && errno == ENOSYS) { >> + struct pollfd random_fd = { >> + .fd = open("/dev/random", O_RDONLY), >> + .events = POLLIN >> + }; >> + if (random_fd.fd < 0) >> + return -errno; >> + *is_creditable = poll(&random_fd, 1, 0) == 1; >> + close(random_fd.fd); >> + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) >> + return 0; >> + urandom_fd = open("/dev/urandom", O_RDONLY); >> + if (urandom_fd < 0) >> + return -errno; >> + ret = read(urandom_fd, seed, len); >> + if (ret == (ssize_t)len) >> + ret = 0; >> + else >> + ret = -errno ? -errno : -EIO; >> + close(urandom_fd); >> + return ret; >> +} >> + >> +static int seed_rng(uint8_t *seed, size_t len, bool credit) >> +{ >> + struct { >> + int entropy_count; >> + int buf_size; >> + uint8_t buffer[MAX_SEED_LEN]; >> + } req = { >> + .entropy_count = credit ? len * 8 : 0, >> + .buf_size = len >> + }; >> + int random_fd, ret; >> + >> + if (len > sizeof(req.buffer)) >> + return -EFBIG; >> + memcpy(req.buffer, seed, len); >> + >> + random_fd = open("/dev/random", O_RDWR); >> + if (random_fd < 0) >> + return -errno; >> + ret = ioctl(random_fd, RNDADDENTROPY, &req); >> + if (ret) >> + ret = -errno ? -errno : -EIO; >> + close(random_fd); >> + return ret; >> +} >> + >> +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) >> +{ >> + uint8_t seed[MAX_SEED_LEN]; >> + ssize_t seed_len; >> + int fd, dfd, ret = 0; >> + >> + fd = open(filename, O_RDONLY); >> + if (fd < 0 && errno == ENOENT) >> + return 0; >> + else if (fd < 0) { >> + ret = -errno; >> + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); >> + return ret; >> + } >> + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); >> + if (dfd < 0) { >> + ret = -errno; >> + close(fd); >> + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); >> + return ret; >> + } >> + seed_len = read(fd, seed, sizeof(seed)); >> + if (seed_len < 0) { >> + ret = -errno; >> + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); >> + } >> + close(fd); >> + if (ret) { >> + close(dfd); >> + return ret; >> + } >> + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { >> + ret = -errno; >> + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); >> + } >> + close(dfd); >> + if (ret) >> + return ret; >> + if (!seed_len) >> + return 0; >> + >> + blake2s_update(hash, &seed_len, sizeof(seed_len)); >> + blake2s_update(hash, seed, seed_len); >> + >> + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); >> + ret = seed_rng(seed, seed_len, credit); >> + if (ret < 0) >> + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); >> + return ret; >> +} >> + >> +static bool skip_credit(void) >> +{ >> + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); >> + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || >> + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); >> +} >> + >> +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) >> +{ >> + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; >> + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; >> + int ret, fd, lock, program_ret = 0; >> + uint8_t new_seed[MAX_SEED_LEN]; >> + size_t new_seed_len; >> + bool new_seed_creditable; >> + struct timespec realtime = { 0 }, boottime = { 0 }; >> + struct blake2s_state hash; >> + >> + umask(0077); >> + if (getuid()) { >> + fprintf(stderr, "ERROR: This program requires root\n"); >> + return 1; >> + } >> + >> + blake2s_init(&hash, BLAKE2S_HASH_LEN); >> + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); >> + clock_gettime(CLOCK_REALTIME, &realtime); >> + clock_gettime(CLOCK_BOOTTIME, &boottime); >> + blake2s_update(&hash, &realtime, sizeof(realtime)); >> + blake2s_update(&hash, &boottime, sizeof(boottime)); >> + >> + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { >> + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); >> + return 1; >> + } >> + >> + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); >> + if (lock < 0 || flock(lock, LOCK_EX) < 0) { >> + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); >> + return 1; >> + } >> + >> + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); >> + if (ret < 0) >> + program_ret |= 1 << 1; >> + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); >> + if (ret < 0) >> + program_ret |= 1 << 2; >> + >> + new_seed_len = determine_optimal_seed_len(); >> + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); >> + if (ret < 0) { >> + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); >> + new_seed_len = BLAKE2S_HASH_LEN; >> + strncpy((char *)new_seed, seedrng_failure, new_seed_len); >> + program_ret |= 1 << 3; >> + } >> + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); >> + blake2s_update(&hash, new_seed, new_seed_len); >> + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); >> + >> + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); >> + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); >> + if (fd < 0) { >> + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); >> + program_ret |= 1 << 4; >> + goto out; >> + } >> + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { >> + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); >> + program_ret |= 1 << 5; >> + goto out; >> + } >> + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { >> + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); >> + program_ret |= 1 << 6; >> + } >> +out: >> + close(fd); >> + close(lock); >> + return program_ret; >> +} >> diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk >> index 2c09728c46..a5cbb95feb 100644 >> --- a/package/urandom-scripts/urandom-scripts.mk >> +++ b/package/urandom-scripts/urandom-scripts.mk >> @@ -4,7 +4,17 @@ >> # >> ################################################################################ >> >> +define URANDOM_SCRIPTS_EXTRACT_CMDS >> + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) >> +endef >> + >> +define URANDOM_SCRIPTS_BUILD_CMDS >> + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ >> + $(@D)/seedrng.c -o $(@D)/seedrng >> +endef >> + >> define URANDOM_SCRIPTS_INSTALL_INIT_SYSV >> + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng >> $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ >> $(TARGET_DIR)/etc/init.d/S20urandom >> endef >> -- >> 2.35.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Mar 27 19:39:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 21:39:55 +0200 Subject: [Buildroot] [PATCH 1/1] package/opus: enable custom modes Message-ID: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point -- 2.35.1 From fperrad at gmail.com Sun Mar 27 19:47:40 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 27 Mar 2022 21:47:40 +0200 Subject: [Buildroot] [PATCH] package/luasocket: bump to version 3.0.0 Message-ID: <20220327194740.1482539-1-francois.perrad@gadz.org> moved under the hat of https://github.com/lunarmodules diff LICENSE: -LuaSocket 3.0 license -Copyright ? 2004-2013 Diego Nehab +Copyright (C) 2004-2022 Diego Nehab Signed-off-by: Francois Perrad --- package/luasocket/Config.in | 2 +- package/luasocket/luasocket.hash | 4 ++-- package/luasocket/luasocket.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in index 45263030f..5ad00f5c4 100644 --- a/package/luasocket/Config.in +++ b/package/luasocket/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET It provides easy access to TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more. - http://luaforge.net/projects/luasocket/ + https://github.com/lunarmodules/luasocket diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash index 843647b27..b66ae57b9 100644 --- a/package/luasocket/luasocket.hash +++ b/package/luasocket/luasocket.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE +sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index 20927fc1d..eeece26fd 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUASOCKET_VERSION = 3.0rc1-1 -LUASOCKET_SUBDIR = luasocket-3.0-rc1 +LUASOCKET_VERSION = 3.0.0-1 +LUASOCKET_SUBDIR = luasocket LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE -- 2.32.0 From james.hilliard1 at gmail.com Sun Mar 27 19:58:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 13:58:17 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: On Sun, Mar 27, 2022 at 1:36 PM Arnout Vandecappelle wrote: > > > > On 27/03/2022 20:01, James Hilliard wrote: > > On Sat, Mar 26, 2022 at 11:48 PM Jason A. Donenfeld wrote: > >> > >> The RNG can't actually be seeded from a shell script, due to the > >> reliance on ioctls. For this reason, the seedrng project provides a > >> basic script meant to be copy and pasted into projects like buildroot > >> and tweaked as needed: . > >> > >> This commit imports it into buildroot and wires up the init scripts to > >> call it. This also is a significant improvement over the current init > >> script, which doesn't credit entropy and whose hashing in shell scripts > >> is sort of fragile. > >> > >> As seedrng.c is a short tiny C program, we include this here in the > >> package, like a few other packages do. Later we'll investigate adding > >> this to busybox, but for now, this is a good start and a positive step > >> in the right direction. > >> > >> Signed-off-by: Jason A. Donenfeld > [snip] > >> +#ifndef GRND_INSECURE > >> +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ > >> +#endif > >> + > >> +#ifndef LOCALSTATEDIR > >> +#define LOCALSTATEDIR "/var/lib" > >> +#endif > >> +#ifndef RUNSTATEDIR > >> +#define RUNSTATEDIR "/var/run" > >> +#endif > > > > Might be a good idea to have runtime env overrides for these to allow easier > > path customization by only having to override the init script in a > > rootfs overlay: > > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > > Maybe something similar to the SEEDRNG_SKIP_CREDIT env override would > > make sense for these paths. > > I don't know if that makes sense. Dozens of buildroot packages hardocde these > paths already. I'm mostly just thinking that due to this needing to run super early it may be useful to be able to override in case say the seed needs to be stored in a non-standard mount location like the ESP along the lines of systemd: https://www.freedesktop.org/software/systemd/man/bootctl.html#random-seed > > Regards, > Arnout > > > > >> + > >> +#define SEED_DIR LOCALSTATEDIR "/seedrng" > >> +#define CREDITABLE_SEED SEED_DIR "/seed.credit" > >> +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" > >> +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" > >> + > >> +enum blake2s_lengths { > >> + BLAKE2S_BLOCK_LEN = 64, > >> + BLAKE2S_HASH_LEN = 32, > >> + BLAKE2S_KEY_LEN = 32 > >> +}; > >> + > >> +enum seedrng_lengths { > >> + MAX_SEED_LEN = 512, > >> + MIN_SEED_LEN = BLAKE2S_HASH_LEN > >> +}; > >> + > >> +struct blake2s_state { > >> + uint32_t h[8]; > >> + uint32_t t[2]; > >> + uint32_t f[2]; > >> + uint8_t buf[BLAKE2S_BLOCK_LEN]; > >> + unsigned int buflen; > >> + unsigned int outlen; > >> +}; > >> + > >> +#define le32_to_cpup(a) le32toh(*(a)) > >> +#define cpu_to_le32(a) htole32(a) > >> +#ifndef ARRAY_SIZE > >> +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > >> +#endif > >> +#ifndef DIV_ROUND_UP > >> +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > >> +#endif > >> + > >> +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) > >> +{ > >> + while (words--) { > >> + *buf = cpu_to_le32(*buf); > >> + ++buf; > >> + } > >> +} > >> + > >> +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) > >> +{ > >> + while (words--) { > >> + *buf = le32_to_cpup(buf); > >> + ++buf; > >> + } > >> +} > >> + > >> +static inline uint32_t ror32(uint32_t word, unsigned int shift) > >> +{ > >> + return (word >> (shift & 31)) | (word << ((-shift) & 31)); > >> +} > >> + > >> +static const uint32_t blake2s_iv[8] = { > >> + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, > >> + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL > >> +}; > >> + > >> +static const uint8_t blake2s_sigma[10][16] = { > >> + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, > >> + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, > >> + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, > >> + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, > >> + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, > >> + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, > >> + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, > >> + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, > >> + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, > >> + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, > >> +}; > >> + > >> +static void blake2s_set_lastblock(struct blake2s_state *state) > >> +{ > >> + state->f[0] = -1; > >> +} > >> + > >> +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) > >> +{ > >> + state->t[0] += inc; > >> + state->t[1] += (state->t[0] < inc); > >> +} > >> + > >> +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) > >> +{ > >> + int i; > >> + > >> + memset(state, 0, sizeof(*state)); > >> + for (i = 0; i < 8; ++i) > >> + state->h[i] = blake2s_iv[i]; > >> + state->h[0] ^= param; > >> +} > >> + > >> +static void blake2s_init(struct blake2s_state *state, const size_t outlen) > >> +{ > >> + blake2s_init_param(state, 0x01010000 | outlen); > >> + state->outlen = outlen; > >> +} > >> + > >> +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) > >> +{ > >> + uint32_t m[16]; > >> + uint32_t v[16]; > >> + int i; > >> + > >> + while (nblocks > 0) { > >> + blake2s_increment_counter(state, inc); > >> + memcpy(m, block, BLAKE2S_BLOCK_LEN); > >> + le32_to_cpu_array(m, ARRAY_SIZE(m)); > >> + memcpy(v, state->h, 32); > >> + v[ 8] = blake2s_iv[0]; > >> + v[ 9] = blake2s_iv[1]; > >> + v[10] = blake2s_iv[2]; > >> + v[11] = blake2s_iv[3]; > >> + v[12] = blake2s_iv[4] ^ state->t[0]; > >> + v[13] = blake2s_iv[5] ^ state->t[1]; > >> + v[14] = blake2s_iv[6] ^ state->f[0]; > >> + v[15] = blake2s_iv[7] ^ state->f[1]; > >> + > >> +#define G(r, i, a, b, c, d) do { \ > >> + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > >> + d = ror32(d ^ a, 16); \ > >> + c += d; \ > >> + b = ror32(b ^ c, 12); \ > >> + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > >> + d = ror32(d ^ a, 8); \ > >> + c += d; \ > >> + b = ror32(b ^ c, 7); \ > >> +} while (0) > >> + > >> +#define ROUND(r) do { \ > >> + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > >> + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > >> + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > >> + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > >> + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > >> + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > >> + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > >> + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > >> +} while (0) > >> + ROUND(0); > >> + ROUND(1); > >> + ROUND(2); > >> + ROUND(3); > >> + ROUND(4); > >> + ROUND(5); > >> + ROUND(6); > >> + ROUND(7); > >> + ROUND(8); > >> + ROUND(9); > >> + > >> +#undef G > >> +#undef ROUND > >> + > >> + for (i = 0; i < 8; ++i) > >> + state->h[i] ^= v[i] ^ v[i + 8]; > >> + > >> + block += BLAKE2S_BLOCK_LEN; > >> + --nblocks; > >> + } > >> +} > >> + > >> +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) > >> +{ > >> + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; > >> + const uint8_t *in = inp; > >> + > >> + if (!inlen) > >> + return; > >> + if (inlen > fill) { > >> + memcpy(state->buf + state->buflen, in, fill); > >> + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); > >> + state->buflen = 0; > >> + in += fill; > >> + inlen -= fill; > >> + } > >> + if (inlen > BLAKE2S_BLOCK_LEN) { > >> + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); > >> + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); > >> + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); > >> + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); > >> + } > >> + memcpy(state->buf + state->buflen, in, inlen); > >> + state->buflen += inlen; > >> +} > >> + > >> +static void blake2s_final(struct blake2s_state *state, uint8_t *out) > >> +{ > >> + blake2s_set_lastblock(state); > >> + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); > >> + blake2s_compress(state, state->buf, 1, state->buflen); > >> + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); > >> + memcpy(out, state->h, state->outlen); > >> +} > >> + > >> +static size_t determine_optimal_seed_len(void) > >> +{ > >> + size_t ret = 0; > >> + char poolsize_str[11] = { 0 }; > >> + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); > >> + > >> + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { > >> + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); > >> + ret = MIN_SEED_LEN; > >> + } else > >> + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); > >> + if (fd >= 0) > >> + close(fd); > >> + if (ret < MIN_SEED_LEN) > >> + ret = MIN_SEED_LEN; > >> + else if (ret > MAX_SEED_LEN) > >> + ret = MAX_SEED_LEN; > >> + return ret; > >> +} > >> + > >> +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) > >> +{ > >> + ssize_t ret; > >> + int urandom_fd; > >> + > >> + *is_creditable = false; > >> + ret = getrandom(seed, len, GRND_NONBLOCK); > >> + if (ret == (ssize_t)len) { > >> + *is_creditable = true; > >> + return 0; > >> + } else if (ret < 0 && errno == ENOSYS) { > >> + struct pollfd random_fd = { > >> + .fd = open("/dev/random", O_RDONLY), > >> + .events = POLLIN > >> + }; > >> + if (random_fd.fd < 0) > >> + return -errno; > >> + *is_creditable = poll(&random_fd, 1, 0) == 1; > >> + close(random_fd.fd); > >> + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) > >> + return 0; > >> + urandom_fd = open("/dev/urandom", O_RDONLY); > >> + if (urandom_fd < 0) > >> + return -errno; > >> + ret = read(urandom_fd, seed, len); > >> + if (ret == (ssize_t)len) > >> + ret = 0; > >> + else > >> + ret = -errno ? -errno : -EIO; > >> + close(urandom_fd); > >> + return ret; > >> +} > >> + > >> +static int seed_rng(uint8_t *seed, size_t len, bool credit) > >> +{ > >> + struct { > >> + int entropy_count; > >> + int buf_size; > >> + uint8_t buffer[MAX_SEED_LEN]; > >> + } req = { > >> + .entropy_count = credit ? len * 8 : 0, > >> + .buf_size = len > >> + }; > >> + int random_fd, ret; > >> + > >> + if (len > sizeof(req.buffer)) > >> + return -EFBIG; > >> + memcpy(req.buffer, seed, len); > >> + > >> + random_fd = open("/dev/random", O_RDWR); > >> + if (random_fd < 0) > >> + return -errno; > >> + ret = ioctl(random_fd, RNDADDENTROPY, &req); > >> + if (ret) > >> + ret = -errno ? -errno : -EIO; > >> + close(random_fd); > >> + return ret; > >> +} > >> + > >> +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) > >> +{ > >> + uint8_t seed[MAX_SEED_LEN]; > >> + ssize_t seed_len; > >> + int fd, dfd, ret = 0; > >> + > >> + fd = open(filename, O_RDONLY); > >> + if (fd < 0 && errno == ENOENT) > >> + return 0; > >> + else if (fd < 0) { > >> + ret = -errno; > >> + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); > >> + return ret; > >> + } > >> + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); > >> + if (dfd < 0) { > >> + ret = -errno; > >> + close(fd); > >> + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); > >> + return ret; > >> + } > >> + seed_len = read(fd, seed, sizeof(seed)); > >> + if (seed_len < 0) { > >> + ret = -errno; > >> + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); > >> + } > >> + close(fd); > >> + if (ret) { > >> + close(dfd); > >> + return ret; > >> + } > >> + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { > >> + ret = -errno; > >> + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); > >> + } > >> + close(dfd); > >> + if (ret) > >> + return ret; > >> + if (!seed_len) > >> + return 0; > >> + > >> + blake2s_update(hash, &seed_len, sizeof(seed_len)); > >> + blake2s_update(hash, seed, seed_len); > >> + > >> + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); > >> + ret = seed_rng(seed, seed_len, credit); > >> + if (ret < 0) > >> + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); > >> + return ret; > >> +} > >> + > >> +static bool skip_credit(void) > >> +{ > >> + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); > >> + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || > >> + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); > >> +} > >> + > >> +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) > >> +{ > >> + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; > >> + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; > >> + int ret, fd, lock, program_ret = 0; > >> + uint8_t new_seed[MAX_SEED_LEN]; > >> + size_t new_seed_len; > >> + bool new_seed_creditable; > >> + struct timespec realtime = { 0 }, boottime = { 0 }; > >> + struct blake2s_state hash; > >> + > >> + umask(0077); > >> + if (getuid()) { > >> + fprintf(stderr, "ERROR: This program requires root\n"); > >> + return 1; > >> + } > >> + > >> + blake2s_init(&hash, BLAKE2S_HASH_LEN); > >> + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); > >> + clock_gettime(CLOCK_REALTIME, &realtime); > >> + clock_gettime(CLOCK_BOOTTIME, &boottime); > >> + blake2s_update(&hash, &realtime, sizeof(realtime)); > >> + blake2s_update(&hash, &boottime, sizeof(boottime)); > >> + > >> + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { > >> + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); > >> + return 1; > >> + } > >> + > >> + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); > >> + if (lock < 0 || flock(lock, LOCK_EX) < 0) { > >> + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); > >> + return 1; > >> + } > >> + > >> + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); > >> + if (ret < 0) > >> + program_ret |= 1 << 1; > >> + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); > >> + if (ret < 0) > >> + program_ret |= 1 << 2; > >> + > >> + new_seed_len = determine_optimal_seed_len(); > >> + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); > >> + if (ret < 0) { > >> + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); > >> + new_seed_len = BLAKE2S_HASH_LEN; > >> + strncpy((char *)new_seed, seedrng_failure, new_seed_len); > >> + program_ret |= 1 << 3; > >> + } > >> + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); > >> + blake2s_update(&hash, new_seed, new_seed_len); > >> + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); > >> + > >> + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > >> + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > >> + if (fd < 0) { > >> + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > >> + program_ret |= 1 << 4; > >> + goto out; > >> + } > >> + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > >> + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > >> + program_ret |= 1 << 5; > >> + goto out; > >> + } > >> + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > >> + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > >> + program_ret |= 1 << 6; > >> + } > >> +out: > >> + close(fd); > >> + close(lock); > >> + return program_ret; > >> +} > >> diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk > >> index 2c09728c46..a5cbb95feb 100644 > >> --- a/package/urandom-scripts/urandom-scripts.mk > >> +++ b/package/urandom-scripts/urandom-scripts.mk > >> @@ -4,7 +4,17 @@ > >> # > >> ################################################################################ > >> > >> +define URANDOM_SCRIPTS_EXTRACT_CMDS > >> + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) > >> +endef > >> + > >> +define URANDOM_SCRIPTS_BUILD_CMDS > >> + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ > >> + $(@D)/seedrng.c -o $(@D)/seedrng > >> +endef > >> + > >> define URANDOM_SCRIPTS_INSTALL_INIT_SYSV > >> + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng > >> $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ > >> $(TARGET_DIR)/etc/init.d/S20urandom > >> endef > >> -- > >> 2.35.1 > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Sun Mar 27 20:06:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 14:06:51 -0600 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.4 Message-ID: <20220327200651.4189748-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac20..3572b25965 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..9feed9c084 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.3 +SYSTEMD_VERSION = 250.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.25.1 From Jason at zx2c4.com Sun Mar 27 20:08:16 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:08:16 -0400 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: Hi James, Arnout, On Sun, Mar 27, 2022 at 3:58 PM James Hilliard wrote: > I'm mostly just thinking that due to this needing to run super early > it may be useful > to be able to override in case say the seed needs to be stored in a non-standard > mount location like the ESP along the lines of systemd: > https://www.freedesktop.org/software/systemd/man/bootctl.html#random-seed If you want to reengineer other things about this, please feel free to do so after with follow-up commits. This keeps the same path location root as the code that it replaces. Let's do one thing at a time. If we do all these things at once, it'll be hard to fix regressions or understand what's happened. This commit here improves one dimension of things. Future ones from you can add additional features or tweaks or whatever else. Jason From Jason at zx2c4.com Sun Mar 27 20:10:34 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:10:34 -0400 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: Hey again, Oh, I didn't see the whole conversation because you failed to reply all. Please keep me in the CC, as I have list mail turned off. I see now you just want an option to do this via environment. This is what I did on OpenRC. I'll send a v2 with that for here. Jason From Jason at zx2c4.com Sun Mar 27 20:24:15 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:24:15 -0400 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: Message-ID: <20220327202415.1248312-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 64 +-- package/urandom-scripts/seedrng.c | 455 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 6 + 4 files changed, 479 insertions(+), 50 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..1959fad93b 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -6,63 +6,35 @@ # Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -URANDOM_SEED="/var/lib/random-seed" +# The following knobs can be adjusted by placing uncommented modified lines +# into /etc/default/urandom: +# +# Set these to change where the seed and runtime lock file are stored: +# +# export SEEDRNG_SEED_DIR=/var/lib/seedrng +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock +# +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng: +# +# export SEEDRNG_SKIP_CREDIT=false +# # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in start|restart|reload) # Carry a random seed from start-up to start-up # Load and then save the whole entropy pool - init_rng && save_random_seed;; + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; stop) # Carry a random seed from shut-down to start-up # Save the whole entropy pool - save_random_seed;; + seedrng;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..b3f6381bd8 --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,455 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + + +static const char *SEED_DIR; +static const char *LOCK_FILE; +static char *CREDITABLE_SEED; +static char *NON_CREDITABLE_SEED; + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +static void populate_global_paths(void) +{ + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); + if (!SEED_DIR || !*SEED_DIR) + SEED_DIR = "/var/lib/seedrng"; + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); + if (!LOCK_FILE || !*LOCK_FILE) + LOCK_FILE = "/var/run/seedrng.lock"; + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); + exit(1); + } +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + populate_global_paths(); + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + return 1; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + close(fd); + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..e8526e248a 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,13 @@ # ################################################################################ +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From peter at korsgaard.com Sun Mar 27 20:24:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:24:51 +0200 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix CVE comments In-Reply-To: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:19:21 +0100") References: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> Message-ID: <87zglbb0to.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE > comments > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Sun Mar 27 20:25:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 14:25:29 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: On Sun, Mar 27, 2022 at 2:10 PM Jason A. Donenfeld wrote: > > Hey again, > > Oh, I didn't see the whole conversation because you failed to reply > all. Please keep me in the CC, as I have list mail turned off. Strange, I did use reply all, maybe it ended up in spam? It appears to have been sent correctly from what I can tell: https://lore.kernel.org/buildroot/CADvTj4rJcC8NQnG4A70VgF6uqzj-xGDxg2nOyRB=jxj4wSLpqg at mail.gmail.com/ > > I see now you just want an option to do this via environment. This is > what I did on OpenRC. I'll send a v2 with that for here. Yeah, I'm just suggesting a path override since that's trivial to tweak with the existing script via a rootfs overlay override but slightly more complex to do if one has to modify a binary. > > Jason From peter at korsgaard.com Sun Mar 27 20:25:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:25:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build on sparc v8 In-Reply-To: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:26:33 +0100") References: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> Message-ID: <87v8vzb0rs.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure on sparc v8 raised since commit > 5770a645a3a49a3f0f02972131a4ff5283b4c11e: > ERROR: detected a std::atomic implementation that fails for function pointers. > Please apply the patch corresponding to your Standard Library vendor, found in > qtbase/config.tests/atomicfptr > Fixes: > - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From Jason at zx2c4.com Sun Mar 27 20:26:40 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:26:40 -0400 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: Hey James, On Sun, Mar 27, 2022 at 4:25 PM James Hilliard wrote: > Strange, I did use reply all, maybe it ended up in spam? > > It appears to have been sent correctly from what I can tell: > https://lore.kernel.org/buildroot/CADvTj4rJcC8NQnG4A70VgF6uqzj-xGDxg2nOyRB=jxj4wSLpqg at mail.gmail.com/ Indeed I think you're right. MTA issues? I'll investigate. > > > > > I see now you just want an option to do this via environment. This is > > what I did on OpenRC. I'll send a v2 with that for here. > > Yeah, I'm just suggesting a path override since that's trivial to tweak with the > existing script via a rootfs overlay override but slightly more complex to do if > one has to modify a binary. Yep! Already done for the v2: https://lore.kernel.org/buildroot/20220327202415.1248312-1-Jason at zx2c4.com/ Jason From peter at korsgaard.com Sun Mar 27 20:28:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:28:58 +0200 Subject: [Buildroot] [PATCH v2, 1/1] package/nbd: security bump to version 3.24 In-Reply-To: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:33:33 +0100") References: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> Message-ID: <87r16nb0mt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an > integer overflow with a resultant heap-based buffer overflow. A value of > 0xffffffff in the name length field will cause a zero-sized buffer to be > allocated for the name, resulting in a write to a dangling pointer. This > issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME > messages. > Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a > stack-based buffer overflow. An attacker can cause a buffer overflow in > the parsing of the name field by sending a crafted NBD_OPT_INFO or > NBD_OPT_GO message with an large value as the length of the name. > https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Tag as a security bump and add CVEs Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 27 20:28:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:28:26 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/nbd: security bump to version 3.24 Message-ID: <20220327202006.9134985E9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c5423f166ced3cd2399c5d98bf7e377c1739fe1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bf2e459bb9fc9fe57147313cda35f7022172e6e8) Signed-off-by: Peter Korsgaard --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs From peter at korsgaard.com Sun Mar 27 20:22:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:22:39 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: fix CVE comments Message-ID: <20220327202020.6EE4385EA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d87883dc8d39bc597171e6f82bf0011b842876c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE comments Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8b2adbff1585b2581c76c9abcc8d5529134be60c) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..b20bdea7f6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,8 +12,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 # A few comments: From peter at korsgaard.com Sun Mar 27 20:27:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:27:15 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/nbd: security bump to version 3.24 Message-ID: <20220327202020.8260A85EA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98cd43b646001a8617573f44e7e7666595ef861f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bf2e459bb9fc9fe57147313cda35f7022172e6e8) Signed-off-by: Peter Korsgaard --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs From peter at korsgaard.com Sun Mar 27 20:25:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:25:38 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: fix build on sparc v8 Message-ID: <20220327202020.7806F85EA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=482b0099ea11e1ad0ccc839396bad88246992f8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure on sparc v8 raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: ERROR: detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr Fixes: - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ee6d734f08e772202320841208f11a1a239ea49b) Signed-off-by: Peter Korsgaard --- ...b-configure.json-fix-atomicfptr-detection.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 0000000000..5f0f81a4bd --- /dev/null +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + From james.hilliard1 at gmail.com Sun Mar 27 20:29:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 14:29:39 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220327202415.1248312-1-Jason@zx2c4.com> References: <20220327202415.1248312-1-Jason@zx2c4.com> Message-ID: On Sun, Mar 27, 2022 at 2:24 PM Jason A. Donenfeld wrote: > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. > > Signed-off-by: Jason A. Donenfeld Reviewed-by: James Hilliard > --- > package/urandom-scripts/Config.in | 4 - > package/urandom-scripts/S20urandom | 64 +-- > package/urandom-scripts/seedrng.c | 455 +++++++++++++++++++++ > package/urandom-scripts/urandom-scripts.mk | 6 + > 4 files changed, 479 insertions(+), 50 deletions(-) > create mode 100644 package/urandom-scripts/seedrng.c > > diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in > index 987e442e22..070ffa5e9a 100644 > --- a/package/urandom-scripts/Config.in > +++ b/package/urandom-scripts/Config.in > @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS > depends on !BR2_PACKAGE_SYSTEMD > help > Initscript to preserve the random seed between reboots. > - > - WARNING: this is a poor fit to try and get high-quality > - entropy at boot. There are better ways, like haveged, or > - rng-tools. > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index c6b2ebd48f..1959fad93b 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -6,63 +6,35 @@ > # Quietly do nothing if /dev/urandom does not exist > [ -c /dev/urandom ] || exit 0 > > -URANDOM_SEED="/var/lib/random-seed" > +# The following knobs can be adjusted by placing uncommented modified lines > +# into /etc/default/urandom: > +# > +# Set these to change where the seed and runtime lock file are stored: > +# > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > +# > +# Set this to true only if you do not want seed files to actually credit the > +# RNG, for example if you plan to replicate this file system image and do not > +# have the wherewithal to first delete the contents of /var/lib/seedrng: > +# > +# export SEEDRNG_SKIP_CREDIT=false > +# > > # shellcheck source=/dev/null > [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" > > -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then > - pool_size=$((pool_bits/8)) > -else > - pool_size=512 > -fi > - > -init_rng() { > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > -} > - > -save_random_seed() { > - printf 'Saving random seed: ' > - status=1 > - if touch "$URANDOM_SEED.new" 2> /dev/null; then > - old_umask=$(umask) > - umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > - | sha256sum \ > - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > - rm -f "$URANDOM_SEED.tmp" > - umask "$old_umask" > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - > - else > - echo "SKIP (read-only file system detected)" > - fi > - return "$status" > -} > - > case "$1" in > start|restart|reload) > # Carry a random seed from start-up to start-up > # Load and then save the whole entropy pool > - init_rng && save_random_seed;; > + # Never fail, as this isn't worth making a fuss > + # over if it doesn't go as planned. > + seedrng || true;; > stop) > # Carry a random seed from shut-down to start-up > # Save the whole entropy pool > - save_random_seed;; > + seedrng;; > *) > echo "Usage: $0 {start|stop|restart|reload}" > exit 1 > diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c > new file mode 100644 > index 0000000000..b3f6381bd8 > --- /dev/null > +++ b/package/urandom-scripts/seedrng.c > @@ -0,0 +1,455 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) > +/* > + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. > + * > + * This is based on code from . > + */ > + > +#define _GNU_SOURCE > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#ifndef GRND_INSECURE > +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ > +#endif > + > + > +static const char *SEED_DIR; > +static const char *LOCK_FILE; > +static char *CREDITABLE_SEED; > +static char *NON_CREDITABLE_SEED; > + > +enum blake2s_lengths { > + BLAKE2S_BLOCK_LEN = 64, > + BLAKE2S_HASH_LEN = 32, > + BLAKE2S_KEY_LEN = 32 > +}; > + > +enum seedrng_lengths { > + MAX_SEED_LEN = 512, > + MIN_SEED_LEN = BLAKE2S_HASH_LEN > +}; > + > +struct blake2s_state { > + uint32_t h[8]; > + uint32_t t[2]; > + uint32_t f[2]; > + uint8_t buf[BLAKE2S_BLOCK_LEN]; > + unsigned int buflen; > + unsigned int outlen; > +}; > + > +#define le32_to_cpup(a) le32toh(*(a)) > +#define cpu_to_le32(a) htole32(a) > +#ifndef ARRAY_SIZE > +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > +#endif > +#ifndef DIV_ROUND_UP > +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > +#endif > + > +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = cpu_to_le32(*buf); > + ++buf; > + } > +} > + > +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = le32_to_cpup(buf); > + ++buf; > + } > +} > + > +static inline uint32_t ror32(uint32_t word, unsigned int shift) > +{ > + return (word >> (shift & 31)) | (word << ((-shift) & 31)); > +} > + > +static const uint32_t blake2s_iv[8] = { > + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, > + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL > +}; > + > +static const uint8_t blake2s_sigma[10][16] = { > + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, > + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, > + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, > + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, > + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, > + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, > + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, > + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, > + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, > + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, > +}; > + > +static void blake2s_set_lastblock(struct blake2s_state *state) > +{ > + state->f[0] = -1; > +} > + > +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) > +{ > + state->t[0] += inc; > + state->t[1] += (state->t[0] < inc); > +} > + > +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) > +{ > + int i; > + > + memset(state, 0, sizeof(*state)); > + for (i = 0; i < 8; ++i) > + state->h[i] = blake2s_iv[i]; > + state->h[0] ^= param; > +} > + > +static void blake2s_init(struct blake2s_state *state, const size_t outlen) > +{ > + blake2s_init_param(state, 0x01010000 | outlen); > + state->outlen = outlen; > +} > + > +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) > +{ > + uint32_t m[16]; > + uint32_t v[16]; > + int i; > + > + while (nblocks > 0) { > + blake2s_increment_counter(state, inc); > + memcpy(m, block, BLAKE2S_BLOCK_LEN); > + le32_to_cpu_array(m, ARRAY_SIZE(m)); > + memcpy(v, state->h, 32); > + v[ 8] = blake2s_iv[0]; > + v[ 9] = blake2s_iv[1]; > + v[10] = blake2s_iv[2]; > + v[11] = blake2s_iv[3]; > + v[12] = blake2s_iv[4] ^ state->t[0]; > + v[13] = blake2s_iv[5] ^ state->t[1]; > + v[14] = blake2s_iv[6] ^ state->f[0]; > + v[15] = blake2s_iv[7] ^ state->f[1]; > + > +#define G(r, i, a, b, c, d) do { \ > + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > + d = ror32(d ^ a, 16); \ > + c += d; \ > + b = ror32(b ^ c, 12); \ > + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > + d = ror32(d ^ a, 8); \ > + c += d; \ > + b = ror32(b ^ c, 7); \ > +} while (0) > + > +#define ROUND(r) do { \ > + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > +} while (0) > + ROUND(0); > + ROUND(1); > + ROUND(2); > + ROUND(3); > + ROUND(4); > + ROUND(5); > + ROUND(6); > + ROUND(7); > + ROUND(8); > + ROUND(9); > + > +#undef G > +#undef ROUND > + > + for (i = 0; i < 8; ++i) > + state->h[i] ^= v[i] ^ v[i + 8]; > + > + block += BLAKE2S_BLOCK_LEN; > + --nblocks; > + } > +} > + > +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) > +{ > + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; > + const uint8_t *in = inp; > + > + if (!inlen) > + return; > + if (inlen > fill) { > + memcpy(state->buf + state->buflen, in, fill); > + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); > + state->buflen = 0; > + in += fill; > + inlen -= fill; > + } > + if (inlen > BLAKE2S_BLOCK_LEN) { > + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); > + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); > + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); > + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); > + } > + memcpy(state->buf + state->buflen, in, inlen); > + state->buflen += inlen; > +} > + > +static void blake2s_final(struct blake2s_state *state, uint8_t *out) > +{ > + blake2s_set_lastblock(state); > + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); > + blake2s_compress(state, state->buf, 1, state->buflen); > + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); > + memcpy(out, state->h, state->outlen); > +} > + > +static size_t determine_optimal_seed_len(void) > +{ > + size_t ret = 0; > + char poolsize_str[11] = { 0 }; > + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); > + > + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { > + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); > + ret = MIN_SEED_LEN; > + } else > + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); > + if (fd >= 0) > + close(fd); > + if (ret < MIN_SEED_LEN) > + ret = MIN_SEED_LEN; > + else if (ret > MAX_SEED_LEN) > + ret = MAX_SEED_LEN; > + return ret; > +} > + > +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) > +{ > + ssize_t ret; > + int urandom_fd; > + > + *is_creditable = false; > + ret = getrandom(seed, len, GRND_NONBLOCK); > + if (ret == (ssize_t)len) { > + *is_creditable = true; > + return 0; > + } else if (ret < 0 && errno == ENOSYS) { > + struct pollfd random_fd = { > + .fd = open("/dev/random", O_RDONLY), > + .events = POLLIN > + }; > + if (random_fd.fd < 0) > + return -errno; > + *is_creditable = poll(&random_fd, 1, 0) == 1; > + close(random_fd.fd); > + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) > + return 0; > + urandom_fd = open("/dev/urandom", O_RDONLY); > + if (urandom_fd < 0) > + return -errno; > + ret = read(urandom_fd, seed, len); > + if (ret == (ssize_t)len) > + ret = 0; > + else > + ret = -errno ? -errno : -EIO; > + close(urandom_fd); > + return ret; > +} > + > +static int seed_rng(uint8_t *seed, size_t len, bool credit) > +{ > + struct { > + int entropy_count; > + int buf_size; > + uint8_t buffer[MAX_SEED_LEN]; > + } req = { > + .entropy_count = credit ? len * 8 : 0, > + .buf_size = len > + }; > + int random_fd, ret; > + > + if (len > sizeof(req.buffer)) > + return -EFBIG; > + memcpy(req.buffer, seed, len); > + > + random_fd = open("/dev/random", O_RDWR); > + if (random_fd < 0) > + return -errno; > + ret = ioctl(random_fd, RNDADDENTROPY, &req); > + if (ret) > + ret = -errno ? -errno : -EIO; > + close(random_fd); > + return ret; > +} > + > +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) > +{ > + uint8_t seed[MAX_SEED_LEN]; > + ssize_t seed_len; > + int fd, dfd, ret = 0; > + > + fd = open(filename, O_RDONLY); > + if (fd < 0 && errno == ENOENT) > + return 0; > + else if (fd < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); > + return ret; > + } > + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); > + if (dfd < 0) { > + ret = -errno; > + close(fd); > + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); > + return ret; > + } > + seed_len = read(fd, seed, sizeof(seed)); > + if (seed_len < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); > + } > + close(fd); > + if (ret) { > + close(dfd); > + return ret; > + } > + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); > + } > + close(dfd); > + if (ret) > + return ret; > + if (!seed_len) > + return 0; > + > + blake2s_update(hash, &seed_len, sizeof(seed_len)); > + blake2s_update(hash, seed, seed_len); > + > + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); > + ret = seed_rng(seed, seed_len, credit); > + if (ret < 0) > + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); > + return ret; > +} > + > +static bool skip_credit(void) > +{ > + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); > + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || > + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); > +} > + > +static void populate_global_paths(void) > +{ > + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); > + if (!SEED_DIR || !*SEED_DIR) > + SEED_DIR = "/var/lib/seedrng"; > + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); > + if (!LOCK_FILE || !*LOCK_FILE) > + LOCK_FILE = "/var/run/seedrng.lock"; > + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || > + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { > + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); > + exit(1); > + } > +} > + > +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) > +{ > + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; > + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; > + int ret, fd, lock, program_ret = 0; > + uint8_t new_seed[MAX_SEED_LEN]; > + size_t new_seed_len; > + bool new_seed_creditable; > + struct timespec realtime = { 0 }, boottime = { 0 }; > + struct blake2s_state hash; > + > + umask(0077); > + if (getuid()) { > + fprintf(stderr, "ERROR: This program requires root\n"); > + return 1; > + } > + > + populate_global_paths(); > + blake2s_init(&hash, BLAKE2S_HASH_LEN); > + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); > + clock_gettime(CLOCK_REALTIME, &realtime); > + clock_gettime(CLOCK_BOOTTIME, &boottime); > + blake2s_update(&hash, &realtime, sizeof(realtime)); > + blake2s_update(&hash, &boottime, sizeof(boottime)); > + > + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { > + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); > + return 1; > + } > + > + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); > + if (lock < 0 || flock(lock, LOCK_EX) < 0) { > + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); > + return 1; > + } > + > + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); > + if (ret < 0) > + program_ret |= 1 << 1; > + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); > + if (ret < 0) > + program_ret |= 1 << 2; > + > + new_seed_len = determine_optimal_seed_len(); > + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); > + if (ret < 0) { > + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); > + new_seed_len = BLAKE2S_HASH_LEN; > + strncpy((char *)new_seed, seedrng_failure, new_seed_len); > + program_ret |= 1 << 3; > + } > + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); > + blake2s_update(&hash, new_seed, new_seed_len); > + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); > + > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > + if (fd < 0) { > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > + program_ret |= 1 << 4; > + goto out; > + } > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > + program_ret |= 1 << 5; > + goto out; > + } > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > + program_ret |= 1 << 6; > + } > +out: > + close(fd); > + close(lock); > + return program_ret; > +} > diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk > index 2c09728c46..e8526e248a 100644 > --- a/package/urandom-scripts/urandom-scripts.mk > +++ b/package/urandom-scripts/urandom-scripts.mk > @@ -4,7 +4,13 @@ > # > ################################################################################ > > +define URANDOM_SCRIPTS_BUILD_CMDS > + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ > + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng > +endef > + > define URANDOM_SCRIPTS_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng > $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ > $(TARGET_DIR)/etc/init.d/S20urandom > endef > -- > 2.35.1 > From fontaine.fabrice at gmail.com Sun Mar 27 20:32:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 22:32:18 +0200 Subject: [Buildroot] [PATCH 1/1] package/matio: security bump to version 1.5.22 Message-ID: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash pf COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING -- 2.35.1 From peter at korsgaard.com Sun Mar 27 20:36:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:36:01 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220327202704.26C8285EB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14d329ee1c52563d46165dadd06e923444a01594 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92a3ca0932155498747c46d6f902a939d55c39f4) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Mar 27 20:34:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:34:15 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220327202719.331C585EBD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3171d7bc1b7b03d97e4c8df549b375742df21b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92a3ca0932155498747c46d6f902a939d55c39f4) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Mar 27 20:37:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:37:25 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 In-Reply-To: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:47:41 +0100") References: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> Message-ID: <87mthbb08q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21716: Twisted is an event-based framework for internet > applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH > client and server implement is able to accept an infinite amount of data > for the peer's SSH version identifier. This ends up with a buffer using > all the available memory. The attach is a simple as `nc -rv localhost 22 > < /dev/zero`. A patch is available in version 22.2.0. There are > currently no known workarounds. > https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Mar 27 20:57:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 22:57:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/unclutter-xfixes: bump to version 1.6 Message-ID: <20220327205750.1448336-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.6 Signed-off-by: Fabrice Fontaine --- package/unclutter-xfixes/unclutter-xfixes.hash | 4 ++-- package/unclutter-xfixes/unclutter-xfixes.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash index 785825da7a..b0bd5532ef 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.hash +++ b/package/unclutter-xfixes/unclutter-xfixes.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk index 713a84bca6..6da607b660 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.mk +++ b/package/unclutter-xfixes/unclutter-xfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNCLUTTER_XFIXES_VERSION = 1.5 +UNCLUTTER_XFIXES_VERSION = 1.6 UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) UNCLUTTER_XFIXES_LICENSE = MIT UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 27 21:15:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 23:15:05 +0200 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.13 Message-ID: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine --- ...iple-def-of-invalid_dircache_entries.patch | 25 ------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch -- 2.35.1 From alseycmiller at gmail.com Mon Mar 28 06:00:27 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Mon, 28 Mar 2022 06:00:27 +0000 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries Message-ID: <20220328060027.2483147-1-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/Config.in | 11 + package/foundation/Config.in | 14 ++ package/foundation/foundation.hash | 1 + package/foundation/foundation.mk | 102 ++++++++ package/libdispatch/Config.in | 11 + package/libdispatch/libdispatch.hash | 2 + package/libdispatch/libdispatch.mk | 78 ++++++ package/libswiftdispatch/Config.in | 12 + .../libswiftdispatch/libswiftdispatch.hash | 2 + package/libswiftdispatch/libswiftdispatch.mk | 86 +++++++ package/swift-crypto/Config.in | 10 + .../swift-crypto-shared-lib.patch | 13 + package/swift-crypto/swift-crypto.mk | 36 +++ package/swift-hello/Config.in | 10 + package/swift-hello/src/Package.swift | 22 ++ .../src/Sources/swift-hello/Hello.swift | 31 +++ .../swift-helloTests/swift_helloTests.swift | 47 ++++ package/swift-hello/swift-hello.mk | 33 +++ package/swift/Config.in | 55 +++++ package/swift/Float16.patch | 13 + package/swift/RefCount.h.diff | 18 ++ package/swift/swift-5.6-armv5.patch | 161 ++++++++++++ package/swift/swift.hash | 1 + package/swift/swift.mk | 232 ++++++++++++++++++ 24 files changed, 1001 insertions(+) create mode 100644 package/foundation/Config.in create mode 100644 package/foundation/foundation.hash create mode 100644 package/foundation/foundation.mk create mode 100644 package/libdispatch/Config.in create mode 100644 package/libdispatch/libdispatch.hash create mode 100644 package/libdispatch/libdispatch.mk create mode 100644 package/libswiftdispatch/Config.in create mode 100644 package/libswiftdispatch/libswiftdispatch.hash create mode 100644 package/libswiftdispatch/libswiftdispatch.mk create mode 100644 package/swift-crypto/Config.in create mode 100644 package/swift-crypto/swift-crypto-shared-lib.patch create mode 100644 package/swift-crypto/swift-crypto.mk create mode 100644 package/swift-hello/Config.in create mode 100644 package/swift-hello/src/Package.swift create mode 100644 package/swift-hello/src/Sources/swift-hello/Hello.swift create mode 100644 package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift create mode 100644 package/swift-hello/swift-hello.mk create mode 100644 package/swift/Config.in create mode 100644 package/swift/Float16.patch create mode 100644 package/swift/RefCount.h.diff create mode 100644 package/swift/swift-5.6-armv5.patch create mode 100644 package/swift/swift.hash create mode 100644 package/swift/swift.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..b89a49913e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1422,6 +1422,7 @@ menu "Crypto" source "package/openssl/Config.in" source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" + source "package/swift-crypto/Config.in" source "package/tinydtls/Config.in" source "package/tpm2-pkcs11/Config.in" source "package/tpm2-tss/Config.in" @@ -1939,6 +1940,7 @@ menu "Other" source "package/flann/Config.in" source "package/flatbuffers/Config.in" source "package/flatcc/Config.in" + source "package/foundation/Config.in" source "package/gconf/Config.in" source "package/gflags/Config.in" source "package/gli/Config.in" @@ -1968,6 +1970,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdispatch/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" @@ -2001,6 +2004,7 @@ menu "Other" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" source "package/libspatialindex/Config.in" + source "package/libswiftdispatch/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" source "package/libtommath/Config.in" @@ -2021,6 +2025,10 @@ comment "linux-pam plugins" endif source "package/liquid-dsp/Config.in" source "package/llvm/Config.in" + source "package/swift/Config.in" + source "package/libdispatch/Config.in" + source "package/libswiftdispatch/Config.in" + source "package/foundation/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" source "package/mpc/Config.in" @@ -2044,6 +2052,7 @@ endif source "package/skalibs/Config.in" source "package/sphinxbase/Config.in" source "package/startup-notification/Config.in" + source "package/swift/Config.in" source "package/tinycbor/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" @@ -2102,6 +2111,7 @@ menu "Mail" endmenu menu "Miscellaneous" + source "package/swift-hello/Config.in" source "package/aespipe/Config.in" source "package/bc/Config.in" source "package/bitcoin/Config.in" @@ -2125,6 +2135,7 @@ menu "Miscellaneous" source "package/rtl_433/Config.in" source "package/shared-mime-info/Config.in" source "package/sunwait/Config.in" + source "package/swift-hello/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" source "package/xmrig/Config.in" diff --git a/package/foundation/Config.in b/package/foundation/Config.in new file mode 100644 index 0000000000..7a9dc8b514 --- /dev/null +++ b/package/foundation/Config.in @@ -0,0 +1,14 @@ +if BR2_PACKAGE_SWIFT + +config BR2_PACKAGE_FOUNDATION + bool "foundation" + depends on BR2_PACKAGE_SWIFT + select BR2_PACKAGE_LIBSWIFTDISPATCH + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXML2 + help + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. + + http://swift.org + +endif diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash new file mode 100644 index 0000000000..f15edb8420 --- /dev/null +++ b/package/foundation/foundation.hash @@ -0,0 +1 @@ +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk new file mode 100644 index 0000000000..93c7cedbdd --- /dev/null +++ b/package/foundation/foundation.mk @@ -0,0 +1,102 @@ +### Foundation +FOUNDATION_VERSION = $(SWIFT_VERSION) +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags +FOUNDATION_LICENSE = Apache-2.0 +FOUNDATION_LICENSE_FILES = LICENSE +FOUNDATION_INSTALL_STAGING = YES +FOUNDATION_INSTALL_TARGET = YES +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch + +FOUNDATION_CONF_OPTS += \ + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ + -DCMAKE_Swift_FLAGS_DEBUG="" \ + -DCMAKE_Swift_FLAGS_RELEASE="" \ + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ + -DCF_DEPLOYMENT_SWIFT=ON \ + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ + +ifeq ($(BR2_PACKAGE_LIBCURL),y) + FOUNDATION_DEPENDENCIES += libcurl + FOUNDATION_CONF_OPTS += \ + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ + +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) + FOUNDATION_DEPENDENCIES += libxml2 + FOUNDATION_CONF_OPTS += \ + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ + +endif + +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) +else +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build +endif + +define FOUNDATION_CONFIGURE_CMDS + # Workaround Dispatch defined with cmake and module + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch + # Clean + rm -rf $(FOUNDATION_BUILDDIR) + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation + # Configure + (mkdir -p $(FOUNDATION_BUILDDIR) && \ + cd $(FOUNDATION_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + $(FOUNDATION_CONF_OPTS) \ + ) +endef + +define FOUNDATION_BUILD_CMDS + # Compile + (cd $(FOUNDATION_BUILDDIR) && ninja) +endef + +define FOUNDATION_INSTALL_TARGET_CMDS + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ +endef + +define FOUNDATION_INSTALL_STAGING_CMDS + # Copy libraries + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ + # Copy CoreFoundation module + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map + # Copy CFXMLInterface module + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map + # Copy CFURLSessionInterface module + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map + # Copy Swift modules + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ + # Restore Dispatch headers + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) + +endef + +$(eval $(generic-package)) diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in new file mode 100644 index 0000000000..2f7c115375 --- /dev/null +++ b/package/libdispatch/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBDISPATCH + bool "libdispatch" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBBSD + + help + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + http://swift.org diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash new file mode 100644 index 0000000000..a89c48c55f --- /dev/null +++ b/package/libdispatch/libdispatch.hash @@ -0,0 +1,2 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk new file mode 100644 index 0000000000..a334c3052d --- /dev/null +++ b/package/libdispatch/libdispatch.mk @@ -0,0 +1,78 @@ +### Grand Central Dispatch (C API) +LIBDISPATCH_VERSION = $(SWIFT_VERSION) +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags +LIBDISPATCH_LICENSE = Apache-2.0 +LIBDISPATCH_LICENSE_FILES = LICENSE +LIBDISPATCH_INSTALL_STAGING = YES +LIBDISPATCH_INSTALL_TARGET = YES +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBDISPATCH_DEPENDENCIES = libbsd +LIBDISPATCH_PATCH = \ + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch + +LIBDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + +ifeq (LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD),YES) +LIBDISPATCH_BUILDDIR = $(LIBDISPATCH_SRCDIR) +else +LIBDISPATCH_BUILDDIR = $(LIBDISPATCH_SRCDIR)/build +endif + +define LIBDISPATCH_CONFIGURE_CMDS + # Clean + rm -rf $(LIBDISPATCH_BUILDDIR) + rm -rf $(STAGING_DIR)/usr/lib/swift/dispatch + # Configure for Ninja + (mkdir -p $(LIBDISPATCH_BUILDDIR) && \ + cd $(LIBDISPATCH_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(LIBDISPATCH_CONF_ENV) $(BR2_CMAKE) -S $(LIBDISPATCH_SRCDIR) -B $(LIBDISPATCH_BUILDDIR) -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(SWIFT_NATIVE_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(SWIFT_EXTRA_FLAGS) -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(SWIFT_EXTRA_FLAGS) -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + $(LIBDISPATCH_CONF_OPTS) \ + ) +endef + +define LIBDISPATCH_BUILD_CMDS + # Compile + (cd $(LIBDISPATCH_BUILDDIR) && ninja) +endef + +define LIBDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +define LIBDISPATCH_INSTALL_STAGING_CMDS + # Copy libraries + cp $(LIBDISPATCH_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/ + # Copy headers + mkdir -p ${STAGING_DIR}/usr/include/dispatch + cp $(LIBDISPATCH_SRCDIR)/dispatch/*.h ${STAGING_DIR}/usr/include/dispatch + mkdir -p ${STAGING_DIR}/usr/include/Block + cp $(LIBDISPATCH_SRCDIR)/src/BlocksRuntime/Block.h ${STAGING_DIR}/usr/include/Block/ + mkdir -p ${STAGING_DIR}/usr/include/os + cp $(LIBDISPATCH_SRCDIR)/os/object.h ${STAGING_DIR}/usr/include/os/ + cp $(LIBDISPATCH_SRCDIR)/os/generic_unix_base.h ${STAGING_DIR}/usr/include/os/ +endef + +$(eval $(generic-package)) diff --git a/package/libswiftdispatch/Config.in b/package/libswiftdispatch/Config.in new file mode 100644 index 0000000000..c16ed3217c --- /dev/null +++ b/package/libswiftdispatch/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBSWIFTDISPATCH + bool "libswiftdispatch" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_LIBBSD + depends on BR2_PACKAGE_SWIFT + + help + Swift overlay for libdispatch. + + http://swift.org diff --git a/package/libswiftdispatch/libswiftdispatch.hash b/package/libswiftdispatch/libswiftdispatch.hash new file mode 100644 index 0000000000..a89c48c55f --- /dev/null +++ b/package/libswiftdispatch/libswiftdispatch.hash @@ -0,0 +1,2 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch diff --git a/package/libswiftdispatch/libswiftdispatch.mk b/package/libswiftdispatch/libswiftdispatch.mk new file mode 100644 index 0000000000..45bef5b8f2 --- /dev/null +++ b/package/libswiftdispatch/libswiftdispatch.mk @@ -0,0 +1,86 @@ +### Grand Central Dispatch with Swift overlay +LIBSWIFTDISPATCH_VERSION = $(SWIFT_VERSION) +LIBSWIFTDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz +LIBSWIFTDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags +LIBSWIFTDISPATCH_LICENSE = Apache-2.0 +LIBSWIFTDISPATCH_LICENSE_FILES = LICENSE +LIBSWIFTDISPATCH_INSTALL_STAGING = YES +LIBSWIFTDISPATCH_INSTALL_TARGET = YES +LIBSWIFTDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBSWIFTDISPATCH_DEPENDENCIES = libbsd swift +LIBSWIFTDISPATCH_PATCH = \ + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch + +LIBSWIFTDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + -DENABLE_SWIFT=YES \ + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ + -DCMAKE_Swift_FLAGS_DEBUG="" \ + -DCMAKE_Swift_FLAGS_RELEASE="" \ + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ + +ifeq (LIBSWIFTDISPATCH_SUPPORTS_IN_SOURCE_BUILD),YES) +LIBSWIFTDISPATCH_BUILDDIR = $(LIBSWIFTDISPATCH_SRCDIR) +else +LIBSWIFTDISPATCH_BUILDDIR = $(LIBSWIFTDISPATCH_SRCDIR)/build +endif + +define LIBSWIFTDISPATCH_CONFIGURE_CMDS + # Clean + rm -rf $(LIBSWIFTDISPATCH_BUILDDIR) + rm -rf $(STAGING_DIR)/usr/lib/swift/dispatch + # Configure for Ninja + (mkdir -p $(LIBSWIFTDISPATCH_BUILDDIR) && \ + cd $(LIBSWIFTDISPATCH_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(LIBSWIFTDISPATCH_CONF_ENV) $(BR2_CMAKE) -S $(LIBSWIFTDISPATCH_SRCDIR) -B $(LIBSWIFTDISPATCH_BUILDDIR) -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(SWIFT_NATIVE_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + $(LIBSWIFTDISPATCH_CONF_OPTS) \ + ) +endef + +define LIBSWIFTDISPATCH_BUILD_CMDS + # Compile + (cd $(LIBSWIFTDISPATCH_BUILDDIR) && ninja) +endef + +define LIBSWIFTDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBSWIFTDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +define LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS + # Copy libraries + cp $(LIBSWIFTDISPATCH_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ + # Copy headers + mkdir -p ${STAGING_DIR}/usr/lib/swift/dispatch + cp $(LIBSWIFTDISPATCH_SRCDIR)/dispatch/*.h ${STAGING_DIR}/usr/lib/swift/dispatch/ + cp $(LIBSWIFTDISPATCH_SRCDIR)/dispatch/module.modulemap ${STAGING_DIR}/usr/lib/swift/dispatch/ + mkdir -p ${STAGING_DIR}/usr/lib/swift/Block + cp $(LIBSWIFTDISPATCH_SRCDIR)/src/BlocksRuntime/Block.h ${STAGING_DIR}/usr/lib/swift/Block/ + mkdir -p ${STAGING_DIR}/usr/lib/swift/os + cp $(LIBSWIFTDISPATCH_SRCDIR)/os/object.h ${STAGING_DIR}/usr/lib/swift/os/ + cp $(LIBSWIFTDISPATCH_SRCDIR)/os/generic_unix_base.h ${STAGING_DIR}/usr/lib/swift/os/ + # Copy Swift modules + cp $(LIBSWIFTDISPATCH_BUILDDIR)/src/swift/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ +endef + +$(eval $(generic-package)) diff --git a/package/swift-crypto/Config.in b/package/swift-crypto/Config.in new file mode 100644 index 0000000000..35c42fdc88 --- /dev/null +++ b/package/swift-crypto/Config.in @@ -0,0 +1,10 @@ +if BR2_PACKAGE_SWIFT + +config BR2_PACKAGE_SWIFT_CRYPTO + bool "swift-crypto" + depends on BR2_PACKAGE_SWIFT + depends on BR2_PACKAGE_FOUNDATION + help + Swift Crypto is an open-source implementation of a substantial portion of the API of Apple CryptoKit suitable for use on Linux platforms. + +endif diff --git a/package/swift-crypto/swift-crypto-shared-lib.patch b/package/swift-crypto/swift-crypto-shared-lib.patch new file mode 100644 index 0000000000..049a1a37d5 --- /dev/null +++ b/package/swift-crypto/swift-crypto-shared-lib.patch @@ -0,0 +1,13 @@ +diff --git a/Package.swift b/Package.swift +index 4991568..2cb150f 100644 +--- a/Package.swift ++++ b/Package.swift +@@ -39,7 +39,7 @@ let package = Package( + .tvOS(.v13), + ], + products: [ +- .library(name: "Crypto", targets: ["Crypto"]), ++ .library(name: "Crypto", type: .dynamic, targets: ["Crypto"]), + .library(name: "_CryptoExtras", targets: ["_CryptoExtras"]), + /* This target is used only for symbol mangling. It's added and removed automatically because it emits build warnings. MANGLE_START + .library(name: "CCryptoBoringSSL", type: .static, targets: ["CCryptoBoringSSL"]), diff --git a/package/swift-crypto/swift-crypto.mk b/package/swift-crypto/swift-crypto.mk new file mode 100644 index 0000000000..c0c34f53b3 --- /dev/null +++ b/package/swift-crypto/swift-crypto.mk @@ -0,0 +1,36 @@ +### Swift CryptoKit library +SWIFT_CRYPTO_VERSION = 2.0.5 +SWIFT_CRYPTO_SOURCE = $(SWIFT_CRYPTO_VERSION).tar.gz +SWIFT_CRYPTO_SITE = https://github.com/apple/swift-crypto/archive/refs/tags/ +SWIFT_CRYPTO_LICENSE = Apache-2.0 +SWIFT_CRYPTO_LICENSE_FILES = LICENSE.txt +SWIFT_CRYPTO_INSTALL_STAGING = YES +SWIFT_CRYPTO_INSTALL_TARGET = YES +SWIFT_CRYPTO_SUPPORTS_IN_SOURCE_BUILD = YES +SWIFT_CRYPTO_DEPENDENCIES = swift foundation +SWIFT_CRYPTO_BUILDDIR = $(SWIFT_CRYPTO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) + +define SWIFT_CRYPTO_BUILD_CMDS + ( \ + cd $(SWIFT_CRYPTO_SRCDIR) && \ + rm -rf .build && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ + ) +endef + +define SWIFT_CRYPTO_INSTALL_TARGET_CMDS + # Copy dynamic libraries + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/libCrypto.so $(TARGET_DIR)/usr/lib/ +endef + +define SWIFT_CRYPTO_INSTALL_STAGING_CMDS + # Copy dynamic libraries + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/libCrypto.so $(STAGING_DIR)/usr/lib/swift/linux/ + # Copy Swift module + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/Crypto.swiftdoc ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/Crypto.swiftmodule ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/Crypto.swiftsourceinfo ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ +endef + +$(eval $(generic-package)) diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in new file mode 100644 index 0000000000..cbeed69667 --- /dev/null +++ b/package/swift-hello/Config.in @@ -0,0 +1,10 @@ +if BR2_PACKAGE_SWIFT + +config BR2_PACKAGE_SWIFT_HELLO + bool "swift-hello" + depends on BR2_PACKAGE_SWIFT + depends on BR2_PACKAGE_FOUNDATION + help + Demo application for Swift. + +endif diff --git a/package/swift-hello/src/Package.swift b/package/swift-hello/src/Package.swift new file mode 100644 index 0000000000..d26517480c --- /dev/null +++ b/package/swift-hello/src/Package.swift @@ -0,0 +1,22 @@ +// swift-tools-version:5.5 +import PackageDescription + +let package = Package( + name: "swift-hello", + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .executableTarget( + name: "swift-hello", + dependencies: [] + ), + .testTarget( + name: "swift-helloTests", + dependencies: ["swift-hello"] + ), + ] +) diff --git a/package/swift-hello/src/Sources/swift-hello/Hello.swift b/package/swift-hello/src/Sources/swift-hello/Hello.swift new file mode 100644 index 0000000000..d68c3fb1a3 --- /dev/null +++ b/package/swift-hello/src/Sources/swift-hello/Hello.swift @@ -0,0 +1,31 @@ +import Foundation +#if canImport(Crypto) +import Crypto +#endif + + at main +struct Hello { + static func main() async throws { + print("Hello, world! ?") + #if canImport(Crypto) + print("Swift Crypto installed") + #endif + let task = Task { + var didCatchError = false + do { try await errorTest() } + catch CocoaError.userCancelled { didCatchError = true } + catch { fatalError() } + print("Task ran") + } + for _ in 0 ..< 10 { + print(UUID()) + try await Task.sleep(1_000_000_000) + } + } +} + +func errorTest() async throws { + print("Will throw") + throw CocoaError(.userCancelled) +} + diff --git a/package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift b/package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift new file mode 100644 index 0000000000..f9ca48cacd --- /dev/null +++ b/package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift @@ -0,0 +1,47 @@ +import XCTest +import class Foundation.Bundle + +final class swift_helloTests: XCTestCase { + func testExample() throws { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct + // results. + + // Some of the APIs that we use below are available in macOS 10.13 and above. + guard #available(macOS 10.13, *) else { + return + } + + // Mac Catalyst won't have `Process`, but it is supported for executables. + #if !targetEnvironment(macCatalyst) + + let fooBinary = productsDirectory.appendingPathComponent("swift-hello") + + let process = Process() + process.executableURL = fooBinary + + let pipe = Pipe() + process.standardOutput = pipe + + try process.run() + process.waitUntilExit() + + let data = pipe.fileHandleForReading.readDataToEndOfFile() + let output = String(data: data, encoding: .utf8) + + XCTAssertEqual(output, "Hello, world!\n") + #endif + } + + /// Returns path to the built products directory. + var productsDirectory: URL { + #if os(macOS) + for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") { + return bundle.bundleURL.deletingLastPathComponent() + } + fatalError("couldn't find the products directory") + #else + return Bundle.main.bundleURL + #endif + } +} diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk new file mode 100644 index 0000000000..b3cded3f7c --- /dev/null +++ b/package/swift-hello/swift-hello.mk @@ -0,0 +1,33 @@ +### Swift Demo +SWIFT_HELLO_VERSION = 0.1.0 +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src +SWIFT_HELLO_SITE_METHOD = local +SWIFT_HELLO_INSTALL_STAGING = NO +SWIFT_HELLO_INSTALL_TARGET = YES +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES +SWIFT_HELLO_DEPENDENCIES = swift foundation +SWIFT_HELLO_EXECUTABLES = swift-hello +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) + +define SWIFT_HELLO_BUILD_CMDS + ( \ + cd $(SWIFT_HELLO_SRCDIR) && \ + rm -rf .build && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ + ) +endef + +define SWIFT_HELLO_INSTALL_TARGET_CMDS + # Copy dynamic libraries + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello +endef + +define SWIFT_HELLO_INSTALL_STAGING_CMDS + # Copy dynamic libraries + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello +endef + +$(eval $(generic-package)) diff --git a/package/swift/Config.in b/package/swift/Config.in new file mode 100644 index 0000000000..97c59a8b70 --- /dev/null +++ b/package/swift/Config.in @@ -0,0 +1,55 @@ +config BR2_PACKAGE_SWIFT_ARCH_SUPPORTS + bool + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_RISCV_64 + +config BR2_PACKAGE_SWIFT_TARGET_ARCH + string + default "aarch64" if BR2_aarch64 + default "armv5" if BR2_ARM_CPU_ARMV5 + default "armv6" if BR2_ARM_CPU_ARMV6 + default "armv7" if BR2_ARM_CPU_ARMV7A + default "x86_64" if BR2_x86_64 + default "powerpc" if BR2_powerpc + default "mips" if BR2_mips + default "mipsel" if BR2_mipsel + default "mips64" if BR2_mips64 + default "mips64el" if BR2_mips64el + default "riscv64" if BR2_RISCV_64 + +config BR2_PACKAGE_SWIFT + bool "swift" + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_ICU + select BR2_PACKAGE_LIBDISPATCH + help + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. + + http://swift.org + +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH + +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS + string "Path to host Swift toolchain" + default "/usr/bin" + +config BR2_PACKAGE_SWIFT_LLVM_DIR + string "Path to host LLVM library path" + default "/usr/lib/llvm-12" + +endif + +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/swift/Float16.patch b/package/swift/Float16.patch new file mode 100644 index 0000000000..2768d0cd20 --- /dev/null +++ b/package/swift/Float16.patch @@ -0,0 +1,13 @@ +diff --git a/stdlib/public/runtime/Float16Support.cpp b/stdlib/public/runtime/Float16Support.cpp +index 817739d4cdf..b1896a4e364 100644 +--- a/stdlib/public/runtime/Float16Support.cpp ++++ b/stdlib/public/runtime/Float16Support.cpp +@@ -29,7 +29,7 @@ + + // Android NDK > $(SWIFTPM_DESTINATION_FILE) + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) + + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ + fi + + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ + + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ + fi + + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ + fi + + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) + echo '}' >> $(SWIFTPM_DESTINATION_FILE) + +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) \ No newline at end of file -- 2.30.2 From bugzilla at busybox.net Mon Mar 28 06:11:42 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 06:11:42 +0000 Subject: [Buildroot] [Bug 14701] New: Multiple unresolved symbols while building kernel module package Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 Bug ID: 14701 Summary: Multiple unresolved symbols while building kernel module package Product: buildroot Version: 2021.11.1 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jose.pekkarinen at unikie.com CC: buildroot at uclibc.org Target Milestone: --- Hi, I'm trying to build a package for sgx driver: https://github.com/intel/linux-sgx The package looks like: sgx-driver.mk: ################################################################################ # # sgx-driver # ################################################################################ SGX_DRIVER_VERSION = 2.14 SGX_DRIVER_SOURCE = sgx_driver_$(SGX_DRIVER_VERSION).tar.gz SGX_DRIVER_SITE = https://github.com/intel/linux-sgx-driver/archive/refs/tags SGX_DRIVER_LICENSE = BSD-3-Clause, GPL-2.0 SGX_DRIVER_LICENSE_FILES = License.txt $(eval $(kernel-module)) $(eval $(generic-package)) Config.in: comment "sgx-driver needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SGX_DRIVER bool "sgx-driver" depends on BR2_LINUX_KERNEL help Intel sgx driver for secured containers. https://github.com/intel/linux-sgx-driver When building with a valid config, the build process stops like this: >>> sgx-driver 2.14 Building kernel module(s) PATH="/usr/src/output/br_admin/output_x86_upxtreme/host/bin:/usr/src/output/br_admin/output_x86_upxtreme/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" PKG_CONFIG="/usr/src/output/br_admin/output_x86_upxtreme/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/usr/src/output/br_admin/output_x86_upxtreme/host/lib/pkgconfig:/usr/src/output/br_admin/output_x86_upxtreme/host/share/pkgconfig" BR_BINARIES_DIR=/usr/src/output/br_admin/output_x86_upxtreme/images KCFLAGS=-Wno-attribute-alias /usr/bin/make -j9 -C /usr/src/output/br_admin/output_x86_upxtreme/build/linux-tc-x86-5.15-sec HOSTCC="/usr/src/output/br_admin/output_x86_upxtreme/host/bin/ccache /usr/bin/gcc -O2 -I/usr/src/output/br_admin/output_x86_upxtreme/host/include -L/usr/src/output/br_admin/output_x86_upxtreme/host/lib -Wl,-rpath,/usr/src/output/br_admin/output_x86_upxtreme/host/lib" ARCH=x86_64 INSTALL_MOD_PATH=/usr/src/output/br_admin/output_x86_upxtreme/target CROSS_COMPILE="/usr/src/output/br_admin/output_x86_upxtreme/host/bin/x86_64-TII-linux-gnu-" DEPMOD=/usr/src/output/br_admin/output_x86_upxtreme/host/sbin/depmod INSTALL_MOD_STRIP=1 PWD=/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/. M=/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/. modules make[2]: Entering directory '/usr/src/output/br_admin/output_x86_upxtreme/build/linux-tc-x86-5.15-sec' CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_main.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_page_cache.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_ioctl.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_vma.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_util.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_encl.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_encl2.o LD [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.o MODPOST /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./Module.symvers ERROR: modpost: "flush_work" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "put_pid" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "up_read" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "boot_cpu_data" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "system_freezing_cnt" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "mmu_notifier_register" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "__warn_printk" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "__x86_indirect_alt_call_rbx" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "__x86_indirect_thunk_rcx" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "alloc_pages" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! WARNING: modpost: suppressed 65 unresolved symbol warnings because there were too many) WARNING: modpost: modpost: Found 2 writable function pointers. While the symbols can be found in the original source code of the kernel. Am I missing something in the package to resolv the symbols? Thanks! Jos?. -- You are receiving this mail because: You are on the CC list for the bug. From foss+buildroot at 0leil.net Mon Mar 28 10:17:50 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 11:17:50 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/qt5/qt5base: security bump Message-ID: <20220328101751.1606988-1-foss+buildroot@0leil.net> From: Quentin Schulz This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- v3: rebased on top of master branch v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html - point to newer commit in KDE branch instead of including Qt diff v1: http://lists.busybox.net/pipermail/buildroot/2022-March/638184.html package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..5f158bd6f2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at -- 2.35.1 From foss+buildroot at 0leil.net Mon Mar 28 10:17:51 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 11:17:51 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 In-Reply-To: <20220328101751.1606988-1-foss+buildroot@0leil.net> References: <20220328101751.1606988-1-foss+buildroot@0leil.net> Message-ID: <20220328101751.1606988-2-foss+buildroot@0leil.net> From: Quentin Schulz The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- v3: rebased on top of master branch v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638900.html - added in v2 package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 5f158bd6f2..972d217ef1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,7 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 -- 2.35.1 From foss+buildroot at 0leil.net Mon Mar 28 11:14:13 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 13:14:13 +0200 Subject: [Buildroot] [PATCH 2/2] package/qt5wayland: fix compilation when libxkbcommon is disabled In-Reply-To: <20220328111413.1618964-1-foss+buildroot@0leil.net> References: <20220328111413.1618964-1-foss+buildroot@0leil.net> Message-ID: <20220328111413.1618964-2-foss+buildroot@0leil.net> From: Quentin Schulz When libxkbcommon is disabled, QT_CONFIG(xkbcommon) is not defined which means the variable and function pointer in this patch are compiled out from the header, but the cpp code actually still made use of it. This patch fixes the build issue when libxkbcommon package is not to be built. This patch was taken from (merged): https://codereview.qt-project.org/c/qt/qtwayland/+/344916 Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- .../0001-Add-missing-define-guards.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/qt5/qt5wayland/0001-Add-missing-define-guards.patch diff --git a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch new file mode 100644 index 0000000000..adad3768b2 --- /dev/null +++ b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch @@ -0,0 +1,35 @@ +From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 22 Apr 2021 15:29:56 +0300 +Subject: [PATCH] Add missing define guards + +Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState +only if xcbcommon is available. + +Pick-to: 5.15 +Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe +Reviewed-by: Aleix Pol Gonzalez +[Backported from: 05658e127dedfff65789860415537c6920ec574d] +Signed-off-by: Quentin Schulz +--- + src/client/qwaylandinputcontext.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp +index 16e03ea1..cbf63cde 100644 +--- a/src/client/qwaylandinputcontext.cpp ++++ b/src/client/qwaylandinputcontext.cpp +@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const + void QWaylandInputContext::reset() + { + qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; ++#if QT_CONFIG(xkbcommon) + if (m_composeState) + xkb_compose_state_reset(m_composeState); ++#endif + + QPlatformInputContext::reset(); + +-- +2.35.1 + -- 2.35.1 From foss+buildroot at 0leil.net Mon Mar 28 11:14:12 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 13:14:12 +0200 Subject: [Buildroot] [PATCH 1/2] package/qt5base: fix race with libxkbcommon Message-ID: <20220328111413.1618964-1-foss+buildroot@0leil.net> From: Quentin Schulz qt5wayland package currently has a bug if the xkbcommon Qt config is not enabled which highlighted a race issues between qt5base, libxkbcommon and qt5wayland. qt5wayland has a dependency on libxkbcommon package if it's enabled. qt5base only has a dependency on libxkbcommon if xcb support is to be enabled. If libxkbcommon package is built before qt5base, qt5base will detect it during its configure step and enable the Qt config accordingly. This will make it available to qt5wayland afterwards, even if xcb support is not enabled in Buildroot Kconfig. However, if qt5base is built before libxkbcommon is, qt5base will not advertise support of xbcommon feature to qt5wayland (which will fail its build because of a bug in the source code). Since the package build order should not impact the outcome of the build, let's explicit the dependency if and only if libxkbcommon package is to be compiled at some point in time so that at least this feature is not susceptible to races. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- package/qt5/qt5base/qt5base.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..891635ad35 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -168,6 +168,11 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) +QT5BASE_CONFIGURE_OPTS += -xkbcommon +QT5BASE_DEPENDENCIES += libxkbcommon +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5BASE_CONFIGURE_OPTS += -xcb QT5BASE_CONFIGURE_OPTS += -xkbcommon -- 2.35.1 From d.lang at abatec.at Mon Mar 28 12:29:22 2022 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 28 Mar 2022 12:29:22 +0000 Subject: [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0 Message-ID: - License has been changed from GPL to LGPL or BSD-3-Clause - Drop upstream patches Signed-off-by: Daniel Lang --- .../0001-gcc11-include-typeinfo.patch | 29 ------ .../0002-cmake-improve-include-paths.patch | 91 ------------------- package/dbus-cxx/0003-sasl-use-uid_t.patch | 41 --------- package/dbus-cxx/dbus-cxx.hash | 4 +- package/dbus-cxx/dbus-cxx.mk | 4 +- 5 files changed, 4 insertions(+), 165 deletions(-) delete mode 100644 package/dbus-cxx/0001-gcc11-include-typeinfo.patch delete mode 100644 package/dbus-cxx/0002-cmake-improve-include-paths.patch delete mode 100644 package/dbus-cxx/0003-sasl-use-uid_t.patch diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch deleted file mode 100644 index b4b7d83de2..0000000000 --- a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 03:42:44 +0100 -Subject: [PATCH] Include typeinfo for typeid() (#83) - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H - diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch deleted file mode 100644 index 1f6a36a2c0..0000000000 --- a/package/dbus-cxx/0002-cmake-improve-include-paths.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Mon, 17 Jan 2022 13:57:55 +0100 -Subject: [PATCH] cmake: improve include paths - -Adding the dbus-cxx subfolders as an include path might override system -headers (signal.h for gcc 10). -By removing the subfolders, includes can happen via #include "..." or -via #include . - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - CMakeLists.txt | 4 +--- - dbus-cxx/matchrule.h | 2 +- - dbus-cxx/sasl.h | 2 +- - dbus-cxx/sendmsgtransport.cpp | 2 +- - dbus-cxx/simpletransport.cpp | 2 +- - 5 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6d28c..e76cd61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS - - set( DBUS_CXX_INCLUDE_DIRECTORIES - ${PROJECT_SOURCE_DIR} -- ${PROJECT_SOURCE_DIR}/dbus-cxx -- ${PROJECT_BINARY_DIR} -- ${PROJECT_BINARY_DIR}/dbus-cxx ) -+ ${PROJECT_BINARY_DIR} ) - include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} - ${dbus_INCLUDE_DIRS} - ${sigc_INCLUDE_DIRS} ) -diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h -index 69fdab7..18c9e81 100644 ---- a/dbus-cxx/matchrule.h -+++ b/dbus-cxx/matchrule.h -@@ -20,7 +20,7 @@ - #define DBUSCXX_MATCH_RULE_H - - #include --#include "dbus-cxx-config.h" -+#include - - namespace DBus { - -diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h -index d7429a3..44edd6e 100644 ---- a/dbus-cxx/sasl.h -+++ b/dbus-cxx/sasl.h -@@ -19,7 +19,7 @@ - #ifndef DBUSCXX_SASL_H - #define DBUSCXX_SASL_H - --#include -+#include - - #include - #include -diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp -index ae053ff..a10ae66 100644 ---- a/dbus-cxx/sendmsgtransport.cpp -+++ b/dbus-cxx/sendmsgtransport.cpp -@@ -21,8 +21,8 @@ - #include "dbus-cxx-private.h" - #include "utility.h" - #include "validator.h" -+#include "message.h" - --#include - #include - #include - #include -diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp -index f291d9f..fed4364 100644 ---- a/dbus-cxx/simpletransport.cpp -+++ b/dbus-cxx/simpletransport.cpp -@@ -18,7 +18,7 @@ - ***************************************************************************/ - #include "simpletransport.h" - --#include -+#include "dbus-cxx-private.h" - #include "demarshaling.h" - #include "message.h" - #include "utility.h" - diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch deleted file mode 100644 index f08769b6c5..0000000000 --- a/package/dbus-cxx/0003-sasl-use-uid_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Fri, 28 Jan 2022 07:53:13 +0100 -Subject: [PATCH] use uid_t instead of __uid_t - -uclibc and glibc define getuid() as -extern __uid_t getuid (void) __THROW; -https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 -which is a typedef for unsigned int. - -musl uses uid_t as return type -uid_t getuid(void); -https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 -which is a typedef to unsigned. - -glibc and uclibc include typedefs from __uid_t to uid_t, -which means one should be able to use uid_t as a replacement -for __uid_t and make compiling with all three c standard libraries -possible. - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 -Signed-off-by: Daniel Lang - ---- - dbus-cxx/sasl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; - - diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 907de1866f..5b3a6188fc 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz -sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 55b2541b9c3f3fa705e51e12e6971f66826ebc7185071e0cd1bb6ec9e5adf47f dbus-cxx-2.2.0.tar.gz +sha256 99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk index 3e89fc9db7..b850d45003 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,9 +4,9 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_VERSION = 2.2.0 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +DBUS_CXX_LICENSE = LGPL-3.0 or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE DBUS_CXX_INSTALL_STAGING = YES DBUS_CXX_DEPENDENCIES = libsigc -- 2.25.1 From peter at korsgaard.com Mon Mar 28 13:17:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:17:12 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220328130807.7B77F85E9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afe309d54e5b63bb33dc84443345716dc8d6d2ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used but there's currently no way to do that from a shell script for now. Signed-off-by: Jason A. Donenfeld Signed-off-by: Yann E. MORIN (cherry picked from commit f0986de551f46e72268857fd817986e9be697cd0) Signed-off-by: Peter Korsgaard --- package/urandom-scripts/S20urandom | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" From peter at korsgaard.com Mon Mar 28 13:17:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:17:50 +0200 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324082433.GA3649946@scaer> (Yann E. MORIN's message of "Thu, 24 Mar 2022 09:24:33 +0100") References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: <87fsn2b4ht.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Jason, All, > +Peter: candidate for backporting as a security fix > On 2022-03-23 14:07 -0600, Jason A. Donenfeld spake thusly: >> Writing into /dev/urandom doesn't actually credit any entropy bits. And >> while it adds that data to the entropy pool, it won't actually be >> immediately used when reading from /dev/urandom subsequently. This is >> how the kernel's /dev/urandom has always worked, unfortunately. >> >> As a result of this behavior, which may be understandably surprising, >> writing a good seed file into /dev/urandom and then saving a new seed >> file immediately after is dangerous, because the new seed file may wind >> up being entirely deterministic, even if the old seed file was quite >> good. >> >> This has been fixed in systemd with >> , >> and fortunately it's possible to do the same thing in shell script here. >> Specifically, instead of just saving new /dev/urandom output straight >> up, we hash the new /dev/urandom together with the old seed, in order to >> produce the new seed. This way the amount of entropy in the new seed >> will stay the same or get better, but not appreciably regress. >> >> At the same time, the pool size check in this script is useless. Writing >> to /dev/urandom never credits bits anyway, so no matter what, writing >> into /dev/urandom is useful and not harmful. There's also not much of a >> point in seeding with more than 256 bits, which is what the hashing >> operation above produces. So this commit removes the file size check. >> >> As a final note, while this commit improves upon the status quo by >> removing a vulnerability, this shell script still does not actually >> initialize the RNG like it says it does. For initialization via a seed >> file, the RNDADDENTROPY ioctl must be used. >> >> Signed-off-by: Jason A. Donenfeld > Applied to master, thanks. Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 28 06:03:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 08:03:39 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220328130849.3680385ECD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58559ea02181b6b5f5e84a5ff7131c0ddd89a27c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used but there's currently no way to do that from a shell script for now. Signed-off-by: Jason A. Donenfeld Signed-off-by: Yann E. MORIN (cherry picked from commit f0986de551f46e72268857fd817986e9be697cd0) Signed-off-by: Peter Korsgaard --- package/urandom-scripts/S20urandom | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" From peter at korsgaard.com Mon Mar 28 13:18:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:18:59 +0200 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220324123117.2369981-1-neal.frager@amd.com> (Neal Frager's message of "Thu, 24 Mar 2022 06:31:17 -0600") References: <20220324123117.2369981-1-neal.frager@amd.com> Message-ID: <87bkxqb4fw.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// > The git:// location is no longer supported. > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > Signed-off-by: Neal Frager Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 28 13:18:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:18:37 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] configs/zynqmp_zcu10x: change git to https Message-ID: <20220328130958.B0CA085ED8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9471cbad4d58eb0d95845c0d4e1e8bd846800c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The git:// location is no longer supported by github, so change to https:// For more details: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard (cherry picked from commit 92f653c24057065a4964f83e9ed70e868eac0f89) Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 4 ++-- configs/zynqmp_zcu106_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" From bugzilla at busybox.net Mon Mar 28 13:39:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 13:39:58 +0000 Subject: [Buildroot] [Bug 14706] New: nodjs build problem Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14706 Bug ID: 14706 Summary: nodjs build problem Product: buildroot Version: 2022.02 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: w.meganck at televic.com CC: buildroot at uclibc.org Target Milestone: --- Have a build problem with nodejs. mkdir -p /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin ln -sf /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin/python /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/node.gyp /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/tools/v8_gypfiles/v8.gyp (cd /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3; PATH="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PKG_CONFIG="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/pkgconfig:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/share/pkgconfig" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CXXFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" LDFLAGS="-L/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib -Wl,-rpath,/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib" INTLTOOL_PERL=/usr/bin/perl PATH=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin:"/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PYTHON=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 ./configure --prefix=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host --without-dtrace --without-etw --shared-openssl --shared-openssl-includes=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include --shared-openssl-libpath=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib --shared-zlib --no-cross-compiling --with-intl=system-icu ) Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 13:46:31 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 13:46:31 +0000 Subject: [Buildroot] [Bug 14711] New: nodjs build problem missing bzip Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 Bug ID: 14711 Summary: nodjs build problem missing bzip Product: buildroot Version: 2022.02 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: w.meganck at televic.com CC: buildroot at uclibc.org Target Milestone: --- >>> host-nodejs 14.18.3 Configuring mkdir -p /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin ln -sf /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin/python /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/node.gyp /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/tools/v8_gypfiles/v8.gyp (cd /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3; PATH="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PKG_CONFIG="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/pkgconfig:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/share/pkgconfig" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CXXFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" LDFLAGS="-L/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib -Wl,-rpath,/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib" INTLTOOL_PERL=/usr/bin/perl PATH=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin:"/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PYTHON=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 ./configure --prefix=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host --without-dtrace --without-etw --shared-openssl --shared-openssl-includes=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include --shared-openssl-libpath=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib --shared-zlib --no-cross-compiling --with-intl=system-icu ) Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 13:50:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 13:50:04 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #1 from Wim Meganck --- >>> host-nodejs 14.18.3 Configuring mkdir -p /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin ln -sf /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin/python /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/node.gyp /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/tools/v8_gypfiles/v8.gyp (cd /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3; PATH="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PKG_CONFIG="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/pkgconfig:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/share/pkgconfig" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CXXFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" LDFLAGS="-L/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib -Wl,-rpath,/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib" INTLTOOL_PERL=/usr/bin/perl PATH=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin:"/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PYTHON=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 ./configure --prefix=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host --without-dtrace --without-etw --shared-openssl --shared-openssl-includes=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include --shared-openssl-libpath=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib --shared-zlib --no-cross-compiling --with-intl=system-icu ) Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 19:03:47 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 19:03:47 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #2 from Arnout Vandecappelle --- *** Bug 14706 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 19:03:47 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 19:03:47 +0000 Subject: [Buildroot] [Bug 14706] nodjs build problem In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14706 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #1 from Arnout Vandecappelle --- *** This bug has been marked as a duplicate of bug 14711 *** -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 19:17:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 19:17:17 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #3 from Arnout Vandecappelle --- This shouldn't happen, BR2_PACKAGE_HOST_NODEJS should cause python3 to be built with bzip2 support. Can you check if BR2_PACKAGE_HOST_PYTHON3_BZIP2=y is set in .config? Can you check if _bz2 is in DISABLED_EXTENSIONS in output/build/host-python3-3.10.2? Can you check if _bz2.*.so is indeed missing in output/host/lib/python3.10/lib-dynload? -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Mon Mar 28 19:52:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:52:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0 In-Reply-To: References: Message-ID: <88e09ed0-f4d9-bc00-e596-540111c707ce@mind.be> On 28/03/2022 14:29, Lang Daniel via buildroot wrote: > - License has been changed from GPL to LGPL or BSD-3-Clause > - Drop upstream patches > > Signed-off-by: Daniel Lang [snip] > diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk > index 3e89fc9db7..b850d45003 100644 > --- a/package/dbus-cxx/dbus-cxx.mk > +++ b/package/dbus-cxx/dbus-cxx.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -DBUS_CXX_VERSION = 2.1.0 > +DBUS_CXX_VERSION = 2.2.0 > DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) > -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) > +DBUS_CXX_LICENSE = LGPL-3.0 or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) It's LGPL-3.0+ actually. Applied to master with that fixed, thanks. Regards, Arnout > DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE > DBUS_CXX_INSTALL_STAGING = YES > DBUS_CXX_DEPENDENCIES = libsigc From arnout at mind.be Mon Mar 28 19:54:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:54:24 +0200 Subject: [Buildroot] [PATCH 1/2] package/qt5base: fix race with libxkbcommon In-Reply-To: <20220328111413.1618964-1-foss+buildroot@0leil.net> References: <20220328111413.1618964-1-foss+buildroot@0leil.net> Message-ID: <9470c420-5f40-c626-173d-a7e22571ba7a@mind.be> On 28/03/2022 13:14, Quentin Schulz wrote: > From: Quentin Schulz > > qt5wayland package currently has a bug if the xkbcommon Qt config is not > enabled which highlighted a race issues between qt5base, libxkbcommon > and qt5wayland. > > qt5wayland has a dependency on libxkbcommon package if it's enabled. > qt5base only has a dependency on libxkbcommon if xcb support is to be > enabled. > > If libxkbcommon package is built before qt5base, qt5base will detect it > during its configure step and enable the Qt config accordingly. This > will make it available to qt5wayland afterwards, even if xcb support is > not enabled in Buildroot Kconfig. > > However, if qt5base is built before libxkbcommon is, qt5base will not > advertise support of xbcommon feature to qt5wayland (which will fail its > build because of a bug in the source code). > > Since the package build order should not impact the outcome of the > build, let's explicit the dependency if and only if libxkbcommon package > is to be compiled at some point in time so that at least this feature is > not susceptible to races. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz > --- > package/qt5/qt5base/qt5base.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 4418f0d3ba..891635ad35 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -168,6 +168,11 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,- > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) > QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) > > +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) > +QT5BASE_CONFIGURE_OPTS += -xkbcommon > +QT5BASE_DEPENDENCIES += libxkbcommon > +endif > + > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > QT5BASE_CONFIGURE_OPTS += -xcb > QT5BASE_CONFIGURE_OPTS += -xkbcommon The existing entries should be removed. Applied both to master with that fixed, thanks. Regards, Arnout From arnout at mind.be Mon Mar 28 19:54:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:54:45 +0200 Subject: [Buildroot] [PATCH v3 1/2] package/qt5/qt5base: security bump In-Reply-To: <20220328101751.1606988-1-foss+buildroot@0leil.net> References: <20220328101751.1606988-1-foss+buildroot@0leil.net> Message-ID: On 28/03/2022 12:17, Quentin Schulz wrote: > From: Quentin Schulz > > This fixes CVE-2022-25255 and CVE-2022-25634. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied both to master, thanks. Regards, Arnout > --- > > v3: rebased on top of master branch > v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html > - point to newer commit in KDE branch instead of including Qt diff > v1: http://lists.busybox.net/pipermail/buildroot/2022-March/638184.html > > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 1b9ff43ab2..c031f71c77 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 4418f0d3ba..5f158bd6f2 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES > > # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" > +QT5BASE_IGNORE_CVES += CVE-2022-25634 > > # A few comments: > # * -no-pch to workaround the issue described at From arnout at mind.be Mon Mar 28 19:55:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:55:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.13 In-Reply-To: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> References: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 23:15, Fabrice Fontaine wrote: > - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, > CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 > - Drop second patch (already in version) > - Add tarball sha256 > - Update indentation in hash file (two spaces) > > https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...iple-def-of-invalid_dircache_entries.patch | 25 ------------------- > package/netatalk/netatalk.hash | 7 +++--- > package/netatalk/netatalk.mk | 2 +- > 3 files changed, 5 insertions(+), 29 deletions(-) > delete mode 100644 package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch > > diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch > deleted file mode 100644 > index e7ccc52553..0000000000 > --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 > -From: Andrew Bauer > -Date: Wed, 22 Jan 2020 09:59:47 -0600 > -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries > - > -[Retrieved from: > -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] > -Signed-off-by: Fabrice Fontaine > ---- > - etc/afpd/directory.h | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h > -index eb89c606..81bfa9cb 100644 > ---- a/etc/afpd/directory.h > -+++ b/etc/afpd/directory.h > -@@ -91,7 +91,7 @@ struct maccess { > - #define AR_UWRITE (1<<2) > - #define AR_UOWN (1<<7) > - > --q_t *invalid_dircache_entries; > -+extern q_t *invalid_dircache_entries; > - > - typedef int (*dir_loop)(struct dirent *, char *, void *); > - > diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash > index 6c3250a005..6dead5457c 100644 > --- a/package/netatalk/netatalk.hash > +++ b/package/netatalk/netatalk.hash > @@ -1,6 +1,7 @@ > -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ > -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 > -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 > +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ > +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 > +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 > # Locally computed > +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 > sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING > sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT > diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk > index 0c219a2316..7cc950beb6 100644 > --- a/package/netatalk/netatalk.mk > +++ b/package/netatalk/netatalk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NETATALK_VERSION = 3.1.12 > +NETATALK_VERSION = 3.1.13 > NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) > NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 > # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From arnout at mind.be Mon Mar 28 19:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:55:23 +0200 Subject: [Buildroot] [PATCH 1/1] package/unclutter-xfixes: bump to version 1.6 In-Reply-To: <20220327205750.1448336-1-fontaine.fabrice@gmail.com> References: <20220327205750.1448336-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 22:57, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.6 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/unclutter-xfixes/unclutter-xfixes.hash | 4 ++-- > package/unclutter-xfixes/unclutter-xfixes.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash > index 785825da7a..b0bd5532ef 100644 > --- a/package/unclutter-xfixes/unclutter-xfixes.hash > +++ b/package/unclutter-xfixes/unclutter-xfixes.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz > -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE > +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz > +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE > diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk > index 713a84bca6..6da607b660 100644 > --- a/package/unclutter-xfixes/unclutter-xfixes.mk > +++ b/package/unclutter-xfixes/unclutter-xfixes.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UNCLUTTER_XFIXES_VERSION = 1.5 > +UNCLUTTER_XFIXES_VERSION = 1.6 > UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) > UNCLUTTER_XFIXES_LICENSE = MIT > UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE From arnout at mind.be Mon Mar 28 19:55:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:55:38 +0200 Subject: [Buildroot] [PATCH 1/1] package/matio: security bump to version 1.5.22 In-Reply-To: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> References: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 22:32, Fabrice Fontaine wrote: > - Fixed heap-based buffer overflows when reading (crafted) MAT file > (CVE-2020-36428, CVE-2021-36977) > - Update hash pf COPYING (year updated and contributors added: > https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) > > https://github.com/tbeu/matio/releases/tag/v1.5.22 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/matio/matio.hash | 6 +++--- > package/matio/matio.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/matio/matio.hash b/package/matio/matio.hash > index 4dd05dee07..4634074ca0 100644 > --- a/package/matio/matio.hash > +++ b/package/matio/matio.hash > @@ -1,4 +1,4 @@ > -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ > -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz > +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ > +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz > # Locally computed > -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING > +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING > diff --git a/package/matio/matio.mk b/package/matio/matio.mk > index 236466d4d9..d282852d37 100644 > --- a/package/matio/matio.mk > +++ b/package/matio/matio.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MATIO_VERSION = 1.5.21 > +MATIO_VERSION = 1.5.22 > MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) > MATIO_LICENSE = BSD-2-Clause > MATIO_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:56:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:56:24 +0200 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.4 In-Reply-To: <20220327200651.4189748-1-james.hilliard1@gmail.com> References: <20220327200651.4189748-1-james.hilliard1@gmail.com> Message-ID: On 27/03/2022 22:06, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/systemd/systemd.hash | 2 +- > package/systemd/systemd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index 81f51eac20..3572b25965 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz > +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index b07fac27d4..9feed9c084 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -19,7 +19,7 @@ > # - Diff sysusers.d with the previous version > # - Diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) > -SYSTEMD_VERSION = 250.3 > +SYSTEMD_VERSION = 250.4 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ From arnout at mind.be Mon Mar 28 19:56:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:56:40 +0200 Subject: [Buildroot] [PATCH] package/luasocket: bump to version 3.0.0 In-Reply-To: <20220327194740.1482539-1-francois.perrad@gadz.org> References: <20220327194740.1482539-1-francois.perrad@gadz.org> Message-ID: <5f14a369-6211-9133-881f-2dbb41a6ad1d@mind.be> On 27/03/2022 21:47, Francois Perrad wrote: > moved under the hat of https://github.com/lunarmodules > > diff LICENSE: > -LuaSocket 3.0 license > -Copyright ? 2004-2013 Diego Nehab > +Copyright (C) 2004-2022 Diego Nehab > > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/luasocket/Config.in | 2 +- > package/luasocket/luasocket.hash | 4 ++-- > package/luasocket/luasocket.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in > index 45263030f..5ad00f5c4 100644 > --- a/package/luasocket/Config.in > +++ b/package/luasocket/Config.in > @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET > It provides easy access to TCP, UDP, DNS, SMTP, > FTP, HTTP, MIME and much more. > > - http://luaforge.net/projects/luasocket/ > + https://github.com/lunarmodules/luasocket > diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash > index 843647b27..b66ae57b9 100644 > --- a/package/luasocket/luasocket.hash > +++ b/package/luasocket/luasocket.hash > @@ -1,3 +1,3 @@ > # computed by luarocks/buildroot > -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock > -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE > +sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock > +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE > diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk > index 20927fc1d..eeece26fd 100644 > --- a/package/luasocket/luasocket.mk > +++ b/package/luasocket/luasocket.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LUASOCKET_VERSION = 3.0rc1-1 > -LUASOCKET_SUBDIR = luasocket-3.0-rc1 > +LUASOCKET_VERSION = 3.0.0-1 > +LUASOCKET_SUBDIR = luasocket > LUASOCKET_LICENSE = MIT > LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE > From arnout at mind.be Mon Mar 28 19:56:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:56:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/opus: enable custom modes In-Reply-To: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> References: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 21:39, Fabrice Fontaine wrote: > Enable custom modes to avoid the following build failure with jack2 > raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: > > Checking for header opus/opus_custom.h : not found > The above check failed, but the checkee is required for --opus. > > It should be noted that before this commit, opus was silently disabled > > Fixes: > - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/opus/opus.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/opus/opus.mk b/package/opus/opus.mk > index 3fb2d5d65f..4f816df477 100644 > --- a/package/opus/opus.mk > +++ b/package/opus/opus.mk > @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 > endif > > OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" > +OPUS_CONF_OPTS = --enable-custom-modes > > ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) > OPUS_CONF_OPTS += --enable-fixed-point From arnout at mind.be Mon Mar 28 19:57:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:57:16 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.62.0 In-Reply-To: <20220327174130.2577520-1-james.hilliard1@gmail.com> References: <20220327174130.2577520-1-james.hilliard1@gmail.com> Message-ID: On 27/03/2022 19:41, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index 8389adb243..38fa43f6dc 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc > -sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz.asc > +sha256 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb meson-0.62.0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index e9c3145183..13adc2f2b1 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 0.61.4 > +MESON_VERSION = 0.62.0 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:57:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:57:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/jack1: bump to version 0.126 In-Reply-To: <20220327192613.1239929-1-fontaine.fabrice@gmail.com> References: <20220327192613.1239929-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 21:26, Fabrice Fontaine wrote: > - Switch site to get latest release > - libsndfile and readline are not a dependency since removal of > example-clients and tools with > https://github.com/jackaudio/jack1/commit/ca3af4b0d8a8a8fd6c4ae72c24e4df6e18f83af9 > - Update indentation in hash file (two spaces) > > https://jackaudio.org/news/2022/01/15/jack1-v01260-and-jack2-v1920-releases.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/jack1/jack1.hash | 8 ++++---- > package/jack1/jack1.mk | 14 +++----------- > 2 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash > index d7787ac2ad..d82b9daffd 100644 > --- a/package/jack1/jack1.hash > +++ b/package/jack1/jack1.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz > -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING > -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL > -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL > +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz > +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING > +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL > +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL > diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk > index 6dca56001f..4e16d7e96e 100644 > --- a/package/jack1/jack1.mk > +++ b/package/jack1/jack1.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -JACK1_VERSION = 0.125.0 > -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz > -JACK1_SITE = http://jackaudio.org/downloads > +JACK1_VERSION = 0.126.0 > +JACK1_SITE = \ > + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) > JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) > JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL > JACK1_INSTALL_STAGING = YES > @@ -17,14 +17,6 @@ ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) > JACK1_DEPENDENCIES += libsamplerate > endif > > -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > -JACK1_DEPENDENCIES += libsndfile > -endif > - > -ifeq ($(BR2_PACKAGE_READLINE),y) > -JACK1_DEPENDENCIES += readline > -endif > - > JACK1_CONF_OPTS = --without-html-dir --disable-oss > > $(eval $(autotools-package)) From arnout at mind.be Mon Mar 28 18:54:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:42 +0200 Subject: [Buildroot] [git commit] package/meson: bump to version 0.62.0 Message-ID: <20220328194854.3B5BB85F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97abb7a8d5b595acab2d3d0363f117ba78798ec1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 8389adb243..38fa43f6dc 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc -sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz.asc +sha256 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb meson-0.62.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e9c3145183..13adc2f2b1 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.4 +MESON_VERSION = 0.62.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 Message-ID: <20220328194854.8A4EE85F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be3f9cde29f1727e264d6a2a023588273410c800 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 5f158bd6f2..972d217ef1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,7 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 From arnout at mind.be Mon Mar 28 18:54:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:47 +0200 Subject: [Buildroot] [git commit] package/opus: enable custom modes Message-ID: <20220328194854.4E54185F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92e436b73df21ff9347c53c25fd33d8fd48a9d43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point From arnout at mind.be Mon Mar 28 19:22:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:26 +0200 Subject: [Buildroot] [git commit] package/matio: security bump to version 1.5.22 Message-ID: <20220328194854.694CD85F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f33260685bf9dedd76db5b19f2dce0f4b5cbce2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash of COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:51:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:51:00 +0200 Subject: [Buildroot] [git commit] package/qt5wayland: fix compilation when libxkbcommon is disabled Message-ID: <20220328194854.99EDB85F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1da911cbde3d744ff70211cf3ea714f55888adc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When libxkbcommon is disabled, QT_CONFIG(xkbcommon) is not defined which means the variable and function pointer in this patch are compiled out from the header, but the cpp code actually still made use of it. This patch fixes the build issue when libxkbcommon package is not to be built. This patch was taken from (merged): https://codereview.qt-project.org/c/qt/qtwayland/+/344916 Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Add-missing-define-guards.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch new file mode 100644 index 0000000000..adad3768b2 --- /dev/null +++ b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch @@ -0,0 +1,35 @@ +From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 22 Apr 2021 15:29:56 +0300 +Subject: [PATCH] Add missing define guards + +Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState +only if xcbcommon is available. + +Pick-to: 5.15 +Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe +Reviewed-by: Aleix Pol Gonzalez +[Backported from: 05658e127dedfff65789860415537c6920ec574d] +Signed-off-by: Quentin Schulz +--- + src/client/qwaylandinputcontext.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp +index 16e03ea1..cbf63cde 100644 +--- a/src/client/qwaylandinputcontext.cpp ++++ b/src/client/qwaylandinputcontext.cpp +@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const + void QWaylandInputContext::reset() + { + qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; ++#if QT_CONFIG(xkbcommon) + if (m_composeState) + xkb_compose_state_reset(m_composeState); ++#endif + + QPlatformInputContext::reset(); + +-- +2.35.1 + From arnout at mind.be Mon Mar 28 18:54:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:50 +0200 Subject: [Buildroot] [git commit] package/luasocket: bump to version 3.0.0 Message-ID: <20220328194854.5820185F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab1c99158aa499cca78058ad2284f1e16deb6045 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master moved under the hat of https://github.com/lunarmodules diff LICENSE: -LuaSocket 3.0 license -Copyright ??? 2004-2013 Diego Nehab +Copyright (C) 2004-2022 Diego Nehab Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luasocket/Config.in | 2 +- package/luasocket/luasocket.hash | 4 ++-- package/luasocket/luasocket.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in index 45263030f3..5ad00f5c48 100644 --- a/package/luasocket/Config.in +++ b/package/luasocket/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET It provides easy access to TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more. - http://luaforge.net/projects/luasocket/ + https://github.com/lunarmodules/luasocket diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash index 843647b27f..b66ae57b9b 100644 --- a/package/luasocket/luasocket.hash +++ b/package/luasocket/luasocket.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE +sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index 20927fc1d6..eeece26fd5 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUASOCKET_VERSION = 3.0rc1-1 -LUASOCKET_SUBDIR = luasocket-3.0-rc1 +LUASOCKET_VERSION = 3.0.0-1 +LUASOCKET_SUBDIR = luasocket LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/unclutter-xfixes: bump to version 1.6 Message-ID: <20220328194854.710FC85F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f44c5d3f54893195c731523423c01e355978ef6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unclutter-xfixes/unclutter-xfixes.hash | 4 ++-- package/unclutter-xfixes/unclutter-xfixes.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash index 785825da7a..b0bd5532ef 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.hash +++ b/package/unclutter-xfixes/unclutter-xfixes.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk index 713a84bca6..6da607b660 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.mk +++ b/package/unclutter-xfixes/unclutter-xfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNCLUTTER_XFIXES_VERSION = 1.5 +UNCLUTTER_XFIXES_VERSION = 1.6 UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) UNCLUTTER_XFIXES_LICENSE = MIT UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/netatalk: security bump to version 3.1.13 Message-ID: <20220328194854.7914385F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ed1baa7e2d20c2b6184db265f398d1c2bb0e2e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-multiple-def-of-invalid_dircache_entries.patch | 25 ---------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From arnout at mind.be Mon Mar 28 19:49:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:49:39 +0200 Subject: [Buildroot] [git commit] package/qt5base: fix race with libxkbcommon Message-ID: <20220328194854.9205085F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba8f35eda65d3623967e35547d6bec38f5ebc66a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qt5wayland package currently has a bug if the xkbcommon Qt config is not enabled which highlighted a race issues between qt5base, libxkbcommon and qt5wayland. qt5wayland has a dependency on libxkbcommon package if it's enabled. qt5base only has a dependency on libxkbcommon if xcb support is to be enabled. If libxkbcommon package is built before qt5base, qt5base will detect it during its configure step and enable the Qt config accordingly. This will make it available to qt5wayland afterwards, even if xcb support is not enabled in Buildroot Kconfig. However, if qt5base is built before libxkbcommon is, qt5base will not advertise support of xbcommon feature to qt5wayland (which will fail its build because of a bug in the source code). Since the package build order should not impact the outcome of the build, let's explicit the dependency if and only if libxkbcommon package is to be compiled at some point in time so that at least this feature is not susceptible to races. Move the xkbcommon entries out of the BR2_PACKAGE_QT5BASE_XCB condition, instead make them depend on BR2_PACKAGE_LIBXKBCOMMON. Since BR2_PACKAGE_QT5BASE_XCB selects BR2_PACKAGE_LIBXKBCOMMON they are still included if xcb is selected. Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: remove the already existing xkbcommon entries] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 972d217ef1..0c811b3ac1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -174,9 +174,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) +QT5BASE_CONFIGURE_OPTS += -xkbcommon +QT5BASE_DEPENDENCIES += libxkbcommon +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5BASE_CONFIGURE_OPTS += -xcb -QT5BASE_CONFIGURE_OPTS += -xkbcommon QT5BASE_DEPENDENCIES += \ libxcb \ @@ -184,8 +188,7 @@ QT5BASE_DEPENDENCIES += \ xcb-util-image \ xcb-util-keysyms \ xcb-util-renderutil \ - xlib_libX11 \ - libxkbcommon + xlib_libX11 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) QT5BASE_DEPENDENCIES += xlib_libXext endif From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/qt5/qt5base: security bump Message-ID: <20220328194854.81E2785F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cae2aa844f5ad0962ec073f6cac103c0dc6af1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..5f158bd6f2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at From arnout at mind.be Mon Mar 28 19:51:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:51:00 +0200 Subject: [Buildroot] [git commit] package/dbus-cxx: bump to version 2.2.0 Message-ID: <20220328194854.A28A885F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1506ff275b0e53a4ac886d6eed7d4fea9456ae00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - License has been changed from GPL to LGPL or BSD-3-Clause - Drop upstream patches Signed-off-by: Daniel Lang [Arnout: license is actually LGPL-3.0+, not LGPL-3.0] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dbus-cxx/0001-gcc11-include-typeinfo.patch | 29 ------- .../0002-cmake-improve-include-paths.patch | 91 ---------------------- package/dbus-cxx/0003-sasl-use-uid_t.patch | 41 ---------- package/dbus-cxx/dbus-cxx.hash | 4 +- package/dbus-cxx/dbus-cxx.mk | 4 +- 5 files changed, 4 insertions(+), 165 deletions(-) diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch deleted file mode 100644 index b4b7d83de2..0000000000 --- a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 03:42:44 +0100 -Subject: [PATCH] Include typeinfo for typeid() (#83) - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H - diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch deleted file mode 100644 index 1f6a36a2c0..0000000000 --- a/package/dbus-cxx/0002-cmake-improve-include-paths.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Mon, 17 Jan 2022 13:57:55 +0100 -Subject: [PATCH] cmake: improve include paths - -Adding the dbus-cxx subfolders as an include path might override system -headers (signal.h for gcc 10). -By removing the subfolders, includes can happen via #include "..." or -via #include . - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - CMakeLists.txt | 4 +--- - dbus-cxx/matchrule.h | 2 +- - dbus-cxx/sasl.h | 2 +- - dbus-cxx/sendmsgtransport.cpp | 2 +- - dbus-cxx/simpletransport.cpp | 2 +- - 5 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6d28c..e76cd61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS - - set( DBUS_CXX_INCLUDE_DIRECTORIES - ${PROJECT_SOURCE_DIR} -- ${PROJECT_SOURCE_DIR}/dbus-cxx -- ${PROJECT_BINARY_DIR} -- ${PROJECT_BINARY_DIR}/dbus-cxx ) -+ ${PROJECT_BINARY_DIR} ) - include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} - ${dbus_INCLUDE_DIRS} - ${sigc_INCLUDE_DIRS} ) -diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h -index 69fdab7..18c9e81 100644 ---- a/dbus-cxx/matchrule.h -+++ b/dbus-cxx/matchrule.h -@@ -20,7 +20,7 @@ - #define DBUSCXX_MATCH_RULE_H - - #include --#include "dbus-cxx-config.h" -+#include - - namespace DBus { - -diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h -index d7429a3..44edd6e 100644 ---- a/dbus-cxx/sasl.h -+++ b/dbus-cxx/sasl.h -@@ -19,7 +19,7 @@ - #ifndef DBUSCXX_SASL_H - #define DBUSCXX_SASL_H - --#include -+#include - - #include - #include -diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp -index ae053ff..a10ae66 100644 ---- a/dbus-cxx/sendmsgtransport.cpp -+++ b/dbus-cxx/sendmsgtransport.cpp -@@ -21,8 +21,8 @@ - #include "dbus-cxx-private.h" - #include "utility.h" - #include "validator.h" -+#include "message.h" - --#include - #include - #include - #include -diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp -index f291d9f..fed4364 100644 ---- a/dbus-cxx/simpletransport.cpp -+++ b/dbus-cxx/simpletransport.cpp -@@ -18,7 +18,7 @@ - ***************************************************************************/ - #include "simpletransport.h" - --#include -+#include "dbus-cxx-private.h" - #include "demarshaling.h" - #include "message.h" - #include "utility.h" - diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch deleted file mode 100644 index f08769b6c5..0000000000 --- a/package/dbus-cxx/0003-sasl-use-uid_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Fri, 28 Jan 2022 07:53:13 +0100 -Subject: [PATCH] use uid_t instead of __uid_t - -uclibc and glibc define getuid() as -extern __uid_t getuid (void) __THROW; -https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 -which is a typedef for unsigned int. - -musl uses uid_t as return type -uid_t getuid(void); -https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 -which is a typedef to unsigned. - -glibc and uclibc include typedefs from __uid_t to uid_t, -which means one should be able to use uid_t as a replacement -for __uid_t and make compiling with all three c standard libraries -possible. - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 -Signed-off-by: Daniel Lang - ---- - dbus-cxx/sasl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; - - diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 907de1866f..5b3a6188fc 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz -sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 55b2541b9c3f3fa705e51e12e6971f66826ebc7185071e0cd1bb6ec9e5adf47f dbus-cxx-2.2.0.tar.gz +sha256 99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk index 3e89fc9db7..c0bcff1c67 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,9 +4,9 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_VERSION = 2.2.0 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +DBUS_CXX_LICENSE = LGPL-3.0+ or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE DBUS_CXX_INSTALL_STAGING = YES DBUS_CXX_DEPENDENCIES = libsigc From arnout at mind.be Mon Mar 28 18:54:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:53 +0200 Subject: [Buildroot] [git commit] package/systemd: bump to version 250.4 Message-ID: <20220328194854.608E785F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea04ee34f0078952aae0e27150b683ec3c8defdf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac20..3572b25965 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..9feed9c084 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.3 +SYSTEMD_VERSION = 250.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From arnout at mind.be Mon Mar 28 18:54:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:45 +0200 Subject: [Buildroot] [git commit] package/jack1: bump to version 0.126 Message-ID: <20220328194854.449C385F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5eefab2d4e211adb51d261700b4022e76c60c20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch site to get latest release - libsndfile and readline are not a dependency since removal of example-clients and tools with https://github.com/jackaudio/jack1/commit/ca3af4b0d8a8a8fd6c4ae72c24e4df6e18f83af9 - Update indentation in hash file (two spaces) https://jackaudio.org/news/2022/01/15/jack1-v01260-and-jack2-v1920-releases.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack1/jack1.hash | 8 ++++---- package/jack1/jack1.mk | 14 +++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash index d7787ac2ad..d82b9daffd 100644 --- a/package/jack1/jack1.hash +++ b/package/jack1/jack1.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 6dca56001f..4e16d7e96e 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -4,9 +4,9 @@ # ################################################################################ -JACK1_VERSION = 0.125.0 -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz -JACK1_SITE = http://jackaudio.org/downloads +JACK1_VERSION = 0.126.0 +JACK1_SITE = \ + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES @@ -17,14 +17,6 @@ ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -JACK1_DEPENDENCIES += libsndfile -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK1_DEPENDENCIES += readline -endif - JACK1_CONF_OPTS = --without-html-dir --disable-oss $(eval $(autotools-package)) From fontaine.fabrice at gmail.com Mon Mar 28 20:15:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 28 Mar 2022 22:15:21 +0200 Subject: [Buildroot] [PATCH 1/1] Revert "package/tpm2-tss: bump version to 3.2.0" Message-ID: <20220328201521.4084-1-fontaine.fabrice@gmail.com> This reverts commit ed13a65a08cfe315aed9344abc609f5f2b92c782 as it has the following non trivial issues: - pkgconfig files have no version number if we run autoreconf (https://github.com/tpm2-software/tpm2-tss/issues/2329) resulting in the following build failures with tpm2-{abrmd,pkcs11} or libsecret: configure: error: Package requirements (tss2-esys >= 2.0) were not met: Package dependency requirement 'tss2-esys >= 2.0' could not be satisfied. Package 'tss2-esys' has version '', required version is '>= 2.0' - addgroup/groupadd and adduser/useradd are mandatory since https://github.com/tpm2-software/tpm2-tss/commit/7fde604383c62fc764a1e060dff48fc06f79860b: configure: error: addgroup or groupadd are needed. It seems better to find an upstreamable solution to both issues before bumping. Fixes: - http://autobuild.buildroot.org/results/d4d6807af3493deb47951c6f11f427040e5c5e11 - http://autobuild.buildroot.org/results/a304e45bacb8cd7e7ea9bc49e4a8ec9359ca0a3a - http://autobuild.buildroot.org/results/be0befa81e955ac8cf16f9d20723f9b9b174e012 - http://autobuild.buildroot.org/results/d4ebee400423f6df51613193c86db3c58c94ff88 Signed-off-by: Fabrice Fontaine --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index db6b3b7ad0..b6eb3c1f97 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz +sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 2bb1235177..f475697e40 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.2.0 +TPM2_TSS_VERSION = 3.1.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE -- 2.35.1 From fontaine.fabrice at gmail.com Mon Mar 28 20:21:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 28 Mar 2022 22:21:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/paho-mqtt-c: bump to version 1.3.10 Message-ID: <20220328202136.7182-1-fontaine.fabrice@gmail.com> Service release. Issues resolved: https://github.com/eclipse/paho.mqtt.c/milestone/17?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.10 Signed-off-by: Fabrice Fontaine --- package/paho-mqtt-c/paho-mqtt-c.hash | 2 +- package/paho-mqtt-c/paho-mqtt-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash index 4cdedfbf9a..931bf5b9c8 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 386c9b5fa1cf6d0d516db12d57fd8f6a410dd0fdc5e9a2da870aae437a2535ed paho-mqtt-c-1.3.9.tar.gz +sha256 c70db96e66adacae411d5d875fbb08bca6ff9945de3d215b3af93cbd22792db5 paho-mqtt-c-1.3.10.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk index 68b58f2e02..d6356a7ccc 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.9 +PAHO_MQTT_C_VERSION = 1.3.10 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE -- 2.35.1 From ju.o at free.fr Mon Mar 28 20:31:39 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 28 Mar 2022 22:31:39 +0200 Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: bump to version 2.2.6 Message-ID: <20220328203139.1115402-1-ju.o@free.fr> For change log since v2.2.5, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.6 Signed-off-by: Julien Olivain --- Tested with: make check-package ... 0 warnings generated ./utils/test-pkg -p fluidsynth ... 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0d41c16d8d..20eb9ec49f 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz +sha256 ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f fluidsynth-2.2.6.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index b500944c16..d7c72ed059 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.5 +FLUIDSYNTH_VERSION = 2.2.6 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE -- 2.35.1 From arnout at mind.be Mon Mar 28 20:35:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 22:35:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries In-Reply-To: <20220328060027.2483147-1-alseycmiller@gmail.com> References: <20220328060027.2483147-1-alseycmiller@gmail.com> Message-ID: <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> Hi Alsey, Thank you for your contribution! I have a number of review comments below. Please take them into account and send a new patch series. For the time being, I've marked the patch as Changes Requested in patchwork. Firt of all, the patch should be split up in separate patches: one patch per package you add. Make sure all of them are posted together and in the correct order. Each patch should have as subject "package/...: new package". I have a few more comments below, but it's hard to properly review such a big patch so I will probably have missed some things. On 28/03/2022 08:00, Alsey Coleman Miller wrote: > Signed-off-by: Alsey Coleman Miller > --- > package/Config.in | 11 + Please add yourself to the DEVELOPERS file [1] for this package. This way, you'll get an e-mail if the package fails in the autobuilders, or when a new version is released if the package is registered on release-monitoring.org. [snip] > diff --git a/package/foundation/Config.in b/package/foundation/Config.in > new file mode 100644 > index 0000000000..7a9dc8b514 > --- /dev/null > +++ b/package/foundation/Config.in > @@ -0,0 +1,14 @@ > +if BR2_PACKAGE_SWIFT I get that you only want swift-related packages to appear in the menus if swift itself is selected. It would be even better, then, to sort all of them under the swift main entry. Perhaps even prefix all of them with swift-, like is done for python, perl and lua packages. > + > +config BR2_PACKAGE_FOUNDATION > + bool "foundation" > + depends on BR2_PACKAGE_SWIFT > + select BR2_PACKAGE_LIBSWIFTDISPATCH > + select BR2_PACKAGE_LIBCURL > + select BR2_PACKAGE_LIBXML2 > + help > + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. Please make sure indentation is done correctly, as reported by the utils/check-package script. In this case, the line length is way too long. > + > + http://swift.org > + > +endif > diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash > new file mode 100644 > index 0000000000..f15edb8420 > --- /dev/null > +++ b/package/foundation/foundation.hash > @@ -0,0 +1 @@ > +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz > diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk > new file mode 100644 > index 0000000000..93c7cedbdd > --- /dev/null > +++ b/package/foundation/foundation.mk > @@ -0,0 +1,102 @@ > +### Foundation Missin comment header, as reported by check-package (I'm not going to repeat all the other check-package errors). > +FOUNDATION_VERSION = $(SWIFT_VERSION) > +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz > +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags This doesn't look right - shouldn't you be using the github helper? > +FOUNDATION_LICENSE = Apache-2.0 > +FOUNDATION_LICENSE_FILES = LICENSE > +FOUNDATION_INSTALL_STAGING = YES > +FOUNDATION_INSTALL_TARGET = YES _INSTALL_TARGET = YES is not needed, it's done automatically. > +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO > +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch > + > +FOUNDATION_CONF_OPTS += \ > + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ > + -DCMAKE_Swift_FLAGS_DEBUG="" \ Please consistently indent with one tab. > + -DCMAKE_Swift_FLAGS_RELEASE="" \ > + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ > + -DCF_DEPLOYMENT_SWIFT=ON \ > + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ > + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ > + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ > + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ > + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ > + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ > + > +ifeq ($(BR2_PACKAGE_LIBCURL),y) Since Config.in selects libcurl, this is always true. > + FOUNDATION_DEPENDENCIES += libcurl No indentation within make conditions. > + FOUNDATION_CONF_OPTS += \ > + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ > + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ > + > +endif > + > +ifeq ($(BR2_PACKAGE_LIBXML2),y) > + FOUNDATION_DEPENDENCIES += libxml2 > + FOUNDATION_CONF_OPTS += \ > + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ > + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ > + > +endif > + > +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) > +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) > +else > +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build > +endif This stuff is done automatically by the infra. > + > +define FOUNDATION_CONFIGURE_CMDS > + # Workaround Dispatch defined with cmake and module > + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch > + # Clean > + rm -rf $(FOUNDATION_BUILDDIR) > + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation > + # Configure > + (mkdir -p $(FOUNDATION_BUILDDIR) && \ > + cd $(FOUNDATION_BUILDDIR) && \ > + rm -f CMakeCache.txt && \ > + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ > + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ > + -DCMAKE_INSTALL_PREFIX="/usr" \ > + -DBUILD_SHARED_LIBS=ON \ > + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ > + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ > + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ > + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + $(FOUNDATION_CONF_OPTS) \ > + ) I haven't looked at the details, but not using the cmake infrastructure is not a good idea. > +endef > + > +define FOUNDATION_BUILD_CMDS > + # Compile > + (cd $(FOUNDATION_BUILDDIR) && ninja) If the problem is that it only supports the ninja build system: please use [2] and explain in the cover letter of your series that it depends on that. > +endef > + > +define FOUNDATION_INSTALL_TARGET_CMDS > + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ > +endef > + > +define FOUNDATION_INSTALL_STAGING_CMDS > + # Copy libraries > + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ > + # Copy CoreFoundation module > + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation > + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ > + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map > + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map > + # Copy CFXMLInterface module > + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface > + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map > + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map > + # Copy CFURLSessionInterface module > + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface > + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map > + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map > + # Copy Swift modules > + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ > + # Restore Dispatch headers > + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) > + > +endef > + > +$(eval $(generic-package)) > diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in > new file mode 100644 > index 0000000000..2f7c115375 > --- /dev/null > +++ b/package/libdispatch/Config.in > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_LIBDISPATCH > + bool "libdispatch" > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_USES_GLIBC When there are toolchain dependencies, there should also be a comment that tells the user why the package can't be selected. Look at other packages for examples. Since it's not clear here, you should probably explain in the commit message why these dependencies are needed. > + select BR2_PACKAGE_LIBBSD > + > + help > + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. > + > + http://swift.org > diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash > new file mode 100644 > index 0000000000..a89c48c55f > --- /dev/null > +++ b/package/libdispatch/libdispatch.hash > @@ -0,0 +1,2 @@ > +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz > +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch > diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk > new file mode 100644 > index 0000000000..a334c3052d > --- /dev/null > +++ b/package/libdispatch/libdispatch.mk > @@ -0,0 +1,78 @@ > +### Grand Central Dispatch (C API) > +LIBDISPATCH_VERSION = $(SWIFT_VERSION) > +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz > +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags > +LIBDISPATCH_LICENSE = Apache-2.0 > +LIBDISPATCH_LICENSE_FILES = LICENSE > +LIBDISPATCH_INSTALL_STAGING = YES > +LIBDISPATCH_INSTALL_TARGET = YES > +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO > +LIBDISPATCH_DEPENDENCIES = libbsd > +LIBDISPATCH_PATCH = \ > + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch Downloading a patch from your own gist isn't exactly great for allowing reviews :-). Please instead include the patch directly in Buildroot. Since upstream is managed in git, please make this a git-formatted patch (generated with git format-patch -N) [1]. Make sure it has a summary and description just like any other commit, and also include your Signed-off-by. The latter is needed to ascertain that the patch may be distributed under the upstream project's license (which may be different from Buildroot's). [snip] > diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in > new file mode 100644 > index 0000000000..cbeed69667 > --- /dev/null > +++ b/package/swift-hello/Config.in > @@ -0,0 +1,10 @@ > +if BR2_PACKAGE_SWIFT > + > +config BR2_PACKAGE_SWIFT_HELLO > + bool "swift-hello" > + depends on BR2_PACKAGE_SWIFT > + depends on BR2_PACKAGE_FOUNDATION > + help > + Demo application for Swift. If I understand correctly, this package serves no purpose other than proving that it's possibleto biuld a swift application in Buildroot. Nobody is ever going to select it. Instead, it would be better to move it to the runtime test infrastructure (and of course actually runtime test it, which proves that the generated binaries actually work). [snip] > diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk > new file mode 100644 > index 0000000000..b3cded3f7c > --- /dev/null > +++ b/package/swift-hello/swift-hello.mk > @@ -0,0 +1,33 @@ > +### Swift Demo > +SWIFT_HELLO_VERSION = 0.1.0 > +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src > +SWIFT_HELLO_SITE_METHOD = local > +SWIFT_HELLO_INSTALL_STAGING = NO > +SWIFT_HELLO_INSTALL_TARGET = YES > +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES > +SWIFT_HELLO_DEPENDENCIES = swift foundation > +SWIFT_HELLO_EXECUTABLES = swift-hello > +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) > + > +define SWIFT_HELLO_BUILD_CMDS > + ( \ These parenthesis are actually not needed. They are still used in a lot of places in Buildroot, but that's legacy stuff. > + cd $(SWIFT_HELLO_SRCDIR) && \ > + rm -rf .build && \ > + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ > + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ > + ) > +endef > + > +define SWIFT_HELLO_INSTALL_TARGET_CMDS > + # Copy dynamic libraries > + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ Please don't keep commented-out lines. > + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello > +endef > + > +define SWIFT_HELLO_INSTALL_STAGING_CMDS > + # Copy dynamic libraries > + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ > + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello > +endef > + > +$(eval $(generic-package)) [snip] > +config BR2_PACKAGE_SWIFT > + bool "swift" > + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_USES_GLIBC > + select BR2_PACKAGE_ICU > + select BR2_PACKAGE_LIBDISPATCH > + help > + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. > + > + http://swift.org > + > +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH > + > +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS > + string "Path to host Swift toolchain" > + default "/usr/bin" > + > +config BR2_PACKAGE_SWIFT_LLVM_DIR > + string "Path to host LLVM library path" > + default "/usr/lib/llvm-12" I guess swift is built on top of LLVM. Is it possible to use package/llvm, or is it a patched version? > + > +endif > + > +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" > + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ > + || BR2_STATIC_LIBS || !BR2_USE_WCHAR [snip] > diff --git a/package/swift/swift.mk b/package/swift/swift.mk > new file mode 100644 > index 0000000000..da10aae8fd > --- /dev/null > +++ b/package/swift/swift.mk > @@ -0,0 +1,232 @@ > +### Apple's Swift Programming Language > +SWIFT_VERSION = 5.6 > +SWIFT_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz > +SWIFT_SITE = https://github.com/apple/swift/archive/refs/tags > +SWIFT_LICENSE = Apache-2.0 > +SWIFT_LICENSE_FILES = LICENSE.txt > +SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH)) > +SWIFT_NATIVE_PATH = $(call qstrip,$(BR2_PACKAGE_SWIFT_NATIVE_TOOLS)) > +SWIFT_LLVM_DIR = $(call qstrip,$(BR2_PACKAGE_SWIFT_LLVM_DIR)) > +SWIFT_INSTALL_STAGING = YES > +SWIFT_INSTALL_TARGET = YES > +SWIFT_SUPPORTS_IN_SOURCE_BUILD = NO > +SWIFT_DEPENDENCIES = icu libxml2 libbsd libdispatch > + > +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > +SWIFT_CONF_ENV += LIBS="-latomic" > +endif > + > +HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift > +SWIFTPM_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/$(SWIFT_TARGET_NAME)-toolchain.json This should have simply a SWIFT_ prefix, not SWIFTPM. [snip] > +define SWIFT_INSTALL_STAGING_CMDS > + mkdir -p $(HOST_SWIFT_SUPPORT_DIR) > + # Copy runtime libraries and swift interfaces > + cp -rf $(SWIFT_BUILDDIR)/lib/swift ${STAGING_DIR}/usr/lib/ > + # Generate SwiftPM cross compilation toolchain file > + rm -f $(SWIFTPM_DESTINATION_FILE) > + touch $(SWIFTPM_DESTINATION_FILE) > + echo '{' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) We generally prefer to have a template file (called swift-toolchain.json.in) in the package directory, and use sed to replace @XXXX@ entries. See e.g. how it's done for cmake's toolchainfile. > + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) > + > + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ > + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ > + fi > + > + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ > + > + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ > + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ > + fi > + > + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ > + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ > + fi > + > + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) > + echo '}' >> $(SWIFTPM_DESTINATION_FILE) > + > +endef > + > +$(eval $(generic-package)) > +$(eval $(host-generic-package)) > \ No newline at end of file Please make sure there's a newline at the end of the file. Regards, Arnout [1] https://buildroot.org/downloads/manual/manual.html#DEVELOPERS [2] https://patchwork.ozlabs.org/project/buildroot/list/?series=282194 [3] https://buildroot.org/manual.html#_format_and_licensing_of_the_package_patches From Matthew.Weber at collins.com Mon Mar 28 20:29:18 2022 From: Matthew.Weber at collins.com (Weber, Matthew L Collins) Date: Mon, 28 Mar 2022 20:29:18 +0000 Subject: [Buildroot] [External] Re: [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> Message-ID: James, > From: James Hilliard > Sent: Wednesday, March 23, 2022 11:30 PM > To: Arnout Vandecappelle > Cc: Romain Naour ; Joseph Kogut ; Thomas Petazzoni ; buildroot ; Romain Naour ; Weber, Matthew L Collins ; Valentin Korenblit > Subject: [External] Re: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 > [snip] > I think I managed to fix the blockers with libclc in Matt's series > which I've sent as a v12: Thank you for picking up these patches! I can confirm that the "runtest" passes for the CLANG compiler-rt (ARM64 QEMU) and I've successfully built/used an x86 defconfig(GCC8.x / Linux 4.14) I use for fuzzing. Tested-by: Matthew Weber Regards, Matt From Jason at zx2c4.com Tue Mar 29 05:04:01 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 29 Mar 2022 01:04:01 -0400 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220327202415.1248312-1-Jason@zx2c4.com> References: <20220327202415.1248312-1-Jason@zx2c4.com> Message-ID: <20220329050401.110856-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Reviewed-by: James Hilliard Signed-off-by: Jason A. Donenfeld --- Changes v2->v3: - Some small fixes on the exit path to be a bit cleaner. package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 64 +-- package/urandom-scripts/seedrng.c | 458 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 6 + 4 files changed, 482 insertions(+), 50 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..1959fad93b 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -6,63 +6,35 @@ # Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -URANDOM_SEED="/var/lib/random-seed" +# The following knobs can be adjusted by placing uncommented modified lines +# into /etc/default/urandom: +# +# Set these to change where the seed and runtime lock file are stored: +# +# export SEEDRNG_SEED_DIR=/var/lib/seedrng +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock +# +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng: +# +# export SEEDRNG_SKIP_CREDIT=false +# # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in start|restart|reload) # Carry a random seed from start-up to start-up # Load and then save the whole entropy pool - init_rng && save_random_seed;; + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; stop) # Carry a random seed from shut-down to start-up # Save the whole entropy pool - save_random_seed;; + seedrng;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..2a9df3c914 --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,458 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + + +static const char *SEED_DIR; +static const char *LOCK_FILE; +static char *CREDITABLE_SEED; +static char *NON_CREDITABLE_SEED; + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +static void populate_global_paths(void) +{ + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); + if (!SEED_DIR || !*SEED_DIR) + SEED_DIR = "/var/lib/seedrng"; + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); + if (!LOCK_FILE || !*LOCK_FILE) + LOCK_FILE = "/var/run/seedrng.lock"; + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); + exit(1); + } +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd = -1, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + populate_global_paths(); + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + program_ret = 1; + goto out; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + if (fd >= 0) + close(fd); + if (lock >= 0) + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..e8526e248a 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,13 @@ # ################################################################################ +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From dan at thejacksons.uk Tue Mar 29 05:57:55 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 05:57:55 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? Message-ID: Hello, Sorry once again if this is a silly/noob question. If I have an existing router device running a 2.6.39.3 kernel, which has a USB port and is capable of supporting USB devices, but the manufacturer has removed/not installed the necessary kernel modules, can I use Buildroot to recreate the missing modules and thus re-enable the missing USB support? If so, how would I do it? This time I successfully managed to build other binaries (e.g. dropbear, busybox) which run OK on the device. Thanks, Dan Jackson. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Tue Mar 29 06:07:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 29 Mar 2022 06:07:59 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #1 from Jos? Pekkarinen --- Is there any way I can set in buildroot KBUILD_MODPOST_WARN? According to the kernel documentation it will set all errors as warning, and this is for testing purposes only, so no matter if it boils out. -- You are receiving this mail because: You are on the CC list for the bug. From David.Laight at ACULAB.COM Tue Mar 29 06:12:41 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Tue, 29 Mar 2022 06:12:41 +0000 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220329050401.110856-1-Jason@zx2c4.com> References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> Message-ID: From: Jason A. Donenfeld > Sent: 29 March 2022 06:04 > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. It isn't that tiny, this bloats out to quite a lot of code. > +#define G(r, i, a, b, c, d) do { \ > + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > + d = ror32(d ^ a, 16); \ > + c += d; \ > + b = ror32(b ^ c, 12); \ > + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > + d = ror32(d ^ a, 8); \ > + c += d; \ > + b = ror32(b ^ c, 7); \ > +} while (0) > + > +#define ROUND(r) do { \ > + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > +} while (0) > + ROUND(0); > + ROUND(1); > + ROUND(2); > + ROUND(3); > + ROUND(4); > + ROUND(5); > + ROUND(6); > + ROUND(7); > + ROUND(8); > + ROUND(9); I've not looked at why the code is doing this. If you are feeding data that has come from the RNG back in as state/entropy why does it contain a copy of blake2? I was expecting to see a program that copied stdin to /dev/urandom in a manner that actually credited entropy. About 10 lines of code. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From bugzilla at busybox.net Tue Mar 29 06:21:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 29 Mar 2022 06:21:17 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #2 from Jos? Pekkarinen --- as a workaround I have added to the package the following line: SGX_DRIVER_MAKE_OPTS=KBUILD_MODPOST_WARN=1 That allows to build and test stuff. I'm uncertain this is a kernel bug instead of a buildroot one by now. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 29 07:23:20 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 29 Mar 2022 07:23:20 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #3 from Jos? Pekkarinen --- This is the list of "missing" symbols: depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __put_page depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __check_object_size depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol vmf_insert_pfn depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol misc_deregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol alloc_workqueue depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_insert depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_alt_call_rcx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol platform_driver_unregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol on_each_cpu_cond_mask depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol queue_work_on depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol stackleak_track_stack depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _find_first_bit depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_lookup depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_alt_call_rax depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol finish_wait depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol ioremap_cache depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol iounmap depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _find_first_zero_bit depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol set_freezable depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol zap_vma_ptes depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol ex_handler_default depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol prepare_to_wait_event depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol kthread_should_stop depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __wake_up depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _raw_spin_lock depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol msleep_interruptible depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol wake_up_process depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __refrigerator depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_thunk_rax depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _printk depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol schedule depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol refcount_warn_saturate depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol smp_call_function depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __free_pages depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _dev_info depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol find_vma depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol page_offset_base depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __cond_resched depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_delete depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol init_wait_entry depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol shmem_file_setup depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __list_add_valid depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol fput depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_next_chunk depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol platform_device_unregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol destroy_workqueue depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_thunk_rbx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol shmem_read_mapping_page_gfp depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol apply_to_page_range depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol mmu_notifier_unregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __cpu_online_mask depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __list_del_entry_valid depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol kthread_stop depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __mutex_init depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol freezing_slow_path depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol current_task depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol misc_register depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _copy_to_user depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol down_read depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __platform_driver_register depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol kthread_create_on_node depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol set_page_dirty depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol vmemmap_base depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __ubsan_handle_shift_out_of_bounds depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol platform_device_register_full depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol alloc_pages depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_thunk_rcx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_alt_call_rbx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __warn_printk depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol mmu_notifier_register depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol system_freezing_cnt depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol boot_cpu_data depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol up_read depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol put_pid depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol flush_work -- You are receiving this mail because: You are on the CC list for the bug. From br015 at umbiko.net Tue Mar 29 09:40:26 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Tue, 29 Mar 2022 09:40:26 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: Message-ID: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> Hi Dan, On 2022-03-29 05:58, Dan Jackson wrote: > Hello, > > Sorry once again if this is a silly/noob question. > > If I have an existing router device running a 2.6.39.3 kernel, which > has a USB port and is capable of supporting USB devices, but the > manufacturer has removed/not installed the necessary kernel modules, > can I use Buildroot to recreate the missing modules and thus re-enable > the missing USB support? It might work: the driver is contained in the USB module, so building and loading that module could do the trick. > If so, how would I do it? Supposing the Linux kernel source contained in [1] is the one that is running on your device, you need to configure Buildroot to build a Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some information about how to do this for a Kernel source tree (see chapter 8.14.6). You then need to enable USB support in the kernel (Device Drivers -> USB support), probably CONFIG_USB=m CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y is enough, otherwise try some of the hardware specific (driver) options. Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ to the corresponding location on your device and load the driver with modprobe. Depending on which functionality (e.g. USB_STORAGE) you want on your USB port, additional configurations changes may be necessary. Kind regards, Andreas > This time I successfully managed to build other binaries (e.g. > dropbear, busybox) which run OK on the device. > > Thanks, > Dan Jackson. > -------------- next part -------------- > An HTML attachment was scrubbed... > URL: > [1] https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ [2] https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From dan at thejacksons.uk Tue Mar 29 12:48:51 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 12:48:51 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 29 March 2022 10:40 > To: Dan Jackson > Cc: Buildroot > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > Hi Dan, > > On 2022-03-29 05:58, Dan Jackson wrote: > > > Hello, > > > > Sorry once again if this is a silly/noob question. > > > > If I have an existing router device running a 2.6.39.3 kernel, which > > has a USB port and is capable of supporting USB devices, but the > > manufacturer has removed/not installed the necessary kernel modules, > > can I use Buildroot to recreate the missing modules and thus re-enable > > the missing USB support? > > It might work: the driver is contained in the USB module, so building and > loading that module could do the trick. > > > If so, how would I do it? > > Supposing the Linux kernel source contained in [1] is the one that is running > on your device, you need to configure Buildroot to build a Linux kernel > (BR2_LINUX_KERNEL). The manual [2] has some information about how to > do this for a Kernel source tree (see chapter 8.14.6). It looks like I got that part to work. The buildroot build process definitely seems to be able to see the kernel source tree which is in /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. > > You then need to enable USB support in the kernel (Device Drivers -> USB > support), probably > > CONFIG_USB=m > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_OHCI_HCD=y > > is enough, otherwise try some of the hardware specific (driver) options. This is where I have fallen down. I did "make linux-menuconfig" expecting to be able to configure the kernel/modules (as I couldn't see any options for that in buildroot's own "make menuconfig"). However, at this point it seems like it went off and tried to build the whole kernel from a default configuration. This eventually failed, so I tried "make linux-reconfigure" at that point but that did not work either. Here is the error it gave upon failure: /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux-uclibcgnueabi/bin/ld: /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: error loading plugin: /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: undefined symbol: _onload collect2: error: ld returned 1 exit status Makefile.in:114: recipe for target '../utils/getconf' failed make[3]: *** [../utils/getconf] Error 1 Makefile.in:455: recipe for target 'utils' failed make[2]: *** [utils] Error 2 package/pkg-generic.mk:380: recipe for target '/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed' failed make[1]: *** [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed] Error 2 Makefile:84: recipe for target '_all' failed make: *** [_all] Error 2 Looking at this error message, maybe I need to select an older version of gcc, in my buildroot configuration? Is it that the kernel can only be compiled by gcc versions that existed at the time? > > Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ to the > corresponding location on your device and load the driver with modprobe. > > Depending on which functionality (e.g. USB_STORAGE) you want on your > USB port, additional configurations changes may be necessary. Yes, USB storage functionality is what I would like to add back in. Incidentally, this is a newer router than the one I was experimenting with before; this one has a Puma 6 CPU. Though, oddly I found it necessary to select an armv5 CPU type in buildroot in order to get binaries that work, despite /proc/cpuinfo on the device claiming it is armv6. > > Kind regards, > Andreas > > > This time I successfully managed to build other binaries (e.g. > > dropbear, busybox) which run OK on the device. > > > > Thanks, > > Dan Jackson. > > -------------- next part -------------- An HTML attachment was > > scrubbed... > > URL: > > > 3c49a2d/attachment.html> > > [1] > https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ > [2] > https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From andreynech at gmail.com Tue Mar 29 14:59:04 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Tue, 29 Mar 2022 16:59:04 +0200 Subject: [Buildroot] [PATCH] package/cmake: bump version to 3.22.3 Message-ID: <20220329145904.63900-1-andreynech@gmail.com> Version 3.20 is the first one where the following issue is fixed: https://gitlab.kitware.com/cmake/cmake/-/issues/18299 Was affected by this bug and decide to bump the version to the latest stable --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index da514a6d6b..1749db8c27 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt -sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz +# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt +sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz # Locally calculated sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 4177b119ab..053658fad6 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.18 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 +CMAKE_VERSION_MAJOR = 3.22 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -- 2.32.0 From br015 at umbiko.net Tue Mar 29 15:13:40 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Tue, 29 Mar 2022 15:13:40 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> Message-ID: <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> Hi Dan, On 2022-03-29 12:48, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 29 March 2022 10:40 >> To: Dan Jackson >> Cc: Buildroot >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> Hi Dan, >> >> On 2022-03-29 05:58, Dan Jackson wrote: >> >> > Hello, >> > >> > Sorry once again if this is a silly/noob question. >> > >> > If I have an existing router device running a 2.6.39.3 kernel, which >> > has a USB port and is capable of supporting USB devices, but the >> > manufacturer has removed/not installed the necessary kernel modules, >> > can I use Buildroot to recreate the missing modules and thus re-enable >> > the missing USB support? >> >> It might work: the driver is contained in the USB module, so building >> and >> loading that module could do the trick. >> >> > If so, how would I do it? >> >> Supposing the Linux kernel source contained in [1] is the one that is >> running >> on your device, you need to configure Buildroot to build a Linux >> kernel >> (BR2_LINUX_KERNEL). The manual [2] has some information about how to >> do this for a Kernel source tree (see chapter 8.14.6). > > It looks like I got that part to work. The buildroot build process > definitely seems to be able to see the kernel source tree which is in > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. > >> >> You then need to enable USB support in the kernel (Device Drivers -> >> USB >> support), probably >> >> CONFIG_USB=m >> CONFIG_USB_EHCI_HCD=y >> CONFIG_USB_OHCI_HCD=y >> >> is enough, otherwise try some of the hardware specific (driver) >> options. > > This is where I have fallen down. I did "make linux-menuconfig" > expecting to be able to configure the kernel/modules (as I couldn't > see any options for that in buildroot's own "make menuconfig"). > > However, at this point it seems like it went off and tried to build > the whole kernel from a default configuration. 'make linux-menuconfig' needs a working build system. If they are not present, all dependencies of the Linux package get built. First step is the installation of the kernel source; if Buildroot tries to install a default kernel, something is amiss with your configuration. > This eventually failed, so I tried "make linux-reconfigure" at that > point but that did not work either. > > Here is the error it gave upon failure: > > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux-uclibcgnueabi/bin/ld: > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > error loading plugin: > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > undefined symbol: _onload > collect2: error: ld returned 1 exit status > Makefile.in:114: recipe for target '../utils/getconf' failed > make[3]: *** [../utils/getconf] Error 1 > Makefile.in:455: recipe for target 'utils' failed > make[2]: *** [utils] Error 2 > package/pkg-generic.mk:380: recipe for target > '/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed' > failed > make[1]: *** > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed] > Error 2 > Makefile:84: recipe for target '_all' failed > make: *** [_all] Error 2 This error is from the uClibc build - do you use an internal or external toolchain? Maybe you have conflicting static /dynamic library options? Again, probably a buildroot misconfiguration ... Maybe you could post your buildroot configuration (the result of make savedefconfig)? > Looking at this error message, maybe I need to select an older version > of gcc, in my buildroot configuration? Is it that the kernel can only > be compiled by gcc versions that existed at the time? Older kernels used to have a include/compiler.h which had predefined includes for specific compiler versions. Use the oldest compiler available in Buildroot and try to either get a compiler-gcc9.h from a newer kernel or make your own. I believe this schema changed somewhere between 3.x and 4.x For newer compilers, this file is comparatively empty. >> >> Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ to >> the >> corresponding location on your device and load the driver with >> modprobe. >> >> Depending on which functionality (e.g. USB_STORAGE) you want on your >> USB port, additional configurations changes may be necessary. > > Yes, USB storage functionality is what I would like to add back in. > Incidentally, this is a newer router than the one I was experimenting > with before; this one has a Puma 6 CPU. Though, oddly I found it > necessary to select an armv5 CPU type in buildroot in order to get > binaries that work, despite /proc/cpuinfo on the device claiming it is > armv6. > >> >> Kind regards, >> Andreas >> >> > This time I successfully managed to build other binaries (e.g. >> > dropbear, busybox) which run OK on the device. >> > >> > Thanks, >> > Dan Jackson. >> > -------------- next part -------------- An HTML attachment was >> > scrubbed... >> > URL: >> > > > 3c49a2d/attachment.html> >> >> [1] >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ >> [2] >> https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From dan at thejacksons.uk Tue Mar 29 16:17:03 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 16:17:03 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 29 March 2022 16:14 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > Hi Dan, > > On 2022-03-29 12:48, Dan Jackson wrote: > >> -----Original Message----- > >> From: Andreas Ziegler > >> Sent: 29 March 2022 10:40 > >> To: Dan Jackson > >> Cc: Buildroot > >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel > >> - > >> possible? > >> > >> Hi Dan, > >> > >> On 2022-03-29 05:58, Dan Jackson wrote: > >> > >> > Hello, > >> > > >> > Sorry once again if this is a silly/noob question. > >> > > >> > If I have an existing router device running a 2.6.39.3 kernel, > >> > which has a USB port and is capable of supporting USB devices, but > >> > the manufacturer has removed/not installed the necessary kernel > >> > modules, can I use Buildroot to recreate the missing modules and > >> > thus re-enable the missing USB support? > >> > >> It might work: the driver is contained in the USB module, so building > >> and loading that module could do the trick. > >> > >> > If so, how would I do it? > >> > >> Supposing the Linux kernel source contained in [1] is the one that is > >> running on your device, you need to configure Buildroot to build a > >> Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some information > >> about how to do this for a Kernel source tree (see chapter 8.14.6). > > > > It looks like I got that part to work. The buildroot build process > > definitely seems to be able to see the kernel source tree which is in > > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. > > > >> > >> You then need to enable USB support in the kernel (Device Drivers -> > >> USB support), probably > >> > >> CONFIG_USB=m > >> CONFIG_USB_EHCI_HCD=y > >> CONFIG_USB_OHCI_HCD=y > >> > >> is enough, otherwise try some of the hardware specific (driver) > >> options. > > > > This is where I have fallen down. I did "make linux-menuconfig" > > expecting to be able to configure the kernel/modules (as I couldn't > > see any options for that in buildroot's own "make menuconfig"). > > > > However, at this point it seems like it went off and tried to build > > the whole kernel from a default configuration. > > 'make linux-menuconfig' needs a working build system. If they are not > present, all dependencies of the Linux package get built. First step is the > installation of the kernel source; if Buildroot tries to install a default kernel, > something is amiss with your configuration. > > > This eventually failed, so I tried "make linux-reconfigure" at that > > point but that did not work either. > > > > Here is the error it gave upon failure: > > > > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot- > linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux- > uclibcgnueabi/bin/ld: > > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- > linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > > error loading plugin: > > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- > linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > > undefined symbol: _onload > > collect2: error: ld returned 1 exit status > > Makefile.in:114: recipe for target '../utils/getconf' failed > > make[3]: *** [../utils/getconf] Error 1 > > Makefile.in:455: recipe for target 'utils' failed > > make[2]: *** [utils] Error 2 > > package/pkg-generic.mk:380: recipe for target > > '/home/danj/buildroot-2022.02/output/build/uclibc- > 1.0.40/.stamp_target_installed' > > failed > > make[1]: *** > > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target > > _installed] > > Error 2 > > Makefile:84: recipe for target '_all' failed > > make: *** [_all] Error 2 > > This error is from the uClibc build - do you use an internal or external > toolchain? Maybe you have conflicting static /dynamic library options? > Again, probably a buildroot misconfiguration ... This turned out to be that I had some wrong environment variables set from a previous attempt. Logged out and back in and now I am past that error. > > Maybe you could post your buildroot configuration (the result of make > savedefconfig)? It's quite short as it turns out: BR2_armeb=y BR2_STATIC_LIBS=y BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_PTHREAD_DEBUG=y BR2_BINUTILS_VERSION_2_37_X=y BR2_GCC_VERSION_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_HOST_GDB=y BR2_GDB_VERSION_9_2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" BR2_PACKAGE_JOE=y I can see I have got a USE_ARCH_DEFAULT_CONFIG in there which I'm guessing is part of my problems? > > > Looking at this error message, maybe I need to select an older version > > of gcc, in my buildroot configuration? Is it that the kernel can only > > be compiled by gcc versions that existed at the time? > > Older kernels used to have a include/compiler.h which had predefined > includes for specific compiler versions. Use the oldest compiler available in > Buildroot and try to either get a compiler-gcc9.h from a newer kernel or > make your own. I believe this schema changed somewhere between 3.x and > 4.x For newer compilers, this file is comparatively empty. GCC 9.x is the oldest option available in current buildroot so I have switched to that. I found a compiler-gcc5.h in kernel 4.1, newer kernels do not have any numbered files of this type at all. I downloaded this one and symlinked it as compiler-gcc9.h and it looks like this got me past this error. However, now I have a new missing file error, and I can't seem to locate a suitable candidate: In file included from /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/system.h:165, from /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/bitops.h:27, from include/linux/bitops.h:22, from include/linux/kernel.h:17, from include/linux/sched.h:55, from arch/arm/kernel/asm-offsets.c:13: /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/memory.h:19:10: fatal error: mach/memory.h: No such file or directory 19 | #include | ^~~~~~~~~~~~~~~ compilation terminated. /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: recipe for target 'arch/arm/kernel/asm-offsets.s' failed make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 Makefile:1009: recipe for target 'prepare0' failed make[2]: *** [prepare0] Error 2 make[2]: *** Waiting for unfinished jobs.... HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/sumversion.o HOSTLD scripts/mod/modpost make[2]: *** wait: No child processes. Stop. package/pkg-generic.mk:289: recipe for target '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' failed make[1]: *** [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] Error 2 Makefile:84: recipe for target '_all' failed make: *** [_all] Error 2 I think maybe I am still doing something wrong because it sure seems to be compiling a lot of stuff instead of letting me configure things. > > >> > >> Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ > >> to the corresponding location on your device and load the driver with > >> modprobe. > >> > >> Depending on which functionality (e.g. USB_STORAGE) you want on your > >> USB port, additional configurations changes may be necessary. > > > > Yes, USB storage functionality is what I would like to add back in. > > Incidentally, this is a newer router than the one I was experimenting > > with before; this one has a Puma 6 CPU. Though, oddly I found it > > necessary to select an armv5 CPU type in buildroot in order to get > > binaries that work, despite /proc/cpuinfo on the device claiming it is > > armv6. > > > >> > >> Kind regards, > >> Andreas > >> > >> > This time I successfully managed to build other binaries (e.g. > >> > dropbear, busybox) which run OK on the device. > >> > > >> > Thanks, > >> > Dan Jackson. > >> > -------------- next part -------------- An HTML attachment was > >> > scrubbed... > >> > URL: > >> > >> > 9/4 > >> > 3c49a2d/attachment.html> > >> > >> [1] > >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ > >> [2] > >> > https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From james.hilliard1 at gmail.com Tue Mar 29 16:40:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 10:40:36 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering Message-ID: <20220329164036.4045575-1-james.hilliard1@gmail.com> We need to backport a patch to fix software rendering with cog. Signed-off-by: James Hilliard --- ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch new file mode 100644 index 0000000000..fec21c225c --- /dev/null +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch @@ -0,0 +1,42 @@ +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 26 Mar 2022 13:30:47 -0600 +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release + function name. + +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91) + +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc] +--- + platform/wayland/cog-platform-wl.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c +index 0ff9e6f..46c5185 100644 +--- a/platform/wayland/cog-platform-wl.c ++++ b/platform/wayland/cog-platform-wl.c +@@ -63,7 +63,7 @@ + + #define DEFAULT_ZOOM_STEP 0.1f + +-#if defined(WPE_WL_CHECK_VERSION) ++#if defined(WPE_FDO_CHECK_VERSION) + # define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0) + # define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1) + #else +@@ -1705,8 +1705,8 @@ static void + shm_buffer_destroy(struct shm_buffer *buffer) + { + if (buffer->exported_buffer) { +- wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, +- buffer->exported_buffer); ++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, ++ buffer->exported_buffer); + } + + wl_buffer_destroy(buffer->buffer); +-- +2.25.1 + -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 29 16:45:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 10:45:34 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.3 Message-ID: <20220329164534.4046877-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 839b12e619..839211ef72 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.3.tar.xz.sums +md5 320d01d8546144fba2e14bed3522c8c7 cog-0.12.3.tar.xz +sha1 8e28b216bb2462325a1df1e8e03ac199487440b0 cog-0.12.3.tar.xz +sha256 f464065057373c0430f6267205d1ab3367b54ac04d15b6b5531683b03212f45f cog-0.12.3.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 2f6ef402fb..22c31f7944 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.1 +COG_VERSION = 0.12.3 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -- 2.25.1 From br015 at umbiko.net Tue Mar 29 17:52:14 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Tue, 29 Mar 2022 17:52:14 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> Message-ID: <54f87d03a99935fb452424992a81409c@umbiko.net> On 2022-03-29 16:17, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 29 March 2022 16:14 >> To: Dan Jackson >> Cc: buildroot at buildroot.org >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> Hi Dan, >> >> On 2022-03-29 12:48, Dan Jackson wrote: >> >> -----Original Message----- >> >> From: Andreas Ziegler >> >> Sent: 29 March 2022 10:40 >> >> To: Dan Jackson >> >> Cc: Buildroot >> >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> >> - >> >> possible? >> >> >> >> Hi Dan, >> >> >> >> On 2022-03-29 05:58, Dan Jackson wrote: >> >> >> >> > Hello, >> >> > >> >> > Sorry once again if this is a silly/noob question. >> >> > >> >> > If I have an existing router device running a 2.6.39.3 kernel, >> >> > which has a USB port and is capable of supporting USB devices, but >> >> > the manufacturer has removed/not installed the necessary kernel >> >> > modules, can I use Buildroot to recreate the missing modules and >> >> > thus re-enable the missing USB support? >> >> >> >> It might work: the driver is contained in the USB module, so building >> >> and loading that module could do the trick. >> >> >> >> > If so, how would I do it? >> >> >> >> Supposing the Linux kernel source contained in [1] is the one that is >> >> running on your device, you need to configure Buildroot to build a >> >> Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some information >> >> about how to do this for a Kernel source tree (see chapter 8.14.6). >> > >> > It looks like I got that part to work. The buildroot build process >> > definitely seems to be able to see the kernel source tree which is in >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. >> > >> >> >> >> You then need to enable USB support in the kernel (Device Drivers -> >> >> USB support), probably >> >> >> >> CONFIG_USB=m >> >> CONFIG_USB_EHCI_HCD=y >> >> CONFIG_USB_OHCI_HCD=y >> >> >> >> is enough, otherwise try some of the hardware specific (driver) >> >> options. >> > >> > This is where I have fallen down. I did "make linux-menuconfig" >> > expecting to be able to configure the kernel/modules (as I couldn't >> > see any options for that in buildroot's own "make menuconfig"). >> > >> > However, at this point it seems like it went off and tried to build >> > the whole kernel from a default configuration. >> >> 'make linux-menuconfig' needs a working build system. If they are not >> present, all dependencies of the Linux package get built. First step >> is the >> installation of the kernel source; if Buildroot tries to install a >> default kernel, >> something is amiss with your configuration. >> >> > This eventually failed, so I tried "make linux-reconfigure" at that >> > point but that did not work either. >> > >> > Here is the error it gave upon failure: >> > >> > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot- >> linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux- >> uclibcgnueabi/bin/ld: >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: >> > error loading plugin: >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: >> > undefined symbol: _onload >> > collect2: error: ld returned 1 exit status >> > Makefile.in:114: recipe for target '../utils/getconf' failed >> > make[3]: *** [../utils/getconf] Error 1 >> > Makefile.in:455: recipe for target 'utils' failed >> > make[2]: *** [utils] Error 2 >> > package/pkg-generic.mk:380: recipe for target >> > '/home/danj/buildroot-2022.02/output/build/uclibc- >> 1.0.40/.stamp_target_installed' >> > failed >> > make[1]: *** >> > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target >> > _installed] >> > Error 2 >> > Makefile:84: recipe for target '_all' failed >> > make: *** [_all] Error 2 >> >> This error is from the uClibc build - do you use an internal or >> external >> toolchain? Maybe you have conflicting static /dynamic library options? >> Again, probably a buildroot misconfiguration ... > > This turned out to be that I had some wrong environment variables set > from a previous attempt. Logged out and back in and now I am past that > error. > >> >> Maybe you could post your buildroot configuration (the result of make >> savedefconfig)? > > It's quite short as it turns out: > > BR2_armeb=y > BR2_STATIC_LIBS=y > BR2_KERNEL_HEADERS_VERSION=y > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > BR2_PTHREAD_DEBUG=y > BR2_BINUTILS_VERSION_2_37_X=y > BR2_GCC_VERSION_9_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_HOST_GDB=y > BR2_GDB_VERSION_9_2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_PACKAGE_DROPBEAR=y > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" > BR2_PACKAGE_JOE=y The configuration uses a kernel downloaded from kernel.org, not the vendor kernel. You need to configure Buildroot to use a custom source directory. > I can see I have got a USE_ARCH_DEFAULT_CONFIG in there which I'm > guessing is part of my problems? You need to configure Buildroot to use your existing .config with BR2_LINUX_CUSTOM_KERNEL_CONFIG_FILE. >> >> > Looking at this error message, maybe I need to select an older version >> > of gcc, in my buildroot configuration? Is it that the kernel can only >> > be compiled by gcc versions that existed at the time? >> >> Older kernels used to have a include/compiler.h which had predefined >> includes for specific compiler versions. Use the oldest compiler >> available in >> Buildroot and try to either get a compiler-gcc9.h from a newer kernel >> or >> make your own. I believe this schema changed somewhere between 3.x and >> 4.x For newer compilers, this file is comparatively empty. > > GCC 9.x is the oldest option available in current buildroot so I have > switched to that. > > I found a compiler-gcc5.h in kernel 4.1, newer kernels do not have any > numbered files of this type at all. I downloaded this one and > symlinked it as compiler-gcc9.h and it looks like this got me past > this error. > > However, now I have a new missing file error, and I can't seem to > locate a suitable candidate: > > In file included from > /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/system.h:165, > from > /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/bitops.h:27, > from include/linux/bitops.h:22, > from include/linux/kernel.h:17, > from include/linux/sched.h:55, > from arch/arm/kernel/asm-offsets.c:13: > /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/memory.h:19:10: > fatal error: mach/memory.h: No such file or directory > 19 | #include > | ^~~~~~~~~~~~~~~ > compilation terminated. > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > Makefile:1009: recipe for target 'prepare0' failed > make[2]: *** [prepare0] Error 2 > make[2]: *** Waiting for unfinished jobs.... > HOSTCC scripts/mod/modpost.o > HOSTCC scripts/mod/sumversion.o > HOSTLD scripts/mod/modpost > make[2]: *** wait: No child processes. Stop. > package/pkg-generic.mk:289: recipe for target > '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' > failed > make[1]: *** > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] > Error 2 > Makefile:84: recipe for target '_all' failed > make: *** [_all] Error 2 This seems not to be the defconfig from above? It now uses linux-custom ... The failure may be due to the default kernel configuration. Try to configure the correct one and see if you get further. > I think maybe I am still doing something wrong because it sure seems > to be compiling a lot of stuff instead of letting me configure things. It gets better once everything necessary is built. >> >> >> >> >> Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ >> >> to the corresponding location on your device and load the driver with >> >> modprobe. >> >> >> >> Depending on which functionality (e.g. USB_STORAGE) you want on your >> >> USB port, additional configurations changes may be necessary. >> > >> > Yes, USB storage functionality is what I would like to add back in. >> > Incidentally, this is a newer router than the one I was experimenting >> > with before; this one has a Puma 6 CPU. Though, oddly I found it >> > necessary to select an armv5 CPU type in buildroot in order to get >> > binaries that work, despite /proc/cpuinfo on the device claiming it is >> > armv6. >> > >> >> >> >> Kind regards, >> >> Andreas >> >> >> >> > This time I successfully managed to build other binaries (e.g. >> >> > dropbear, busybox) which run OK on the device. >> >> > >> >> > Thanks, >> >> > Dan Jackson. >> >> > -------------- next part -------------- An HTML attachment was >> >> > scrubbed... >> >> > URL: >> >> > > >> > 9/4 >> >> > 3c49a2d/attachment.html> >> >> >> >> [1] >> >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ >> >> [2] >> >> >> https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From alseycmiller at gmail.com Tue Mar 29 18:25:36 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 11:25:36 -0700 Subject: [Buildroot] [PATCH] package/cmake: bump version to 3.22.3 In-Reply-To: <20220329145904.63900-1-andreynech@gmail.com> References: <20220329145904.63900-1-andreynech@gmail.com> Message-ID: <9D9C16F3-628C-4BA5-B218-5066F12FAEFD@gmail.com> This newer version of cmake is also needed to cross compile Apple?s Swift programming language, so it would be great if this got merged. > On Mar 29, 2022, at 7:59 AM, Andrey Nechypurenko wrote: > > Version 3.20 is the first one where the following issue is fixed: > https://gitlab.kitware.com/cmake/cmake/-/issues/18299 > Was affected by this bug and decide to bump the version to the > latest stable > --- > package/cmake/cmake.hash | 4 ++-- > package/cmake/cmake.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash > index da514a6d6b..1749db8c27 100644 > --- a/package/cmake/cmake.hash > +++ b/package/cmake/cmake.hash > @@ -1,5 +1,5 @@ > -# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt > -sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz > +# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt > +sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz > > # Locally calculated > sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt > diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk > index 4177b119ab..053658fad6 100644 > --- a/package/cmake/cmake.mk > +++ b/package/cmake/cmake.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -CMAKE_VERSION_MAJOR = 3.18 > -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 > +CMAKE_VERSION_MAJOR = 3.22 > +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 > CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) > CMAKE_LICENSE = BSD-3-Clause > CMAKE_LICENSE_FILES = Copyright.txt > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Tue Mar 29 18:44:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 29 Mar 2022 20:44:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/nbd: needs host-bison Message-ID: <20220329184458.289902-1-fontaine.fabrice@gmail.com> host-bison is mandatory to avoid the following build failure since bump to version 3.24 in commit bf2e459bb9fc9fe57147313cda35f7022172e6e8 and https://github.com/NetworkBlockDevice/nbd/commit/cd099ee7d0602104506bdd5063c0a3db2ec9b550: configure: error: bison is required Fixes: - http://autobuild.buildroot.org/results/05872813c9e9b9f39f960fa9a33ad82dc124c808 Signed-off-by: Fabrice Fontaine --- package/nbd/nbd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index f0fb23910e..50f698dd24 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -8,7 +8,7 @@ NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -NBD_DEPENDENCIES = host-pkgconf libglib2 +NBD_DEPENDENCIES = host-bison host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 NBD_LICENSE_FILES = COPYING NBD_CPE_ID_VENDOR = network_block_device_project -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:56 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:56 +0000 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain Message-ID: <20220329185059.943889-1-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..9b36ee2b47 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES - +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) $(2)_BUILDDIR = $$($(2)_SRCDIR) @@ -82,6 +82,7 @@ ifeq ($(4),target) # documented as a standard CMake variable. If a package supports it, # it must handle it explicitly. # +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) define $(2)_CONFIGURE_CMDS (mkdir -p $$($$(PKG)_BUILDDIR) && \ cd $$($$(PKG)_BUILDDIR) && \ @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS ) endef else +define $(2)_CONFIGURE_CMDS + (mkdir -p $$($$(PKG)_BUILDDIR) && \ + cd $$($$(PKG)_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$$(BR_PATH) \ + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ + $$(CMAKE_QUIET) \ + $$($$(PKG)_CONF_OPTS) \ + ) +endef +endif +else # Configure package for host define $(2)_CONFIGURE_CMDS -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:57 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:57 +0000 Subject: [Buildroot] [PATCH 2/4] package/libdispatch: add libdispatch package In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <20220329185059.943889-2-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/Config.in | 1 + package/libdispatch/Config.in | 43 ++++++++++++++++++++++ package/libdispatch/libdispatch.hash | 1 + package/libdispatch/libdispatch.mk | 53 ++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 package/libdispatch/Config.in create mode 100644 package/libdispatch/libdispatch.hash create mode 100644 package/libdispatch/libdispatch.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..e217ff5282 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdispatch/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in new file mode 100644 index 0000000000..f4fa5e47fb --- /dev/null +++ b/package/libdispatch/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + bool + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH + string + default "aarch64" if BR2_aarch64 + default "armv5" if BR2_ARM_CPU_ARMV5 + default "armv6" if BR2_ARM_CPU_ARMV6 + default "armv7" if BR2_ARM_CPU_ARMV7A + default "x86_64" if BR2_x86_64 + default "powerpc" if BR2_powerpc + default "mips" if BR2_mips + default "mipsel" if BR2_mipsel + default "mips64" if BR2_mips64 + default "mips64el" if BR2_mips64el + default "riscv64" if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH + bool "libdispatch" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBBSD + + help + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + http://swift.org + +comment "libdispatch needs a toolchain w/ Glibc, wchar, threads, C++, dynamic library" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ No newline at end of file diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash new file mode 100644 index 0000000000..64543b56eb --- /dev/null +++ b/package/libdispatch/libdispatch.hash @@ -0,0 +1 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab libdispatch-swift-5.6-RELEASE.tar.gz diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk new file mode 100644 index 0000000000..a3b441ba36 --- /dev/null +++ b/package/libdispatch/libdispatch.mk @@ -0,0 +1,53 @@ +### Grand Central Dispatch +LIBDISPATCH_VERSION = 5.6 +LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE) +LIBDISPATCH_LICENSE = Apache-2.0 +LIBDISPATCH_LICENSE_FILES = LICENSE +LIBDISPATCH_INSTALL_STAGING = YES +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN = NO +LIBDISPATCH_DEPENDENCIES = host-clang host-lld libbsd + +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv7) +LIBDISPATCH_TARGET_NAME = armv7-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv6) +LIBDISPATCH_TARGET_NAME = armv6-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_TARGET_NAME = armv5-unknown-linux-gnueabi +else +LIBDISPATCH_TARGET_NAME = $(LIBDISPATCH_TARGET_ARCH)-unknown-linux-gnu +endif + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 +else +LIBDISPATCH_EXTRA_FLAGS = +endif + +LIBDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + -DCMAKE_C_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + +define LIBDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +$(eval $(cmake-package)) -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:58 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:58 +0000 Subject: [Buildroot] [PATCH 3/4] package/libdispatch: add fix for 32-bit arm In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <20220329185059.943889-3-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/libdispatch/arm-yield.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/libdispatch/arm-yield.patch diff --git a/package/libdispatch/arm-yield.patch b/package/libdispatch/arm-yield.patch new file mode 100644 index 0000000000..fa7cf7cce4 --- /dev/null +++ b/package/libdispatch/arm-yield.patch @@ -0,0 +1,13 @@ +diff --git a/src/shims/yield.c b/src/shims/yield.c +index 43f0017..d0c5fff 100644 +--- a/src/shims/yield.c ++++ b/src/shims/yield.c +@@ -36,7 +36,7 @@ void * + _dispatch_wait_for_enqueuer(void **ptr) + { + #if !DISPATCH_HW_CONFIG_UP +-#if defined(__arm__) || defined(__arm64__) ++#if (defined(__arm__) && defined(__APPLE__)) || defined(__arm64__) + int spins = DISPATCH_WAIT_SPINS_WFE; + void *value; + while (unlikely(spins-- > 0)) { -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:59 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:59 +0000 Subject: [Buildroot] [PATCH 4/4] DEVELOPERS: add Alsey Miller for libdispatch In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <20220329185059.943889-4-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a66b9d7eee..555ec0175b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -122,6 +122,9 @@ F: boot/opensbi/ F: configs/hifive_unleashed_defconfig F: package/xen/ +N: Alsey Miller +F: package/libdispatch/ + N: Alvaro G. M F: package/dcron/ F: package/libxmlrpc/ -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:54:56 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 11:54:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries In-Reply-To: <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> References: <20220328060027.2483147-1-alseycmiller@gmail.com> <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> Message-ID: I have submitted new patches for only libdispatch and minimal changes to cmake to support building Apple?s (and Clang based) projects. > On Mar 28, 2022, at 1:35 PM, Arnout Vandecappelle wrote: > > Hi Alsey, > > Thank you for your contribution! I have a number of review comments below. Please take them into account and send a new patch series. For the time being, I've marked the patch as Changes Requested in patchwork. > > Firt of all, the patch should be split up in separate patches: one patch per package you add. Make sure all of them are posted together and in the correct order. Each patch should have as subject "package/...: new package". > > I have a few more comments below, but it's hard to properly review such a big patch so I will probably have missed some things. > > On 28/03/2022 08:00, Alsey Coleman Miller wrote: >> Signed-off-by: Alsey Coleman Miller >> --- >> package/Config.in | 11 + > > > Please add yourself to the DEVELOPERS file [1] for this package. This way, you'll get an e-mail if the package fails in the autobuilders, or when a new version is released if the package is registered on release-monitoring.org. > > [snip] >> diff --git a/package/foundation/Config.in b/package/foundation/Config.in >> new file mode 100644 >> index 0000000000..7a9dc8b514 >> --- /dev/null >> +++ b/package/foundation/Config.in >> @@ -0,0 +1,14 @@ >> +if BR2_PACKAGE_SWIFT > > I get that you only want swift-related packages to appear in the menus if swift itself is selected. It would be even better, then, to sort all of them under the swift main entry. Perhaps even prefix all of them with swift-, like is done for python, perl and lua packages. > >> + >> +config BR2_PACKAGE_FOUNDATION >> + bool "foundation" >> + depends on BR2_PACKAGE_SWIFT >> + select BR2_PACKAGE_LIBSWIFTDISPATCH >> + select BR2_PACKAGE_LIBCURL >> + select BR2_PACKAGE_LIBXML2 >> + help >> + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. > > Please make sure indentation is done correctly, as reported by the utils/check-package script. In this case, the line length is way too long. > >> + >> + http://swift.org >> + >> +endif >> diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash >> new file mode 100644 >> index 0000000000..f15edb8420 >> --- /dev/null >> +++ b/package/foundation/foundation.hash >> @@ -0,0 +1 @@ >> +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz >> diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk >> new file mode 100644 >> index 0000000000..93c7cedbdd >> --- /dev/null >> +++ b/package/foundation/foundation.mk >> @@ -0,0 +1,102 @@ >> +### Foundation > > Missin comment header, as reported by check-package (I'm not going to repeat all the other check-package errors). > >> +FOUNDATION_VERSION = $(SWIFT_VERSION) >> +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags > > This doesn't look right - shouldn't you be using the github helper? > >> +FOUNDATION_LICENSE = Apache-2.0 >> +FOUNDATION_LICENSE_FILES = LICENSE >> +FOUNDATION_INSTALL_STAGING = YES >> +FOUNDATION_INSTALL_TARGET = YES > > _INSTALL_TARGET = YES is not needed, it's done automatically. > >> +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO >> +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch >> + >> +FOUNDATION_CONF_OPTS += \ >> + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ >> + -DCMAKE_Swift_FLAGS_DEBUG="" \ > > Please consistently indent with one tab. > >> + -DCMAKE_Swift_FLAGS_RELEASE="" \ >> + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ >> + -DCF_DEPLOYMENT_SWIFT=ON \ >> + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ >> + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +ifeq ($(BR2_PACKAGE_LIBCURL),y) > > Since Config.in selects libcurl, this is always true. > >> + FOUNDATION_DEPENDENCIES += libcurl > > No indentation within make conditions. > >> + FOUNDATION_CONF_OPTS += \ >> + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ >> + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +endif >> + >> +ifeq ($(BR2_PACKAGE_LIBXML2),y) >> + FOUNDATION_DEPENDENCIES += libxml2 >> + FOUNDATION_CONF_OPTS += \ >> + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ >> + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ >> + >> +endif >> + >> +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) >> +else >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build >> +endif > > This stuff is done automatically by the infra. > >> + >> +define FOUNDATION_CONFIGURE_CMDS >> + # Workaround Dispatch defined with cmake and module >> + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch >> + # Clean >> + rm -rf $(FOUNDATION_BUILDDIR) >> + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation >> + # Configure >> + (mkdir -p $(FOUNDATION_BUILDDIR) && \ >> + cd $(FOUNDATION_BUILDDIR) && \ >> + rm -f CMakeCache.txt && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ >> + -DCMAKE_INSTALL_PREFIX="/usr" \ >> + -DBUILD_SHARED_LIBS=ON \ >> + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ >> + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ >> + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ >> + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + $(FOUNDATION_CONF_OPTS) \ >> + ) > > I haven't looked at the details, but not using the cmake infrastructure is not a good idea. > > >> +endef >> + >> +define FOUNDATION_BUILD_CMDS >> + # Compile >> + (cd $(FOUNDATION_BUILDDIR) && ninja) > > If the problem is that it only supports the ninja build system: please use [2] and explain in the cover letter of your series that it depends on that. > >> +endef >> + >> +define FOUNDATION_INSTALL_TARGET_CMDS >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ >> +endef >> + >> +define FOUNDATION_INSTALL_STAGING_CMDS >> + # Copy libraries >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + # Copy CoreFoundation module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation >> + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ >> + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + # Copy CFXMLInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + # Copy CFURLSessionInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + # Copy Swift modules >> + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ >> + # Restore Dispatch headers >> + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) >> + >> +endef >> + >> +$(eval $(generic-package)) >> diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in >> new file mode 100644 >> index 0000000000..2f7c115375 >> --- /dev/null >> +++ b/package/libdispatch/Config.in >> @@ -0,0 +1,11 @@ >> +config BR2_PACKAGE_LIBDISPATCH >> + bool "libdispatch" >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC > > When there are toolchain dependencies, there should also be a comment that tells the user why the package can't be selected. Look at other packages for examples. > > Since it's not clear here, you should probably explain in the commit message why these dependencies are needed. > >> + select BR2_PACKAGE_LIBBSD >> + >> + help >> + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. >> + >> + http://swift.org >> diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash >> new file mode 100644 >> index 0000000000..a89c48c55f >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.hash >> @@ -0,0 +1,2 @@ >> +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz >> +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch >> diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk >> new file mode 100644 >> index 0000000000..a334c3052d >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.mk >> @@ -0,0 +1,78 @@ >> +### Grand Central Dispatch (C API) >> +LIBDISPATCH_VERSION = $(SWIFT_VERSION) >> +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags >> +LIBDISPATCH_LICENSE = Apache-2.0 >> +LIBDISPATCH_LICENSE_FILES = LICENSE >> +LIBDISPATCH_INSTALL_STAGING = YES >> +LIBDISPATCH_INSTALL_TARGET = YES >> +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO >> +LIBDISPATCH_DEPENDENCIES = libbsd >> +LIBDISPATCH_PATCH = \ >> + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch > > Downloading a patch from your own gist isn't exactly great for allowing reviews :-). Please instead include the patch directly in Buildroot. Since upstream is managed in git, please make this a git-formatted patch (generated with git format-patch -N) [1]. Make sure it has a summary and description just like any other commit, and also include your Signed-off-by. The latter is needed to ascertain that the patch may be distributed under the upstream project's license (which may be different from Buildroot's). > > [snip] >> diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in >> new file mode 100644 >> index 0000000000..cbeed69667 >> --- /dev/null >> +++ b/package/swift-hello/Config.in >> @@ -0,0 +1,10 @@ >> +if BR2_PACKAGE_SWIFT >> + >> +config BR2_PACKAGE_SWIFT_HELLO >> + bool "swift-hello" >> + depends on BR2_PACKAGE_SWIFT >> + depends on BR2_PACKAGE_FOUNDATION >> + help >> + Demo application for Swift. > > If I understand correctly, this package serves no purpose other than proving that it's possibleto biuld a swift application in Buildroot. Nobody is ever going to select it. Instead, it would be better to move it to the runtime test infrastructure (and of course actually runtime test it, which proves that the generated binaries actually work). > > [snip] >> diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk >> new file mode 100644 >> index 0000000000..b3cded3f7c >> --- /dev/null >> +++ b/package/swift-hello/swift-hello.mk >> @@ -0,0 +1,33 @@ >> +### Swift Demo >> +SWIFT_HELLO_VERSION = 0.1.0 >> +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src >> +SWIFT_HELLO_SITE_METHOD = local >> +SWIFT_HELLO_INSTALL_STAGING = NO >> +SWIFT_HELLO_INSTALL_TARGET = YES >> +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES >> +SWIFT_HELLO_DEPENDENCIES = swift foundation >> +SWIFT_HELLO_EXECUTABLES = swift-hello >> +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) >> + >> +define SWIFT_HELLO_BUILD_CMDS >> + ( \ > > These parenthesis are actually not needed. They are still used in a lot of places in Buildroot, but that's legacy stuff. > >> + cd $(SWIFT_HELLO_SRCDIR) && \ >> + rm -rf .build && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ >> + ) >> +endef >> + >> +define SWIFT_HELLO_INSTALL_TARGET_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ > > Please don't keep commented-out lines. > >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello >> +endef >> + >> +define SWIFT_HELLO_INSTALL_STAGING_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello >> +endef >> + >> +$(eval $(generic-package)) > > [snip] >> +config BR2_PACKAGE_SWIFT >> + bool "swift" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC >> + select BR2_PACKAGE_ICU >> + select BR2_PACKAGE_LIBDISPATCH >> + help >> + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. >> + >> + http://swift.org >> + >> +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH >> + >> +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS >> + string "Path to host Swift toolchain" >> + default "/usr/bin" >> + >> +config BR2_PACKAGE_SWIFT_LLVM_DIR >> + string "Path to host LLVM library path" >> + default "/usr/lib/llvm-12" > > I guess swift is built on top of LLVM. Is it possible to use package/llvm, or is it a patched version? > >> + >> +endif >> + >> +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ >> + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > > [snip] >> diff --git a/package/swift/swift.mk b/package/swift/swift.mk >> new file mode 100644 >> index 0000000000..da10aae8fd >> --- /dev/null >> +++ b/package/swift/swift.mk >> @@ -0,0 +1,232 @@ >> +### Apple's Swift Programming Language >> +SWIFT_VERSION = 5.6 >> +SWIFT_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +SWIFT_SITE = https://github.com/apple/swift/archive/refs/tags >> +SWIFT_LICENSE = Apache-2.0 >> +SWIFT_LICENSE_FILES = LICENSE.txt >> +SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH)) >> +SWIFT_NATIVE_PATH = $(call qstrip,$(BR2_PACKAGE_SWIFT_NATIVE_TOOLS)) >> +SWIFT_LLVM_DIR = $(call qstrip,$(BR2_PACKAGE_SWIFT_LLVM_DIR)) >> +SWIFT_INSTALL_STAGING = YES >> +SWIFT_INSTALL_TARGET = YES >> +SWIFT_SUPPORTS_IN_SOURCE_BUILD = NO >> +SWIFT_DEPENDENCIES = icu libxml2 libbsd libdispatch >> + >> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) >> +SWIFT_CONF_ENV += LIBS="-latomic" >> +endif >> + >> +HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift >> +SWIFTPM_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/$(SWIFT_TARGET_NAME)-toolchain.json > > This should have simply a SWIFT_ prefix, not SWIFTPM. > > [snip] >> +define SWIFT_INSTALL_STAGING_CMDS >> + mkdir -p $(HOST_SWIFT_SUPPORT_DIR) >> + # Copy runtime libraries and swift interfaces >> + cp -rf $(SWIFT_BUILDDIR)/lib/swift ${STAGING_DIR}/usr/lib/ >> + # Generate SwiftPM cross compilation toolchain file >> + rm -f $(SWIFTPM_DESTINATION_FILE) >> + touch $(SWIFTPM_DESTINATION_FILE) >> + echo '{' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) > > We generally prefer to have a template file (called swift-toolchain.json.in) in the package directory, and use sed to replace @XXXX@ entries. See e.g. how it's done for cmake's toolchainfile. > >> + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ >> + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) >> + echo '}' >> $(SWIFTPM_DESTINATION_FILE) >> + >> +endef >> + >> +$(eval $(generic-package)) >> +$(eval $(host-generic-package)) >> \ No newline at end of file > > Please make sure there's a newline at the end of the file. > > Regards, > Arnout > > [1] https://buildroot.org/downloads/manual/manual.html#DEVELOPERS > [2] https://patchwork.ozlabs.org/project/buildroot/list/?series=282194 > [3] https://buildroot.org/manual.html#_format_and_licensing_of_the_package_patches From alseycmiller at gmail.com Tue Mar 29 19:17:50 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 12:17:50 -0700 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. > On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: > > Signed-off-by: Alsey Coleman Miller > --- > package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 3b1db35fb6..9b36ee2b47 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > > $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > - > +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES > > ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) > $(2)_BUILDDIR = $$($(2)_SRCDIR) > @@ -82,6 +82,7 @@ ifeq ($(4),target) > # documented as a standard CMake variable. If a package supports it, > # it must handle it explicitly. > # > +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) > define $(2)_CONFIGURE_CMDS > (mkdir -p $$($$(PKG)_BUILDDIR) && \ > cd $$($$(PKG)_BUILDDIR) && \ > @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS > ) > endef > else > +define $(2)_CONFIGURE_CMDS > + (mkdir -p $$($$(PKG)_BUILDDIR) && \ > + cd $$($$(PKG)_BUILDDIR) && \ > + rm -f CMakeCache.txt && \ > + PATH=$$(BR_PATH) \ > + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > + -DCMAKE_INSTALL_PREFIX="/usr" \ > + -DCMAKE_COLOR_MAKEFILE=OFF \ > + -DBUILD_DOC=OFF \ > + -DBUILD_DOCS=OFF \ > + -DBUILD_EXAMPLE=OFF \ > + -DBUILD_EXAMPLES=OFF \ > + -DBUILD_TEST=OFF \ > + -DBUILD_TESTS=OFF \ > + -DBUILD_TESTING=OFF \ > + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ > + $$(CMAKE_QUIET) \ > + $$($$(PKG)_CONF_OPTS) \ > + ) > +endef > +endif > +else > > # Configure package for host > define $(2)_CONFIGURE_CMDS > -- > 2.35.1 > From dan at thejacksons.uk Tue Mar 29 19:19:52 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 19:19:52 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <54f87d03a99935fb452424992a81409c@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 29 March 2022 18:52 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > On 2022-03-29 16:17, Dan Jackson wrote: > >> -----Original Message----- > >> From: Andreas Ziegler > >> Sent: 29 March 2022 16:14 > >> To: Dan Jackson > >> Cc: buildroot at buildroot.org > >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel > >> - > >> possible? > >> > >> Hi Dan, > >> > >> On 2022-03-29 12:48, Dan Jackson wrote: > >> >> -----Original Message----- > >> >> From: Andreas Ziegler > >> >> Sent: 29 March 2022 10:40 > >> >> To: Dan Jackson > >> >> Cc: Buildroot > >> >> Subject: Re: Adding USB support to existing device on 2.6.39.3 > >> >> kernel > >> >> - > >> >> possible? > >> >> > >> >> Hi Dan, > >> >> > >> >> On 2022-03-29 05:58, Dan Jackson wrote: > >> >> > >> >> > Hello, > >> >> > > >> >> > Sorry once again if this is a silly/noob question. > >> >> > > >> >> > If I have an existing router device running a 2.6.39.3 kernel, > >> >> > which has a USB port and is capable of supporting USB devices, > >> >> > but the manufacturer has removed/not installed the necessary > >> >> > kernel modules, can I use Buildroot to recreate the missing > >> >> > modules and thus re-enable the missing USB support? > >> >> > >> >> It might work: the driver is contained in the USB module, so > >> >> building and loading that module could do the trick. > >> >> > >> >> > If so, how would I do it? > >> >> > >> >> Supposing the Linux kernel source contained in [1] is the one that > >> >> is running on your device, you need to configure Buildroot to > >> >> build a Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some > >> >> information about how to do this for a Kernel source tree (see chapter > 8.14.6). > >> > > >> > It looks like I got that part to work. The buildroot build process > >> > definitely seems to be able to see the kernel source tree which is > >> > in /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux- > 2.6.39.3/src. > >> > > >> >> > >> >> You then need to enable USB support in the kernel (Device Drivers > >> >> -> USB support), probably > >> >> > >> >> CONFIG_USB=m > >> >> CONFIG_USB_EHCI_HCD=y > >> >> CONFIG_USB_OHCI_HCD=y > >> >> > >> >> is enough, otherwise try some of the hardware specific (driver) > >> >> options. > >> > > >> > This is where I have fallen down. I did "make linux-menuconfig" > >> > expecting to be able to configure the kernel/modules (as I couldn't > >> > see any options for that in buildroot's own "make menuconfig"). > >> > > >> > However, at this point it seems like it went off and tried to build > >> > the whole kernel from a default configuration. > >> > >> 'make linux-menuconfig' needs a working build system. If they are not > >> present, all dependencies of the Linux package get built. First step > >> is the installation of the kernel source; if Buildroot tries to > >> install a default kernel, something is amiss with your configuration. > >> > >> > This eventually failed, so I tried "make linux-reconfigure" at that > >> > point but that did not work either. > >> > > >> > Here is the error it gave upon failure: > >> > > >> > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot- > >> linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux- > >> uclibcgnueabi/bin/ld: > >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb- > buildroo > >> > t- > >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > >> > error loading plugin: > >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb- > buildroo > >> > t- > >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > >> > undefined symbol: _onload > >> > collect2: error: ld returned 1 exit status > >> > Makefile.in:114: recipe for target '../utils/getconf' failed > >> > make[3]: *** [../utils/getconf] Error 1 > >> > Makefile.in:455: recipe for target 'utils' failed > >> > make[2]: *** [utils] Error 2 > >> > package/pkg-generic.mk:380: recipe for target > >> > '/home/danj/buildroot-2022.02/output/build/uclibc- > >> 1.0.40/.stamp_target_installed' > >> > failed > >> > make[1]: *** > >> > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_tar > >> > get > >> > _installed] > >> > Error 2 > >> > Makefile:84: recipe for target '_all' failed > >> > make: *** [_all] Error 2 > >> > >> This error is from the uClibc build - do you use an internal or > >> external toolchain? Maybe you have conflicting static /dynamic > >> library options? > >> Again, probably a buildroot misconfiguration ... > > > > This turned out to be that I had some wrong environment variables set > > from a previous attempt. Logged out and back in and now I am past that > > error. > > > >> > >> Maybe you could post your buildroot configuration (the result of make > >> savedefconfig)? > > > > It's quite short as it turns out: > > > > BR2_armeb=y > > BR2_STATIC_LIBS=y > > BR2_KERNEL_HEADERS_VERSION=y > > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > > BR2_PTHREAD_DEBUG=y > > BR2_BINUTILS_VERSION_2_37_X=y > > BR2_GCC_VERSION_9_X=y > > BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_PACKAGE_HOST_GDB=y > > BR2_GDB_VERSION_9_2=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_PACKAGE_DROPBEAR=y > > > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions > .h" > > BR2_PACKAGE_JOE=y > > The configuration uses a kernel downloaded from kernel.org, not the vendor > kernel. You need to configure Buildroot to use a custom source directory. > > > I can see I have got a USE_ARCH_DEFAULT_CONFIG in there which I'm > > guessing is part of my problems? > > You need to configure Buildroot to use your existing .config with > BR2_LINUX_CUSTOM_KERNEL_CONFIG_FILE. > > >> > >> > Looking at this error message, maybe I need to select an older > >> > version of gcc, in my buildroot configuration? Is it that the > >> > kernel can only be compiled by gcc versions that existed at the time? > >> > >> Older kernels used to have a include/compiler.h which had predefined > >> includes for specific compiler versions. Use the oldest compiler > >> available in Buildroot and try to either get a compiler-gcc9.h from a > >> newer kernel or make your own. I believe this schema changed > >> somewhere between 3.x and 4.x For newer compilers, this file is > >> comparatively empty. > > > > GCC 9.x is the oldest option available in current buildroot so I have > > switched to that. > > > > I found a compiler-gcc5.h in kernel 4.1, newer kernels do not have any > > numbered files of this type at all. I downloaded this one and > > symlinked it as compiler-gcc9.h and it looks like this got me past > > this error. > > > > However, now I have a new missing file error, and I can't seem to > > locate a suitable candidate: > > > > In file included from > > /home/danj/buildroot-2022.02/output/build/linux- > custom/arch/arm/include/asm/system.h:165, > > from > > /home/danj/buildroot-2022.02/output/build/linux- > custom/arch/arm/include/asm/bitops.h:27, > > from include/linux/bitops.h:22, > > from include/linux/kernel.h:17, > > from include/linux/sched.h:55, > > from arch/arm/kernel/asm-offsets.c:13: > > /home/danj/buildroot-2022.02/output/build/linux- > custom/arch/arm/include/asm/memory.h:19:10: > > fatal error: mach/memory.h: No such file or directory > > 19 | #include > > | ^~~~~~~~~~~~~~~ > > compilation terminated. > > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: > > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > > Makefile:1009: recipe for target 'prepare0' failed > > make[2]: *** [prepare0] Error 2 > > make[2]: *** Waiting for unfinished jobs.... > > HOSTCC scripts/mod/modpost.o > > HOSTCC scripts/mod/sumversion.o > > HOSTLD scripts/mod/modpost > > make[2]: *** wait: No child processes. Stop. > > package/pkg-generic.mk:289: recipe for target > > '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' > > failed > > make[1]: *** > > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] > > Error 2 > > Makefile:84: recipe for target '_all' failed > > make: *** [_all] Error 2 > > This seems not to be the defconfig from above? It now uses linux-custom ... > The failure may be due to the default kernel configuration. Try to configure > the correct one and see if you get further. > > > I think maybe I am still doing something wrong because it sure seems > > to be compiling a lot of stuff instead of letting me configure things. > > It gets better once everything necessary is built. Still no luck I'm afraid. Same error with mach/memory.h as above. Buildroot defconfig now looks like this: BR2_armeb=y BR2_STATIC_LIBS=y BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_PTHREAD_DEBUG=y BR2_BINUTILS_VERSION_2_37_X=y BR2_GCC_VERSION_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_HOST_GDB=y BR2_GDB_VERSION_9_2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" BR2_PACKAGE_JOE=y I forgot to mention this before but the buildroot manual page you mentioned said to create a local.mk file in order to use external source, this looks like this: LINUX_OVERRIDE_SRCDIR = /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ For the kernel configuration I entered the kernel source dir and did "make menuconfig", I left everything at the defaults except for enabling the USB related items. The resulting configuration file is attached as a text file. Unfortunately it's been literally decades since I last actually compiled a kernel, so I'm afraid I have no idea what bits would be suitable to disable/remove to get the results I want (I'm guessing this will be the most likely way to eliminate the error I'm getting?) > > >> > >> >> > >> >> Copy usbcore.ko from Buildroot > >> >> target/lib/modules/{kernel-version}/ > >> >> to the corresponding location on your device and load the driver > >> >> with modprobe. > >> >> > >> >> Depending on which functionality (e.g. USB_STORAGE) you want on > >> >> your USB port, additional configurations changes may be necessary. > >> > > >> > Yes, USB storage functionality is what I would like to add back in. > >> > Incidentally, this is a newer router than the one I was > >> > experimenting with before; this one has a Puma 6 CPU. Though, oddly > >> > I found it necessary to select an armv5 CPU type in buildroot in > >> > order to get binaries that work, despite /proc/cpuinfo on the > >> > device claiming it is armv6. > >> > > >> >> > >> >> Kind regards, > >> >> Andreas > >> >> > >> >> > This time I successfully managed to build other binaries (e.g. > >> >> > dropbear, busybox) which run OK on the device. > >> >> > > >> >> > Thanks, > >> >> > Dan Jackson. > >> >> > -------------- next part -------------- An HTML attachment was > >> >> > scrubbed... > >> >> > URL: > >> >> > >> >> > 032 > >> >> > 9/4 > >> >> > 3c49a2d/attachment.html> > >> >> > >> >> [1] > >> >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103 > >> >> FB/ > >> >> [2] > >> >> > >> > https://buildroot.org/downloads/manual/manual.html#_advanced_usage, -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: kernelconfiguration.txt URL: From james.hilliard1 at gmail.com Tue Mar 29 19:26:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 13:26:35 -0600 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: > > This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. I think this is probably a better way of dealing with the issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > > > On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: > > > > Signed-off-by: Alsey Coleman Miller > > --- > > package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- > > 1 file changed, 24 insertions(+), 1 deletion(-) > > > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > > index 3b1db35fb6..9b36ee2b47 100644 > > --- a/package/pkg-cmake.mk > > +++ b/package/pkg-cmake.mk > > @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > > $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > > > > $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > > - > > +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES > > > > ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) > > $(2)_BUILDDIR = $$($(2)_SRCDIR) > > @@ -82,6 +82,7 @@ ifeq ($(4),target) > > # documented as a standard CMake variable. If a package supports it, > > # it must handle it explicitly. > > # > > +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) > > define $(2)_CONFIGURE_CMDS > > (mkdir -p $$($$(PKG)_BUILDDIR) && \ > > cd $$($$(PKG)_BUILDDIR) && \ > > @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS > > ) > > endef > > else > > +define $(2)_CONFIGURE_CMDS > > + (mkdir -p $$($$(PKG)_BUILDDIR) && \ > > + cd $$($$(PKG)_BUILDDIR) && \ > > + rm -f CMakeCache.txt && \ > > + PATH=$$(BR_PATH) \ > > + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > > + -DCMAKE_INSTALL_PREFIX="/usr" \ > > + -DCMAKE_COLOR_MAKEFILE=OFF \ > > + -DBUILD_DOC=OFF \ > > + -DBUILD_DOCS=OFF \ > > + -DBUILD_EXAMPLE=OFF \ > > + -DBUILD_EXAMPLES=OFF \ > > + -DBUILD_TEST=OFF \ > > + -DBUILD_TESTS=OFF \ > > + -DBUILD_TESTING=OFF \ > > + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ > > + $$(CMAKE_QUIET) \ > > + $$($$(PKG)_CONF_OPTS) \ > > + ) > > +endef > > +endif > > +else > > > > # Configure package for host > > define $(2)_CONFIGURE_CMDS > > -- > > 2.35.1 > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Mar 29 19:34:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:34:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: switch to autotools-package In-Reply-To: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 18:39:19 +0100") References: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> Message-ID: <8735j0bliq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Switch to autotools-package to avoid the following static build failure > since commit d661740201405970f65c16c39a79f4148705af30: > [ 56%] Linking C executable rtl_biast > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: > attempted static link of dynamic object > `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' > collect2: error: ld returned 1 exit status > Drop both cmake-related patches > Fixes: > - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:42:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:42:05 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.3 In-Reply-To: <20220314183014.2173419-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 14 Mar 2022 12:30:14 -0600") References: <20220314183014.2173419-1-james.hilliard1@gmail.com> Message-ID: <87y20sa6lu.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:44:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:39 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.1 In-Reply-To: <20220314183234.2174325-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 14 Mar 2022 12:32:34 -0600") References: <20220314183234.2174325-1-james.hilliard1@gmail.com> Message-ID: <87tubga6hk.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:45:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:45:09 +0200 Subject: [Buildroot] [PATCH] DEVELOPERS: Add some more entries for Thomas Huth In-Reply-To: <20220314203226.4481-1-huth@tuxfamily.org> (Thomas Huth's message of "Mon, 14 Mar 2022 21:32:26 +0100") References: <20220314203226.4481-1-huth@tuxfamily.org> Message-ID: <87pmm4a6gq.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Huth writes: > I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU > machine, so I could help to have a look on these files, too. > Signed-off-by: Thomas Huth Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:44:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:56 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220329193608.546C985F4F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=658763f397e5e418c115e367aca20b18132764d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3396e945dfc1482cb21b65e5451abc5ec96a796b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3397565457..d299eb79c8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2525,8 +2525,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni From peter at korsgaard.com Tue Mar 29 19:47:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:47:56 +0200 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le In-Reply-To: <20220315130737.428449-1-joel@jms.id.au> (Joel Stanley's message of "Tue, 15 Mar 2022 23:37:37 +1030") References: <20220315130737.428449-1-joel@jms.id.au> Message-ID: <87lewsa6c3.fsf@dell.be.48ers.dk> >>>>> "Joel" == Joel Stanley writes: > When generating a filesystem image on a power10 build machine running > Ubuntu, we see a segfault when fakeroot is running chmod. > This has been reported and fixed upstream in Debian in version 1.26-1.2: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 > Add the samae patch to resolve the segfault. > Signed-off-by: Joel Stanley > --- > This isn't a commit in the fakeroot tree, rather a patch from the Debian > packaging. > I would appreciate if this was added to the 2022.02 stable tree. > Signed-off-by: Joel Stanley Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:48:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:48:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-rpi-gpio: enable package on aarch64 In-Reply-To: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> (Mirza Kapetanovic's message of "Tue, 15 Mar 2022 15:26:40 +0100") References: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> Message-ID: <87h77ga6al.fsf@dell.be.48ers.dk> >>>>> "Mirza" == Mirza Kapetanovic writes: > Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested > this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. > Signed-off-by: Mirza Kapetanovic Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:52:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:52:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 18:32:31 +0100") References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> Message-ID: <87czi4a63p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > reintroduction of the package in commit > 16ff948444c3978d63f483344a3d92d994c64312: Huh? This is the commit where ola was reintroduced, but this is a failure in grpc and the config doesn't even have ola enabled? > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: > undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 > Signed-off-by: Fabrice Fontaine > --- > package/grpc/grpc.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index 23b92f1750..9138b4ea59 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf > # which doesn't do this. These CARES settings trick the gRPC cmake code into > # not looking for c-ares at all and yet still linking with the library. > GRPC_CONF_OPTS = \ > + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ > -DgRPC_ABSL_PROVIDER=package \ > -D_gRPC_CARES_LIBRARIES=cares \ > -DgRPC_CARES_PROVIDER=none \ > @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ > -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +GRPC_DEPENDENCIES += libexecinfo > +GRPC_EXE_LINKER_FLAGS += -lexecinfo > +endif > + > # grpc can use __atomic builtins, so we need to link with > # libatomic when available > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > +GRPC_EXE_LINKER_FLAGS += -latomic > endif > GRPC_CFLAGS = $(TARGET_CFLAGS) > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:56:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:56:43 +0200 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls In-Reply-To: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 21:59:18 +0100") References: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> Message-ID: <878rssa5xg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 0.40.2 in > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > FAILED: src/librygel-core/RygelCore-2.6.typelib > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler > --output src/librygel-core/RygelCore-2.6.typelib > /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file > /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: > Failed to parse included gir GUPnP-1.2 > Fixes: > - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:57:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:57:46 +0200 Subject: [Buildroot] [PATCH 1/2] package/python-avro: renumber patch In-Reply-To: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 22:16:52 +0100") References: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Message-ID: <874k3ga5vp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber > patch > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From alseycmiller at gmail.com Tue Mar 29 19:58:25 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 12:58:25 -0700 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> That commit is not merged and only seems to override the C flags. How can we force cmake to use Clang for target packages? I would be fine with basing my work that patch if support for using Clang and as the C and C++ compiler is added. > On Mar 29, 2022, at 12:26 PM, James Hilliard wrote: > > On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: >> >> This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. > > I think this is probably a better way of dealing with the issue: > https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > >> >>> On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: >>> >>> Signed-off-by: Alsey Coleman Miller >>> --- >>> package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- >>> 1 file changed, 24 insertions(+), 1 deletion(-) >>> >>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk >>> index 3b1db35fb6..9b36ee2b47 100644 >>> --- a/package/pkg-cmake.mk >>> +++ b/package/pkg-cmake.mk >>> @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast >>> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast >>> >>> $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES >>> - >>> +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES >>> >>> ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) >>> $(2)_BUILDDIR = $$($(2)_SRCDIR) >>> @@ -82,6 +82,7 @@ ifeq ($(4),target) >>> # documented as a standard CMake variable. If a package supports it, >>> # it must handle it explicitly. >>> # >>> +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) >>> define $(2)_CONFIGURE_CMDS >>> (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>> cd $$($$(PKG)_BUILDDIR) && \ >>> @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS >>> ) >>> endef >>> else >>> +define $(2)_CONFIGURE_CMDS >>> + (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>> + cd $$($$(PKG)_BUILDDIR) && \ >>> + rm -f CMakeCache.txt && \ >>> + PATH=$$(BR_PATH) \ >>> + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ >>> + -DCMAKE_INSTALL_PREFIX="/usr" \ >>> + -DCMAKE_COLOR_MAKEFILE=OFF \ >>> + -DBUILD_DOC=OFF \ >>> + -DBUILD_DOCS=OFF \ >>> + -DBUILD_EXAMPLE=OFF \ >>> + -DBUILD_EXAMPLES=OFF \ >>> + -DBUILD_TEST=OFF \ >>> + -DBUILD_TESTS=OFF \ >>> + -DBUILD_TESTING=OFF \ >>> + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ >>> + $$(CMAKE_QUIET) \ >>> + $$($$(PKG)_CONF_OPTS) \ >>> + ) >>> +endef >>> +endif >>> +else >>> >>> # Configure package for host >>> define $(2)_CONFIGURE_CMDS >>> -- >>> 2.35.1 >>> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Mar 29 20:01:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:01:11 +0200 Subject: [Buildroot] [PATCH 1/1] package/libbluray: bump to version 1.3.1 In-Reply-To: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 23:03:05 +0100") References: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> Message-ID: <87zgl88r5k.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Tue Mar 29 20:10:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 14:10:12 -0600 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> Message-ID: On Tue, Mar 29, 2022 at 1:58 PM Alsey Miller wrote: > > That commit is not merged and only seems to override the C flags. How can we force cmake to use Clang for target packages? I would be fine with basing my work that patch if support for using Clang and as the C and C++ compiler is added. It should allow overriding any of the toolchain variables like this: https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-6-james.hilliard1 at gmail.com/ I think this will pretty much work as is with your libdispatch patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220329185059.943889-2-alseycmiller at gmail.com/ It should allow you to drop this part: LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN = NO You might also be able to drop some of the other conf opts since the toolchain file can then still be used with partial overrides. > > > On Mar 29, 2022, at 12:26 PM, James Hilliard wrote: > > > > On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: > >> > >> This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. > > > > I think this is probably a better way of dealing with the issue: > > https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > > > >> > >>> On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: > >>> > >>> Signed-off-by: Alsey Coleman Miller > >>> --- > >>> package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- > >>> 1 file changed, 24 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > >>> index 3b1db35fb6..9b36ee2b47 100644 > >>> --- a/package/pkg-cmake.mk > >>> +++ b/package/pkg-cmake.mk > >>> @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > >>> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > >>> > >>> $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > >>> - > >>> +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES > >>> > >>> ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) > >>> $(2)_BUILDDIR = $$($(2)_SRCDIR) > >>> @@ -82,6 +82,7 @@ ifeq ($(4),target) > >>> # documented as a standard CMake variable. If a package supports it, > >>> # it must handle it explicitly. > >>> # > >>> +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) > >>> define $(2)_CONFIGURE_CMDS > >>> (mkdir -p $$($$(PKG)_BUILDDIR) && \ > >>> cd $$($$(PKG)_BUILDDIR) && \ > >>> @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS > >>> ) > >>> endef > >>> else > >>> +define $(2)_CONFIGURE_CMDS > >>> + (mkdir -p $$($$(PKG)_BUILDDIR) && \ > >>> + cd $$($$(PKG)_BUILDDIR) && \ > >>> + rm -f CMakeCache.txt && \ > >>> + PATH=$$(BR_PATH) \ > >>> + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > >>> + -DCMAKE_INSTALL_PREFIX="/usr" \ > >>> + -DCMAKE_COLOR_MAKEFILE=OFF \ > >>> + -DBUILD_DOC=OFF \ > >>> + -DBUILD_DOCS=OFF \ > >>> + -DBUILD_EXAMPLE=OFF \ > >>> + -DBUILD_EXAMPLES=OFF \ > >>> + -DBUILD_TEST=OFF \ > >>> + -DBUILD_TESTS=OFF \ > >>> + -DBUILD_TESTING=OFF \ > >>> + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ > >>> + $$(CMAKE_QUIET) \ > >>> + $$($$(PKG)_CONF_OPTS) \ > >>> + ) > >>> +endef > >>> +endif > >>> +else > >>> > >>> # Configure package for host > >>> define $(2)_CONFIGURE_CMDS > >>> -- > >>> 2.35.1 > >>> > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Tue Mar 29 20:15:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:15:52 +0200 Subject: [Buildroot] [PATCH 1/1] package/dav1d: use official tarball In-Reply-To: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 23:10:11 +0100") References: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> Message-ID: <87v8vw8qh3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 20:18:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:18:21 +0200 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 In-Reply-To: <97a25507-2a9c-4928-eb14-388693a3766b@mind.be> (Arnout Vandecappelle's message of "Thu, 24 Mar 2022 22:46:38 +0100") References: <20220316190545.3618918-1-james.hilliard1@gmail.com> <97a25507-2a9c-4928-eb14-388693a3766b@mind.be> Message-ID: <87r16k8qcy.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 16/03/2022 20:05, James Hilliard wrote: >> Signed-off-by: James Hilliard > Applied both to master, thanks. > As Peter said, a changelog would be nice (so Peter K. knows if it > needs to be backported to the stable branches), but I've applied > as-is anyway. Is it needed for 2022.02.x? -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 20:29:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:29:03 +0200 Subject: [Buildroot] [PATCH] package/unbound: use system libevent In-Reply-To: <20220317162530.427876-1-kyle@balena.io> (Kyle Harding via buildroot's message of "Thu, 17 Mar 2022 12:25:30 -0400") References: <20220317162530.427876-1-kyle@balena.io> Message-ID: <87mth88pv4.fsf@dell.be.48ers.dk> >>>>> "Kyle" == Kyle Harding via buildroot writes: > The file descriptor limit when using the builtin mini-event > cannot handle more than 1024 file descriptors. > https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent > Signed-off-by: Kyle Harding Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 20:19:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:19:53 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/unbound: use system libevent Message-ID: <20220329202014.2F01485F4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a1c2492d29b7b51e1ce4b563e9ec09b109d2802 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Without explicit --with-libevent, it uses the builtin mini-event. Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 929df7c483d19cf08badc36ef19a56735896b5d5) Signed-off-by: Peter Korsgaard --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 37456db416..78a817fdb3 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr From peter at korsgaard.com Tue Mar 29 19:57:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:57:32 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-avro: renumber patch Message-ID: <20220329202014.2764A85F63@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45fcdf9bf9a54401f77b8f268d5494151de93c90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4a23f6b7b011fee47812bb70a11c21b9d68844b0) Signed-off-by: Peter Korsgaard --- ...ing.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From peter at korsgaard.com Tue Mar 29 19:44:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:50 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220329202022.33AAB85F8A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8909b3739761dce8f67f9f0afdd79757d7839de0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3396e945dfc1482cb21b65e5451abc5ec96a796b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c3d7c4a6fe..9d77673f3c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2749,8 +2749,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni From peter at korsgaard.com Tue Mar 29 19:57:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:57:14 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-avro: renumber patch Message-ID: <20220329202022.5429585F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c2f016736037f22c2c286ee63ea82189b5a3968 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4a23f6b7b011fee47812bb70a11c21b9d68844b0) Signed-off-by: Peter Korsgaard --- ...ing.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From peter at korsgaard.com Tue Mar 29 19:41:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:41:34 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/meson: bump to version 0.61.3 Message-ID: <20220329202022.22DE485F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=525813a9e02492b73c71e1106fc50cf2441cb429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ffb0c357397a67ceaadd215669bf00dcb27bd558) Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d4..d909709b24 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd46..4615e839fe 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 0.61.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From peter at korsgaard.com Tue Mar 29 20:19:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:19:32 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/unbound: use system libevent Message-ID: <20220329202022.6FC2D85F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01b2a04486d56f78fc166a164e8efb2d3c9fbc21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Without explicit --with-libevent, it uses the builtin mini-event. Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 929df7c483d19cf08badc36ef19a56735896b5d5) Signed-off-by: Peter Korsgaard --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..d9be639244 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr From peter at korsgaard.com Tue Mar 29 19:48:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:48:44 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-rpi-gpio: enable package on aarch64 Message-ID: <20220329202022.446F885F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0009e18a52ad6bb7152a6de9910dad863157537f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. Signed-off-by: Mirza Kapetanovic Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 45f2609ca2eb5577ec5e6e204aec5a3eb2e80253) Signed-off-by: Peter Korsgaard --- package/python-rpi-gpio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb06..f3c0928c62 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. From peter at korsgaard.com Tue Mar 29 19:46:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:46:51 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] fakeroot: Fix segfault on ppc64le Message-ID: <20220329202022.3BD3885F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bd54a26cb32187432f56504cd358fb09186c303 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x When generating a filesystem image on a power10 build machine running Ubuntu, we see a segfault when fakeroot is running chmod. This has been reported and fixed upstream in Debian in version 1.26-1.2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 Add the same patch to resolve the segfault. Signed-off-by: Joel Stanley [Arnout: add patch signoff and give proper name (check-package)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a38c6827dba0a5ccee5504167344ea6bba44e9d9) Signed-off-by: Peter Korsgaard --- .../fakeroot/0001-fix-prototype-generation.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/fakeroot/0001-fix-prototype-generation.patch b/package/fakeroot/0001-fix-prototype-generation.patch new file mode 100644 index 0000000000..960bad2129 --- /dev/null +++ b/package/fakeroot/0001-fix-prototype-generation.patch @@ -0,0 +1,61 @@ +Subject: Fix prototype generation for openat +Author: Christoph Biedl +Date: 2021-12-30 +Bug-Debian: https://bugs.debian.org/995393 +Forwarded: Yes (implicitely) + + As jrtc27 pointed out in IRC, ppc64el is more strict than other + architectures when it comes to va_arg handling: + + it's that ppc64le uses the elfv2 abi, and for variadic calls you + must reserve space for a parameter save area + + So enhance wrapawk to create a proper prototype and argument + handling although it's specific to the openat call. Also add the + missing documentation for the sixth column to wrapfunc.inp. + +Signed-off-by: Joel Stanley + +--- a/wrapawk ++++ b/wrapawk +@@ -37,7 +37,25 @@ + argtype=$3; + argname=$4; + MACRO=$5; +- if(MACRO){ ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -9,8 +9,10 @@ + /**/ */ + /* each line of this file lists 4 fields, seperated by a ";". */ + /* The first field is the name of the wrapped function, then it's return */ +-/* value. After that come the function arguments with types, and the last */ ++/* value. After that come the function arguments with types, and the fifth */ + /* field contains the function arguments without types. */ ++/* A sixth field is a special needed when wrapping the openat syscall. */ ++/* Otherwise it's like the third (function arguments with types). */ + /**/ + + /* __*xstat are used on glibc systems instead of just *xstat. */ From peter at korsgaard.com Tue Mar 29 19:55:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:55:40 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/rygel: fix g_ir_compiler calls Message-ID: <20220329202022.4C27F85F8A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06e2a7273572f4264eda6538391adb2da2b65c48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command FAILED: src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 94515b902c74d51aeb32654a4795ca92d6dd7279) Signed-off-by: Peter Korsgaard --- .../0002-meson.build-fix-g_ir_compiler-calls.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 0000000000..3961ad0564 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + From peter at korsgaard.com Tue Mar 29 19:33:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:33:39 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/librtlsdr: switch to autotools-package Message-ID: <20220329202022.1709985F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=711534ce860776a9274db04d3f01abfac3f98741 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Switch to autotools-package to avoid the following static build failure since commit d661740201405970f65c16c39a79f4148705af30: [ 56%] Linking C executable rtl_biast /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' collect2: error: ld returned 1 exit status Drop both cmake-related patches Fixes: - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 26a16ed9d84cbd934fbad4d6042dfd10dc8063b4) Signed-off-by: Peter Korsgaard --- ...m-respect-DESTDIR-with-install-udev-rules.patch | 31 +++++ ...01-disable_shared_library_target_in_build.patch | 130 --------------------- ...es-Version.cmake-don-t-use-Git-version-if.patch | 47 -------- package/librtlsdr/librtlsdr.mk | 26 ++--- 4 files changed, 42 insertions(+), 192 deletions(-) diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 0000000000..1aec8166cc --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465de..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41..0000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a..908be158b1 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) From peter at korsgaard.com Tue Mar 29 19:44:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:33 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-aioconsole: bump to version 0.4.1 Message-ID: <20220329202022.2B0E585F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df1fe3d8e8cba5ba0856a4d029dc6a2499fa67d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a3a1593b74048eec038cd351b06a6654e8bba0c4) Signed-off-by: Peter Korsgaard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b2..af8b5c4de9 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d4..a58fd33a61 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.4.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From peter at korsgaard.com Tue Mar 29 20:02:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:02:19 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/dav1d: use official tarball Message-ID: <20220329202022.6695185F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5adb8c23fdd0537fa04a9e7b673b7d9daf5d4d1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0bdf40b1b0a36212fefef0b19632545f94c06423) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 3 ++- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae7..5e838b0951 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8..ecc4cc55c3 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -5,8 +5,8 @@ ################################################################################ DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES From peter at korsgaard.com Tue Mar 29 20:00:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:00:54 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/libbluray: bump to version 1.3.1 Message-ID: <20220329202022.5C7F285F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a66f78923985a838ba5a8b2ed945ba2f77c7fb11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 49413c6d97b72ef5f44341a3dc720b902a88279b) Signed-off-by: Peter Korsgaard --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c85866..6e62bb49a1 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38d..a9eb3c67c6 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES From vincent.stehle at laposte.net Tue Mar 29 20:51:36 2022 From: vincent.stehle at laposte.net (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Tue, 29 Mar 2022 22:51:36 +0200 Subject: [Buildroot] [PATCH] configs/qemu_xtensa_lx60_nommu: use busybox minimal config Message-ID: <20220329205136.32435-1-vincent.stehle@laposte.net> Update the qemu_xtensa_lx60_nommu_defconfig to use the busybox-minimal.config, to make it more consistent with the other no-MMU defconfigs. After commit 3de486f8b052 ("package/busybox: fix udhcpc options in minimal config"), this has the benefit of fixing the following network initialization failure: udhcpc: invalid option -- b Signed-off-by: Vincent Stehl? Cc: Romain Naour Cc: Gerome Burlats --- configs/qemu_xtensa_lx60_nommu_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c4473fb32a..44fb81bd74 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -7,6 +7,9 @@ BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/ BR2_PACKAGE_HOST_ELF2FLT=y # BR2_USE_MMU is not set +# Use minimal busybox with hush and networking tools +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 29 21:22:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 29 Mar 2022 23:22:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <87czi4a63p.fsf@dell.be.48ers.dk> References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> <87czi4a63p.fsf@dell.be.48ers.dk> Message-ID: Le mar. 29 mars 2022 ? 21:53, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > Fix the following build failure raised on uclibc and musl since the > > reintroduction of the package in commit > > 16ff948444c3978d63f483344a3d92d994c64312: > > Huh? This is the commit where ola was reintroduced, but this is a > failure in grpc and the config doesn't even have ola enabled? Indeed, I made a copy / paste error, the correct commit message should have been: "Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4" > > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > > /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: > > undefined reference to `backtrace' > > > Fixes: > > - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 > > > Signed-off-by: Fabrice Fontaine > > --- > > package/grpc/grpc.mk | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > > index 23b92f1750..9138b4ea59 100644 > > --- a/package/grpc/grpc.mk > > +++ b/package/grpc/grpc.mk > > @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf > > # which doesn't do this. These CARES settings trick the gRPC cmake code into > > # not looking for c-ares at all and yet still linking with the library. > > GRPC_CONF_OPTS = \ > > + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ > > -DgRPC_ABSL_PROVIDER=package \ > > -D_gRPC_CARES_LIBRARIES=cares \ > > -DgRPC_CARES_PROVIDER=none \ > > @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ > > -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > > -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > > +GRPC_DEPENDENCIES += libexecinfo > > +GRPC_EXE_LINKER_FLAGS += -lexecinfo > > +endif > > + > > # grpc can use __atomic builtins, so we need to link with > > # libatomic when available > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > > +GRPC_EXE_LINKER_FLAGS += -latomic > > endif > > > GRPC_CFLAGS = $(TARGET_CFLAGS) > > -- > > > 2.35.1 > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From alseycmiller at gmail.com Tue Mar 29 21:54:32 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 21:54:32 +0000 Subject: [Buildroot] [PATCH 1/2] package/libdispatch: add libdispatch package Message-ID: <20220329215433.1018660-1-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/libdispatch/Config.in | 43 +++++++++++++++++++++++ package/libdispatch/libdispatch.hash | 1 + package/libdispatch/libdispatch.mk | 52 ++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 package/libdispatch/Config.in create mode 100644 package/libdispatch/libdispatch.hash create mode 100644 package/libdispatch/libdispatch.mk diff --git a/DEVELOPERS b/DEVELOPERS index a66b9d7eee..555ec0175b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -122,6 +122,9 @@ F: boot/opensbi/ F: configs/hifive_unleashed_defconfig F: package/xen/ +N: Alsey Miller +F: package/libdispatch/ + N: Alvaro G. M F: package/dcron/ F: package/libxmlrpc/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..e217ff5282 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdispatch/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in new file mode 100644 index 0000000000..f4fa5e47fb --- /dev/null +++ b/package/libdispatch/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + bool + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH + string + default "aarch64" if BR2_aarch64 + default "armv5" if BR2_ARM_CPU_ARMV5 + default "armv6" if BR2_ARM_CPU_ARMV6 + default "armv7" if BR2_ARM_CPU_ARMV7A + default "x86_64" if BR2_x86_64 + default "powerpc" if BR2_powerpc + default "mips" if BR2_mips + default "mipsel" if BR2_mipsel + default "mips64" if BR2_mips64 + default "mips64el" if BR2_mips64el + default "riscv64" if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH + bool "libdispatch" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBBSD + + help + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + http://swift.org + +comment "libdispatch needs a toolchain w/ Glibc, wchar, threads, C++, dynamic library" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ No newline at end of file diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash new file mode 100644 index 0000000000..64543b56eb --- /dev/null +++ b/package/libdispatch/libdispatch.hash @@ -0,0 +1 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab libdispatch-swift-5.6-RELEASE.tar.gz diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk new file mode 100644 index 0000000000..79fc4f7780 --- /dev/null +++ b/package/libdispatch/libdispatch.mk @@ -0,0 +1,52 @@ +### Grand Central Dispatch +LIBDISPATCH_VERSION = 5.6 +LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE) +LIBDISPATCH_LICENSE = Apache-2.0 +LIBDISPATCH_LICENSE_FILES = LICENSE +LIBDISPATCH_INSTALL_STAGING = YES +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBDISPATCH_DEPENDENCIES = host-clang host-lld libbsd + +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv7) +LIBDISPATCH_TARGET_NAME = armv7-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv6) +LIBDISPATCH_TARGET_NAME = armv6-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_TARGET_NAME = armv5-unknown-linux-gnueabi +else +LIBDISPATCH_TARGET_NAME = $(LIBDISPATCH_TARGET_ARCH)-unknown-linux-gnu +endif + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 +else +LIBDISPATCH_EXTRA_FLAGS = +endif + +LIBDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + -DCMAKE_C_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + +define LIBDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +$(eval $(cmake-package)) -- 2.30.2 From alseycmiller at gmail.com Tue Mar 29 21:54:33 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 21:54:33 +0000 Subject: [Buildroot] [PATCH 2/2] package/libdispatch: add fix for 32-bit arm In-Reply-To: <20220329215433.1018660-1-alseycmiller@gmail.com> References: <20220329215433.1018660-1-alseycmiller@gmail.com> Message-ID: <20220329215433.1018660-2-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/libdispatch/arm-yield.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/libdispatch/arm-yield.patch diff --git a/package/libdispatch/arm-yield.patch b/package/libdispatch/arm-yield.patch new file mode 100644 index 0000000000..fa7cf7cce4 --- /dev/null +++ b/package/libdispatch/arm-yield.patch @@ -0,0 +1,13 @@ +diff --git a/src/shims/yield.c b/src/shims/yield.c +index 43f0017..d0c5fff 100644 +--- a/src/shims/yield.c ++++ b/src/shims/yield.c +@@ -36,7 +36,7 @@ void * + _dispatch_wait_for_enqueuer(void **ptr) + { + #if !DISPATCH_HW_CONFIG_UP +-#if defined(__arm__) || defined(__arm64__) ++#if (defined(__arm__) && defined(__APPLE__)) || defined(__arm64__) + int spins = DISPATCH_WAIT_SPINS_WFE; + void *value; + while (unlikely(spins-- > 0)) { -- 2.30.2 From alseycmiller at gmail.com Tue Mar 29 21:57:14 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 14:57:14 -0700 Subject: [Buildroot] [PATCH 1/2] package/libdispatch: add libdispatch package In-Reply-To: <20220329215433.1018660-1-alseycmiller@gmail.com> References: <20220329215433.1018660-1-alseycmiller@gmail.com> Message-ID: <2B3FDE91-2C84-4F3B-BDB8-DB0E85EFB3FF@gmail.com> This patch successfully builds with https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ applied. Although its not required for this package, I suggest merging https://patchwork.ozlabs.org/project/buildroot/patch/20220329145904.63900-1-andreynech at gmail.com/ as well. > On Mar 29, 2022, at 2:54 PM, Alsey Coleman Miller wrote: > > Signed-off-by: Alsey Coleman Miller > --- > DEVELOPERS | 3 ++ > package/Config.in | 1 + > package/libdispatch/Config.in | 43 +++++++++++++++++++++++ > package/libdispatch/libdispatch.hash | 1 + > package/libdispatch/libdispatch.mk | 52 ++++++++++++++++++++++++++++ > 5 files changed, 100 insertions(+) > create mode 100644 package/libdispatch/Config.in > create mode 100644 package/libdispatch/libdispatch.hash > create mode 100644 package/libdispatch/libdispatch.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index a66b9d7eee..555ec0175b 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -122,6 +122,9 @@ F: boot/opensbi/ > F: configs/hifive_unleashed_defconfig > F: package/xen/ > > +N: Alsey Miller > +F: package/libdispatch/ > + > N: Alvaro G. M > F: package/dcron/ > F: package/libxmlrpc/ > diff --git a/package/Config.in b/package/Config.in > index 0d5d763180..e217ff5282 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1968,6 +1968,7 @@ menu "Other" > source "package/libcrossguid/Config.in" > source "package/libcsv/Config.in" > source "package/libdaemon/Config.in" > + source "package/libdispatch/Config.in" > source "package/libeastl/Config.in" > source "package/libee/Config.in" > source "package/libev/Config.in" > diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in > new file mode 100644 > index 0000000000..f4fa5e47fb > --- /dev/null > +++ b/package/libdispatch/Config.in > @@ -0,0 +1,43 @@ > +config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS > + bool > + default y if BR2_x86_64 > + default y if BR2_aarch64 > + default y if BR2_arm > + default y if BR2_powerpc > + default y if BR2_mips > + default y if BR2_mipsel > + default y if BR2_mips64 > + default y if BR2_mips64el > + default y if BR2_RISCV_64 > + > +config BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH > + string > + default "aarch64" if BR2_aarch64 > + default "armv5" if BR2_ARM_CPU_ARMV5 > + default "armv6" if BR2_ARM_CPU_ARMV6 > + default "armv7" if BR2_ARM_CPU_ARMV7A > + default "x86_64" if BR2_x86_64 > + default "powerpc" if BR2_powerpc > + default "mips" if BR2_mips > + default "mipsel" if BR2_mipsel > + default "mips64" if BR2_mips64 > + default "mips64el" if BR2_mips64el > + default "riscv64" if BR2_RISCV_64 > + > +config BR2_PACKAGE_LIBDISPATCH > + bool "libdispatch" > + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_USES_GLIBC > + select BR2_PACKAGE_LIBBSD > + > + help > + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. > + > + http://swift.org > + > +comment "libdispatch needs a toolchain w/ Glibc, wchar, threads, C++, dynamic library" > + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ > + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > \ No newline at end of file > diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash > new file mode 100644 > index 0000000000..64543b56eb > --- /dev/null > +++ b/package/libdispatch/libdispatch.hash > @@ -0,0 +1 @@ > +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab libdispatch-swift-5.6-RELEASE.tar.gz > diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk > new file mode 100644 > index 0000000000..79fc4f7780 > --- /dev/null > +++ b/package/libdispatch/libdispatch.mk > @@ -0,0 +1,52 @@ > +### Grand Central Dispatch > +LIBDISPATCH_VERSION = 5.6 > +LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE) > +LIBDISPATCH_LICENSE = Apache-2.0 > +LIBDISPATCH_LICENSE_FILES = LICENSE > +LIBDISPATCH_INSTALL_STAGING = YES > +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO > +LIBDISPATCH_DEPENDENCIES = host-clang host-lld libbsd > + > +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) > +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin > + > +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv7) > +LIBDISPATCH_TARGET_NAME = armv7-unknown-linux-gnueabihf > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv6) > +LIBDISPATCH_TARGET_NAME = armv6-unknown-linux-gnueabihf > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) > +LIBDISPATCH_TARGET_NAME = armv5-unknown-linux-gnueabi > +else > +LIBDISPATCH_TARGET_NAME = $(LIBDISPATCH_TARGET_ARCH)-unknown-linux-gnu > +endif > + > +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) > +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) > +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) > +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 > +else > +LIBDISPATCH_EXTRA_FLAGS = > +endif > + > +LIBDISPATCH_CONF_OPTS += \ > + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ > + -DCMAKE_C_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang \ > + -DCMAKE_CXX_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang++ \ > + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ > + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ > + -DCMAKE_CXX_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + > +define LIBDISPATCH_INSTALL_TARGET_CMDS > + (cd $(LIBDISPATCH_BUILDDIR) && \ > + cp ./*.so $(TARGET_DIR)/usr/lib/ \ > + ) > +endef > + > +$(eval $(cmake-package)) > -- > 2.30.2 > -------------- next part -------------- An HTML attachment was scrubbed... URL: From aperez at igalia.com Tue Mar 29 22:34:03 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 30 Mar 2022 01:34:03 +0300 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering In-Reply-To: <20220329164036.4045575-1-james.hilliard1@gmail.com> References: <20220329164036.4045575-1-james.hilliard1@gmail.com> Message-ID: <20220330013403.GB1671742@momiji> Hi James, On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard wrote: > We need to backport a patch to fix software rendering with cog. I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am planning to release version 0.12.4 in the next hours. WDYT about waiting until we have that and skip ahead to .4 -- that way it will not be needed to import this patch in Buildroot. Cheers, -Adrian > Signed-off-by: James Hilliard > --- > ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++ > 1 file changed, 42 insertions(+) > create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > new file mode 100644 > index 0000000000..fec21c225c > --- /dev/null > +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > @@ -0,0 +1,42 @@ > +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Sat, 26 Mar 2022 13:30:47 -0600 > +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release > + function name. > + > +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91) > + > +Signed-off-by: James Hilliard > +[james.hilliard1 at gmail.com: backport from upstream commit > +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc] > +--- > + platform/wayland/cog-platform-wl.c | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c > +index 0ff9e6f..46c5185 100644 > +--- a/platform/wayland/cog-platform-wl.c > ++++ b/platform/wayland/cog-platform-wl.c > +@@ -63,7 +63,7 @@ > + > + #define DEFAULT_ZOOM_STEP 0.1f > + > +-#if defined(WPE_WL_CHECK_VERSION) > ++#if defined(WPE_FDO_CHECK_VERSION) > + # define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0) > + # define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1) > + #else > +@@ -1705,8 +1705,8 @@ static void > + shm_buffer_destroy(struct shm_buffer *buffer) > + { > + if (buffer->exported_buffer) { > +- wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > +- buffer->exported_buffer); > ++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > ++ buffer->exported_buffer); > + } > + > + wl_buffer_destroy(buffer->buffer); > +-- > +2.25.1 > + > -- > 2.25.1 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From james.hilliard1 at gmail.com Tue Mar 29 23:07:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 17:07:57 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering In-Reply-To: <20220330013403.GB1671742@momiji> References: <20220329164036.4045575-1-james.hilliard1@gmail.com> <20220330013403.GB1671742@momiji> Message-ID: On Tue, Mar 29, 2022 at 4:34 PM Adrian Perez de Castro wrote: > > Hi James, > > On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard wrote: > > We need to backport a patch to fix software rendering with cog. > > I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am > planning to release version 0.12.4 in the next hours. WDYT about waiting > until we have that and skip ahead to .4 -- that way it will not be needed to > import this patch in Buildroot. Yeah, that's probably better. > > Cheers, > -Adrian > > > Signed-off-by: James Hilliard > > --- > > ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++ > > 1 file changed, 42 insertions(+) > > create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > > > diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > new file mode 100644 > > index 0000000000..fec21c225c > > --- /dev/null > > +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > @@ -0,0 +1,42 @@ > > +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001 > > +From: James Hilliard > > +Date: Sat, 26 Mar 2022 13:30:47 -0600 > > +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release > > + function name. > > + > > +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91) > > + > > +Signed-off-by: James Hilliard > > +[james.hilliard1 at gmail.com: backport from upstream commit > > +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc] > > +--- > > + platform/wayland/cog-platform-wl.c | 6 +++--- > > + 1 file changed, 3 insertions(+), 3 deletions(-) > > + > > +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c > > +index 0ff9e6f..46c5185 100644 > > +--- a/platform/wayland/cog-platform-wl.c > > ++++ b/platform/wayland/cog-platform-wl.c > > +@@ -63,7 +63,7 @@ > > + > > + #define DEFAULT_ZOOM_STEP 0.1f > > + > > +-#if defined(WPE_WL_CHECK_VERSION) > > ++#if defined(WPE_FDO_CHECK_VERSION) > > + # define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0) > > + # define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1) > > + #else > > +@@ -1705,8 +1705,8 @@ static void > > + shm_buffer_destroy(struct shm_buffer *buffer) > > + { > > + if (buffer->exported_buffer) { > > +- wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > > +- buffer->exported_buffer); > > ++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > > ++ buffer->exported_buffer); > > + } > > + > > + wl_buffer_destroy(buffer->buffer); > > +-- > > +2.25.1 > > + > > -- > > 2.25.1 From aperez at igalia.com Tue Mar 29 23:11:25 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 30 Mar 2022 02:11:25 +0300 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering In-Reply-To: <20220330013403.GB1671742@momiji> References: <20220329164036.4045575-1-james.hilliard1@gmail.com> <20220330013403.GB1671742@momiji> Message-ID: <20220330021125.GB1680234@momiji> On Wed, 30 Mar 2022 01:34:03 +0300 Adrian Perez de Castro wrote: > On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard wrote: > > We need to backport a patch to fix software rendering with cog. > > I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am > planning to release version 0.12.4 in the next hours. WDYT about waiting > until we have that and skip ahead to .4 -- that way it will not be needed to > import this patch in Buildroot. Here it goes: https://wpewebkit.org/release/cog-0.12.4.html Cheers, -Adrian -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From alseycmiller at gmail.com Tue Mar 29 23:18:42 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 16:18:42 -0700 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries In-Reply-To: <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> References: <20220328060027.2483147-1-alseycmiller@gmail.com> <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> Message-ID: <5AD70D34-E7F5-4A51-A104-1642AFCEA532@gmail.com> I?ve submitted a new patch that deals only with libdispatch. Once that is merged I will submit smaller patches for each individual package. > On Mar 28, 2022, at 1:35 PM, Arnout Vandecappelle wrote: > > Hi Alsey, > > Thank you for your contribution! I have a number of review comments below. Please take them into account and send a new patch series. For the time being, I've marked the patch as Changes Requested in patchwork. > > Firt of all, the patch should be split up in separate patches: one patch per package you add. Make sure all of them are posted together and in the correct order. Each patch should have as subject "package/...: new package". > > I have a few more comments below, but it's hard to properly review such a big patch so I will probably have missed some things. > > On 28/03/2022 08:00, Alsey Coleman Miller wrote: >> Signed-off-by: Alsey Coleman Miller >> --- >> package/Config.in | 11 + > > > Please add yourself to the DEVELOPERS file [1] for this package. This way, you'll get an e-mail if the package fails in the autobuilders, or when a new version is released if the package is registered on release-monitoring.org. > > [snip] >> diff --git a/package/foundation/Config.in b/package/foundation/Config.in >> new file mode 100644 >> index 0000000000..7a9dc8b514 >> --- /dev/null >> +++ b/package/foundation/Config.in >> @@ -0,0 +1,14 @@ >> +if BR2_PACKAGE_SWIFT > > I get that you only want swift-related packages to appear in the menus if swift itself is selected. It would be even better, then, to sort all of them under the swift main entry. Perhaps even prefix all of them with swift-, like is done for python, perl and lua packages. > >> + >> +config BR2_PACKAGE_FOUNDATION >> + bool "foundation" >> + depends on BR2_PACKAGE_SWIFT >> + select BR2_PACKAGE_LIBSWIFTDISPATCH >> + select BR2_PACKAGE_LIBCURL >> + select BR2_PACKAGE_LIBXML2 >> + help >> + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. > > Please make sure indentation is done correctly, as reported by the utils/check-package script. In this case, the line length is way too long. > >> + >> + http://swift.org >> + >> +endif >> diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash >> new file mode 100644 >> index 0000000000..f15edb8420 >> --- /dev/null >> +++ b/package/foundation/foundation.hash >> @@ -0,0 +1 @@ >> +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz >> diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk >> new file mode 100644 >> index 0000000000..93c7cedbdd >> --- /dev/null >> +++ b/package/foundation/foundation.mk >> @@ -0,0 +1,102 @@ >> +### Foundation > > Missin comment header, as reported by check-package (I'm not going to repeat all the other check-package errors). > >> +FOUNDATION_VERSION = $(SWIFT_VERSION) >> +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags > > This doesn't look right - shouldn't you be using the github helper? > >> +FOUNDATION_LICENSE = Apache-2.0 >> +FOUNDATION_LICENSE_FILES = LICENSE >> +FOUNDATION_INSTALL_STAGING = YES >> +FOUNDATION_INSTALL_TARGET = YES > > _INSTALL_TARGET = YES is not needed, it's done automatically. > >> +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO >> +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch >> + >> +FOUNDATION_CONF_OPTS += \ >> + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ >> + -DCMAKE_Swift_FLAGS_DEBUG="" \ > > Please consistently indent with one tab. > >> + -DCMAKE_Swift_FLAGS_RELEASE="" \ >> + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ >> + -DCF_DEPLOYMENT_SWIFT=ON \ >> + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ >> + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +ifeq ($(BR2_PACKAGE_LIBCURL),y) > > Since Config.in selects libcurl, this is always true. > >> + FOUNDATION_DEPENDENCIES += libcurl > > No indentation within make conditions. > >> + FOUNDATION_CONF_OPTS += \ >> + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ >> + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +endif >> + >> +ifeq ($(BR2_PACKAGE_LIBXML2),y) >> + FOUNDATION_DEPENDENCIES += libxml2 >> + FOUNDATION_CONF_OPTS += \ >> + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ >> + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ >> + >> +endif >> + >> +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) >> +else >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build >> +endif > > This stuff is done automatically by the infra. > >> + >> +define FOUNDATION_CONFIGURE_CMDS >> + # Workaround Dispatch defined with cmake and module >> + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch >> + # Clean >> + rm -rf $(FOUNDATION_BUILDDIR) >> + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation >> + # Configure >> + (mkdir -p $(FOUNDATION_BUILDDIR) && \ >> + cd $(FOUNDATION_BUILDDIR) && \ >> + rm -f CMakeCache.txt && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ >> + -DCMAKE_INSTALL_PREFIX="/usr" \ >> + -DBUILD_SHARED_LIBS=ON \ >> + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ >> + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ >> + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ >> + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + $(FOUNDATION_CONF_OPTS) \ >> + ) > > I haven't looked at the details, but not using the cmake infrastructure is not a good idea. > > >> +endef >> + >> +define FOUNDATION_BUILD_CMDS >> + # Compile >> + (cd $(FOUNDATION_BUILDDIR) && ninja) > > If the problem is that it only supports the ninja build system: please use [2] and explain in the cover letter of your series that it depends on that. > >> +endef >> + >> +define FOUNDATION_INSTALL_TARGET_CMDS >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ >> +endef >> + >> +define FOUNDATION_INSTALL_STAGING_CMDS >> + # Copy libraries >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + # Copy CoreFoundation module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation >> + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ >> + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + # Copy CFXMLInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + # Copy CFURLSessionInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + # Copy Swift modules >> + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ >> + # Restore Dispatch headers >> + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) >> + >> +endef >> + >> +$(eval $(generic-package)) >> diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in >> new file mode 100644 >> index 0000000000..2f7c115375 >> --- /dev/null >> +++ b/package/libdispatch/Config.in >> @@ -0,0 +1,11 @@ >> +config BR2_PACKAGE_LIBDISPATCH >> + bool "libdispatch" >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC > > When there are toolchain dependencies, there should also be a comment that tells the user why the package can't be selected. Look at other packages for examples. > > Since it's not clear here, you should probably explain in the commit message why these dependencies are needed. > >> + select BR2_PACKAGE_LIBBSD >> + >> + help >> + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. >> + >> + http://swift.org >> diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash >> new file mode 100644 >> index 0000000000..a89c48c55f >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.hash >> @@ -0,0 +1,2 @@ >> +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz >> +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch >> diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk >> new file mode 100644 >> index 0000000000..a334c3052d >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.mk >> @@ -0,0 +1,78 @@ >> +### Grand Central Dispatch (C API) >> +LIBDISPATCH_VERSION = $(SWIFT_VERSION) >> +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags >> +LIBDISPATCH_LICENSE = Apache-2.0 >> +LIBDISPATCH_LICENSE_FILES = LICENSE >> +LIBDISPATCH_INSTALL_STAGING = YES >> +LIBDISPATCH_INSTALL_TARGET = YES >> +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO >> +LIBDISPATCH_DEPENDENCIES = libbsd >> +LIBDISPATCH_PATCH = \ >> + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch > > Downloading a patch from your own gist isn't exactly great for allowing reviews :-). Please instead include the patch directly in Buildroot. Since upstream is managed in git, please make this a git-formatted patch (generated with git format-patch -N) [1]. Make sure it has a summary and description just like any other commit, and also include your Signed-off-by. The latter is needed to ascertain that the patch may be distributed under the upstream project's license (which may be different from Buildroot's). > > [snip] >> diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in >> new file mode 100644 >> index 0000000000..cbeed69667 >> --- /dev/null >> +++ b/package/swift-hello/Config.in >> @@ -0,0 +1,10 @@ >> +if BR2_PACKAGE_SWIFT >> + >> +config BR2_PACKAGE_SWIFT_HELLO >> + bool "swift-hello" >> + depends on BR2_PACKAGE_SWIFT >> + depends on BR2_PACKAGE_FOUNDATION >> + help >> + Demo application for Swift. > > If I understand correctly, this package serves no purpose other than proving that it's possibleto biuld a swift application in Buildroot. Nobody is ever going to select it. Instead, it would be better to move it to the runtime test infrastructure (and of course actually runtime test it, which proves that the generated binaries actually work). > > [snip] >> diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk >> new file mode 100644 >> index 0000000000..b3cded3f7c >> --- /dev/null >> +++ b/package/swift-hello/swift-hello.mk >> @@ -0,0 +1,33 @@ >> +### Swift Demo >> +SWIFT_HELLO_VERSION = 0.1.0 >> +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src >> +SWIFT_HELLO_SITE_METHOD = local >> +SWIFT_HELLO_INSTALL_STAGING = NO >> +SWIFT_HELLO_INSTALL_TARGET = YES >> +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES >> +SWIFT_HELLO_DEPENDENCIES = swift foundation >> +SWIFT_HELLO_EXECUTABLES = swift-hello >> +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) >> + >> +define SWIFT_HELLO_BUILD_CMDS >> + ( \ > > These parenthesis are actually not needed. They are still used in a lot of places in Buildroot, but that's legacy stuff. > >> + cd $(SWIFT_HELLO_SRCDIR) && \ >> + rm -rf .build && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ >> + ) >> +endef >> + >> +define SWIFT_HELLO_INSTALL_TARGET_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ > > Please don't keep commented-out lines. > >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello >> +endef >> + >> +define SWIFT_HELLO_INSTALL_STAGING_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello >> +endef >> + >> +$(eval $(generic-package)) > > [snip] >> +config BR2_PACKAGE_SWIFT >> + bool "swift" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC >> + select BR2_PACKAGE_ICU >> + select BR2_PACKAGE_LIBDISPATCH >> + help >> + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. >> + >> + http://swift.org >> + >> +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH >> + >> +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS >> + string "Path to host Swift toolchain" >> + default "/usr/bin" >> + >> +config BR2_PACKAGE_SWIFT_LLVM_DIR >> + string "Path to host LLVM library path" >> + default "/usr/lib/llvm-12" > > I guess swift is built on top of LLVM. Is it possible to use package/llvm, or is it a patched version? > >> + >> +endif >> + >> +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ >> + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > > [snip] >> diff --git a/package/swift/swift.mk b/package/swift/swift.mk >> new file mode 100644 >> index 0000000000..da10aae8fd >> --- /dev/null >> +++ b/package/swift/swift.mk >> @@ -0,0 +1,232 @@ >> +### Apple's Swift Programming Language >> +SWIFT_VERSION = 5.6 >> +SWIFT_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +SWIFT_SITE = https://github.com/apple/swift/archive/refs/tags >> +SWIFT_LICENSE = Apache-2.0 >> +SWIFT_LICENSE_FILES = LICENSE.txt >> +SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH)) >> +SWIFT_NATIVE_PATH = $(call qstrip,$(BR2_PACKAGE_SWIFT_NATIVE_TOOLS)) >> +SWIFT_LLVM_DIR = $(call qstrip,$(BR2_PACKAGE_SWIFT_LLVM_DIR)) >> +SWIFT_INSTALL_STAGING = YES >> +SWIFT_INSTALL_TARGET = YES >> +SWIFT_SUPPORTS_IN_SOURCE_BUILD = NO >> +SWIFT_DEPENDENCIES = icu libxml2 libbsd libdispatch >> + >> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) >> +SWIFT_CONF_ENV += LIBS="-latomic" >> +endif >> + >> +HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift >> +SWIFTPM_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/$(SWIFT_TARGET_NAME)-toolchain.json > > This should have simply a SWIFT_ prefix, not SWIFTPM. > > [snip] >> +define SWIFT_INSTALL_STAGING_CMDS >> + mkdir -p $(HOST_SWIFT_SUPPORT_DIR) >> + # Copy runtime libraries and swift interfaces >> + cp -rf $(SWIFT_BUILDDIR)/lib/swift ${STAGING_DIR}/usr/lib/ >> + # Generate SwiftPM cross compilation toolchain file >> + rm -f $(SWIFTPM_DESTINATION_FILE) >> + touch $(SWIFTPM_DESTINATION_FILE) >> + echo '{' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) > > We generally prefer to have a template file (called swift-toolchain.json.in) in the package directory, and use sed to replace @XXXX@ entries. See e.g. how it's done for cmake's toolchainfile. > >> + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ >> + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) >> + echo '}' >> $(SWIFTPM_DESTINATION_FILE) >> + >> +endef >> + >> +$(eval $(generic-package)) >> +$(eval $(host-generic-package)) >> \ No newline at end of file > > Please make sure there's a newline at the end of the file. > > Regards, > Arnout > > [1] https://buildroot.org/downloads/manual/manual.html#DEVELOPERS > [2] https://patchwork.ozlabs.org/project/buildroot/list/?series=282194 > [3] https://buildroot.org/manual.html#_format_and_licensing_of_the_package_patches From alseycmiller at gmail.com Tue Mar 29 23:19:33 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 16:19:33 -0700 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: References: <20220329185059.943889-1-alseycmiller@gmail.com> <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> Message-ID: <057A8C3C-8DAC-46A3-86AB-2DAA92A9368B@gmail.com> I?ve submitted a new series of patches that I?ve tested with your patch. So the `LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN` line is remove and all `pkg-cmake` changes. > On Mar 29, 2022, at 1:10 PM, James Hilliard wrote: > > On Tue, Mar 29, 2022 at 1:58 PM Alsey Miller wrote: >> >> That commit is not merged and only seems to override the C flags. How can we force cmake to use Clang for target packages? I would be fine with basing my work that patch if support for using Clang and as the C and C++ compiler is added. > > It should allow overriding any of the toolchain variables like this: > https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-6-james.hilliard1 at gmail.com/ > > I think this will pretty much work as is with your libdispatch patch: > https://patchwork.ozlabs.org/project/buildroot/patch/20220329185059.943889-2-alseycmiller at gmail.com/ > > It should allow you to drop this part: > LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN = NO > > You might also be able to drop some of the other conf opts since the toolchain > file can then still be used with partial overrides. > >> >>> On Mar 29, 2022, at 12:26 PM, James Hilliard wrote: >>> >>> On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: >>>> >>>> This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. >>> >>> I think this is probably a better way of dealing with the issue: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ >>> >>>> >>>>> On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: >>>>> >>>>> Signed-off-by: Alsey Coleman Miller >>>>> --- >>>>> package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- >>>>> 1 file changed, 24 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk >>>>> index 3b1db35fb6..9b36ee2b47 100644 >>>>> --- a/package/pkg-cmake.mk >>>>> +++ b/package/pkg-cmake.mk >>>>> @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast >>>>> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast >>>>> >>>>> $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES >>>>> - >>>>> +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES >>>>> >>>>> ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) >>>>> $(2)_BUILDDIR = $$($(2)_SRCDIR) >>>>> @@ -82,6 +82,7 @@ ifeq ($(4),target) >>>>> # documented as a standard CMake variable. If a package supports it, >>>>> # it must handle it explicitly. >>>>> # >>>>> +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) >>>>> define $(2)_CONFIGURE_CMDS >>>>> (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>>>> cd $$($$(PKG)_BUILDDIR) && \ >>>>> @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS >>>>> ) >>>>> endef >>>>> else >>>>> +define $(2)_CONFIGURE_CMDS >>>>> + (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>>>> + cd $$($$(PKG)_BUILDDIR) && \ >>>>> + rm -f CMakeCache.txt && \ >>>>> + PATH=$$(BR_PATH) \ >>>>> + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ >>>>> + -DCMAKE_INSTALL_PREFIX="/usr" \ >>>>> + -DCMAKE_COLOR_MAKEFILE=OFF \ >>>>> + -DBUILD_DOC=OFF \ >>>>> + -DBUILD_DOCS=OFF \ >>>>> + -DBUILD_EXAMPLE=OFF \ >>>>> + -DBUILD_EXAMPLES=OFF \ >>>>> + -DBUILD_TEST=OFF \ >>>>> + -DBUILD_TESTS=OFF \ >>>>> + -DBUILD_TESTING=OFF \ >>>>> + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ >>>>> + $$(CMAKE_QUIET) \ >>>>> + $$($$(PKG)_CONF_OPTS) \ >>>>> + ) >>>>> +endef >>>>> +endif >>>>> +else >>>>> >>>>> # Configure package for host >>>>> define $(2)_CONFIGURE_CMDS >>>>> -- >>>>> 2.35.1 >>>>> >>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >> From dpb at corrigendum.ru Tue Mar 29 23:24:48 2022 From: dpb at corrigendum.ru (=?UTF-8?B?0KDQvtC80LDQvSDQlNC+0L3Rh9C10L3QutC+?=) Date: Wed, 30 Mar 2022 02:24:48 +0300 Subject: [Buildroot] Should the CONFIG_STACK_OPTIMIZATION_386 BusyBox option default to off? Message-ID: <6ef1aeb2-ce3c-eb63-fa59-9c666fe37856@corrigendum.ru> Hi, I tried to build a system using Buildroot with the x86-core2 glibc bleeding-edge toolchain. When testing the result, I discovered that the BusyBox shell segfaults upon executing any command. I investigated this, and found out that BusyBox calls libc routines with a misaligned stack. Apparently the i386 ABI was changed in version 1.1 [1] to require ESP+4 to be a multiple of 16 on function entry, and the version of glibc included with the toolchain expects that. On the other hand, BusyBox is built with -mpreferred-stack-boundary=2, so it ensures only that ESP is a multiple of 4. The -mpreferred-stack-boundary=2 option is controlled by BusyBox's CONFIG_STACK_OPTIMIZATION_386 configuration option, which in Buildroot is set to "y" by default. Since this configuration is incompatible with at least some toolchains and violates the ABI, perhaps the default ought to be "n" instead? -Roman. [1] , section 2.2.2 From vincent.stehle at laposte.net Wed Mar 30 00:28:13 2022 From: vincent.stehle at laposte.net (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Wed, 30 Mar 2022 02:28:13 +0200 Subject: [Buildroot] [PATCH] package/zerofree: new package Message-ID: <20220330002813.19070-1-vincent.stehle@laposte.net> zerofree is a utility which scans the free blocks in an ext2 filesystem and fills any non-zero blocks with zeroes. https://frippery.org/uml/ Signed-off-by: Vincent Stehl? Cc: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/zerofree/Config.in | 14 ++++++++++++++ package/zerofree/zerofree.hash | 3 +++ package/zerofree/zerofree.mk | 22 ++++++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 package/zerofree/Config.in create mode 100644 package/zerofree/zerofree.hash create mode 100644 package/zerofree/zerofree.mk diff --git a/DEVELOPERS b/DEVELOPERS index a66b9d7eee..04e2bad5a2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2897,6 +2897,7 @@ F: configs/uevm5432_defconfig F: package/i7z/ F: package/msr-tools/ F: package/pixz/ +F: package/zerofree/ N: Vinicius Tinti F: package/python-thrift/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..0e58cbc832 100644 --- a/package/Config.in +++ b/package/Config.in @@ -238,6 +238,7 @@ menu "Filesystem and flash utilities" source "package/udftools/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" + source "package/zerofree/Config.in" source "package/zfs/Config.in" endmenu diff --git a/package/zerofree/Config.in b/package/zerofree/Config.in new file mode 100644 index 0000000000..c90add442e --- /dev/null +++ b/package/zerofree/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_ZEROFREE + bool "zerofree" + depends on BR2_USE_MMU # e2fsprogs + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_E2FSPROGS + help + zerofree is a utility which scans the free blocks in an ext2 + filesystem and fills any non-zero blocks with zeroes. + + https://frippery.org/uml/ + +comment "zerofree needs MMU, dynamic library and does not build with musl" + depends on !BR2_USE_MMU || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/zerofree/zerofree.hash b/package/zerofree/zerofree.hash new file mode 100644 index 0000000000..3399611787 --- /dev/null +++ b/package/zerofree/zerofree.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 956bc861b55ba0a2b7593c58d32339dab1a0e7da6ea2b813d27c80f08b723867 zerofree-1.1.1.tgz +sha256 90daae00475a992a367da5b0658469a5d1c4449dbbe964c5b7246e1aec92f491 COPYING diff --git a/package/zerofree/zerofree.mk b/package/zerofree/zerofree.mk new file mode 100644 index 0000000000..63c9fd57d8 --- /dev/null +++ b/package/zerofree/zerofree.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# zerofree +# +################################################################################ + +ZEROFREE_VERSION = 1.1.1 +ZEROFREE_SOURCE = zerofree-$(ZEROFREE_VERSION).tgz +ZEROFREE_SITE = https://frippery.org/uml +ZEROFREE_LICENSE = GPL-2.0 +ZEROFREE_LICENSE_FILE = COPYING +ZEROFREE_DEPENDENCIES = e2fsprogs + +define ZEROFREE_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all +endef + +define ZEROFREE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/zerofree $(TARGET_DIR)/usr/bin +endef + +$(eval $(generic-package)) -- 2.35.1 From bugzilla at busybox.net Wed Mar 30 00:39:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 00:39:59 +0000 Subject: [Buildroot] [Bug 14721] New: python-argon2_cffi no longer works Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14721 Bug ID: 14721 Summary: python-argon2_cffi no longer works Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: emile.cormier.jr at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9256 --> https://bugs.busybox.net/attachment.cgi?id=9256&action=edit Snippet of the build log concerning argon2-cffi and argon2-cffi-bindings Commit https://github.com/buildroot/buildroot/commit/e2957f5ce743cfaf4fb3aaa98d619e83e8e6989e breaks the argon2-cffi Python package for my ARM target (Beaglebone Black). The installation of the argon2-cffi Python package somehow got broken with the version bump. Just before that commit, I get (via serial terminal): # python -c 'help("modules")' | grep argon2 __future__ argon2 gzip selectors # python -c 'from argon2 import PasswordHasher; print(PasswordHasher().hash("cor rect horse battery staple"));' $argon2id$v=19$m=102400,t=2,p=8$qHc/evoNvfGlp98pE26Ayw$tZWcHYjxFTKDUoaSysapPA And just after that commit, I get: # python -c 'help("modules")' | grep argon2 _argon2_cffi_bindings ast hmac shutil Traceback (most recent call last): File "", line 1, in ModuleNotFoundError: No module named 'argon2' argon2-cffi is the only Python package I have enabled via menu xconfig for this test. I've attached a snippet of the build log concerning argon2-cffi and argon2-cffi-bindings. -- You are receiving this mail because: You are on the CC list for the bug. From emile.cormier.jr at gmail.com Wed Mar 30 00:54:18 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Tue, 29 Mar 2022 21:54:18 -0300 Subject: [Buildroot] python-argon2-cffi no longer works Message-ID: Hi Everyone, Commit https://github.com/buildroot/buildroot/commit e2957f5ce743cfaf4fb3aaa98d619e83e8e6989e breaks the argon2-cffi Python package for my ARM target (Beaglebone Black). The installation of the argon2-cffi Python package somehow got broken with the version bump. Just before that commit, I get (via serial terminal): # python -c 'help("modules")' | grep argon2 __future__ argon2 gzip selectors # python -c 'from argon2 import PasswordHasher; print(PasswordHasher().hash("cor rect horse battery staple"));' $argon2id$v=19$m=102400,t=2,p=8$qHc/evoNvfGlp98pE26Ayw$tZWcHYjxFTKDUoaSysapPA And just after that commit, I get: # python -c 'help("modules")' | grep argon2 _argon2_cffi_bindings ast hmac shutil Traceback (most recent call last): File "", line 1, in ModuleNotFoundError: No module named 'argon2' argon2-cffi is the only Python package I have enabled via make xconfig for this test. Any hints on how I can track down the problem would be appreciated. Note that I'm not an expert in Python or how its package management system works. I'm working on a project that is dependent on another Python project that depends on argon2-cffi. I submitted this bug report: https://bugs.busybox.net/show_bug.cgi?id=14721 Cheers, Emile Cormier -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 30 03:17:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 03:17:59 +0000 Subject: [Buildroot] [Bug 14721] python-argon2_cffi no longer works In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14721 --- Comment #1 from Emile Cormier --- TL;DR: The new Python flit setup infrastructure seems to be deploying to the wrong destination directory. ----- I see now that argon2-cffi now uses the new flit setup type. The argon2-cffi package now gets installed under /lib/python3.10/site-packages/argon2 whereas it used to be installed under /usr/lib/python3.10/site-packages Here's the output of 'python -m site' on my BeagleBone Black device: sys.path = [ '/lib/python3.10/site-packages/argon2', '/usr/lib/python310.zip', '/usr/lib/python3.10', '/usr/lib/python3.10/lib-dynload', '/usr/lib/python3.10/site-packages', ] USER_BASE: '/root/.local' (doesn't exist) USER_SITE: '/root/.local/lib/python3.10/site-packages' (doesn't exist) ENABLE_USER_SITE: True If I add /lib/python3.10/site-packages to the "real" system-wide site-packages via: echo "/lib/python3.10/site-packages" > /usr/lib/python3.10/site-packages/extra.pth then argon2 now appears in python -c 'help("modules")' and the following test command works! # python -c 'from argon2 import PasswordHasher; print(PasswordHasher().hash("correct horse battery staple"));' $argon2id$v=19$m=65536,t=3,p=4$CZO2H3qcZr/Vp9w0qVpLxA$eAz24Ry+cvSdRTJaPYDcf9HTc/Zyq/PmoFkFFPcQHm0 -- You are receiving this mail because: You are on the CC list for the bug. From emile.cormier.jr at gmail.com Wed Mar 30 04:05:36 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 01:05:36 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path Message-ID: package/pkg-python.mk: fix PEP517 purelib deployment path This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..6aaca1f465 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -149,7 +149,7 @@ HOST_PKG_PYTHON_PEP517_ENV = \ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 30 04:11:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 04:11:23 +0000 Subject: [Buildroot] [Bug 14721] python-argon2_cffi no longer works In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14721 --- Comment #2 from Emile Cormier --- I've tracked it down to package/pkg-python.mk using /lib/python$(PYTHON3_VERSION_MAJOR)/site-packages instead of /usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages Submitted a patch via the mailing list: https://lists.buildroot.org/pipermail/buildroot/2022-March/639798.html I can import and use the argon2 module in a Python program with those changes. -- You are receiving this mail because: You are on the CC list for the bug. From emile.cormier.jr at gmail.com Wed Mar 30 04:21:31 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 01:21:31 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: Sorry, forgot to CC the relevant developers (at least who I think are relevant). I'm more accustomed to modern software collaboration tools like GitHub / GitLab / JIRA, to be honest. On Wed, Mar 30, 2022 at 1:05 AM Emile Cormier wrote: > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..6aaca1f465 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > + > --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - > --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + > --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -149,7 +149,7 @@ HOST_PKG_PYTHON_PEP517_ENV = \ > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + > --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(HOST_DIR)/usr/bin \ > --data=$(HOST_DIR)/usr > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 30 05:15:47 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 05:15:47 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #4 from Wim Meganck --- If I add BR2_PACKAGE_HOST_PYTHON3_BZIP2=y in the .config file is it gone after make. _bz2 is in the list of DISABLED_EXTENSIONS _bz2.*.so is indeed missing in output/host/lib/python3.10/lib-dynload -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 30 05:33:06 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 05:33:06 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #5 from Wim Meganck --- I made following changes in the .config: BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_PYTHON3_BZIP2=y Rebuild bzip and python3. Run make _bz2 is still in the list of DISABLED_EXTENSIONS _bz2.*.so is still missing in output/host/lib/python3.10/lib-dynload But still same error Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 30 05:37:38 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 05:37:38 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #4 from Jos? Pekkarinen --- I want to highlight that this may be a buildroot issue, and not a driver, or a linux one. This is because I tried the same kernel version on my laptop: $ uname -r 5.15.21-hardened1 And this is the building output of the module: make make -C /lib/modules/5.15.21-hardened1/build M=/home/pekkari/linux-sgx-driver-sgx_driver_2.14 modules make[1]: Entering directory '/usr/src/linux-headers-5.15.21-hardened1' CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_main.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_page_cache.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_ioctl.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_vma.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_util.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_encl.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_encl2.o LD [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/isgx.o MODPOST /home/pekkari/linux-sgx-driver-sgx_driver_2.14/Module.symvers WARNING: modpost: modpost: Found 2 writable function pointers. To see full details build your kernel with: 'make CONFIG_DEBUG_WRITABLE_FUNCTION_POINTERS_VERBOSE=y' CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/isgx.mod.o LD [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/isgx.ko make[1]: Leaving directory '/usr/src/linux-headers-5.15.21-hardened1' and installing and loading the module I can see in dmesg: [ 233.145965] isgx: loading out-of-tree module taints kernel. [ 233.146006] isgx: module verification failed: signature and/or required key missing - tainting kernel [ 233.146559] intel_sgx: the CPU is missing SGX So symbols are in place, kernel is not wrong, module either, but buildroot configures the linker in a way the symbols are not found. Thanks! -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Wed Mar 30 07:06:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 01:06:53 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Tue, Mar 29, 2022 at 10:06 PM Emile Cormier wrote: > > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..6aaca1f465 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ I must have copy pasted that wrong, usually /usr/lib is merged with /usr so worked for me when runtime testing. > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -149,7 +149,7 @@ HOST_PKG_PYTHON_PEP517_ENV = \ > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(HOST_DIR)/usr/bin \ > --data=$(HOST_DIR)/usr For the host I think all these paths should not be under /usr. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Wed Mar 30 07:12:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:12:28 +0200 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5base: remove leftover patch In-Reply-To: <20220317163823.2913753-2-foss+buildroot@0leil.net> (Quentin Schulz's message of "Thu, 17 Mar 2022 17:38:22 +0100") References: <20220317163823.2913753-1-foss+buildroot@0leil.net> <20220317163823.2913753-2-foss+buildroot@0leil.net> Message-ID: <87ilrv9an7.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > From: Quentin Schulz > CVE-2021-38593 fixes originally missed a usecase that was covered by the > to-be-removed patch. However, this patch was incorrect and added some > issues on its own, which was then fixed by now-removed > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. > Unfortunately for us, the to-be-removed patch (fixed by > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually > be applied (with fuzz; by `patch` only) on top of the now-removed patch. > When the move to KDE Qt fork was made, some patches were removed as they > were already part of the new git fork. However, the to-be-removed patch > was not. This means the > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually > undone when Buildroot patched qt5base. > Let's remove this patch to fix this oversight. > As a reference: > e7ea2ed27c Improve fix for avoiding huge number of tiny dashes > fixed by > 65b3aa6a1c Refix for avoiding huge number of tiny dashes > in the git repo. > Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From br015 at umbiko.net Wed Mar 30 07:13:32 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 30 Mar 2022 07:13:32 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> Message-ID: <35c2351b33bcb44d81333adfa848d221@umbiko.net> Hi Dan, cutting some old content. On 2022-03-29 19:19, Dan Jackson wrote: >> > However, now I have a new missing file error, and I can't seem to >> > locate a suitable candidate: >> > >> > In file included from >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/arch/arm/include/asm/system.h:165, >> > from >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/arch/arm/include/asm/bitops.h:27, >> > from include/linux/bitops.h:22, >> > from include/linux/kernel.h:17, >> > from include/linux/sched.h:55, >> > from arch/arm/kernel/asm-offsets.c:13: >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/arch/arm/include/asm/memory.h:19:10: >> > fatal error: mach/memory.h: No such file or directory >> > 19 | #include >> > | ^~~~~~~~~~~~~~~ >> > compilation terminated. >> > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 >> > Makefile:1009: recipe for target 'prepare0' failed >> > make[2]: *** [prepare0] Error 2 >> > make[2]: *** Waiting for unfinished jobs.... >> > HOSTCC scripts/mod/modpost.o >> > HOSTCC scripts/mod/sumversion.o >> > HOSTLD scripts/mod/modpost >> > make[2]: *** wait: No child processes. Stop. >> > package/pkg-generic.mk:289: recipe for target >> > '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' >> > failed >> > make[1]: *** >> > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] >> > Error 2 >> > Makefile:84: recipe for target '_all' failed >> > make: *** [_all] Error 2 >> >> This seems not to be the defconfig from above? It now uses >> linux-custom ... >> The failure may be due to the default kernel configuration. Try to >> configure >> the correct one and see if you get further. >> >> > I think maybe I am still doing something wrong because it sure seems >> > to be compiling a lot of stuff instead of letting me configure things. >> >> It gets better once everything necessary is built. > > Still no luck I'm afraid. Same error with mach/memory.h as above. > > Buildroot defconfig now looks like this: > > BR2_armeb=y > BR2_STATIC_LIBS=y > BR2_KERNEL_HEADERS_VERSION=y > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > BR2_PTHREAD_DEBUG=y > BR2_BINUTILS_VERSION_2_37_X=y > BR2_GCC_VERSION_9_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_HOST_GDB=y > BR2_GDB_VERSION_9_2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" > BR2_PACKAGE_DROPBEAR=y > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" > BR2_PACKAGE_JOE=y > > I forgot to mention this before but the buildroot manual page you > mentioned said to create a local.mk file in order to use external > source, this looks like this: > > LINUX_OVERRIDE_SRCDIR = > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ > > For the kernel configuration I entered the kernel source dir and did > "make menuconfig", I left everything at the defaults except for > enabling the USB related items. > > The resulting configuration file is attached as a text file. > Unfortunately it's been literally decades since I last actually > compiled a kernel, so I'm afraid I have no idea what bits would be > suitable to disable/remove to get the results I want (I'm guessing > this will be the most likely way to eliminate the error I'm getting?) I did a compile test this morning, the Buildroot version was some early 2022.02 version, not up-to-date. You have a potential header mismatch, Select Toolchain -> Kernel Headers -> Same as kernel being built to use the vendor source also for the headers. I could configure Linux with make menuconfig, did not encounter the missing memory.h error above, but the build stops during Linux kernel compilation with this error: /tmp/ccSO8f6S.s: Assembler messages: /tmp/ccSO8f6S.s:950: Error: .err encountered make[3]: *** [scripts/Makefile.build:284: arch/arm/kernel/sys_oabi-compat.o] Error 1 make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 make[1]: *** [package/pkg-generic.mk:292: /home/data/test/buildroot/output/build/linux-custom/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 Full error log is here: https://pastebin.com/VrXqSVsD You might now do some research: https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly-error-when-building-linux-kernel-3-14-17-in-buildroot-2020 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 or try to switch to an older compiler ... -- Andreas From peter at korsgaard.com Wed Mar 30 07:13:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:13:31 +0200 Subject: [Buildroot] [PATCH v1] package/qt5base: fix eglconvenience compile (missing QList include) In-Reply-To: <20220316182440.17393-1-ps.report@gmx.net> (Peter Seiderer's message of "Wed, 16 Mar 2022 19:24:40 +0100") References: <20220316182440.17393-1-ps.report@gmx.net> Message-ID: <87ee2j9alg.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add 0008-eglconvenience-add-missing-QList-include.patch to fix > eglconvenience compile (missing QList include) > Fixes: > qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type > 418 | QList extensions = > | ^~~~~~~~~~ > qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? > 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); > | ^ > Signed-off-by: Peter Seiderer Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 07:12:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:12:54 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5base: fix eglconvenience compile (missing QList include) Message-ID: <20220330070437.AA0FE85FB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=988f192a659fff3b54e5ad00ebbb5b2615a03d7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - add 0008-eglconvenience-add-missing-QList-include.patch to fix eglconvenience compile (missing QList include) Fixes: qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | ^ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 68159373d1a1fcb542a1ad411141dc910b8e1d49) Signed-off-by: Peter Korsgaard --- ...-eglconvenience-add-missing-QList-include.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 0000000000..c7127291e4 --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + From peter at korsgaard.com Wed Mar 30 06:50:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 08:50:49 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: remove leftover patch Message-ID: <20220330070437.A0D1D85FB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2992d27bd63adc3d1c6f265b57e07746f0761f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: renumber patches 0007 and 0008] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3857bccca5e59dfe90fc5b5823bfe672a1847cd5) Signed-off-by: Peter Korsgaard --- ...scv32.patch => 0006-Fix-build-on-riscv32.patch} | 0 ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 ---------------------- ...-configure.json-fix-atomicfptr-detection.patch} | 0 3 files changed, 37 deletions(-) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch similarity index 100% rename from package/qt5/qt5base/0007-Fix-build-on-riscv32.patch rename to package/qt5/qt5base/0006-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert L??hning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch similarity index 100% rename from package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch rename to package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch From james.hilliard1 at gmail.com Wed Mar 30 07:14:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 01:14:49 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.4 Message-ID: <20220330071449.4060342-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 839b12e619..00d3a4e191 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.4.tar.xz.sums +md5 cdb8acdc3acc9b5082e7db9c279155c3 cog-0.12.4.tar.xz +sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz +sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 2f6ef402fb..f2ca0af93d 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.1 +COG_VERSION = 0.12.4 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -- 2.25.1 From emile.cormier.jr at gmail.com Wed Mar 30 07:19:06 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 04:19:06 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 4:07 AM James Hilliard wrote: > On Tue, Mar 29, 2022 at 10:06 PM Emile Cormier > wrote: > > > > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > + > --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > --scripts=$(HOST_DIR)/usr/bin \ > > --data=$(HOST_DIR)/usr > > For the host I think all these paths should not be under /usr. > For me output/host/usr is a simlink to output/host: ls -l output/host total 48 drwxr-xr-x 3 emile emile 4096 Mar 30 01:27 arm-buildroot-linux-gnueabihf drwxr-xr-x 2 emile emile 12288 Mar 30 01:40 bin drwxr-xr-x 3 emile emile 4096 Mar 30 01:38 doc drwxr-xr-x 5 emile emile 4096 Mar 30 01:40 etc drwxr-xr-x 19 emile emile 4096 Mar 30 01:39 include drwxr-xr-x 7 emile emile 4096 Mar 30 01:39 lib lrwxrwxrwx 1 emile emile 3 Mar 30 01:27 lib64 -> lib drwxr-xr-x 2 emile emile 4096 Mar 30 01:32 libexec drwxr-xr-x 3 emile emile 4096 Mar 30 01:28 opt drwxr-xr-x 2 emile emile 4096 Mar 30 01:29 sbin drwxr-xr-x 22 emile emile 4096 Mar 30 01:38 share lrwxrwxrwx 1 emile emile 1 Mar 30 01:27 usr -> . -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 07:23:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 01:23:04 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 1:19 AM Emile Cormier wrote: > > > > On Wed, Mar 30, 2022 at 4:07 AM James Hilliard wrote: >> >> On Tue, Mar 29, 2022 at 10:06 PM Emile Cormier >> wrote: >> > >> > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > + --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > --scripts=$(HOST_DIR)/usr/bin \ >> > --data=$(HOST_DIR)/usr >> >> For the host I think all these paths should not be under /usr. > > > For me output/host/usr is a simlink to output/host: Yeah, I think it usually works but should not have /usr for consistency. > ls -l output/host > total 48 > drwxr-xr-x 3 emile emile 4096 Mar 30 01:27 arm-buildroot-linux-gnueabihf > drwxr-xr-x 2 emile emile 12288 Mar 30 01:40 bin > drwxr-xr-x 3 emile emile 4096 Mar 30 01:38 doc > drwxr-xr-x 5 emile emile 4096 Mar 30 01:40 etc > drwxr-xr-x 19 emile emile 4096 Mar 30 01:39 include > drwxr-xr-x 7 emile emile 4096 Mar 30 01:39 lib > lrwxrwxrwx 1 emile emile 3 Mar 30 01:27 lib64 -> lib > drwxr-xr-x 2 emile emile 4096 Mar 30 01:32 libexec > drwxr-xr-x 3 emile emile 4096 Mar 30 01:28 opt > drwxr-xr-x 2 emile emile 4096 Mar 30 01:29 sbin > drwxr-xr-x 22 emile emile 4096 Mar 30 01:38 share > lrwxrwxrwx 1 emile emile 1 Mar 30 01:27 usr -> . From peter at korsgaard.com Wed Mar 30 07:29:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:29:05 +0200 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series In-Reply-To: <20220322082939.2153092-1-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 22 Mar 2022 09:29:38 +0100") References: <20220322082939.2153092-1-peter@korsgaard.com> Message-ID: <87a6d799vi.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.4.x is now EOL, so no more updates for that series. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 07:28:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:28:24 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220330072006.72AA485FC0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e94e0515f22b99f142206c8006c91e3f8b0f8c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard (cherry picked from commit 607c5986a9b3bde0cacdbe38eeaea2ab456a6e80) [Peter: drop 5.15.x / 5.16.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index da50a2ced5..8276d1f737 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.103" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.107" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 2589f43b1d..fb96894977 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 2554d4aace..f1b031a46e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -347,11 +347,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Wed Mar 30 07:26:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:26:13 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220330072044.D31E085FC4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dcc62e62f8728b6d73ec43a419c1ce6abc93e05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard (cherry picked from commit 607c5986a9b3bde0cacdbe38eeaea2ab456a6e80) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f21beb4222..f25b662aa5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.30" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 976f1d07c0..87a0f0465b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 cca7d6e053e33f44af1b39f7becec73a387911d81ede5a84ecf671692533138f linux-5.16.16.tar.xz +sha256 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132 linux-5.15.30.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831..479f64b72e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -381,13 +381,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 + default "5.15.30" if BR2_KERNEL_HEADERS_5_15 + default "5.16.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From fperrad at gmail.com Wed Mar 30 07:31:52 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 30 Mar 2022 09:31:52 +0200 Subject: [Buildroot] [PATCH] package/luaexpt: bump to version 1.4.0 Message-ID: <20220330073152.1804932-1-francois.perrad@gadz.org> moved under the hat of https://github.com/lunarmodules remove upstream patch diff LICENSE: -The MIT License (MIT) -Copyright (c) 2013 Tom?s Guisasola +Copyright (C) 2003-2007 The Kepler Project, 2013-2022 Matthew Wild Signed-off-by: Francois Perrad --- .../0001-restore-getcurrentbytecount.patch | 40 ------------------- package/luaexpat/Config.in | 2 +- package/luaexpat/luaexpat.hash | 4 +- package/luaexpat/luaexpat.mk | 3 +- 4 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 package/luaexpat/0001-restore-getcurrentbytecount.patch diff --git a/package/luaexpat/0001-restore-getcurrentbytecount.patch b/package/luaexpat/0001-restore-getcurrentbytecount.patch deleted file mode 100644 index 6cf219267..000000000 --- a/package/luaexpat/0001-restore-getcurrentbytecount.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77cb691f781918908dfe34785f00a5ff75d5cc20 Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sat, 16 Feb 2019 15:56:00 +0100 -Subject: [PATCH] restore getcurrentbytecount - -see https://github.com/tomasguisasola/luaexpat/issues/3 - -Fetch from: https://github.com/tomasguisasola/luaexpat/commit/0926f2d705109b7d35b721344264b39c1169e0de - -Signed-off-by: Francois Perrad ---- - src/lxplib.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/luaexpat-1.3.3/src/lxplib.c b/luaexpat-1.3.3/src/lxplib.c -index 7726913..35bec3c 100644 ---- a/luaexpat-1.3.3/src/lxplib.c -+++ b/luaexpat-1.3.3/src/lxplib.c -@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) { - return 1; - } - -+static int lxp_getcurrentbytecount (lua_State* L) { -+ lxp_userdata *xpu = checkparser(L, 1); -+ lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser)); -+ return 1; -+} -+ - static const luaL_Reg lxp_meths[] = { - {"parse", lxp_parse}, - {"close", lxp_close}, - {"__gc", parser_gc}, - {"pos", lxp_pos}, -+ {"getcurrentbytecount", lxp_getcurrentbytecount}, - {"setencoding", lxp_setencoding}, - {"getcallbacks", getcallbacks}, - {"getbase", getbase}, --- -2.17.1 - diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in index 2322dc430..25b067460 100644 --- a/package/luaexpat/Config.in +++ b/package/luaexpat/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUAEXPAT help LuaExpat is a SAX XML parser based on the Expat library. - http://www.keplerproject.org/luaexpat/ + https://lunarmodules.github.io/luaexpat diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index dd1cf40e5..fbfb623fc 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b55908fcd7df490a59aab25284460add8283f1c6b94ab584900fe3e49775172a luaexpat-1.3.3-1.src.rock -sha256 7f5cb0c1750babcbb09637b7f0ff34972d51cf23b7f413bef902b47aa65febcd luaexpat-1.3.3/LICENSE +sha256 bee88ddc1063f49c5685b75b6696e8df0607a388432cbcb189cd0b8291d956aa luaexpat-1.4.0-1.src.rock +sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index 8c86b24f2..c176fb8c1 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,8 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.3.3-1 +LUAEXPAT_VERSION = 1.4.0-1 +LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE LUAEXPAT_DEPENDENCIES = expat -- 2.32.0 From aperez at igalia.com Wed Mar 30 07:44:19 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 30 Mar 2022 10:44:19 +0300 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.4 In-Reply-To: <20220330071449.4060342-1-james.hilliard1@gmail.com> References: <20220330071449.4060342-1-james.hilliard1@gmail.com> Message-ID: <20220330104419.GB1721679@momiji> Hi, Thanks James for the patch and for waiting until .4 was released to update it :) On Wed, 30 Mar 2022 01:14:49 -0600 James Hilliard wrote: > Signed-off-by: James Hilliard Acked-by: Adrian Perez de Castro > --- > package/cog/cog.hash | 8 ++++---- > package/cog/cog.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cog/cog.hash b/package/cog/cog.hash > index 839b12e619..00d3a4e191 100644 > --- a/package/cog/cog.hash > +++ b/package/cog/cog.hash > @@ -1,7 +1,7 @@ > -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums > -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz > -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz > -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz > +# From https://wpewebkit.org/releases/cog-0.12.4.tar.xz.sums > +md5 cdb8acdc3acc9b5082e7db9c279155c3 cog-0.12.4.tar.xz > +sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz > +sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz > > # Hashes for license files: > sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING > diff --git a/package/cog/cog.mk b/package/cog/cog.mk > index 2f6ef402fb..f2ca0af93d 100644 > --- a/package/cog/cog.mk > +++ b/package/cog/cog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -COG_VERSION = 0.12.1 > +COG_VERSION = 0.12.4 > COG_SITE = https://wpewebkit.org/releases > COG_SOURCE = cog-$(COG_VERSION).tar.xz > COG_INSTALL_STAGING = YES > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From peter at korsgaard.com Wed Mar 30 07:52:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:52:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: (Fabrice Fontaine's message of "Tue, 29 Mar 2022 23:22:30 +0200") References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> <87czi4a63p.fsf@dell.be.48ers.dk> Message-ID: <875ynv98sa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Le mar. 29 mars 2022 ? 21:53, Peter Korsgaard a ?crit : >> >> >>>>> "Fabrice" == Fabrice Fontaine writes: >> >> > Fix the following build failure raised on uclibc and musl since the >> > reintroduction of the package in commit >> > 16ff948444c3978d63f483344a3d92d994c64312: >> >> Huh? This is the commit where ola was reintroduced, but this is a >> failure in grpc and the config doesn't even have ola enabled? > Indeed, I made a copy / paste error, the correct commit message should > have been: > "Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4" Ahh, so it also applies to the version we have in 2022.02.x (1.43.0)? Strangely enough we only have autobuilder failures for 1.44.0. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Wed Mar 30 09:53:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 11:53:40 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <875ynv98sa.fsf@dell.be.48ers.dk> References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> <87czi4a63p.fsf@dell.be.48ers.dk> <875ynv98sa.fsf@dell.be.48ers.dk> Message-ID: Le mer. 30 mars 2022 ? 09:52, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > Le mar. 29 mars 2022 ? 21:53, Peter Korsgaard a ?crit : > >> > >> >>>>> "Fabrice" == Fabrice Fontaine writes: > >> > >> > Fix the following build failure raised on uclibc and musl since the > >> > reintroduction of the package in commit > >> > 16ff948444c3978d63f483344a3d92d994c64312: > >> > >> Huh? This is the commit where ola was reintroduced, but this is a > >> failure in grpc and the config doesn't even have ola enabled? > > > Indeed, I made a copy / paste error, the correct commit message should > > have been: > > "Fix the following build failure raised on uclibc and musl since the > > addition of libexecinfo package in commit > > eea8ba446c10701a273432552108d80fb2224ef4" > > Ahh, so it also applies to the version we have in 2022.02.x (1.43.0)? > Strangely enough we only have autobuilder failures for 1.44.0. After further investigation, the build failure is raised by a library provided by libabseil-cpp. libabseil-cpp uses execinfo.h since version 20210324.0 and https://github.com/abseil/abseil-cpp/commit/dc969f34a79d019497abb61c2a3f79b5b4be2ea9 2022.02.x uses 20211102.0 so I think this patch should be applied to this branch. > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From br015 at umbiko.net Wed Mar 30 13:27:49 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 30 Mar 2022 15:27:49 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: disable expat explicitly unless target package exists Message-ID: <20220330132749.1417115-1-br015@umbiko.net> Background: During configuration, mpd tries to determine the availability of optional dependencies using (host) pkgconfig and CMake. If host and target architecture are identical, it locates host-libexpat (CMake dependency) and tries to incorporate it into the build process. The link step fails subsequently, because some dependencies of host binaries come from the build machine, and are not present on the target. This results in the following build error: /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: warning: libc.so.6, needed by /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7, not found (try using -rpath or -rpath-link) /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7: undefined reference to `__errno_location at GLIBC_2.2.5' The link step fails, because libexpat was built against the build machine's C library. The optional expat dependency is disabled, unless the expat target package is selected. This is in line with BR2_PACKAGE_MPD_UPNP_* handling logic, which selects the target package and needs to enable the expat option. The grey area of expat present on the target for other reasons, but not explicitly needed for mpd, is accepted to avoid making the logic too complicated. Signed-off-by: Andreas Ziegler --- package/mpd/mpd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 12da36098f..c1ad1bc6c6 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -21,6 +21,11 @@ MPD_CONF_OPTS = \ -Dpipewire=disabled \ -Dsnapcast=false +# Disable expat explicitly, unless the target package is selected +ifneq ($(BR2_PACKAGE_EXPAT),y) +MPD_CONF_OPTS += -Dexpat=disabled +endif + # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) MPD_DEPENDENCIES += avahi -- 2.34.1 From dgouarin at gmail.com Wed Mar 30 15:30:13 2022 From: dgouarin at gmail.com (David GOUARIN) Date: Wed, 30 Mar 2022 17:30:13 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix build with BR2_ENABLE_DEBUG Message-ID: <20220330153013.16091-1-david.gouarin@thalesgroup.com> Signed-off-by: David GOUARIN --- package/pkg-cargo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index f7e3f39503..cf5ee2ae54 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -155,6 +155,7 @@ define $(2)_INSTALL_TARGET_CMDS $$($(2)_CARGO_ENV) \ cargo install \ --offline \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,) \ --root $$(TARGET_DIR)/usr/ \ --bins \ --path ./ \ -- 2.17.1 From dgouarin at gmail.com Wed Mar 30 16:04:36 2022 From: dgouarin at gmail.com (David GOUARIN) Date: Wed, 30 Mar 2022 18:04:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix build with BR2_ENABLE_DEBUG Message-ID: <20220330160436.16357-1-david.gouarin@thalesgroup.com> When building with BR2_ENABLE_DEBUG, cargo packages are first built with --debug, then the installation step rebuilds the sources in release mode with cargo install. This is because cargo install forces a rebuild when the --path option is used. This patch adds a --debug to the cargo install command line as a workaround when necessary, but it does not address the root cause, which is that cargo install will rebuild the sources, possibly with different build options. For example, when one use PKG_CARGO_BUILD_OPTS = --features myfeature, one must also use PKG_CARGO_INSTALL_OPTS = --features myfeature. Signed-off-by: David GOUARIN --- package/pkg-cargo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index f7e3f39503..cf5ee2ae54 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -155,6 +155,7 @@ define $(2)_INSTALL_TARGET_CMDS $$($(2)_CARGO_ENV) \ cargo install \ --offline \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,) \ --root $$(TARGET_DIR)/usr/ \ --bins \ --path ./ \ -- 2.17.1 From peter at korsgaard.com Wed Mar 30 16:32:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 18:32:39 +0200 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220329050401.110856-1-Jason@zx2c4.com> (Jason A. Donenfeld's message of "Tue, 29 Mar 2022 01:04:01 -0400") References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> Message-ID: <871qyj8kpk.fsf@dell.be.48ers.dk> >>>>> "Jason" == Jason A Donenfeld writes: Hi, > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. As discussed on IRC, I think it would be nicer to just add a normal seedrng package and depend on that from urandom-scripts, so the standard version/license info/.. stuff works. I can do that change if needed. You mentioned something on IRC about this containing differences from what it is seedrng.git. Those changes/fixes are presumably not specific to Buildroot, will you add those changes to the git repo as well? > +# The following knobs can be adjusted by placing uncommented modified lines > +# into /etc/default/urandom: > +# > +# Set these to change where the seed and runtime lock file are stored: > +# > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > +# Will you add the logic for these features to seedrng.git? If not, then I don't think we should have them here either. A bunch of other code already expects "normal" locations, so people generally have to handle such customizations by symlinks in their rootfs(-overlay). If this customization is left in, then it should ideally use the existing (directory part of) URANDOM_SEED, which used to be how the location could be customized for backwards compatibility. > case "$1" in > start|restart|reload) > # Carry a random seed from start-up to start-up > # Load and then save the whole entropy pool > - init_rng && save_random_seed;; > + # Never fail, as this isn't worth making a fuss > + # over if it doesn't go as planned. > + seedrng || true;; > stop) > # Carry a random seed from shut-down to start-up > # Save the whole entropy pool > - save_random_seed;; > + seedrng;; Nice and short! The comments above are not really correct any more, as the stop logic also loads. > +++ b/package/urandom-scripts/seedrng.c .. > +#define le32_to_cpup(a) le32toh(*(a)) > +#define cpu_to_le32(a) htole32(a) What is the purpose of the to/from le32 stuff in this use case? > + > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); The 0400 confused me a bit, as that would normally cause the open to fail when the file exists, but it happens to work as you unlink above / use the lock file. > + if (fd < 0) { > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > + program_ret |= 1 << 4; > + goto out; > + } > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > + program_ret |= 1 << 5; > + goto out; > + } > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > + program_ret |= 1 << 6; > + } > +out: > + if (fd >= 0) > + close(fd); > + if (lock >= 0) > + close(lock); No fsync of the directory like you do in seed_from_file_if_exists()? -- Bye, Peter Korsgaard From David.Laight at ACULAB.COM Wed Mar 30 16:57:37 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Wed, 30 Mar 2022 16:57:37 +0000 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <871qyj8kpk.fsf@dell.be.48ers.dk> References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: <50a8049df34e4adcba0476bc66ba8f08@AcuMS.aculab.com> From: Peter Korsgaard > Sent: 30 March 2022 17:33 > > Hi, > > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, the seedrng project provides a > > basic script meant to be copy and pasted into projects like buildroot > > and tweaked as needed: . > > > This commit imports it into buildroot and wires up the init scripts to > > call it. This also is a significant improvement over the current init > > script, which doesn't credit entropy and whose hashing in shell scripts > > is sort of fragile. > > > As seedrng.c is a short tiny C program, we include this here in the > > package, like a few other packages do. Later we'll investigate adding > > this to busybox, but for now, this is a good start and a positive step > > in the right direction. > > As discussed on IRC, I think it would be nicer to just add a normal > seedrng package and depend on that from urandom-scripts, so the standard > version/license info/.. stuff works. I can do that change if needed. > > You mentioned something on IRC about this containing differences from > what it is seedrng.git. Those changes/fixes are presumably not specific > to Buildroot, will you add those changes to the git repo as well? I remember this 'not so little' program limiting the amount of data saved and restored to a fairly small amount. I think it referred to a limit in the kernel. I just wrote a 10 line program to copy a file to /dev/urandom using the ioctl so that the 'entropy' is credited. AFAICT the kernel copied all the data into the pool and would credit quite a lot of entropy. There is a loop that uses an 128 byte on-stack buffer. But it is a loop. Another thing I noticed is that the script is S20urandom. This runs rather late, things like udev have already tried to read random numbers. The script really needs to run much sooner. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From fontaine.fabrice at gmail.com Wed Mar 30 16:57:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 18:57:02 +0200 Subject: [Buildroot] [PATCH v2,1/1] package/pango: fix empty-body Message-ID: <20220330165702.1018014-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.50.5 in commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75: ../utils/viewer-cairo.c: In function 'cairo_vector_view_create': ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] ; ^ Fixes: - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Arnout Vandecappelle): - Fix error instead of dropping -Werror ...-utils-viewer-cairo-c-fix-empty-body.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch diff --git a/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch b/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch new file mode 100644 index 0000000000..4b7b5f9b19 --- /dev/null +++ b/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch @@ -0,0 +1,40 @@ +From 5372a0cfd641776ece77db5590bf0d265e810086 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 29 Mar 2022 21:39:03 +0000 +Subject: [PATCH] utils/viewer-cairo.c: fix empty-body + +Fix the following build failure raised +since version 1.50.5 and +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e: + +../utils/viewer-cairo.c: In function 'cairo_vector_view_create': +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] + ; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://gitlab.gnome.org/GNOME/pango/-/commit/5372a0cfd641776ece77db5590bf0d265e810086] +--- + utils/viewer-cairo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/viewer-cairo.c b/utils/viewer-cairo.c +index ca98c1cd..f15b3fb9 100644 +--- a/utils/viewer-cairo.c ++++ b/utils/viewer-cairo.c +@@ -225,7 +225,7 @@ cairo_vector_view_create (const PangoViewer *klass G_GNUC_UNUSED) + return NULL; + + if (0) +- ; ++ {} + #ifdef CAIRO_HAS_SVG_SURFACE + else if (0 == g_ascii_strcasecmp (extension, "svg")) + constructor = cairo_svg_surface_create; +-- +GitLab + -- 2.35.1 From hrsourabh011 at gmail.com Wed Mar 30 17:04:11 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 30 Mar 2022 19:04:11 +0200 Subject: [Buildroot] Run-time dependency error | C shared or static library 'acl' not found Message-ID: Hello All, I am building casync to use with the "rauc" tool. And I am using Buildroot 2022.02 as build system and I have enabled "host meson-tools " in Buildroot "menuconfig ". But while building using https://github.com/systemd/casync#building-casync meson build && ninja -C build && sudo ninja -C build install I am getting the below errors: Found pkg-config: /root/raspcm4/sources/output/host/bin/pkg-config (1.6.3) Run-time dependency liblzma found: YES 5.2.5 Run-time dependency zlib found: YES 1.2.11 Run-time dependency libzstd found: YES 1.5.2 Run-time dependency libcurl found: YES 7.81.0 Run-time dependency openssl found: YES 1.1.1m meson.build:135:0: ERROR: C shared or static library 'acl' not found But BR2_PACKAGE_ACL=y is already selected. Can you please let me know what is the proper package that should be selected in Buildroot? And also what are the other Run-time dependencies (libs/packages) that should be selected in Buildroot? Your help will be much appreciated. Thanks in advance Kind Regards, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: From Jason at zx2c4.com Wed Mar 30 17:13:08 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 30 Mar 2022 13:13:08 -0400 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <871qyj8kpk.fsf@dell.be.48ers.dk> References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, On 3/30/22, Peter Korsgaard wrote: >>>>>> "Jason" == Jason A Donenfeld writes: > > Hi, > > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, the seedrng project provides a > > basic script meant to be copy and pasted into projects like buildroot > > and tweaked as needed: . > > > This commit imports it into buildroot and wires up the init scripts to > > call it. This also is a significant improvement over the current init > > script, which doesn't credit entropy and whose hashing in shell scripts > > is sort of fragile. > > > As seedrng.c is a short tiny C program, we include this here in the > > package, like a few other packages do. Later we'll investigate adding > > this to busybox, but for now, this is a good start and a positive step > > in the right direction. > > As discussed on IRC, I think it would be nicer to just add a normal > seedrng package and depend on that from urandom-scripts, so the standard > version/license info/.. stuff works. I can do that change if needed. > > You mentioned something on IRC about this containing differences from > what it is seedrng.git. Those changes/fixes are presumably not specific > to Buildroot, will you add those changes to the git repo as well? Absolutely not. This 100% does not work for me. I have made it abundantly clear to you that seedrng is code that's meant to be copied into individual distros and tweaked as needed, which I've done for Buildroot. Do not attempt to package it from any repos I may have. If you try to do that, I will intentionally interfere with those operations server side, and take whatever other adversarial steps to ensure my server is not misused for that purpose. I also will not incorporate buildroot-specific tweaks into the sample code repo. That repo supplies sample code. After Yann's absence, I took the necessary steps that a maintainer like him would have done to customize it to Buildroot's needs, incorporating it into the project, and taking into account James' comments. You now have the result of that work here, and I think it'd be silly not to take it. I am offering to maintain this code inside of Buildroot for you. I'm generally very much on top of things in that regard. I'm not offering to start and maintain an external project at your request, no matter how much pressure and conditionalization you apply on this mailing list or IRC. That's not work I'll do for you. However, again, I am offering to maintain this for you inside the buildroot repo as this patch does. That's my offer; take it or leave it. > > > > +# The following knobs can be adjusted by placing uncommented modified > lines > > +# into /etc/default/urandom: > > +# > > +# Set these to change where the seed and runtime lock file are stored: > > +# > > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > > +# > > Will you add the logic for these features to seedrng.git? If not, then I > don't think we should have them here either. A bunch of other code already > expects "normal" locations, so people generally have to handle such > customizations by symlinks in their rootfs(-overlay). > > If this customization is left in, then it should ideally use the > existing (directory part of) URANDOM_SEED, which used to be how the > location could be customized for backwards compatibility. As mentioned, no tweaks go up to seedrng.git. That's sample code. I'm inclined to agree with James' assessment about this, that Buildroot needs it to be customizable. Happy to send a v4 of this patch adjusting the defaults to have paths similar to what was there before. > > > > case "$1" in > > start|restart|reload) > > # Carry a random seed from start-up to start-up > > # Load and then save the whole entropy pool > > - init_rng && save_random_seed;; > > + # Never fail, as this isn't worth making a fuss > > + # over if it doesn't go as planned. > > + seedrng || true;; > > stop) > > # Carry a random seed from shut-down to start-up > > # Save the whole entropy pool > > - save_random_seed;; > > + seedrng;; > > Nice and short! The comments above are not really correct any more, as > the stop logic also loads. Ack, will get rid of those comments for v4. > > > > +++ b/package/urandom-scripts/seedrng.c > .. > > > +#define le32_to_cpup(a) le32toh(*(a)) > > +#define cpu_to_le32(a) htole32(a) > > What is the purpose of the to/from le32 stuff in this use case? So that blake2s passes its test vectors. We're not about to go messing around with the internal encoding of a hash function. B2s specifies little endian, so that's what we use. > > > + > > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", > new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > > The 0400 confused me a bit, as that would normally cause the open to > fail when the file exists, but it happens to work as you unlink above / > use the lock file. > > >> + if (fd < 0) { > > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", > strerror(errno)); > > + program_ret |= 1 << 4; > > + goto out; > > + } > > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || > fsync(fd) < 0) { > > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", > strerror(errno)); > > + program_ret |= 1 << 5; > > + goto out; > > + } > > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) > < 0) { > > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", > strerror(errno)); > > + program_ret |= 1 << 6; > > + } > > +out: > > + if (fd >= 0) > > + close(fd); > > + if (lock >= 0) > > + close(lock); > > No fsync of the directory like you do in seed_from_file_if_exists()? No, it's not necessary here, because this is a transition from no-credit to credit, so if the power clicks off at the bad moment, it fails closed instead of open. From peter at korsgaard.com Wed Mar 30 17:19:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:19:54 +0200 Subject: [Buildroot] [PATCH 1/1] package/libgee: needs gcc >= 4.9 In-Reply-To: <20220317190027.183976-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Mar 2022 20:00:27 +0100") References: <20220317190027.183976-1-fontaine.fabrice@gmail.com> Message-ID: <87wngb73yd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 0.20.5 > in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and > https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: > task.c:59:1: error: initializer element is not constant > static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; > ^ > Fixes: > - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 17:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:21:02 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/spidev_test: fix spidev_test.c version in Config.in help text In-Reply-To: <20220318082446.18552-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 09:24:45 +0100") References: <20220318082446.18552-1-ps.report@gmx.net> Message-ID: <87sfqz73wh.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - fix spidev_test.c version in Config.in help text, version update to 4.10 > (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) > [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 17:20:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:20:38 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220330171238.9084285FCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cff54794f668598f64e45b95a11ddbe8f5a6046 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 53da16e3786cbf4c7637dacfddeef58c315cce66) Signed-off-by: Peter Korsgaard --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..aa57b5edbf 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. From peter at korsgaard.com Wed Mar 30 17:19:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:19:36 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgee: needs gcc >= 4.9 Message-ID: <20220330171246.D348C85FD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b78b4fedb5c19e87d866fdef0acd028c633fa900 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised since bump to version 0.20.5 in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: task.c:59:1: error: initializer element is not constant static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; ^ Fixes: - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit de59a62af68593303bf420338e719a17e1a5e243) Signed-off-by: Peter Korsgaard --- package/granite/Config.in | 6 ++++-- package/libgee/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d..9519e16d45 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985..cb33ec9ec2 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From peter at korsgaard.com Wed Mar 30 17:20:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:20:21 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220330171246.DCE2B85FD2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=997ac4e38bb9a98dfa3db8b046fcaaae192d5291 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 53da16e3786cbf4c7637dacfddeef58c315cce66) Signed-off-by: Peter Korsgaard --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..aa57b5edbf 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. From peter at korsgaard.com Wed Mar 30 17:25:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:25:24 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/libcamera-apps: X11 support needs libdrm In-Reply-To: <20220318131058.32240-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 14:10:57 +0100") References: <20220318131058.32240-1-ps.report@gmx.net> Message-ID: <87o81n73p7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - X11 support needs libdrm (optional libdrm dependency already > present in libcamera-apps.mk) > Fixes: > http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e > .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 18 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > Signed-off-by: Peter Seiderer Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 17:24:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:24:35 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/libcamera-apps: X11 support needs libdrm Message-ID: <20220330171617.74A7285FD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=208aee57beb66f8b2739033c694277cd03bc9718 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - X11 support needs libdrm (optional libdrm dependency already present in libcamera-apps.mk) Fixes: http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2bc5e916beedc1965da2a7bf9a86e74b24a5562) Signed-off-by: Peter Korsgaard --- package/libcamera-apps/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d23..492a99cf55 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 From bernd.kuhls at t-online.de Wed Mar 30 17:29:15 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 30 Mar 2022 19:29:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/libzlib: security bump version to 1.2.12 Message-ID: <20220330172915.265828-1-bernd.kuhls@t-online.de> Fixes CVE-2018-25032. Release notes: http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html Changelog: https://github.com/madler/zlib/blob/master/ChangeLog Updated license hash due to version bump, reformatted hashes: https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 Signed-off-by: Bernd Kuhls --- package/libzlib/libzlib.hash | 4 ++-- package/libzlib/libzlib.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b1011..e6ca974e2f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d1..933732d6ba 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.12 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib -- 2.30.2 From fontaine.fabrice at gmail.com Wed Mar 30 17:32:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 19:32:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/upower: add gobject-introspection optional dependency Message-ID: <20220330173237.1377195-1-fontaine.fabrice@gmail.com> gobject-introspection is an optional dependency which is enabled by default since https://gitlab.freedesktop.org/upower/upower/-/commit/0d7bf34ed6702c60028fa80e5d481621e9741d09 Signed-off-by: Fabrice Fontaine --- package/upower/upower.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/upower/upower.mk b/package/upower/upower.mk index 8989ca9f5d..a6f39d2f46 100644 --- a/package/upower/upower.mk +++ b/package/upower/upower.mk @@ -22,4 +22,11 @@ UPOWER_DEPENDENCIES = \ UPOWER_CONF_OPTS = --disable-man-pages --disable-tests +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +UPOWER_CONF_OPTS += --enable-introspection +UPOWER_DEPENDENCIES += gobject-introspection +else +UPOWER_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) -- 2.35.1 From emile.cormier.jr at gmail.com Wed Mar 30 17:37:41 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 14:37:41 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 4:23 AM James Hilliard wrote: > On Wed, Mar 30, 2022 at 1:19 AM Emile Cormier > wrote: > > For me output/host/usr is a simlink to output/host: > > Yeah, I think it usually works but should not have /usr for consistency. > I tried removing 'usr/' from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS, and the print(PasswordHasher().hash("foo")) test still works for me on the target device. Do you want me to issue another patch with the 'usr/' portion removed from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS? I don't care about receiving credit for such trivial changes. Please do whatever is most expedient to fix the problem. -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 18:01:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 12:01:11 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. On Wed, Mar 30, 2022 at 11:37 AM Emile Cormier wrote: > > On Wed, Mar 30, 2022 at 4:23 AM James Hilliard wrote: >> >> On Wed, Mar 30, 2022 at 1:19 AM Emile Cormier >> wrote: >> > For me output/host/usr is a simlink to output/host: >> >> Yeah, I think it usually works but should not have /usr for consistency. > > > I tried removing 'usr/' from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS, and the print(PasswordHasher().hash("foo")) test still works for me on the target device. > > Do you want me to issue another patch with the 'usr/' portion removed from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS? I don't care about receiving credit for such trivial changes. Please do whatever is most expedient to fix the problem. From bernd.kuhls at t-online.de Wed Mar 30 18:06:05 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 30 Mar 2022 20:06:05 +0200 Subject: [Buildroot] [PATCH v2 1/1] package/libzlib: security bump version to 1.2.12 Message-ID: <20220330180605.557933-1-bernd.kuhls@t-online.de> Fixes CVE-2018-25032. Release notes: http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html Changelog: https://github.com/madler/zlib/blob/master/ChangeLog Added upstream patch to fix build error. Updated license hash due to version bump, reformatted hashes: https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 Signed-off-by: Bernd Kuhls --- v2: added upstream patch to fix build error ...hat-discarded-provided-CC-definition.patch | 28 +++++++++++++++++++ package/libzlib/libzlib.hash | 4 +-- package/libzlib/libzlib.mk | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch new file mode 100644 index 0000000000..398e1c9481 --- /dev/null +++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch @@ -0,0 +1,28 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +Downloaded from upstream commit: +https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d + +Signed-off-by: Bernd Kuhls +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b1011..e6ca974e2f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d1..933732d6ba 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.12 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib -- 2.30.2 From emile.cormier.jr at gmail.com Wed Mar 30 18:51:45 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 15:51:45 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 3:01 PM James Hilliard wrote: > I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. > Alright, I've changed it as you suggested and it still works for me. I'll post an updated patch. -------------- next part -------------- An HTML attachment was scrubbed... URL: From emile.cormier.jr at gmail.com Wed Mar 30 18:52:26 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 15:52:26 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: package/pkg-python.mk: fix PEP517 purelib deployment path This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..ab4f7af6a6 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR)/usr ################################################################################ On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier wrote: > On Wed, Mar 30, 2022 at 3:01 PM James Hilliard > wrote: > >> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. >> > > Alright, I've changed it as you suggested and it still works for me. I'll > post an updated patch. > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dan at thejacksons.uk Wed Mar 30 19:18:10 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Wed, 30 Mar 2022 19:18:10 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <35c2351b33bcb44d81333adfa848d221@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 30 March 2022 08:14 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > Hi Dan, > > cutting some old content. > > On 2022-03-29 19:19, Dan Jackson wrote: > > > > >> > However, now I have a new missing file error, and I can't seem to > >> > locate a suitable candidate: > >> > > >> > In file included from > >> > /home/danj/buildroot-2022.02/output/build/linux- > >> custom/arch/arm/include/asm/system.h:165, > >> > from > >> > /home/danj/buildroot-2022.02/output/build/linux- > >> custom/arch/arm/include/asm/bitops.h:27, > >> > from include/linux/bitops.h:22, > >> > from include/linux/kernel.h:17, > >> > from include/linux/sched.h:55, > >> > from arch/arm/kernel/asm-offsets.c:13: > >> > /home/danj/buildroot-2022.02/output/build/linux- > >> custom/arch/arm/include/asm/memory.h:19:10: > >> > fatal error: mach/memory.h: No such file or directory > >> > 19 | #include > >> > | ^~~~~~~~~~~~~~~ > >> > compilation terminated. > >> > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: > >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > >> > Makefile:1009: recipe for target 'prepare0' failed > >> > make[2]: *** [prepare0] Error 2 > >> > make[2]: *** Waiting for unfinished jobs.... > >> > HOSTCC scripts/mod/modpost.o > >> > HOSTCC scripts/mod/sumversion.o > >> > HOSTLD scripts/mod/modpost > >> > make[2]: *** wait: No child processes. Stop. > >> > package/pkg-generic.mk:289: recipe for target > >> > '/home/danj/buildroot-2022.02/output/build/linux- > custom/.stamp_built' > >> > failed > >> > make[1]: *** > >> > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_buil > >> > t] > >> > Error 2 > >> > Makefile:84: recipe for target '_all' failed > >> > make: *** [_all] Error 2 > >> > >> This seems not to be the defconfig from above? It now uses > >> linux-custom ... > >> The failure may be due to the default kernel configuration. Try to > >> configure the correct one and see if you get further. > >> > >> > I think maybe I am still doing something wrong because it sure > >> > seems to be compiling a lot of stuff instead of letting me configure > things. > >> > >> It gets better once everything necessary is built. > > > > Still no luck I'm afraid. Same error with mach/memory.h as above. > > > > Buildroot defconfig now looks like this: > > > > BR2_armeb=y > > BR2_STATIC_LIBS=y > > BR2_KERNEL_HEADERS_VERSION=y > > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > > BR2_PTHREAD_DEBUG=y > > BR2_BINUTILS_VERSION_2_37_X=y > > BR2_GCC_VERSION_9_X=y > > BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_PACKAGE_HOST_GDB=y > > BR2_GDB_VERSION_9_2=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > > > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 > FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" > > BR2_PACKAGE_DROPBEAR=y > > > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions > .h" > > BR2_PACKAGE_JOE=y > > > > I forgot to mention this before but the buildroot manual page you > > mentioned said to create a local.mk file in order to use external > > source, this looks like this: > > > > LINUX_OVERRIDE_SRCDIR = > > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ > > > > For the kernel configuration I entered the kernel source dir and did > > "make menuconfig", I left everything at the defaults except for > > enabling the USB related items. > > > > The resulting configuration file is attached as a text file. > > Unfortunately it's been literally decades since I last actually > > compiled a kernel, so I'm afraid I have no idea what bits would be > > suitable to disable/remove to get the results I want (I'm guessing > > this will be the most likely way to eliminate the error I'm getting?) > > I did a compile test this morning, the Buildroot version was some early > 2022.02 version, not up-to-date. > > You have a potential header mismatch, Select Toolchain -> Kernel Headers > -> Same as kernel being built to use the vendor source also for the > headers. > > I could configure Linux with make menuconfig, did not encounter the > missing memory.h error above, but the build stops during Linux kernel > compilation with this error: > > /tmp/ccSO8f6S.s: Assembler messages: > /tmp/ccSO8f6S.s:950: Error: .err encountered > make[3]: *** [scripts/Makefile.build:284: > arch/arm/kernel/sys_oabi-compat.o] Error 1 > make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 > make[1]: *** [package/pkg-generic.mk:292: > /home/data/test/buildroot/output/build/linux-custom/.stamp_built] Error > 2 > make: *** [Makefile:84: _all] Error 2 > > Full error log is here: https://pastebin.com/VrXqSVsD Looking at the error log, it seems like vfp has been selected? But my target device only has Features: swp half thumb fastmult edsp java. Also, OABI does not seem like it is the correct ABI. For example, if I run "file" against the busybox binary the device comes with, I get: busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped > > You might now do some research: > > https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- > error-when-building-linux-kernel-3-14-17-in-buildroot-2020 > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 > > or try to switch to an older compiler ... > > -- > Andreas > > From noreply at uclibc.org Wed Mar 30 17:36:15 2022 From: noreply at uclibc.org (uclibc.org) Date: 30 Mar 2022 19:36:15 +0200 Subject: [Buildroot] Bonus/Allowance payment reviews. Message-ID: <20220330193615.765E8AC4BEC9CDC9@uclibc.org> An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 19:25:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 13:25:25 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 12:52 PM Emile Cormier wrote: > > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..ab4f7af6a6 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(HOST_DIR)/usr/bin \ > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(HOST_DIR)/bin \ > --data=$(HOST_DIR)/usr I think it should be something like this for the host: HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR) > > ################################################################################ > > On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier wrote: >> >> On Wed, Mar 30, 2022 at 3:01 PM James Hilliard wrote: >>> >>> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. >> >> >> Alright, I've changed it as you suggested and it still works for me. I'll post an updated patch. From peter at korsgaard.com Wed Mar 30 19:38:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:38:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: update to version 0.23.6 In-Reply-To: <20220319061115.1641-1-br015@umbiko.net> (Andreas Ziegler's message of "Sat, 19 Mar 2022 07:11:15 +0100") References: <20220319061115.1641-1-br015@umbiko.net> Message-ID: <87k0cb6xix.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part > of this release > Change log: > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS > Signed-off-by: Andreas Ziegler Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 19:43:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:43:01 +0200 Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd In-Reply-To: <20220320114138.433796-1-br015@umbiko.net> (Andreas Ziegler's message of "Sun, 20 Mar 2022 12:41:38 +0100") References: <20211227074056.13882-1-br015@umbiko.net> <20220320114138.433796-1-br015@umbiko.net> Message-ID: <87fsmz6xbu.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > The current released version of zziplib copies static libraries with appended > major version, but omits creating the necessary links to the base file names. > This prevents the linker to find the libraries via the search path. > The issue (https://github.com/gdraheim/zziplib/issues/117) has been > fixed upstream; this patch extracts the necessary part of commit > 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of > symlinks. > This resolves the following autobuild issues: > http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 > http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 > http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 > Signed-off-by: Andreas Ziegler > --- > Changes v1 -> v2: > - extract link creation from commit 0e8d35f > Changes v2 -> v3: > - update failure list Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 19:42:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:42:26 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/zziplib: fix static build failure with mpd Message-ID: <20220330193403.3F66985FDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b57789a0845007a9ba560f0e31090965142cc42c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0f3d6d2e6a924b9075accb27cf5d7351a30d8f17) Signed-off-by: Peter Korsgaard --- .../0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..780d990ab7 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From peter at korsgaard.com Wed Mar 30 19:40:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:40:41 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/zziplib: fix static build failure with mpd Message-ID: <20220330193409.8843A85FE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43fd3fd836d142a7c5d16c8b25366d59bdb6d8fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0f3d6d2e6a924b9075accb27cf5d7351a30d8f17) Signed-off-by: Peter Korsgaard --- .../0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..780d990ab7 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From peter at korsgaard.com Wed Mar 30 19:26:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:26:15 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/mpd: update to version 0.23.6 Message-ID: <20220330193409.7CBFC85FDF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c129d19ac2a657044b98b0c4e4f7515646bffe8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part of this release Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8974c6fa26f626021aa170678989c57fa81e8faf) Signed-off-by: Peter Korsgaard --- .../0002-lib-alsa-Error-add-missing-include.patch | 25 ---------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54..0000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf..b09140abf5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..12da36098f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From peter at korsgaard.com Wed Mar 30 20:02:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 22:02:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads In-Reply-To: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 16:47:50 +0100") References: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> Message-ID: <87bkxn6wf7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without threads and openvpn raised since > commit 0199dc161769e5f28e9aebc634230ece08ff5008: > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: > undefined reference to `_pkcs11h_slotevent_init' > Fixes: > - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 19:43:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:43:42 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkcs11-helper: fix build without threads Message-ID: <20220330195929.D7AB585FE1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2f706a26074f701c0205b4e92263cce32990cce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure without threads and openvpn raised since commit 0199dc161769e5f28e9aebc634230ece08ff5008: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' Fixes: - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d76b7564f1bb61762181ecd1fc69c72a925ed25c) Signed-off-by: Peter Korsgaard --- ...kcs11h-core.c-fix-build-without-slotevent.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch new file mode 100644 index 0000000000..5b2829c5ca --- /dev/null +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch @@ -0,0 +1,37 @@ +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Mar 2022 08:50:15 +0100 +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent + +Fix the following build failure with --disable-slotevent: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' + +Fixes: + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] +--- + lib/pkcs11h-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c +index d7bb4cd..0bf11e8 100644 +--- a/lib/pkcs11h-core.c ++++ b/lib/pkcs11h-core.c +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( + + switch (property) { + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: ++#if defined(ENABLE_PKCS11H_SLOTEVENT) + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { + goto cleanup; + } ++#endif + break; + } + cleanup: +-- +2.35.1 + From bernd.kuhls at t-online.de Wed Mar 30 20:10:09 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 30 Mar 2022 22:10:09 +0200 Subject: [Buildroot] [PATCH 1/1] package/stellarium: bump version to 0.22.0 Message-ID: <20220330201009.1459182-1-bernd.kuhls@t-online.de> Release notes: http://stellarium.org/release/2022/03/27/stellarium-0.22.0.html Added upstream patch to fix build error. Added dependency to qt5charts following upstream commit: https://github.com/Stellarium/stellarium/commit/5b8fece8d03c64f27f37469f0604efd88d54393d#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR487 Added configure option to disable qt5webengine support, the package is broken: https://bugs.busybox.net/show_bug.cgi?id=14681 Signed-off-by: Bernd Kuhls --- ...uilding-Stellarium-without-scripting.patch | 49 +++++++++++++++++++ package/stellarium/Config.in | 1 + package/stellarium/stellarium.hash | 4 +- package/stellarium/stellarium.mk | 4 +- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch diff --git a/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch b/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch new file mode 100644 index 0000000000..57f15a8eff --- /dev/null +++ b/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch @@ -0,0 +1,49 @@ +From 710d1c5acd9e962260ce395474819ded2eb6ce12 Mon Sep 17 00:00:00 2001 +From: "Alexander V. Wolf" +Date: Tue, 29 Mar 2022 18:57:06 +0700 +Subject: [PATCH] Fixed building Stellarium without scripting + +Downloaded from upstream commit: +https://github.com/Stellarium/stellarium/commit/710d1c5acd9e962260ce395474819ded2eb6ce12 + +Signed-off-by: Bernd Kuhls +--- + plugins/Calendars/src/Calendars.cpp | 2 ++ + plugins/Calendars/src/Calendars.hpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/plugins/Calendars/src/Calendars.cpp b/plugins/Calendars/src/Calendars.cpp +index e5d89a4c063..4df6caee42e 100644 +--- a/plugins/Calendars/src/Calendars.cpp ++++ b/plugins/Calendars/src/Calendars.cpp +@@ -251,6 +251,7 @@ void Calendars::init() + } + } + ++#ifdef ENABLE_SCRIPTING + // Add calendar as scriptable object! Some scripting functions won't work though, as they use object types unknown to the scripting engine. + void Calendars::makeCalendarsScriptable(StelScriptMgr *ssm) + { +@@ -260,6 +261,7 @@ void Calendars::makeCalendarsScriptable(StelScriptMgr *ssm) + ssm->addObject(cal); + } + } ++#endif + + void Calendars::loadSettings() + { +diff --git a/plugins/Calendars/src/Calendars.hpp b/plugins/Calendars/src/Calendars.hpp +index 461ae1bd9ba..4696183d9d2 100644 +--- a/plugins/Calendars/src/Calendars.hpp ++++ b/plugins/Calendars/src/Calendars.hpp +@@ -145,8 +145,10 @@ class Calendars : public StelModule + //! TODO: ADD HERE: Chinese, NewHinduSolar, NewHinduLunar, ... + Calendar* getCal(QString name); + ++ #ifdef ENABLE_SCRIPTING + //! to be called after program startup, when StelScriptMgr has been set up. + void makeCalendarsScriptable(StelScriptMgr *ssm); ++ #endif + + signals: + //void jdChanged(double jd); diff --git a/package/stellarium/Config.in b/package/stellarium/Config.in index 5922162d44..566f8edc83 100644 --- a/package/stellarium/Config.in +++ b/package/stellarium/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_STELLARIUM select BR2_PACKAGE_QT5BASE_OPENGL select BR2_PACKAGE_QT5BASE_PRINTSUPPORT select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5CHARTS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5MULTIMEDIA select BR2_PACKAGE_ZLIB diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index c3f2e0e8d4..f8185869be 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,5 +1,5 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 a3396c403050e073c592da695faeb048c1d5e19b stellarium-0.21.3.tar.gz -sha256 8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f stellarium-0.21.3.tar.gz +sha1 c4a00fd756c66fb7df633f496dd3be4300bf1d2b stellarium-0.22.0.tar.gz +sha256 0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885 stellarium-0.22.0.tar.gz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index ca5c07b2a7..1226b1190d 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,18 +4,20 @@ # ################################################################################ -STELLARIUM_VERSION = 0.21.3 +STELLARIUM_VERSION = 0.22.0 STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING STELLARIUM_DEPENDENCIES = \ qt5base \ + qt5charts \ qt5location \ qt5multimedia \ zlib STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_QTWEBENGINE=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) -- 2.30.2 From emile.cormier.jr at gmail.com Wed Mar 30 20:17:50 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 17:17:50 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: Oops, missed the interpreter option for HOST_PKG_PYTHON_PEP517_INSTALL_OPTS. I made the change as you suggested and it still works. Revised patch follows: ----- package/pkg-python.mk: fix PEP517 purelib deployment path This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..81c33ba557 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -147,11 +147,11 @@ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ + --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR)/usr ################################################################################ On Wed, Mar 30, 2022 at 4:25 PM James Hilliard wrote: > On Wed, Mar 30, 2022 at 12:52 PM Emile Cormier > wrote: > > > > package/pkg-python.mk: fix PEP517 purelib deployment path > > > > This allows the Python interpreter to find packages built via the new > Flit > > infrastructure and fixes bug #14721. > > Signed-off-by: Emile Cormier > > > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > > index 52ce402281..ab4f7af6a6 100644 > > --- a/package/pkg-python.mk > > +++ b/package/pkg-python.mk > > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > > --interpreter=/usr/bin/python \ > > --script-kind=posix \ > > - > --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > > + > --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > --scripts=$(TARGET_DIR)/usr/bin \ > > --data=$(TARGET_DIR)/usr > > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > > --interpreter=/usr/bin/python \ > > --script-kind=posix \ > > - > --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > > + > --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > --scripts=$(STAGING_DIR)/usr/bin \ > > --data=$(STAGING_DIR)/usr > > @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > > --interpreter=/usr/bin/python \ > > --script-kind=posix \ > > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > - --scripts=$(HOST_DIR)/usr/bin \ > > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > > + --scripts=$(HOST_DIR)/bin \ > > --data=$(HOST_DIR)/usr > > I think it should be something like this for the host: > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/bin/python \ > --script-kind=posix \ > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(HOST_DIR)/bin \ > --data=$(HOST_DIR) > > > > > > > ################################################################################ > > > > On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier < > emile.cormier.jr at gmail.com> wrote: > >> > >> On Wed, Mar 30, 2022 at 3:01 PM James Hilliard < > james.hilliard1 at gmail.com> wrote: > >>> > >>> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. > >> > >> > >> Alright, I've changed it as you suggested and it still works for me. > I'll post an updated patch. > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Wed Mar 30 20:51:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 22:51:12 +0200 Subject: [Buildroot] [PATCH 1/1] package/libabseil-cpp: fix uclibc-ng build Message-ID: <20220330205112.1378968-1-fontaine.fabrice@gmail.com> Fix the following build failure with uclibc-ng and grpc raised on arm and ppc: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_random_internal_randen_hwaes.so.2111.0.0: undefined reference to `getauxval' Strangely enough it seems there is only one autobuilder failure despite the fact that libabseil-cpp is unconditionally using getauxval since its addition in commit 93568440eda120b12bcbfe267af8f0182484c3b6: https://github.com/abseil/abseil-cpp/blob/20200225/absl/random/internal/randen_detect.cc Perhaps this build failure is an unexpected side effect of commit 8251d8c2559b25f11684776fc343059cf100657d Fixes: - http://autobuild.buildroot.org/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 Signed-off-by: Fabrice Fontaine --- .../0002-fix-build-with-uclibc-ng.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch diff --git a/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch b/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch new file mode 100644 index 0000000000..0797d8e51b --- /dev/null +++ b/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch @@ -0,0 +1,62 @@ +From b9ad9bbfed92199a1a58504306d026cd2597539e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 30 Mar 2022 21:56:20 +0200 +Subject: [PATCH] Fix build with uclibc-ng (#1145) + +uclibc-ng doesn't provide getauxval which results in the following build +failure on arm or ppc with any user of abseil-cpp such as grpc: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_random_internal_randen_hwaes.so.2111.0.0: undefined reference to `getauxval' + +To fix this build failure, check that __UCLIBC__ is not defined before +using getauxval (as Babel is not able to check function availability) + +Fixes: + - http://autobuild.buildroot.org/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/abseil/abseil-cpp/commit/b9ad9bbfed92199a1a58504306d026cd2597539e] +--- + absl/debugging/internal/vdso_support.cc | 2 +- + absl/random/internal/randen_detect.cc | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/absl/debugging/internal/vdso_support.cc b/absl/debugging/internal/vdso_support.cc +index c655cf452..e63ac4a3b 100644 +--- a/absl/debugging/internal/vdso_support.cc ++++ b/absl/debugging/internal/vdso_support.cc +@@ -33,7 +33,7 @@ + #endif + #include + +-#if defined(__GLIBC__) && \ ++#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ + (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) + #define ABSL_HAVE_GETAUXVAL + #endif +diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc +index 9bb58fc68..6dababa35 100644 +--- a/absl/random/internal/randen_detect.cc ++++ b/absl/random/internal/randen_detect.cc +@@ -24,6 +24,11 @@ + + #include "absl/random/internal/platform.h" + ++#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ ++ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) ++#define ABSL_HAVE_GETAUXVAL ++#endif ++ + #if defined(ABSL_ARCH_X86_64) + #define ABSL_INTERNAL_USE_X86_CPUID + #elif defined(ABSL_ARCH_PPC) || defined(ABSL_ARCH_ARM) || \ +@@ -31,7 +36,7 @@ + #if defined(__ANDROID__) + #define ABSL_INTERNAL_USE_ANDROID_GETAUXVAL + #define ABSL_INTERNAL_USE_GETAUXVAL +-#elif defined(__linux__) ++#elif defined(__linux__) && defined(ABSL_HAVE_GETAUXVAL) + #define ABSL_INTERNAL_USE_LINUX_GETAUXVAL + #define ABSL_INTERNAL_USE_GETAUXVAL + #endif -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 30 20:58:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 22:58:29 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-paramiko: security bump to version 2.10.3 Message-ID: <20220330205829.1380283-1-fontaine.fabrice@gmail.com> Fix CVE-2022-24302: Creation of new private key files using PKey subclasses was subject to a race condition between file creation & mode modification, which could be exploited by an attacker with knowledge of where the Paramiko-using code would write out such files. https://github.com/paramiko/paramiko/blob/2.10.3/sites/www/changelog.rst Signed-off-by: Fabrice Fontaine --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b11acf1dbc..951bd8e114 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 44136d79da4cd7619e368018ad022619 paramiko-2.7.2.tar.gz -sha256 7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 paramiko-2.7.2.tar.gz +md5 6e47947882e2c1b81f35b4133e8e62b9 paramiko-2.10.3.tar.gz +sha256 ddb1977853aef82804b35d72a0e597b244fa326c404c350bd00c5b01dbfee71a paramiko-2.10.3.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 3c135cf9b1..46209f5823 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.7.2 +PYTHON_PARAMIKO_VERSION = 2.10.3 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cf/a1/20d00ce559a692911f11cadb7f94737aca3ede1c51de16e002c7d3a888e0 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/d4/93/1a1eb7f214e6774099d56153db9e612f93cb8ffcdfd2eca243fcd5bb3a78 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE -- 2.35.1 From hrsourabh011 at gmail.com Wed Mar 30 21:22:43 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 30 Mar 2022 23:22:43 +0200 Subject: [Buildroot] Run-time dependency error | C shared or static library 'acl' not found In-Reply-To: References: Message-ID: Hello All, After including libraries in Buildroot I am getting below eros related "error adding symbols: file in wrong format": ninja: Entering directory `build' [1/29] Linking target test-cachunker FAILED: test-cachunker cc -o test-cachunker test-cachunker.p/test_test-cachunker.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [2/29] Linking target test-cadigest FAILED: test-cadigest cc -o test-cadigest test-cadigest.p/test_test-cadigest.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [3/29] Linking target test-cachunker-histogram FAILED: test-cachunker-histogram cc -o test-cachunker-histogram test-cachunker-histogram.p/test_test-cachunker-histogram.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [4/29] Linking target casync-http FAILED: casync-http cc -o casync-http casync-http.p/src_casync-http.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm -Wl,--end-group /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [5/29] Linking target test-caencoder FAILED: test-caencoder cc -o test-caencoder test-caencoder.p/test_test-caencoder.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [6/29] Linking target test-cachunk FAILED: test-cachunk cc -o test-cachunk test-cachunk.p/test_test-cachunk.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [7/29] Linking target test-calocation FAILED: test-calocation cc -o test-calocation test-calocation.p/test_test-calocation.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [8/29] Linking target test-camakebst FAILED: test-camakebst cc -o test-camakebst test-camakebst.p/test_test-camakebst.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [9/29] Linking target casync FAILED: casync cc -o casync casync.p/src_casync-tool.c.o casync.p/src_canbd.c.o casync.p/src_signal-handler.c.o casync.p/src_cafuse.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libfuse.so -pthread /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libudev.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libfuse.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [10/29] Compiling C object test-caorigin.p/test_test-caorigin.c.o ninja: build stopped: subcommand failed. I don't understand why I am getting these errors. Can anyone please let me know how to resolve this? When asked in systemd/casync git, they suggested checking with Buildroot channel. Your help will be much appreciated. Thanks in advance On Wed, 30 Mar 2022 at 19:04, Sourabh Hegde wrote: > Hello All, > > I am building casync to use with the "rauc" tool. And I am using Buildroot > 2022.02 as build system and I have enabled "host meson-tools " in > Buildroot "menuconfig ". But while building using > https://github.com/systemd/casync#building-casync > > meson build && ninja -C build && sudo ninja -C build install > > I am getting the below errors: > > Found pkg-config: /root/raspcm4/sources/output/host/bin/pkg-config (1.6.3) > Run-time dependency liblzma found: YES 5.2.5 > Run-time dependency zlib found: YES 1.2.11 > Run-time dependency libzstd found: YES 1.5.2 > Run-time dependency libcurl found: YES 7.81.0 > Run-time dependency openssl found: YES 1.1.1m > > meson.build:135:0: ERROR: C shared or static library 'acl' not found > > But BR2_PACKAGE_ACL=y is already selected. > > Can you please let me know what is the proper package that should be > selected in Buildroot? And also what are the other Run-time dependencies > (libs/packages) that should be selected in Buildroot? > > Your help will be much appreciated. > > Thanks in advance > > > Kind Regards, > > Sourabh > -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 22:45:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 16:45:21 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths Message-ID: <20220330224521.4142504-1-james.hilliard1@gmail.com> From: Emile Cormier Use /usr target/staging prefix and / host prefix. This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier Signed-off-by: James Hilliard --- Changes v1 -> v2: - fixup formatting - fix all pep517 prefix paths --- package/pkg-python.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..867341fc7b 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,16 +127,16 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -147,12 +147,12 @@ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ + --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ - --data=$(HOST_DIR)/usr + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) ################################################################################ # inner-python-package -- defines how the configuration, compilation -- 2.25.1 From james.hilliard1 at gmail.com Wed Mar 30 22:53:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 16:53:13 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 2:18 PM Emile Cormier wrote: > > Oops, missed the interpreter option for HOST_PKG_PYTHON_PEP517_INSTALL_OPTS. I made the change as you suggested and it still works. Revised patch follows: You also missed data there as well, and it seems your patch has formatting issues, I went ahead and cleaned it up here, see if that works ok for you: https://patchwork.ozlabs.org/project/buildroot/patch/20220330224521.4142504-1-james.hilliard1 at gmail.com/ FYI I think your email client is corrupting the patch a bit as it didn't apply cleanly, see guide here: https://buildroot.org/downloads/manual/manual.html#submitting-patches Make sure you send the patch using git send-email which should make sure the formatting isn't messed with by your email client. > > ----- > > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..81c33ba557 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -147,11 +147,11 @@ HOST_PKG_PYTHON_PEP517_ENV = \ > $(HOST_CONFIGURE_OPTS) > > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > - --interpreter=/usr/bin/python \ > + --interpreter=/bin/python \ > --script-kind=posix \ > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(HOST_DIR)/usr/bin \ > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(HOST_DIR)/bin \ > --data=$(HOST_DIR)/usr > > ################################################################################ > > On Wed, Mar 30, 2022 at 4:25 PM James Hilliard wrote: >> >> On Wed, Mar 30, 2022 at 12:52 PM Emile Cormier >> wrote: >> > >> > package/pkg-python.mk: fix PEP517 purelib deployment path >> > >> > This allows the Python interpreter to find packages built via the new Flit >> > infrastructure and fixes bug #14721. >> > Signed-off-by: Emile Cormier >> > >> > diff --git a/package/pkg-python.mk b/package/pkg-python.mk >> > index 52ce402281..ab4f7af6a6 100644 >> > --- a/package/pkg-python.mk >> > +++ b/package/pkg-python.mk >> > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ >> > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ >> > --interpreter=/usr/bin/python \ >> > --script-kind=posix \ >> > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > --scripts=$(TARGET_DIR)/usr/bin \ >> > --data=$(TARGET_DIR)/usr >> > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ >> > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ >> > --interpreter=/usr/bin/python \ >> > --script-kind=posix \ >> > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > --scripts=$(STAGING_DIR)/usr/bin \ >> > --data=$(STAGING_DIR)/usr >> > @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ >> > --interpreter=/usr/bin/python \ >> > --script-kind=posix \ >> > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > - --scripts=$(HOST_DIR)/usr/bin \ >> > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ >> > + --scripts=$(HOST_DIR)/bin \ >> > --data=$(HOST_DIR)/usr >> >> I think it should be something like this for the host: >> HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ >> --interpreter=/bin/python \ >> --script-kind=posix \ >> --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ >> --scripts=$(HOST_DIR)/bin \ >> --data=$(HOST_DIR) >> >> >> > >> > ################################################################################ >> > >> > On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier wrote: >> >> >> >> On Wed, Mar 30, 2022 at 3:01 PM James Hilliard wrote: >> >>> >> >>> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. >> >> >> >> >> >> Alright, I've changed it as you suggested and it still works for me. I'll post an updated patch. From bugzilla at busybox.net Thu Mar 31 04:16:27 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 31 Mar 2022 04:16:27 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #6 from Wim Meganck --- Problem solved by adding BR2_PACKAGE_HOST_PYTHON3=y and BR2_PACKAGE_HOST_PYTHON3_BZIP2=y in the config file and did a full rebuild. -- You are receiving this mail because: You are on the CC list for the bug. From br015 at umbiko.net Thu Mar 31 05:57:59 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 05:57:59 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> Message-ID: <7a56c449ef38559922b9858eee8d1799@umbiko.net> On 2022-03-30 19:18, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 30 March 2022 08:14 >> To: Dan Jackson >> Cc: buildroot at buildroot.org >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> Hi Dan, >> >> cutting some old content. >> >> On 2022-03-29 19:19, Dan Jackson wrote: >> >> >> >> >> > However, now I have a new missing file error, and I can't seem to >> >> > locate a suitable candidate: >> >> > >> >> > In file included from >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> custom/arch/arm/include/asm/system.h:165, >> >> > from >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> custom/arch/arm/include/asm/bitops.h:27, >> >> > from include/linux/bitops.h:22, >> >> > from include/linux/kernel.h:17, >> >> > from include/linux/sched.h:55, >> >> > from arch/arm/kernel/asm-offsets.c:13: >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> custom/arch/arm/include/asm/memory.h:19:10: >> >> > fatal error: mach/memory.h: No such file or directory >> >> > 19 | #include >> >> > | ^~~~~~~~~~~~~~~ >> >> > compilation terminated. >> >> > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: >> >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed >> >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 >> >> > Makefile:1009: recipe for target 'prepare0' failed >> >> > make[2]: *** [prepare0] Error 2 >> >> > make[2]: *** Waiting for unfinished jobs.... >> >> > HOSTCC scripts/mod/modpost.o >> >> > HOSTCC scripts/mod/sumversion.o >> >> > HOSTLD scripts/mod/modpost >> >> > make[2]: *** wait: No child processes. Stop. >> >> > package/pkg-generic.mk:289: recipe for target >> >> > '/home/danj/buildroot-2022.02/output/build/linux- >> custom/.stamp_built' >> >> > failed >> >> > make[1]: *** >> >> > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_buil >> >> > t] >> >> > Error 2 >> >> > Makefile:84: recipe for target '_all' failed >> >> > make: *** [_all] Error 2 >> >> >> >> This seems not to be the defconfig from above? It now uses >> >> linux-custom ... >> >> The failure may be due to the default kernel configuration. Try to >> >> configure the correct one and see if you get further. >> >> >> >> > I think maybe I am still doing something wrong because it sure >> >> > seems to be compiling a lot of stuff instead of letting me configure >> things. >> >> >> >> It gets better once everything necessary is built. >> > >> > Still no luck I'm afraid. Same error with mach/memory.h as above. >> > >> > Buildroot defconfig now looks like this: >> > >> > BR2_armeb=y >> > BR2_STATIC_LIBS=y >> > BR2_KERNEL_HEADERS_VERSION=y >> > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" >> > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y >> > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y >> > BR2_PTHREAD_DEBUG=y >> > BR2_BINUTILS_VERSION_2_37_X=y >> > BR2_GCC_VERSION_9_X=y >> > BR2_TOOLCHAIN_BUILDROOT_CXX=y >> > BR2_PACKAGE_HOST_GDB=y >> > BR2_GDB_VERSION_9_2=y >> > BR2_LINUX_KERNEL=y >> > BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" >> > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >> > >> BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 >> FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" >> > BR2_PACKAGE_DROPBEAR=y >> > >> BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions >> .h" >> > BR2_PACKAGE_JOE=y >> > >> > I forgot to mention this before but the buildroot manual page you >> > mentioned said to create a local.mk file in order to use external >> > source, this looks like this: >> > >> > LINUX_OVERRIDE_SRCDIR = >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ >> > >> > For the kernel configuration I entered the kernel source dir and did >> > "make menuconfig", I left everything at the defaults except for >> > enabling the USB related items. >> > >> > The resulting configuration file is attached as a text file. >> > Unfortunately it's been literally decades since I last actually >> > compiled a kernel, so I'm afraid I have no idea what bits would be >> > suitable to disable/remove to get the results I want (I'm guessing >> > this will be the most likely way to eliminate the error I'm getting?) >> >> I did a compile test this morning, the Buildroot version was some >> early >> 2022.02 version, not up-to-date. >> >> You have a potential header mismatch, Select Toolchain -> Kernel >> Headers >> -> Same as kernel being built to use the vendor source also for the >> headers. >> >> I could configure Linux with make menuconfig, did not encounter the >> missing memory.h error above, but the build stops during Linux kernel >> compilation with this error: >> >> /tmp/ccSO8f6S.s: Assembler messages: >> /tmp/ccSO8f6S.s:950: Error: .err encountered >> make[3]: *** [scripts/Makefile.build:284: >> arch/arm/kernel/sys_oabi-compat.o] Error 1 >> make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 >> make[1]: *** [package/pkg-generic.mk:292: >> /home/data/test/buildroot/output/build/linux-custom/.stamp_built] >> Error >> 2 >> make: *** [Makefile:84: _all] Error 2 >> >> Full error log is here: https://pastebin.com/VrXqSVsD > > Looking at the error log, it seems like vfp has been selected? But my > target device only has Features: swp half thumb fastmult edsp java. This is just a warning, I would ignore it at this point in time. Compiler syntax checks tend to get more strict over time ... > Also, OABI does not seem like it is the correct ABI. For example, if I > run "file" against the busybox binary the device comes with, I get: > > busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), > dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped It seems to be a compatibility layer for legacy software; disabling OABI_COMPAT is an option, because you probably will never need it. I used the source tree and unmodified .config contained in the Touchstone DG3270 Cable Gateway project on SourceForge for the test. The original build instructions seem to indicate that more software is needed to build the device firmware. This might be the reason for missing files ... Also, take a look at psp_drivers.Kconfig for the options necessary to enable USB support. >> >> You might now do some research: >> >> https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- >> error-when-building-linux-kernel-3-14-17-in-buildroot-2020 >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 >> >> or try to switch to an older compiler ... >> >> -- >> Andreas >> >> From thomas.petazzoni at bootlin.com Thu Mar 31 06:08:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 31 Mar 2022 06:08:25 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-30 Message-ID: <20220331060828.F2A2883E9B@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-03-30 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 63 | 6 | 0 | 69 | 2022.02.x | 16 | 12 | 1 | 29 | master | 60 | 42 | 0 | 102 | Classification of failures by reason for master ----------------------------------------------- dhcp-4.4.2-P1 | 8 pango-1.50.5 | 7 tpm2-abrmd-2.3.3 | 6 tpm2-tss-3.2.0 | 5 tpm2-tools-5.2 | 3 frr-8.2.2 | 1 glslsandbox-player-2021.08.24 | 1 jack2-1.9.20 | 1 libsecret-0.20.5 | 1 mongodb-4.2.18 | 1 mpd-0.23.6 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 sg3_utils-1.47 | 1 tpm2-pkcs11-1.7.0 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 vlc-3.0.16 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/75beeb024a022513c17b25b9070083402045c1d3 | ORPH sh4 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/9144569593c077af0b840b8308f44aa56537545e | ORPH powerpc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/66920b50afea6b510b1aea2ab26178f79e7d25e4 | ORPH arm | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/69da641c4bd6de1718f49bc04dafa081968dda96 | ORPH arc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/d18b006dce7b46631ce8f4c72fb97eb861993939 | ORPH riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/32ea3d9366102da76e64c48e13f641fda6dced71 | ORPH riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/1ae01f53b213923113d4def79c2ef86d8f265dc2 | ORPH powerpc64le | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/2e6b6cb0a40c9ac972a562e6dc17353e5e4003c1 | ORPH mips64el | frr-8.2.2 | NOK | http://autobuild.buildroot.net/results/a8bd63dfc2012fbec48872b7a6cf4ba59829375c | aarch64 | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/bd4e3fc903cbe0e328c5c46c77770682228ac1ed | m68k | jack2-1.9.20 | NOK | http://autobuild.buildroot.net/results/b59f60b60d51eb495780635ab31b1bb431282ed1 | aarch64 | libsecret-0.20.5 | NOK | http://autobuild.buildroot.net/results/8c025659eaa2bedbc2f349891ca2e4722fb7830e | ORPH arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/b9d211d388701d4588db760df26f8114a9d4677c | arm | mpd-0.23.6 | NOK | http://autobuild.buildroot.net/results/f0a9e719114f19dc9d20622ed85dd4f8e968c20f | powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/f7d227a39e4ec475c0967da031e90eca7399dbca | ORPH mips | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7c3c2ea2b4ca326ebc11b40120993c9e20a22463 | ORPH powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/cef923b7e4847e8bd0d6d7f9bf469ce6fa740363 | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/9589433c7340b2a6137c8134218e78726e38798c | ORPH m68k | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/21669e18d0d8659fa23697eb4656db082ba7e5d5 | ORPH mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7147895b373436a3a9edb42aac1562a2c171d3cd | ORPH nios2 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/b9dea403ee400d5448c1491bc265ad72847035e8 | ORPH arc | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/8029b01ce5816cbafd412b14985becce7a22e09d | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/dcc93ec2d1f861c4f3796d6b8ea5f609e8339161 | or1k | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/f43d80dc23916f78168494da0d3b9b1574d92f87 | ORPH powerpc64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/e031c62fe0180d403ab56da473b19da9f6161562 | ORPH riscv64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/65e2bef20fe1bb1d820a1bfee289f58423dc14f7 | ORPH mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/9ba07ae640ba9bea01c555a5d5ba6d230781ca49 | ORPH mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/5a3ec27e213fe1d7092bd7f51511a3fb703fca78 | ORPH xtensa | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/239e4a5b8923fee53542845d1cffa67277a4480a | ORPH x86_64 | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/66323bd7d5f868874771aa743e08b93f0f6e69e0 | aarch64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/28cfd0284a01473c26c25cc2992b43c4bf9720c6 | ORPH x86_64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/bcc9f0eb135873d665540c3c8a138f0e21bbe089 | ORPH arm | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/8900940ad30946c40e42ccc7c116153aa9c04741 | ORPH riscv32 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/0a01e354928a67a119edb4c9553025f3b2808c6a | ORPH nds32le | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4a1f3212d570128ce8743dda7a9920b5d67cc9a2 | ORPH x86_64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/89b5764d0a5c0f29d027f2b79c219f8347408955 | ORPH sparc64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/785bb203e884c31845ef46774360fc47c27649e0 | ORPH arm | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4ecf58b1d4483386945dca736c3e763b607cabc1 | ORPH s390x | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/b861aa6c0bc9ab39ba01c0afb658496e4f02d26e | arm | unknown | NOK | http://autobuild.buildroot.net/results/56c8cacd93d9aff83a216b13a20be5afbcd3c09e | arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/ef891307af29deecc89209bfc3ad25b33d70eca6 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e02d2df8f05e209e3dcca2fbb9d9ce793509c7c | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 apache-2.4.53 | 1 heirloom-mailx-12.5 | 1 monkey-f54856ce250c4e257354... | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | apache-2.4.53 | NOK | http://autobuild.buildroot.net/results/f2caf6ac63f50dd2fd59dbc0d3135c6f03a293eb | sh4 | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/07e2147e57478e490741f3a40465b487c13ac06c | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c5016c945fd218a26d1de6914d53f4f797851075 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4398bf4ea42569012e541ab2a7badd833ce560d5 | s390x | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0e3e5d0437f25fb014a381e91fe28b76ca8c76bd | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/b0af23591a6cd6255a2548259c01dbe6c219d687 | Classification of failures by reason for 2022.02.x -------------------------------------------------- pango-1.50.5 | 4 dhcp-4.4.2-P1 | 1 host-pango-1.50.5 | 1 libuwsc | 1 nbd-3.24 | 1 ndisc6-1.0.5 | 1 opencv4-4.5.5 | 1 protozero-1.7.1 | 1 unknown | 1 wpa_supplicant-2.10 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/11b0fc25b99d223b9648d822563aeb746de5eb01 | ORPH arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/8bb4bf8414fc20e3ada64b12e579e9c65c6d9643 | ORPH x86_64 | libuwsc | TIM | http://autobuild.buildroot.net/results/555b87bb5e9e003a9fd16b0c26cb62d10cee69b1 | riscv32 | nbd-3.24 | NOK | http://autobuild.buildroot.net/results/10a90ace1cdc5d93bd98fb18ca5134a64a56318e | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/56df999d86a5d343447d23580e5bbbfad8d05fba | ORPH x86_64 | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8ca60c6b072299ad08abaab4638ac544e6612b19 | mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/37218057bb3850609f1cde22d302fa828123d22d | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/44e0caf61871e25b1aa22b5b30e2fdf70ca6fb44 | ORPH mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/63e220221242385f9cd1631dcbd858a09a73f8e4 | ORPH powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/96f2a226ff1793156f1364a52ae3a2675d1a9f3a | ORPH s390x | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/ed941b92d306564d657ba6810006dc00e2ec20e8 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/b418dd5179b31a2a3921c731ca69128bb0f35b14 | mipsel | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/2dea7dee521794b306cc610601fda322987e6cd0 | -- http://autobuild.buildroot.net From dan at thejacksons.uk Thu Mar 31 06:19:37 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Thu, 31 Mar 2022 06:19:37 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <7a56c449ef38559922b9858eee8d1799@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> <7a56c449ef38559922b9858eee8d1799@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 31 March 2022 06:58 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > On 2022-03-30 19:18, Dan Jackson wrote: > >> -----Original Message----- > >> From: Andreas Ziegler > >> Sent: 30 March 2022 08:14 > >> To: Dan Jackson > >> Cc: buildroot at buildroot.org > >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel > >> - > >> possible? > >> > >> Hi Dan, > >> > >> cutting some old content. > >> > >> On 2022-03-29 19:19, Dan Jackson wrote: > >> > >> > >> > >> >> > However, now I have a new missing file error, and I can't seem > >> >> > to locate a suitable candidate: > >> >> > > >> >> > In file included from > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > >> >> custom/arch/arm/include/asm/system.h:165, > >> >> > from > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > >> >> custom/arch/arm/include/asm/bitops.h:27, > >> >> > from include/linux/bitops.h:22, > >> >> > from include/linux/kernel.h:17, > >> >> > from include/linux/sched.h:55, > >> >> > from arch/arm/kernel/asm-offsets.c:13: > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > >> >> custom/arch/arm/include/asm/memory.h:19:10: > >> >> > fatal error: mach/memory.h: No such file or directory > >> >> > 19 | #include > >> >> > | ^~~~~~~~~~~~~~~ > >> >> > compilation terminated. > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > custom/./Kbuild:81: > >> >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > >> >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > >> >> > Makefile:1009: recipe for target 'prepare0' failed > >> >> > make[2]: *** [prepare0] Error 2 > >> >> > make[2]: *** Waiting for unfinished jobs.... > >> >> > HOSTCC scripts/mod/modpost.o > >> >> > HOSTCC scripts/mod/sumversion.o > >> >> > HOSTLD scripts/mod/modpost > >> >> > make[2]: *** wait: No child processes. Stop. > >> >> > package/pkg-generic.mk:289: recipe for target > >> >> > '/home/danj/buildroot-2022.02/output/build/linux- > >> custom/.stamp_built' > >> >> > failed > >> >> > make[1]: *** > >> >> > [/home/danj/buildroot-2022.02/output/build/linux- > custom/.stamp_b > >> >> > uil > >> >> > t] > >> >> > Error 2 > >> >> > Makefile:84: recipe for target '_all' failed > >> >> > make: *** [_all] Error 2 > >> >> > >> >> This seems not to be the defconfig from above? It now uses > >> >> linux-custom ... > >> >> The failure may be due to the default kernel configuration. Try to > >> >> configure the correct one and see if you get further. > >> >> > >> >> > I think maybe I am still doing something wrong because it sure > >> >> > seems to be compiling a lot of stuff instead of letting me > >> >> > configure > >> things. > >> >> > >> >> It gets better once everything necessary is built. > >> > > >> > Still no luck I'm afraid. Same error with mach/memory.h as above. > >> > > >> > Buildroot defconfig now looks like this: > >> > > >> > BR2_armeb=y > >> > BR2_STATIC_LIBS=y > >> > BR2_KERNEL_HEADERS_VERSION=y > >> > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > >> > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > >> > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > >> > BR2_PTHREAD_DEBUG=y > >> > BR2_BINUTILS_VERSION_2_37_X=y > >> > BR2_GCC_VERSION_9_X=y > >> > BR2_TOOLCHAIN_BUILDROOT_CXX=y > >> > BR2_PACKAGE_HOST_GDB=y > >> > BR2_GDB_VERSION_9_2=y > >> > BR2_LINUX_KERNEL=y > >> > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >> > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > >> > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > >> > > >> > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 > >> FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" > >> > BR2_PACKAGE_DROPBEAR=y > >> > > >> > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions > >> .h" > >> > BR2_PACKAGE_JOE=y > >> > > >> > I forgot to mention this before but the buildroot manual page you > >> > mentioned said to create a local.mk file in order to use external > >> > source, this looks like this: > >> > > >> > LINUX_OVERRIDE_SRCDIR = > >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ > >> > > >> > For the kernel configuration I entered the kernel source dir and > >> > did "make menuconfig", I left everything at the defaults except for > >> > enabling the USB related items. > >> > > >> > The resulting configuration file is attached as a text file. > >> > Unfortunately it's been literally decades since I last actually > >> > compiled a kernel, so I'm afraid I have no idea what bits would be > >> > suitable to disable/remove to get the results I want (I'm guessing > >> > this will be the most likely way to eliminate the error I'm > >> > getting?) > >> > >> I did a compile test this morning, the Buildroot version was some > >> early > >> 2022.02 version, not up-to-date. > >> > >> You have a potential header mismatch, Select Toolchain -> Kernel > >> Headers > >> -> Same as kernel being built to use the vendor source also for the > >> headers. > >> > >> I could configure Linux with make menuconfig, did not encounter the > >> missing memory.h error above, but the build stops during Linux kernel > >> compilation with this error: > >> > >> /tmp/ccSO8f6S.s: Assembler messages: > >> /tmp/ccSO8f6S.s:950: Error: .err encountered > >> make[3]: *** [scripts/Makefile.build:284: > >> arch/arm/kernel/sys_oabi-compat.o] Error 1 > >> make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 > >> make[1]: *** [package/pkg-generic.mk:292: > >> /home/data/test/buildroot/output/build/linux-custom/.stamp_built] > >> Error > >> 2 > >> make: *** [Makefile:84: _all] Error 2 > >> > >> Full error log is here: https://pastebin.com/VrXqSVsD > > > > Looking at the error log, it seems like vfp has been selected? But my > > target device only has Features: swp half thumb fastmult edsp java. > > This is just a warning, I would ignore it at this point in time. > Compiler syntax checks tend to get more strict over time ... > > > Also, OABI does not seem like it is the correct ABI. For example, if I > > run "file" against the busybox binary the device comes with, I get: > > > > busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), > > dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped > > It seems to be a compatibility layer for legacy software; disabling > OABI_COMPAT is an option, because you probably will never need it. > > I used the source tree and unmodified .config contained in the Touchstone > DG3270 Cable Gateway project on SourceForge for the test. > > The original build instructions seem to indicate that more software is needed > to build the device firmware. This might be the reason for missing files ... > > Also, take a look at psp_drivers.Kconfig for the options necessary to enable > USB support. It's starting to seem like it might be a better option to try to get the original software development kit to work instead of trying to use its components with modern buildroot. Ironically the SDK is itself based on ancient buildroot - in /proc/version on the target device I can see: (gcc version 4.7.3 (Buildroot 2013.08.1) ) > > >> > >> You might now do some research: > >> > >> https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- > >> error-when-building-linux-kernel-3-14-17-in-buildroot-2020 > >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 > >> > >> or try to switch to an older compiler ... > >> > >> -- > >> Andreas > >> > >> From peter at korsgaard.com Thu Mar 31 06:21:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:21:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: hid and hog needs headers >= 3.18 In-Reply-To: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 17:20:12 +0100") References: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> Message-ID: <877d8a7ibz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with hid and hog raised since their > addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd > because UHID_GET_REPORT is only available since kernel 3.18 and > https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: > profiles/input/device.c: In function 'uhid_send_get_report_reply': > profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' > if (size > sizeof(ev.u.get_report_reply.data)) > ^ > profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' > size = sizeof(ev.u.get_report_reply.data); > ^ > profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) > ev.type = UHID_GET_REPORT_REPLY; > ^ > Fixes: > - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:22:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:22:55 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack1: libsamplerate is optional, not mandatory In-Reply-To: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 22:18:14 +0100") References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> Message-ID: <8735iy7i9s.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libsamplerate is only needed to build the NetJack backend and internal > client > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:23:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:23:06 +0200 Subject: [Buildroot] [PATCH 2/2] package/jack1: libsndfile is optional, not mandatory In-Reply-To: <20220320211815.1798812-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 22:18:15 +0100") References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> <20220320211815.1798812-2-fontaine.fabrice@gmail.com> Message-ID: <87y20q63p1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libsndfile is only needed to build jackrec example client > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:27:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:27:05 +0200 Subject: [Buildroot] [PATCH] package/busybox: fix udhcpc options in minimal config In-Reply-To: <20220321145322.23881-1-vincent.stehle@laposte.net> ("Vincent =?utf-8?Q?Stehl=C3=A9?= via buildroot"'s message of "Mon, 21 Mar 2022 15:53:22 +0100") References: <20220321145322.23881-1-vincent.stehle@laposte.net> Message-ID: <87tube63ie.fsf@dell.be.48ers.dk> >>>>> "Vincent" == Vincent Stehl? via buildroot writes: > The busybox-minimal.config, which is used by systems without an MMU, specifies > the "-b" command line option for udhcpc. However, this option is not supported > by BusyBox udhcpc anymore since version 1.27.0 when building for systems > without an MMU. > Remove the "-b" option from busybox-minimal.config to repair network > initialization on systems without an MMU. > This fixes the following network initialization failure: > udhcpc: invalid option -- b > FAIL > Signed-off-by: Vincent Stehl? > --- Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:22:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:22:23 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack1: libsamplerate is optional, not mandatory Message-ID: <20220331061813.DD90285FE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9479d366376de8ff7a23905173386ae8c24967b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libsamplerate is only needed to build the NetJack backend and internal client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 05bbdfa382ec8b26d9b2f98b1696cb884ed7c2ca) Signed-off-by: Peter Korsgaard --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f10332..625afdf8c1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba0..39183826a4 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate +endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline From peter at korsgaard.com Thu Mar 31 06:22:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:22:29 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack1: libsndfile is optional, not mandatory Message-ID: <20220331061813.ECD5686009@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0bda6dd18e9276cc00813e62c6c53680c318c67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libsndfile is only needed to build jackrec example client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9a78a756134831da20c471dee575f3e8108f62a4) Signed-off-by: Peter Korsgaard --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 625afdf8c1..5b3116e2f1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 39183826a4..6dca56001f 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,12 +11,16 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK1_DEPENDENCIES += libsndfile +endif + ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline endif From peter at korsgaard.com Thu Mar 31 06:04:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:04:38 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/bluez5_utils: hid and hog needs headers >= 3.18 Message-ID: <20220331061813.D4A3985FF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9112ccd069958f34ced18b02d0e3dc386312f60a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure with hid and hog raised since their addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd because UHID_GET_REPORT is only available since kernel 3.18 and https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: profiles/input/device.c: In function 'uhid_send_get_report_reply': profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' if (size > sizeof(ev.u.get_report_reply.data)) ^ profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' size = sizeof(ev.u.get_report_reply.data); ^ profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) ev.type = UHID_GET_REPORT_REPLY; ^ Fixes: - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 328516a5add9e6f260d3a8e0d372c474ae30b2c1) Signed-off-by: Peter Korsgaard --- package/bluez5_utils/Config.in | 16 ++++++++++++++++ package/brltty/Config.in | 2 +- package/cwiid/Config.in | 6 +++--- package/kodi/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced..49bb719102 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e20..3527df6161 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac9405..7e8cdc3086 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on !BR2_USE_MMU diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 6896e85e7b..fd530064ac 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -135,9 +135,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf058..319415754a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. From peter at korsgaard.com Thu Mar 31 06:25:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:25:36 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/busybox: fix udhcpc options in minimal config Message-ID: <20220331061814.02FEC85FF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0467bb87de58a9e6f0f8117e80ed510604ffa9e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The busybox-minimal.config, which is used by systems without an MMU, specifies the "-b" command line option for udhcpc. However, this option is not supported by BusyBox udhcpc anymore since version 1.27.0 when building for systems without an MMU. Remove the "-b" option from busybox-minimal.config to repair network initialization on systems without an MMU. This fixes the following network initialization failure: udhcpc: invalid option -- b FAIL Signed-off-by: Vincent Stehl?? Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3de486f8b052b25c8e29a82903b334ca90f25735) Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4..1fb4e39e21 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities From peter at korsgaard.com Thu Mar 31 06:43:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:43:48 +0200 Subject: [Buildroot] [PATCH v3] package/wget: bump version to 1.21.3 In-Reply-To: (Arnout Vandecappelle's message of "Sun, 27 Mar 2022 18:08:01 +0200") References: <20220321192947.20712-1-ps.report@gmx.net> Message-ID: <87pmm262qj.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 21/03/2022 20:29, Peter Seiderer wrote: >> - bump version to 1.21.3 (for details see [1]) >> - remove legacy --with-libidn option (see [2]), replace with >> --enable-iri option in case locale support and libidn2 are available >> [1] >> https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html >> [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 >> Signed-off-by: Peter Seiderer > Applied to master, thanks. Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:49:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:49:57 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack2: fix build with libexecinfo In-Reply-To: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Mar 2022 18:48:38 +0100") References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Message-ID: <87lewq62ga.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > dbus/sigsegv.c.17.o: in function `signal_segv': > sigsegv.c:(.text+0x98): undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:50:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:50:03 +0200 Subject: [Buildroot] [PATCH 2/2] package/jack2: explicitly {dis, en}able opus and readline In-Reply-To: <20220322174839.2189015-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Mar 2022 18:48:39 +0100") References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> <20220322174839.2189015-2-fontaine.fabrice@gmail.com> Message-ID: <87h77e62g4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Explicitly disable or enable opus and readline which have been added by > commits 055cf588427b40533da74d16df1830e483c5618e and > f658b1934f91e8c416fd7519c9f7e3ab86dca076 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From br015 at umbiko.net Thu Mar 31 06:50:24 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 06:50:24 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> <7a56c449ef38559922b9858eee8d1799@umbiko.net> Message-ID: <75f3a440a863eb293c61223e81bc171b@umbiko.net> On 2022-03-31 06:19, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 31 March 2022 06:58 >> To: Dan Jackson >> Cc: buildroot at buildroot.org >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> On 2022-03-30 19:18, Dan Jackson wrote: >> >> -----Original Message----- >> >> From: Andreas Ziegler >> >> Sent: 30 March 2022 08:14 >> >> To: Dan Jackson >> >> Cc: buildroot at buildroot.org >> >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> >> - >> >> possible? >> >> >> >> Hi Dan, >> >> >> >> cutting some old content. >> >> >> >> On 2022-03-29 19:19, Dan Jackson wrote: >> >> >> >> >> >> >> >> >> > However, now I have a new missing file error, and I can't seem >> >> >> > to locate a suitable candidate: >> >> >> > >> >> >> > In file included from >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> >> custom/arch/arm/include/asm/system.h:165, >> >> >> > from >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> >> custom/arch/arm/include/asm/bitops.h:27, >> >> >> > from include/linux/bitops.h:22, >> >> >> > from include/linux/kernel.h:17, >> >> >> > from include/linux/sched.h:55, >> >> >> > from arch/arm/kernel/asm-offsets.c:13: >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> >> custom/arch/arm/include/asm/memory.h:19:10: >> >> >> > fatal error: mach/memory.h: No such file or directory >> >> >> > 19 | #include >> >> >> > | ^~~~~~~~~~~~~~~ >> >> >> > compilation terminated. >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/./Kbuild:81: >> >> >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed >> >> >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 >> >> >> > Makefile:1009: recipe for target 'prepare0' failed >> >> >> > make[2]: *** [prepare0] Error 2 >> >> >> > make[2]: *** Waiting for unfinished jobs.... >> >> >> > HOSTCC scripts/mod/modpost.o >> >> >> > HOSTCC scripts/mod/sumversion.o >> >> >> > HOSTLD scripts/mod/modpost >> >> >> > make[2]: *** wait: No child processes. Stop. >> >> >> > package/pkg-generic.mk:289: recipe for target >> >> >> > '/home/danj/buildroot-2022.02/output/build/linux- >> >> custom/.stamp_built' >> >> >> > failed >> >> >> > make[1]: *** >> >> >> > [/home/danj/buildroot-2022.02/output/build/linux- >> custom/.stamp_b >> >> >> > uil >> >> >> > t] >> >> >> > Error 2 >> >> >> > Makefile:84: recipe for target '_all' failed >> >> >> > make: *** [_all] Error 2 >> >> >> >> >> >> This seems not to be the defconfig from above? It now uses >> >> >> linux-custom ... >> >> >> The failure may be due to the default kernel configuration. Try to >> >> >> configure the correct one and see if you get further. >> >> >> >> >> >> > I think maybe I am still doing something wrong because it sure >> >> >> > seems to be compiling a lot of stuff instead of letting me >> >> >> > configure >> >> things. >> >> >> >> >> >> It gets better once everything necessary is built. >> >> > >> >> > Still no luck I'm afraid. Same error with mach/memory.h as above. >> >> > >> >> > Buildroot defconfig now looks like this: >> >> > >> >> > BR2_armeb=y >> >> > BR2_STATIC_LIBS=y >> >> > BR2_KERNEL_HEADERS_VERSION=y >> >> > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" >> >> > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y >> >> > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y >> >> > BR2_PTHREAD_DEBUG=y >> >> > BR2_BINUTILS_VERSION_2_37_X=y >> >> > BR2_GCC_VERSION_9_X=y >> >> > BR2_TOOLCHAIN_BUILDROOT_CXX=y >> >> > BR2_PACKAGE_HOST_GDB=y >> >> > BR2_GDB_VERSION_9_2=y >> >> > BR2_LINUX_KERNEL=y >> >> > BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> >> > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" >> >> > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >> >> > >> >> >> BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 >> >> FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" >> >> > BR2_PACKAGE_DROPBEAR=y >> >> > >> >> >> BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions >> >> .h" >> >> > BR2_PACKAGE_JOE=y >> >> > >> >> > I forgot to mention this before but the buildroot manual page you >> >> > mentioned said to create a local.mk file in order to use external >> >> > source, this looks like this: >> >> > >> >> > LINUX_OVERRIDE_SRCDIR = >> >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ >> >> > >> >> > For the kernel configuration I entered the kernel source dir and >> >> > did "make menuconfig", I left everything at the defaults except for >> >> > enabling the USB related items. >> >> > >> >> > The resulting configuration file is attached as a text file. >> >> > Unfortunately it's been literally decades since I last actually >> >> > compiled a kernel, so I'm afraid I have no idea what bits would be >> >> > suitable to disable/remove to get the results I want (I'm guessing >> >> > this will be the most likely way to eliminate the error I'm >> >> > getting?) >> >> >> >> I did a compile test this morning, the Buildroot version was some >> >> early >> >> 2022.02 version, not up-to-date. >> >> >> >> You have a potential header mismatch, Select Toolchain -> Kernel >> >> Headers >> >> -> Same as kernel being built to use the vendor source also for the >> >> headers. >> >> >> >> I could configure Linux with make menuconfig, did not encounter the >> >> missing memory.h error above, but the build stops during Linux kernel >> >> compilation with this error: >> >> >> >> /tmp/ccSO8f6S.s: Assembler messages: >> >> /tmp/ccSO8f6S.s:950: Error: .err encountered >> >> make[3]: *** [scripts/Makefile.build:284: >> >> arch/arm/kernel/sys_oabi-compat.o] Error 1 >> >> make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 >> >> make[1]: *** [package/pkg-generic.mk:292: >> >> /home/data/test/buildroot/output/build/linux-custom/.stamp_built] >> >> Error >> >> 2 >> >> make: *** [Makefile:84: _all] Error 2 >> >> >> >> Full error log is here: https://pastebin.com/VrXqSVsD >> > >> > Looking at the error log, it seems like vfp has been selected? But my >> > target device only has Features: swp half thumb fastmult edsp java. >> >> This is just a warning, I would ignore it at this point in time. >> Compiler syntax checks tend to get more strict over time ... >> >> > Also, OABI does not seem like it is the correct ABI. For example, if I >> > run "file" against the busybox binary the device comes with, I get: >> > >> > busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), >> > dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped >> >> It seems to be a compatibility layer for legacy software; disabling >> OABI_COMPAT is an option, because you probably will never need it. >> >> I used the source tree and unmodified .config contained in the >> Touchstone >> DG3270 Cable Gateway project on SourceForge for the test. >> >> The original build instructions seem to indicate that more software is >> needed >> to build the device firmware. This might be the reason for missing >> files ... >> >> Also, take a look at psp_drivers.Kconfig for the options necessary to >> enable >> USB support. > > It's starting to seem like it might be a better option to try to get > the original software development kit to work instead of trying to use > its components with modern buildroot. > > Ironically the SDK is itself based on ancient buildroot - in > /proc/version on the target device I can see: > > (gcc version 4.7.3 (Buildroot 2013.08.1) ) Now I understand ... no, it is not. Buildroot is used to generate the toolchain, the firmware build uses makefiles and kconfig. >> >> >> >> >> You might now do some research: >> >> >> >> https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- >> >> error-when-building-linux-kernel-3-14-17-in-buildroot-2020 >> >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 >> >> >> >> or try to switch to an older compiler ... >> >> >> >> -- >> >> Andreas >> >> >> >> From peter at korsgaard.com Thu Mar 31 06:50:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:50:26 +0200 Subject: [Buildroot] [PATCH 1/1] package/jack2: bump to version 1.9.20 In-Reply-To: (Jan Havran's message of "Mon, 7 Mar 2022 10:35:00 +0100") References: Message-ID: <87czi262fh.fsf@dell.be.48ers.dk> >>>>> "Jan" == Jan Havran writes: > - Fix URL for 'JACK DBus packaging' GitHub Wiki page. > https://github.com/jackaudio/jack2/releases/tag/v1.9.18 > https://github.com/jackaudio/jack2/releases/tag/v1.9.19 > https://github.com/jackaudio/jack2/releases/tag/v1.9.20 > Signed-off-by: Jan Havran Committed to 2022.02.x given the fixes, thanks. > --- > package/jack2/Config.in | 4 ++-- > package/jack2/jack2.hash | 2 +- > package/jack2/jack2.mk | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > diff --git a/package/jack2/Config.in b/package/jack2/Config.in > index bc883190d5..8abdda6376 100644 > --- a/package/jack2/Config.in > +++ b/package/jack2/Config.in > @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY > help > Build and use jackd. > - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging > + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging > config BR2_PACKAGE_JACK2_DBUS > bool "dbus jack2" > @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS > help > Build and use jackdbus. > - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging > + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging > endif > diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash > index df708f7ca5..6361473cf7 100644 > --- a/package/jack2/jack2.hash > +++ b/package/jack2/jack2.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz > +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz > sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING > diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk > index e6a036bac9..2e55169984 100644 > --- a/package/jack2/jack2.mk > +++ b/package/jack2/jack2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -JACK2_VERSION = 1.9.17 > +JACK2_VERSION = 1.9.20 > JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) > JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) > JACK2_LICENSE_FILES = COPYING > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:47:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:47:28 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack2: explicitly {dis, en}able opus and readline Message-ID: <20220331064151.A7F8886016@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6439b8dbe01b2a80f8cd7202277b8ccd822cc7e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc) Signed-off-by: Peter Korsgaard --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 127c99eed1..6939aac9a6 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -21,10 +21,16 @@ endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) From peter at korsgaard.com Thu Mar 31 06:46:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:46:16 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack2: bump to version 1.9.20 Message-ID: <20220331064151.9118386016@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9820d4903ea09a5640ed9bad83385243c3528eaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fix URL for 'JACK DBus packaging' GitHub Wiki page. https://github.com/jackaudio/jack2/releases/tag/v1.9.18 https://github.com/jackaudio/jack2/releases/tag/v1.9.19 https://github.com/jackaudio/jack2/releases/tag/v1.9.20 Signed-off-by: Jan Havran Signed-off-by: Peter Korsgaard (cherry picked from commit 26ca7fec041836c31f29c5566365fe40eb552bca) Signed-off-by: Peter Korsgaard --- package/jack2/Config.in | 4 ++-- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d5..8abdda6376 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca5..6361473cf7 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..2e55169984 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.20 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 06:46:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:46:24 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack2: fix build with libexecinfo Message-ID: <20220331064151.9D11286014@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a5119afa0eceaf03493142d89b8bf2407f9b983 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': sigsegv.c:(.text+0x98): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 930db465d9d9f2fd558e67bd808914309c2d4619) Signed-off-by: Peter Korsgaard --- package/jack2/jack2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 2e55169984..127c99eed1 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif From peter at korsgaard.com Thu Mar 31 06:43:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:43:19 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: bump version to 1.21.3 Message-ID: <20220331064151.846C686014@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33951d7933c3162265cc44acfa0de7a61a5752f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b5f82a4a5a6f14b4d178a4d662784d7bd6f7fada) Signed-off-by: Peter Korsgaard --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From peter at korsgaard.com Thu Mar 31 06:47:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:47:36 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/jack2: explicitly {dis, en}able opus and readline Message-ID: <20220331064235.1111886024@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46f748347a6f0e289022a0533ce76f8567f71a73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc) Signed-off-by: Peter Korsgaard --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..63b20ef0f7 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -16,10 +16,16 @@ JACK2_CONF_OPTS = --alsa ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) From yegorslists at googlemail.com Thu Mar 31 08:03:57 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Thu, 31 Mar 2022 10:03:57 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-30 In-Reply-To: <20220331060828.F2A2883E9B@smtp1.osuosl.org> References: <20220331060828.F2A2883E9B@smtp1.osuosl.org> Message-ID: Hi All, On Thu, Mar 31, 2022 at 8:08 AM Thomas Petazzoni via buildroot wrote: > > Hello, > > Autobuild statistics for 2022-03-30 > =================================== > > branch | OK | NOK | TIM | TOT | > 2021.02.x | 63 | 6 | 0 | 69 | > 2022.02.x | 16 | 12 | 1 | 29 | > master | 60 | 42 | 0 | 102 | > > Classification of failures by reason for master > ----------------------------------------------- > > dhcp-4.4.2-P1 | 8 > pango-1.50.5 | 7 > tpm2-abrmd-2.3.3 | 6 > tpm2-tss-3.2.0 | 5 > tpm2-tools-5.2 | 3 > frr-8.2.2 | 1 > glslsandbox-player-2021.08.24 | 1 > jack2-1.9.20 | 1 > libsecret-0.20.5 | 1 > mongodb-4.2.18 | 1 > mpd-0.23.6 | 1 > qt-webkit-kiosk-a7720e50f2b... | 1 > sg3_utils-1.47 | 1 > tpm2-pkcs11-1.7.0 | 1 > ulog-0389d243352255f6182326... | 1 > unknown | 1 > vlc-3.0.16 | 1 > wavemon-0.9.4 | 1 > > > Detail of failures for master > ----------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > aarch64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/75beeb024a022513c17b25b9070083402045c1d3 | ORPH > sh4 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/9144569593c077af0b840b8308f44aa56537545e | ORPH > powerpc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/66920b50afea6b510b1aea2ab26178f79e7d25e4 | ORPH > arm | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/69da641c4bd6de1718f49bc04dafa081968dda96 | ORPH > arc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/d18b006dce7b46631ce8f4c72fb97eb861993939 | ORPH > riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/32ea3d9366102da76e64c48e13f641fda6dced71 | ORPH > riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/1ae01f53b213923113d4def79c2ef86d8f265dc2 | ORPH > powerpc64le | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/2e6b6cb0a40c9ac972a562e6dc17353e5e4003c1 | ORPH > mips64el | frr-8.2.2 | NOK | http://autobuild.buildroot.net/results/a8bd63dfc2012fbec48872b7a6cf4ba59829375c | > aarch64 | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/bd4e3fc903cbe0e328c5c46c77770682228ac1ed | > m68k | jack2-1.9.20 | NOK | http://autobuild.buildroot.net/results/b59f60b60d51eb495780635ab31b1bb431282ed1 | > aarch64 | libsecret-0.20.5 | NOK | http://autobuild.buildroot.net/results/8c025659eaa2bedbc2f349891ca2e4722fb7830e | ORPH > arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/b9d211d388701d4588db760df26f8114a9d4677c | > arm | mpd-0.23.6 | NOK | http://autobuild.buildroot.net/results/f0a9e719114f19dc9d20622ed85dd4f8e968c20f | > powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/f7d227a39e4ec475c0967da031e90eca7399dbca | ORPH > mips | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7c3c2ea2b4ca326ebc11b40120993c9e20a22463 | ORPH > powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/cef923b7e4847e8bd0d6d7f9bf469ce6fa740363 | ORPH > arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/9589433c7340b2a6137c8134218e78726e38798c | ORPH > m68k | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/21669e18d0d8659fa23697eb4656db082ba7e5d5 | ORPH > mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7147895b373436a3a9edb42aac1562a2c171d3cd | ORPH > nios2 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/b9dea403ee400d5448c1491bc265ad72847035e8 | ORPH > arc | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/8029b01ce5816cbafd412b14985becce7a22e09d | > m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/dcc93ec2d1f861c4f3796d6b8ea5f609e8339161 | > or1k | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/f43d80dc23916f78168494da0d3b9b1574d92f87 | ORPH > powerpc64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/e031c62fe0180d403ab56da473b19da9f6161562 | ORPH > riscv64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/65e2bef20fe1bb1d820a1bfee289f58423dc14f7 | ORPH > mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/9ba07ae640ba9bea01c555a5d5ba6d230781ca49 | ORPH > mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/5a3ec27e213fe1d7092bd7f51511a3fb703fca78 | ORPH > xtensa | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/239e4a5b8923fee53542845d1cffa67277a4480a | ORPH > x86_64 | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/66323bd7d5f868874771aa743e08b93f0f6e69e0 | > aarch64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/28cfd0284a01473c26c25cc2992b43c4bf9720c6 | ORPH > x86_64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/bcc9f0eb135873d665540c3c8a138f0e21bbe089 | ORPH > arm | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/8900940ad30946c40e42ccc7c116153aa9c04741 | ORPH > riscv32 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/0a01e354928a67a119edb4c9553025f3b2808c6a | ORPH > nds32le | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4a1f3212d570128ce8743dda7a9920b5d67cc9a2 | ORPH > x86_64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/89b5764d0a5c0f29d027f2b79c219f8347408955 | ORPH > sparc64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/785bb203e884c31845ef46774360fc47c27649e0 | ORPH > arm | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4ecf58b1d4483386945dca736c3e763b607cabc1 | ORPH > s390x | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/b861aa6c0bc9ab39ba01c0afb658496e4f02d26e | > arm | unknown | NOK | http://autobuild.buildroot.net/results/56c8cacd93d9aff83a216b13a20be5afbcd3c09e | > arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/ef891307af29deecc89209bfc3ad25b33d70eca6 | > x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e02d2df8f05e209e3dcca2fbb9d9ce793509c7c | > > > Classification of failures by reason for 2021.02.x > -------------------------------------------------- > > host-sentry-cli-1.57.0 | 2 > apache-2.4.53 | 1 > heirloom-mailx-12.5 | 1 > monkey-f54856ce250c4e257354... | 1 > zeromq-4.3.4 | 1 > > > Detail of failures for 2021.02.x > -------------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > riscv32 | apache-2.4.53 | NOK | http://autobuild.buildroot.net/results/f2caf6ac63f50dd2fd59dbc0d3135c6f03a293eb | > sh4 | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/07e2147e57478e490741f3a40465b487c13ac06c | > arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c5016c945fd218a26d1de6914d53f4f797851075 | > xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4398bf4ea42569012e541ab2a7badd833ce560d5 | > s390x | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0e3e5d0437f25fb014a381e91fe28b76ca8c76bd | > or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/b0af23591a6cd6255a2548259c01dbe6c219d687 | > > > Classification of failures by reason for 2022.02.x > -------------------------------------------------- > > pango-1.50.5 | 4 > dhcp-4.4.2-P1 | 1 > host-pango-1.50.5 | 1 > libuwsc | 1 > nbd-3.24 | 1 > ndisc6-1.0.5 | 1 > opencv4-4.5.5 | 1 > protozero-1.7.1 | 1 > unknown | 1 > wpa_supplicant-2.10 | 1 > > > Detail of failures for 2022.02.x > -------------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > m68k | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/11b0fc25b99d223b9648d822563aeb746de5eb01 | ORPH > arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/8bb4bf8414fc20e3ada64b12e579e9c65c6d9643 | ORPH > x86_64 | libuwsc | TIM | http://autobuild.buildroot.net/results/555b87bb5e9e003a9fd16b0c26cb62d10cee69b1 | > riscv32 | nbd-3.24 | NOK | http://autobuild.buildroot.net/results/10a90ace1cdc5d93bd98fb18ca5134a64a56318e | > arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/56df999d86a5d343447d23580e5bbbfad8d05fba | ORPH > x86_64 | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8ca60c6b072299ad08abaab4638ac544e6612b19 | > mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/37218057bb3850609f1cde22d302fa828123d22d | ORPH > arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/44e0caf61871e25b1aa22b5b30e2fdf70ca6fb44 | ORPH > mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/63e220221242385f9cd1631dcbd858a09a73f8e4 | ORPH > powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/96f2a226ff1793156f1364a52ae3a2675d1a9f3a | ORPH > s390x | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/ed941b92d306564d657ba6810006dc00e2ec20e8 | > xtensa | unknown | NOK | http://autobuild.buildroot.net/results/b418dd5179b31a2a3921c731ca69128bb0f35b14 | > mipsel | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/2dea7dee521794b306cc610601fda322987e6cd0 | According to this commit [1], CONFIG_DRIVER_MACSEC_LINUX, that requires libnl, is enabled by default. Should we just enable libnl unconditionally? [1] https://w1.fi/cgit/hostap/commit/?id=a383db0646e177c18beddd52044046f0f16acff8 Regards, Yegor > > > > -- > http://autobuild.buildroot.net > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From stefan at agner.ch Thu Mar 31 08:53:00 2022 From: stefan at agner.ch (Stefan Agner) Date: Thu, 31 Mar 2022 10:53:00 +0200 Subject: [Buildroot] [PATCH] package/openocd: Allow to build BCM2835 on aarch64 Message-ID: Allow to build the BCM2835 bitbang interface on aarch64. Signed-off-by: Stefan Agner --- package/openocd/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/openocd/Config.in b/package/openocd/Config.in index b14f940b27..cef109b511 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -190,13 +190,17 @@ config BR2_PACKAGE_OPENOCD_AT91RM help Enable building support for AT91RM9200 based SBCs +endif # BR2_arm + +if BR2_arm || BR2_aarch64 + config BR2_PACKAGE_OPENOCD_BCM2835 bool "bitbanging on BCM2835" help Enable building support for bitbanging on BCM2835 (as found in Raspberry Pi) -endif # BR2_arm +endif # BR2_arm || BR2_aarch64 config BR2_PACKAGE_OPENOCD_GW16012 bool "Gateworks GW16012 JTAG Programmer" -- 2.35.1 From peter at korsgaard.com Thu Mar 31 11:21:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:21:54 +0200 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix target loaders.cache In-Reply-To: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Mar 2022 20:00:32 +0100") References: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> Message-ID: <878rsq5pv1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > As reported by Rutger Sassen in > https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, > target loaders.cache is broken since commit > 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ > to relative host paths > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:24:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:24:01 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: add cmake dependency support In-Reply-To: <20220324055602.3021498-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 23 Mar 2022 23:56:02 -0600") References: <20220324055602.3021498-1-james.hilliard1@gmail.com> Message-ID: <874k3e5pri.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Meson dependencies and variables can be provided by cmake similar to > how they can be provided by pkgconfig, for this to work we need to > ensure that cmake_prefix_path is set for both cross and native > targets along with the cmake binary path. > See: > https://mesonbuild.com/Dependencies.html#cmake > https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways > https://mesonbuild.com/Machine-files.html#meson-builtin-options > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:20:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:20:43 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220331112525.1003285FC3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f976d735e96a2b82542d3eddd599b6ed5a36e393 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 39ceb94fdb96da47a350b92e86513ddc57a657eb) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9..329c05520e 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From peter at korsgaard.com Thu Mar 31 11:23:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:23:00 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-meson: add cmake dependency support Message-ID: <20220331112525.1978885FEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a28617d676bd223c7440c1c00d58a1869e5a121c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Meson dependencies and variables can be provided by cmake similar to how they can be provided by pkgconfig, for this to work we need to ensure that cmake_prefix_path is set for both cross and native targets along with the cmake binary path. See: https://mesonbuild.com/Dependencies.html#cmake https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways https://mesonbuild.com/Machine-files.html#meson-builtin-options Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b848117699707390b6507e59e2e705c54acdc9fc) Signed-off-by: Peter Korsgaard --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a..9e70d49b60 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e..1977a83501 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,7 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true From peter at korsgaard.com Thu Mar 31 11:21:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:21:36 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220331112536.3EDF88601F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=558fe27fb367add4a75d07e176da3a915dbce187 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 39ceb94fdb96da47a350b92e86513ddc57a657eb) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9..329c05520e 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From peter at korsgaard.com Thu Mar 31 11:36:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:36:55 +0200 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy In-Reply-To: <20220324223218.27767-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 24 Mar 2022 23:32:18 +0100") References: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Message-ID: <87zgl64alk.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure if clang-tidy is found on host (and > protobuf is built before protozero) which is raised since tests are > disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: > CMake Error at CMakeLists.txt:77 (add_dependencies): > The dependency target "writer_tests" of target "clang-tidy" does not exist. > Fixes: > - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:35:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:35:35 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/protozero: fix build with clang-tidy Message-ID: <20220331112752.1A9CF86034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90d633e632636b77dd5c7ce0dd23eec3692f20b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure if clang-tidy is found on host (and protobuf is built before protozero) which is raised since tests are disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: CMake Error at CMakeLists.txt:77 (add_dependencies): The dependency target "writer_tests" of target "clang-tidy" does not exist. Fixes: - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e54b82306d005eeb4ed013a4cbd39e59e5ea8f19) Signed-off-by: Peter Korsgaard --- ...sts.txt-protobuf-is-only-needed-for-tests.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 0000000000..3033e24aa2 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + From peter at korsgaard.com Thu Mar 31 11:44:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:44:37 +0200 Subject: [Buildroot] [PATCH v1] package/wireshark: fix compile with ccache enabled In-Reply-To: <20220325190934.24982-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 25 Mar 2022 20:09:34 +0100") References: <20220325190934.24982-1-ps.report@gmx.net> Message-ID: <87v8vu4a8q.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER > Fixes: > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] > [...] > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > .../host/bin/ccache: invalid option -- 'D' > Reported-by: Dan Ambrosio > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:44:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:44:16 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireshark: fix compile with ccache enabled Message-ID: <20220331113621.DBE4486062@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=275c5fcfb5168a22a42c4a61f8ba3d9678b088b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 082076ffc186392f2b794facaa0545529e4f5851) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5c811319be..a55d9f2848 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -24,7 +24,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Thu Mar 31 11:44:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:44:08 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/wireshark: fix compile with ccache enabled Message-ID: <20220331113626.B35B086069@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2e94303667b66a42f22f185ecfb12bef32728d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 082076ffc186392f2b794facaa0545529e4f5851) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73..1a549f7037 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Thu Mar 31 11:47:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:47:33 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: <20220325212405.25243-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 25 Mar 2022 15:24:05 -0600") References: <20220325212405.25243-1-james.hilliard1@gmail.com> Message-ID: <87r16i4a3u.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:49:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:49:00 +0200 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4632 In-Reply-To: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Mar 2022 21:49:15 +0100") References: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> Message-ID: <87mth64a1f.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub > repository vim/vim prior to 8.2.4563. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:48:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:48:49 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4632 Message-ID: <20220331114131.6327986070@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98eccb68f27144d6b4686eabf02a4688442c31c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b66fdc55fa097d139590d979f24c15b694e8bc3) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Thu Mar 31 11:47:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:47:26 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/meson: bump to version 0.61.4 Message-ID: <20220331114137.3EE8586074@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9d3f2e8819d2a3cbd35913406060f33d2aec25a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 148e2115c0359ce0e39a75012f36ce985472e57f) Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index d909709b24..8389adb243 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 4615e839fe..e9c3145183 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.3 +MESON_VERSION = 0.61.4 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 11:48:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:48:42 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/vim: security bump to version 8.2.4632 Message-ID: <20220331114137.4970386075@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a80eca365eba8a77f250917e5c11d28eb24b073 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b66fdc55fa097d139590d979f24c15b694e8bc3) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Thu Mar 31 11:53:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:53:11 +0200 Subject: [Buildroot] [PATCH] package/luasec: bump to version 1.0.2 In-Reply-To: <20220327142048.1477306-1-francois.perrad@gadz.org> (Francois Perrad's message of "Sun, 27 Mar 2022 16:20:48 +0200") References: <20220327142048.1477306-1-francois.perrad@gadz.org> Message-ID: <87ilru49ug.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > diff LICENSE: > -LuaSec 1.0 license > +LuaSec 1.0.2 license > Signed-off-by: Francois Perrad Committed to 2022.02.x as it looks to be only bugfixes, thanks: https://github.com/brunoos/luasec/blob/master/CHANGELOG -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:52:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:52:35 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/luasec: bump to version 1.0.2 Message-ID: <20220331114401.0CA2A8607A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=898593378c1a89b4d6cb8c97c2bb610480e52f85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x diff LICENSE: -LuaSec 1.0 license +LuaSec 1.0.2 license Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6b609e77bfab37ee71d31eeff24640a302946a44) Signed-off-by: Peter Korsgaard --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9b..1e381612bd 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14daf..4ace94d168 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.0.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From peter at korsgaard.com Thu Mar 31 12:02:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:02:06 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/opus: enable custom modes Message-ID: <20220331115418.5804C86080@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=363284a04df1e4117e9789ee6b0eebbc3fee94c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92e436b73df21ff9347c53c25fd33d8fd48a9d43) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point From peter at korsgaard.com Thu Mar 31 12:03:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:03:49 +0200 Subject: [Buildroot] [PATCH 1/1] package/opus: enable custom modes In-Reply-To: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Mar 2022 21:39:55 +0200") References: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> Message-ID: <87ee2i49cq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Enable custom modes to avoid the following build failure with jack2 > raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: > Checking for header opus/opus_custom.h : not found > The above check failed, but the checkee is required for --opus. > It should be noted that before this commit, opus was silently disabled > Fixes: > - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:56:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:56:10 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/opus: enable custom modes Message-ID: <20220331115555.76A6986083@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a51644aa58832fbd78f205f5390ca90a8095c41e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92e436b73df21ff9347c53c25fd33d8fd48a9d43) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point From peter at korsgaard.com Thu Mar 31 12:13:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:13:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.4 In-Reply-To: <20220327200651.4189748-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 27 Mar 2022 14:06:51 -0600") References: <20220327200651.4189748-1-james.hilliard1@gmail.com> Message-ID: <87a6d648w1.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 12:07:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:07:02 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/systemd: bump to version 250.4 Message-ID: <20220331120508.DBEC086085@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5045b4de6de6c42ce36e31fbc9216dfb3e6a1493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ea04ee34f0078952aae0e27150b683ec3c8defdf) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac20..3572b25965 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..9feed9c084 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.3 +SYSTEMD_VERSION = 250.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From peter at korsgaard.com Thu Mar 31 12:15:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:15:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/matio: security bump to version 1.5.22 In-Reply-To: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Mar 2022 22:32:18 +0200") References: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> Message-ID: <875ynu48tp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixed heap-based buffer overflows when reading (crafted) MAT file > (CVE-2020-36428, CVE-2021-36977) > - Update hash pf COPYING (year updated and contributors added: > https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) > https://github.com/tbeu/matio/releases/tag/v1.5.22 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 12:15:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:15:02 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/matio: Bump version to 1.5.21 Message-ID: <20220331120606.3B77F86089@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8d1f9e2bfce5b766f0a69c9d89c03658d9d5d0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Yann E. MORIN (cherry picked from commit 4047e10ed6e20492bae572d4929eaa5d67eed746) Signed-off-by: Peter Korsgaard --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 55e57338c8..4dd05dee07 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.18/ -sha512 c43e562a101348d64139a056f28bce37c59c6667d701200255ccf9d8b6adf7a92ae9c11c8d921ec8a652cdc81c5de9ab247907279c54c52905adfd65bc3fb90f matio-1.5.18.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ +sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz # Locally computed -sha256 19494e9c9154a5e3f834e99d65fab0653b84280df7c98d1886a98d2bd28369c1 COPYING +sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 0ebba13435..236466d4d9 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.18 +MATIO_VERSION = 1.5.21 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 12:15:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:15:06 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/matio: security bump to version 1.5.22 Message-ID: <20220331120606.454CC8608A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff8555763aa51a43a108dccf4011406bce2d00d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash of COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f33260685bf9dedd76db5b19f2dce0f4b5cbce2b) Signed-off-by: Peter Korsgaard --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 12:17:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:17:47 +0200 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.13 In-Reply-To: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Mar 2022 23:15:05 +0200") References: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> Message-ID: <871qyi48pg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, > CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 > - Drop second patch (already in version) > - Add tarball sha256 > - Update indentation in hash file (two spaces) > https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 12:17:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:17:35 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/netatalk: security bump to version 3.1.13 Message-ID: <20220331120848.44C4E8608F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14c91f703526fee8e0b09a28018a57b0a835ccdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5ed1baa7e2d20c2b6184db265f398d1c2bb0e2e8) Signed-off-by: Peter Korsgaard --- ...-multiple-def-of-invalid_dircache_entries.patch | 25 ---------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From peter at korsgaard.com Thu Mar 31 12:14:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:14:37 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/matio: security bump to version 1.5.22 Message-ID: <20220331120852.DDC1786094@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f93f4dc615414f71eab6fd2d5ea31b527318b37b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash of COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f33260685bf9dedd76db5b19f2dce0f4b5cbce2b) Signed-off-by: Peter Korsgaard --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 12:17:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:17:19 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/netatalk: security bump to version 3.1.13 Message-ID: <20220331120852.E83F786097@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc1f28521055045d66fc3218eeee5e891d4d4ddd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5ed1baa7e2d20c2b6184db265f398d1c2bb0e2e8) Signed-off-by: Peter Korsgaard --- ...-multiple-def-of-invalid_dircache_entries.patch | 25 ---------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From br015 at umbiko.net Thu Mar 31 13:22:19 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 13:22:19 +0000 Subject: [Buildroot] [PATCH 1/1] package/mpd: disable expat explicitly unless target package exists In-Reply-To: <20220330132749.1417115-1-br015@umbiko.net> References: <20220330132749.1417115-1-br015@umbiko.net> Message-ID: <31e6b41904b9d6c1bafeb294d0ca8ffe@umbiko.net> I marked this patch as obsolete. A variant of this failure has come up, and this approach is not feasible anymore. Kind regards, Andreas On 2022-03-30 13:27, Andreas Ziegler wrote: > Background: > During configuration, mpd tries to determine the availability of > optional > dependencies using (host) pkgconfig and CMake. If host and target > architecture > are identical, it locates host-libexpat (CMake dependency) and tries to > incorporate it into the build process. The link step fails > subsequently, because > some dependencies of host binaries come from the build machine, and are > not > present on the target. > > This results in the following build error: > /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > warning: libc.so.6, needed by > /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7, not found (try > using -rpath or -rpath-link) > /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7: undefined > reference to `__errno_location at GLIBC_2.2.5' > > The link step fails, because libexpat was built against the build > machine's C > library. > > The optional expat dependency is disabled, unless the expat target > package is > selected. This is in line with BR2_PACKAGE_MPD_UPNP_* handling logic, > which > selects the target package and needs to enable the expat option. The > grey area > of expat present on the target for other reasons, but not explicitly > needed for > mpd, is accepted to avoid making the logic too complicated. > > Signed-off-by: Andreas Ziegler > --- > package/mpd/mpd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index 12da36098f..c1ad1bc6c6 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -21,6 +21,11 @@ MPD_CONF_OPTS = \ > -Dpipewire=disabled \ > -Dsnapcast=false > > +# Disable expat explicitly, unless the target package is selected > +ifneq ($(BR2_PACKAGE_EXPAT),y) > +MPD_CONF_OPTS += -Dexpat=disabled > +endif > + > # Zeroconf support depends on libdns_sd from avahi. > ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) > MPD_DEPENDENCIES += avahi > -- > 2.34.1 From br015 at umbiko.net Thu Mar 31 13:22:30 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 15:22:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: explicitly disable features to avoid collision with host packages Message-ID: <20220331132230.227424-1-br015@umbiko.net> Background During configuration, the meson build system tries to determine the availability of optional dependencies using (host) pkgconfig and cmake in that order. If a library does not exist on the target, pkg-config will fail, but cmake sometimes finds and reports libraries that exist as host packages. This has been observed for host-expat (cmake dependency) and host-zlib. The link step subsequently fails, because necessary files are not present in the target architecture. Unconditionally disable optional features often found in host binaries and modify the menu selection processing in mpd.mk to re-enable them where necessary. Currently this concerns expat and zlib only. This fixes the following build errors: [expat] /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: warning: libc.so.6, needed by /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7, not found (try using -rpath or -rpath-link) /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7: undefined reference to `__errno_location at GLIBC_2.2.5' [zlib] http://autobuild.buildroot.net/results/f0a/f0a9e719114f19dc9d20622ed85dd4f8e968c20f/ Signed-off-by: Andreas Ziegler --- package/mpd/mpd.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 12da36098f..4e67c9428c 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -14,6 +14,7 @@ MPD_LICENSE_FILES = COPYING # these refer to the FreeBSD PPP daemon MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd +# These features are either unwanted or not selectable via the Buildroot menu MPD_CONF_OPTS = \ -Daudiofile=disabled \ -Ddocumentation=disabled \ @@ -21,6 +22,12 @@ MPD_CONF_OPTS = \ -Dpipewire=disabled \ -Dsnapcast=false +# Explicitly disable features where meson's dependency detection picks up host +# libraries. These settings can be overridden through menu options later +MPD_CONF_OPTS += \ + -Dexpat=disabled \ + -Dzlib=disabled + # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) MPD_DEPENDENCIES += avahi @@ -300,11 +307,11 @@ ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y) MPD_DEPENDENCIES += \ expat \ libupnp -MPD_CONF_OPTS += -Dupnp=pupnp +MPD_CONF_OPTS += -Dupnp=pupnp -Dexpat=enabled else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) MPD_DEPENDENCIES += \ libnpupnp -MPD_CONF_OPTS += -Dupnp=npupnp +MPD_CONF_OPTS += -Dupnp=npupnp -Dexpat=enabled else ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y) MPD_CONF_OPTS += -Dupnp=disabled endif -- 2.34.1 From bugzilla at busybox.net Thu Mar 31 14:21:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 31 Mar 2022 14:21:23 +0000 Subject: [Buildroot] [Bug 14731] New: BR2_PACKAGE_IOSTAT Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14731 Bug ID: 14731 Summary: BR2_PACKAGE_IOSTAT Product: buildroot Version: 2022.02 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: w.meganck at televic.com CC: buildroot at uclibc.org Target Milestone: --- Build error when BR2_PACKAGE_IOSTAT=y is in the .config. Makefile.legacy:9: *** "You have legacy configuration in your .config! Please check your configuration.". Stop. Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 When removed start the build. Is this replaced or removed? -- You are receiving this mail because: You are on the CC list for the bug. From Jason at zx2c4.com Thu Mar 31 14:50:53 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 31 Mar 2022 10:50:53 -0400 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: On Wed, Mar 30, 2022 at 1:13 PM Jason A. Donenfeld wrote: > > If this customization is left in, then it should ideally use the > > existing (directory part of) URANDOM_SEED, which used to be how the > > location could be customized for backwards compatibility. > > As mentioned, no tweaks go up to seedrng.git. That's sample code. > > I'm inclined to agree with James' assessment about this, that > Buildroot needs it to be customizable. Happy to send a v4 of this > patch adjusting the defaults to have paths similar to what was there > before. FYI, I just noticed the old code writes to the file /var/lib/random-seed. The directory part is /var/lib. Therefore /var/lib/seedrng/* shares that same directory part. So I think what's there now fits what you want already? I'll leave that change out of v4. From Jason at zx2c4.com Thu Mar 31 14:57:38 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 31 Mar 2022 10:57:38 -0400 Subject: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: Message-ID: <20220331145738.119773-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Reviewed-by: James Hilliard Signed-off-by: Jason A. Donenfeld --- Changes v3->v4: - Remove unneeded whitespace. - Remove check for /dev/urandom in script file. - Remove outdated comments and group start and stop commands. - Additionally license under public domain (CC0) and 1-clause BSD, to make bringing this into buildroot's tree as easy as possible. package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 73 +--- package/urandom-scripts/seedrng.c | 457 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 6 + 4 files changed, 481 insertions(+), 59 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..1bdb19979a 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -3,66 +3,29 @@ # Preserve the random seed between reboots. See urandom(4). # -# Quietly do nothing if /dev/urandom does not exist -[ -c /dev/urandom ] || exit 0 - -URANDOM_SEED="/var/lib/random-seed" +# The following knobs can be adjusted by placing uncommented modified lines +# into /etc/default/urandom: +# +# Set these to change where the seed and runtime lock file are stored: +# +# export SEEDRNG_SEED_DIR=/var/lib/seedrng +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock +# +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng: +# +# export SEEDRNG_SKIP_CREDIT=false +# # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in - start|restart|reload) - # Carry a random seed from start-up to start-up - # Load and then save the whole entropy pool - init_rng && save_random_seed;; - stop) - # Carry a random seed from shut-down to start-up - # Save the whole entropy pool - save_random_seed;; + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..7793c7338e --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,457 @@ +// SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0 OR MIT OR BSD-1-Clause OR CC0-1.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + +static const char *SEED_DIR; +static const char *LOCK_FILE; +static char *CREDITABLE_SEED; +static char *NON_CREDITABLE_SEED; + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +static void populate_global_paths(void) +{ + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); + if (!SEED_DIR || !*SEED_DIR) + SEED_DIR = "/var/lib/seedrng"; + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); + if (!LOCK_FILE || !*LOCK_FILE) + LOCK_FILE = "/var/run/seedrng.lock"; + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); + exit(1); + } +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd = -1, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + populate_global_paths(); + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + program_ret = 1; + goto out; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + if (fd >= 0) + close(fd); + if (lock >= 0) + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..e8526e248a 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,13 @@ # ################################################################################ +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From bernd.kuhls at t-online.de Thu Mar 31 15:08:47 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 31 Mar 2022 17:08:47 +0200 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.8-Matrix Message-ID: <20220331150847.13617-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 15596333f5..d7a8657da0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-Matrix.tar.gz +sha256 2aca8c87b2f6d19fc385a4b5bde45637a4e6f417d0b43e514980d1cf26404ce7 kodi-pvr-mythtv-19.0.8-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 3040f87e14..d3110aed68 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.7-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.8-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From David.Laight at ACULAB.COM Thu Mar 31 15:16:05 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 31 Mar 2022 15:16:05 +0000 Subject: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220331145738.119773-1-Jason@zx2c4.com> References: <20220331145738.119773-1-Jason@zx2c4.com> Message-ID: From: Jason A. Donenfeld > Sent: 31 March 2022 15:58 > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. > ... > -# Quietly do nothing if /dev/urandom does not exist > -[ -c /dev/urandom ] || exit 0 > - > -URANDOM_SEED="/var/lib/random-seed" > +# The following knobs can be adjusted by placing uncommented modified lines > +# into /etc/default/urandom: > +# > +# Set these to change where the seed and runtime lock file are stored: > +# > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > +# > +# Set this to true only if you do not want seed files to actually credit the > +# RNG, for example if you plan to replicate this file system image and do not > +# have the wherewithal to first delete the contents of /var/lib/seedrng: > +# > +# export SEEDRNG_SKIP_CREDIT=false > +# That quietly breaks anyone who just updates buildroot without noticing that the 'magic' shell variables have changed. I'm also sure you can manage to pass the arguments into the program through argv[] instead of grovelling through the environment. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From bernd.kuhls at t-online.de Thu Mar 31 15:28:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 31 Mar 2022 17:28:16 +0200 Subject: [Buildroot] [PATCH 1/1] package/dav1d: bump version to 1.0.0 Message-ID: <20220331152816.245852-1-bernd.kuhls@t-online.de> Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 5e838b0951..35d753fc27 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 -sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz +# From http://download.videolan.org/pub/videolan/dav1d/1.0.0/dav1d-1.0.0.tar.xz.sha256 +sha256 51737db7e4897e599684f873a4725176dd3c779e639411d7c4fce134bb5ebb82 dav1d-1.0.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index ecc4cc55c3..2d42cdcb67 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.9.2 +DAV1D_VERSION = 1.0.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause -- 2.30.2 From David.Laight at ACULAB.COM Thu Mar 31 15:46:25 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 31 Mar 2022 15:46:25 +0000 Subject: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220331145738.119773-1-Jason@zx2c4.com> Message-ID: <4b68f218df884478b709df580e500d46@AcuMS.aculab.com> Resend to just the list - I think Jason's gmail account is rejecting direct mail from me. Which probably means he hasn't seen my earlier messages either. David > -----Original Message----- > From: David Laight > Sent: 31 March 2022 16:16 > To: 'Jason A. Donenfeld' ; Peter Korsgaard ; buildroot > > Cc: James Hilliard > Subject: RE: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng > > From: Jason A. Donenfeld > > Sent: 31 March 2022 15:58 > > > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, the seedrng project provides a > > basic script meant to be copy and pasted into projects like buildroot > > and tweaked as needed: . > > > > This commit imports it into buildroot and wires up the init scripts to > > call it. This also is a significant improvement over the current init > > script, which doesn't credit entropy and whose hashing in shell scripts > > is sort of fragile. > > > > As seedrng.c is a short tiny C program, we include this here in the > > package, like a few other packages do. Later we'll investigate adding > > this to busybox, but for now, this is a good start and a positive step > > in the right direction. > > > ... > > -# Quietly do nothing if /dev/urandom does not exist > > -[ -c /dev/urandom ] || exit 0 > > - > > -URANDOM_SEED="/var/lib/random-seed" > > +# The following knobs can be adjusted by placing uncommented modified lines > > +# into /etc/default/urandom: > > +# > > +# Set these to change where the seed and runtime lock file are stored: > > +# > > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > > +# > > +# Set this to true only if you do not want seed files to actually credit the > > +# RNG, for example if you plan to replicate this file system image and do not > > +# have the wherewithal to first delete the contents of /var/lib/seedrng: > > +# > > +# export SEEDRNG_SKIP_CREDIT=false > > +# > > That quietly breaks anyone who just updates buildroot without > noticing that the 'magic' shell variables have changed. > > I'm also sure you can manage to pass the arguments into the program > through argv[] instead of grovelling through the environment. > > David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From peter at korsgaard.com Thu Mar 31 15:48:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:48:13 +0200 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5base: security bump In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> (Quentin Schulz's message of "Thu, 17 Mar 2022 17:38:21 +0100") References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <87tube2kea.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > From: Quentin Schulz > This fixes CVE-2022-25255 and CVE-2022-25634. > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:48:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:48:21 +0200 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 In-Reply-To: <20220317163823.2913753-3-foss+buildroot@0leil.net> (Quentin Schulz's message of "Thu, 17 Mar 2022 17:38:23 +0100") References: <20220317163823.2913753-1-foss+buildroot@0leil.net> <20220317163823.2913753-3-foss+buildroot@0leil.net> Message-ID: <87pmm22ke2.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > From: Quentin Schulz > The patches aren't in Buildroot anymore but in the qt5base sources > directly, so let's give the commit hash of the fixes instead. > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:45:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:45:52 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe Message-ID: <20220331154028.B2E12860AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a43cd47910c37a54903714dd1ab32ffecbd86aed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8d88189202e61653850fe1a6d9b4e4d90ebcb1cf) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff..1b9ff43ab2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b20bdea7f6..930b012e94 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 From peter at korsgaard.com Thu Mar 31 15:46:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:46:45 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 Message-ID: <20220331154028.C667C860B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab6120d694c63f2b422d11c25ed0b4d14c7a377 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit be3f9cde29f1727e264d6a2a023588273410c800) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 17c32c86b5..14b58ba384 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,7 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 From peter at korsgaard.com Thu Mar 31 15:46:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:46:34 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: security bump Message-ID: <20220331154028.BC95986092@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b6347fca9dc103d272d28792f00d214e1452996 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1cae2aa844f5ad0962ec073f6cac103c0dc6af1f) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 930b012e94..17c32c86b5 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at From peter at korsgaard.com Thu Mar 31 15:52:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:52:48 +0200 Subject: [Buildroot] [PATCH v2 1/1] package/libzlib: security bump version to 1.2.12 In-Reply-To: <20220330180605.557933-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 30 Mar 2022 20:06:05 +0200") References: <20220330180605.557933-1-bernd.kuhls@t-online.de> Message-ID: <87lewq2k6n.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes CVE-2018-25032. > Release notes: > http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html > Changelog: https://github.com/madler/zlib/blob/master/ChangeLog > Added upstream patch to fix build error. > Updated license hash due to version bump, reformatted hashes: > https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 > Signed-off-by: Bernd Kuhls > --- > v2: added upstream patch to fix build error Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:53:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:53:34 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-paramiko: security bump to version 2.10.3 In-Reply-To: <20220330205829.1380283-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 30 Mar 2022 22:58:29 +0200") References: <20220330205829.1380283-1-fontaine.fabrice@gmail.com> Message-ID: <87h77e2k5d.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24302: Creation of new private key files using PKey > subclasses was subject to a race condition between file creation & mode > modification, which could be exploited by an attacker with knowledge of > where the Paramiko-using code would write out such files. > https://github.com/paramiko/paramiko/blob/2.10.3/sites/www/changelog.rst > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:53:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:53:10 +0200 Subject: [Buildroot] [git commit] package/python-paramiko: security bump to version 2.10.3 Message-ID: <20220331154459.858A585F3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae699d7f9ad3caebe1fb338303f1b7c6ad42f6ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-24302: Creation of new private key files using PKey subclasses was subject to a race condition between file creation & mode modification, which could be exploited by an attacker with knowledge of where the Paramiko-using code would write out such files. https://github.com/paramiko/paramiko/blob/2.10.3/sites/www/changelog.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b11acf1dbc..951bd8e114 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 44136d79da4cd7619e368018ad022619 paramiko-2.7.2.tar.gz -sha256 7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 paramiko-2.7.2.tar.gz +md5 6e47947882e2c1b81f35b4133e8e62b9 paramiko-2.10.3.tar.gz +sha256 ddb1977853aef82804b35d72a0e597b244fa326c404c350bd00c5b01dbfee71a paramiko-2.10.3.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 3c135cf9b1..46209f5823 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.7.2 +PYTHON_PARAMIKO_VERSION = 2.10.3 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cf/a1/20d00ce559a692911f11cadb7f94737aca3ede1c51de16e002c7d3a888e0 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/d4/93/1a1eb7f214e6774099d56153db9e612f93cb8ffcdfd2eca243fcd5bb3a78 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Mar 31 15:53:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:53:54 +0200 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.8-Matrix Message-ID: <20220331154459.8FAD3860C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2120113026cde26f5c9979e9e4aaf82a654d7aca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 15596333f5..d7a8657da0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-Matrix.tar.gz +sha256 2aca8c87b2f6d19fc385a4b5bde45637a4e6f417d0b43e514980d1cf26404ce7 kodi-pvr-mythtv-19.0.8-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 3040f87e14..d3110aed68 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.7-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.8-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Thu Mar 31 15:50:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:50:28 +0200 Subject: [Buildroot] [git commit] package/libzlib: security bump version to 1.2.12 Message-ID: <20220331154459.7BE8C860C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7fa40a9c1e93c063bbc5c5d4cac0c67493087a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes CVE-2018-25032. Release notes: http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html Changelog: https://github.com/madler/zlib/blob/master/ChangeLog Added upstream patch to fix build error. Updated license hash due to version bump, reformatted hashes: https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...sue-that-discarded-provided-CC-definition.patch | 28 ++++++++++++++++++++++ package/libzlib/libzlib.hash | 4 ++-- package/libzlib/libzlib.mk | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch new file mode 100644 index 0000000000..398e1c9481 --- /dev/null +++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch @@ -0,0 +1,28 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +Downloaded from upstream commit: +https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d + +Signed-off-by: Bernd Kuhls +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b1011..e6ca974e2f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d1..933732d6ba 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.12 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib From peter at korsgaard.com Thu Mar 31 15:54:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:54:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.8-Matrix In-Reply-To: <20220331150847.13617-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 31 Mar 2022 17:08:47 +0200") References: <20220331150847.13617-1-bernd.kuhls@t-online.de> Message-ID: <87czi22k49.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 17:11:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 19:11:50 +0200 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: (Jason A. Donenfeld's message of "Wed, 30 Mar 2022 13:13:08 -0400") References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: <87bkxm2gix.fsf@dell.be.48ers.dk> >>>>> "Jason" == Jason A Donenfeld writes: Hi, >> As discussed on IRC, I think it would be nicer to just add a normal >> seedrng package and depend on that from urandom-scripts, so the standard >> version/license info/.. stuff works. I can do that change if needed. >> >> You mentioned something on IRC about this containing differences from >> what it is seedrng.git. Those changes/fixes are presumably not specific >> to Buildroot, will you add those changes to the git repo as well? > Absolutely not. This 100% does not work for me. I have made it > abundantly clear to you that seedrng is code that's meant to be copied > into individual distros and tweaked as needed, which I've done for > Buildroot. Do not attempt to package it from any repos I may have. If > you try to do that, I will intentionally interfere with those > operations server side, and take whatever other adversarial steps to > ensure my server is not misused for that purpose. I also will not > incorporate buildroot-specific tweaks into the sample code repo. > That repo supplies sample code. After Yann's absence, I took the > necessary steps that a maintainer like him would have done to > customize it to Buildroot's needs, incorporating it into the project, > and taking into account James' comments. You now have the result of > that work here, and I think it'd be silly not to take it. > I am offering to maintain this code inside of Buildroot for you. I'm > generally very much on top of things in that regard. I'm not offering > to start and maintain an external project at your request, no matter > how much pressure and conditionalization you apply on this mailing > list or IRC. That's not work I'll do for you. However, again, I am > offering to maintain this for you inside the buildroot repo as this > patch does. > That's my offer; take it or leave it. Then I'm afraid we'll have to leave it. Sorry about that. I do have a lot of respect for your various other open source work, but your aggressive behaviour here is not OK. Not having the entrophy credited by this script is not great, but it has been like this for 20 years already, and it only affects a small subset of users, E.G. people using a combination of writable and persistent /var/lib, the classic initscripts and on a platform without a suitable entrophy source. In the 15+ years that I have been using Buildroot, I have so far never used it. In fact, perhaps we should drop the default y from the package. This can be revisited if something like this ends up in Busybox and/or something similar gets packaged, E.G. https://github.com/jumpnow/rndaddtoentcnt -- Bye, Peter Korsgaard From hrsourabh011 at gmail.com Thu Mar 31 17:55:53 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 31 Mar 2022 19:55:53 +0200 Subject: [Buildroot] Buildroot | ninja build error | /usr/bin/ld:error adding symbols: file in wrong format Message-ID: Hello All, While building casync using ninja build I am facing below errors related to /usr/bin/ld: . . .error adding symbols: file in wrong format I am following "casync" build guideline from https://github.com/systemd/casync#building-casync , it uses "meson " along with ninja build. If build failures persist, run "meson setup --wipe" to rebuild from scratch using the same options as passed when configuring the build. To change option values, run "meson configure" instead. ninja: Entering directory build' [1/31] Linking target casync-http FAILED: casync-http cc -o casync-http casync-http.p/src_casync-http.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm -Wl,--end-group /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [2/31] Linking target test-cachunk FAILED: test-cachunk cc -o test-cachunk test-cachunk.p/test_test-cachunk.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [3/31] Linking target test-cachunker FAILED: test-cachunker cc -o test-cachunker test-cachunker.p/test_test-cachunker.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [4/31] Linking target test-caencoder FAILED: test-caencoder cc -o test-caencoder test-caencoder.p/test_test-caencoder.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status . . [10/31] Compiling C object test-camatch.p/test_test-camatch.c.o ninja: build stopped: subcommand failed. I am using Buildroot as build system and after following similar post in https://stackoverflow.com/questions/27967802/libstdc-so-error-adding-symbols-file-in-wrong-format I changed the PATH environment like: /root/raspcm4/sources/output/host/bin/:/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin But still, I end up getting the same errors Can anyone please let me know how to resolve this issue? Is there any ninja build option to be selected in Buildroot? Your help will be much appreciated. Thanks in advance P.S: Please let me know if any info is missing here -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at gmail.com Thu Mar 31 20:04:04 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:04:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 In-Reply-To: <87mthbb08q.fsf@dell.be.48ers.dk> References: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> <87mthbb08q.fsf@dell.be.48ers.dk> Message-ID: <397c22c3-8ca6-2300-a049-b8f6fa716699@gmail.com> Hello Peter, Le 27/03/2022 ? 22:37, Peter Korsgaard a ?crit?: >>>>>> "Fabrice" == Fabrice Fontaine writes: > > > Fix CVE-2022-21716: Twisted is an event-based framework for internet > > applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH > > client and server implement is able to accept an infinite amount of data > > for the peer's SSH version identifier. This ends up with a buffer using > > all the available memory. The attach is a simple as `nc -rv localhost 22 > > < /dev/zero`. A patch is available in version 22.2.0. There are > > currently no known workarounds. > > > https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 > > > Signed-off-by: Fabrice Fontaine > > Committed to 2021.02.x and 2022.02.x, thanks. > As reported recently, python-twisted and python-treq must use the same version: http://lists.busybox.net/pipermail/buildroot/2022-February/637505.html But this backport requires to update python-treq package: https://git.buildroot.net/buildroot/commit/?id=933447c27c41ebcdb5eb9fa2a374456699ae33f2 Best regards, Romain From ps.report at gmx.net Thu Mar 31 20:12:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 31 Mar 2022 22:12:31 +0200 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: fix X11 preview compile (conversion from Window to EGLNativeWindowType) Message-ID: <20220331201231.26526-1-ps.report@gmx.net> - add 002-preview-fix-egl_preview-compile-conversion-from-Wind.patch Fixes: .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); | ^~~~~~~ | | | Window {aka long unsigned int} Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - add patch with proper type cast instead of '-fpermissive' compiler command line option (suggested by Arnout Vandecappelle) --- ...preview-compile-conversion-from-Wind.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch diff --git a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch new file mode 100644 index 0000000000..cc9069aa86 --- /dev/null +++ b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch @@ -0,0 +1,39 @@ +From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 31 Mar 2022 21:44:22 +0200 +Subject: [PATCH] preview: fix egl_preview compile (conversion from Window to + EGLNativeWindowType) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); + | ^~~~~~~ + | | + | Window {aka long unsigned int} + +[Upstream: https://github.com/raspberrypi/libcamera-apps/pull/283] +Signed-off-by: Peter Seiderer +--- + preview/egl_preview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/preview/egl_preview.cpp b/preview/egl_preview.cpp +index b936e57..593583d 100644 +--- a/preview/egl_preview.cpp ++++ b/preview/egl_preview.cpp +@@ -326,7 +326,7 @@ void EglPreview::makeWindow(char const *name) + wm_delete_window_ = XInternAtom(display_, "WM_DELETE_WINDOW", False); + XSetWMProtocols(display_, window_, &wm_delete_window_, 1); + +- egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); ++ egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast(window_), NULL); + if (!egl_surface_) + throw std::runtime_error("eglCreateWindowSurface failed"); + +-- +2.35.1 + -- 2.35.1 From romain.naour at gmail.com Thu Mar 31 20:17:18 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:17:18 +0200 Subject: [Buildroot] [PATCH] package/python-{treq, twisted}: add a comment to use the same version Message-ID: <20220331201718.728570-1-romain.naour@gmail.com> As reported by [1], python-twisted and python-treq must use the same version because its the same project: https://github.com/twisted/twisted https://github.com/twisted/treq We have to update python-treq to version 22.2.0 [2] otherwise we have a runtime issue: Traceback (most recent call last): File "/root/sample_python_treq.py", line 2, in import treq File "/usr/lib/python3.10/site-packages/treq/__init__.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/api.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/client.py", line 11, in ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown location) The comment should avoid forgeting one of them while upgrading or backporting version bump. [1] http://lists.busybox.net/pipermail/buildroot/2022-February/637505.html [2] https://github.com/twisted/treq/releases/tag/release-22.2.0 [3] https://gitlab.com/buildroot.org/buildroot/-/jobs/2179206653 Signed-off-by: Romain Naour Cc: Fabrice Fontaine --- package/python-treq/python-treq.mk | 3 +++ package/python-twisted/python-twisted.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 57dc50ee74..8995bf2cfe 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,6 +4,9 @@ # ################################################################################ +# When bumping this package, make sure to also verify if the +# python-twisted package still works and to update its hash, +# as they share the same version/site variables. PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index e5d643ec05..8a89d3dc82 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,6 +4,9 @@ # ################################################################################ +# When bumping this package, make sure to also verify if the +# python-treq package still works and to update its hash, +# as they share the same version/site variables. PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 -- 2.35.1 From romain.naour at gmail.com Thu Mar 31 20:38:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:38:41 +0200 Subject: [Buildroot] [PATCH v12 05/11] support/misc/toolchainfile.cmake.in: allow variables to be overridden In-Reply-To: <20220322232224.2842266-5-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-5-james.hilliard1@gmail.com> Message-ID: <9c9f7692-3739-a421-1417-be75bb4a2053@gmail.com> Hello James, Le 23/03/2022 ? 00:22, James Hilliard a ?crit?: > Some packages such as libclc need to override cmake toolchain > variables, to avoid errors caused by trying to set overriden > variables ensure that they are not defined before being set. > > This prevents difficult to debug silent dropping of overriden > variables. Actually, it seems using the toolchainfile.cmake itself should be avoided for such case. For now only libclc package seems requires to override cmake toolchain variable, I'm not sure about potential side effect of this change. Best regards, Romain > > Signed-off-by: James Hilliard > --- > support/misc/toolchainfile.cmake.in | 108 +++++++++++++++++++++------- > 1 file changed, 81 insertions(+), 27 deletions(-) > > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > index be575566a4..30c0e63bf2 100644 > --- a/support/misc/toolchainfile.cmake.in > +++ b/support/misc/toolchainfile.cmake.in > @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR > # so that it can find our custom platform description. > list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) > > -set(CMAKE_SYSTEM_NAME Buildroot) > -set(CMAKE_SYSTEM_VERSION 1) > -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > +if(NOT DEFINED CMAKE_SYSTEM_NAME) > + set(CMAKE_SYSTEM_NAME Buildroot) > +endif() > +if(NOT DEFINED CMAKE_SYSTEM_VERSION) > + set(CMAKE_SYSTEM_VERSION 1) > +endif() > +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) > + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > +endif() > > # Set the {C,CXX}FLAGS appended by CMake depending on the build type > # defined by Buildroot. CMake defaults these variables with -g and/or > @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > # Note: > # if the project forces some of these flag variables, Buildroot is > # screwed up and there is nothing Buildroot can do about that :( > -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) > + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > +endif() > +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) > + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > +endif() > > # Build type from the Buildroot configuration > -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > +if(NOT DEFINED CMAKE_BUILD_TYPE) > + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > +endif() > > # Buildroot defaults flags. > # If you are using this toolchainfile.cmake file outside of Buildroot and > @@ -41,33 +53,75 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur > # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... > # * and make sure the project's CMake code extends them like this if needed: > # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") > -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > +if(NOT DEFINED CMAKE_C_FLAGS) > + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > +endif() > +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) > + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > +endif() > +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) > + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > +endif() > +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) > + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > +endif() > > -set(CMAKE_INSTALL_SO_NO_EXE 0) > +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) > + set(CMAKE_INSTALL_SO_NO_EXE 0) > +endif() > > -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > +if(NOT DEFINED CMAKE_PROGRAM_PATH) > + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > +endif() > +if(NOT DEFINED CMAKE_SYSROOT) > + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) > + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) > + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) > + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) > + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) > + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > +endif() > set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > # This toolchain file can be used both inside and outside Buildroot. > -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > +if(NOT DEFINED CMAKE_C_COMPILER) > + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > +endif() > if(@@TOOLCHAIN_HAS_CXX@@) > - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) > + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > + endif() > + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) > + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > + endif() > + if(NOT DEFINED CMAKE_CXX_FLAGS) > + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > + endif() > + if(NOT DEFINED CMAKE_CXX_COMPILER) > + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > + endif() > endif() > if(@@TOOLCHAIN_HAS_FORTRAN@@) > - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) > + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > + endif() > + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) > + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > + endif() > + if(NOT DEFINED CMAKE_Fortran_FLAGS) > + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > + endif() > + if(NOT DEFINED CMAKE_Fortran_COMPILER) > + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > + endif() > endif() From romain.naour at gmail.com Thu Mar 31 20:50:24 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:50:24 +0200 Subject: [Buildroot] [PATCH v12 06/11] package/libclc: bump version to 13.0.1 In-Reply-To: <20220322232224.2842266-6-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-6-james.hilliard1@gmail.com> Message-ID: Hi James, Le 23/03/2022 ? 00:22, James Hilliard a ?crit?: > From: Matt Weber > > * Converts to the cmake pkg type > * Updates download site > * Adds a crosscompile fixups patch > * Allow prepare_builtins utility to be directly called > (it isn't installed into the path when cross compiling) > * Fix file_find() for root search limitation > > Signed-off-by: Matthew Weber > Signed-off-by: James Hilliard > --- > Changes v11 -> v12: > - update to 13.0.1 instead of 11.1.0 libclc is part of llvm project, the same version than llvm/clang should be used here. Ideally, llvm/clang should be updated to 13.0.1 first (or to the latest version if possible). > - pass required host cmake options for C/CXX compilers > --- > .../0001-support-out-of-tree-build.patch | 71 +++++++++++++++++++ > package/libclc/libclc.hash | 2 +- > package/libclc/libclc.mk | 56 +++++++-------- > 3 files changed, 98 insertions(+), 31 deletions(-) > create mode 100644 package/libclc/0001-support-out-of-tree-build.patch > > diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch > new file mode 100644 > index 0000000000..de7207bedb > --- /dev/null > +++ b/package/libclc/0001-support-out-of-tree-build.patch > @@ -0,0 +1,71 @@ > +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 > +From: Matt Weber > +Date: Tue, 9 Mar 2021 15:55:17 -0600 > +Subject: [PATCH] support out of tree build > + > +(1) The package has a prepare_builtins tool which is built > +but not placed in the path for later use in the build. This > +fix allows the later build steps to use the binary in-place. > + > +(2) With cmake, find_file() when used for non-host builds is > +limited by CMAKE_FIND_ROOT_PATH* scope. > + > +In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the > +following target settings for CMAKE_FIND_ROOT_PATH* which > +limit the scope. > +set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") > +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > + > + > +Signed-off-by: Matthew Weber > +--- > + CMakeLists.txt | 2 +- > + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ > + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ > + 3 files changed, 9 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 9472f19..a784519 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > + > + # Add prepare target > + add_custom_command( OUTPUT "${obj_suffix}" > +- COMMAND prepare_builtins -o > ++ COMMAND ./prepare_builtins -o > + "${obj_suffix}" > + "builtins.opt.${obj_suffix}" > + DEPENDS "opt.${obj_suffix}" > +diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake > +index 94d85d9..5de6a48 100644 > +--- a/cmake/CMakeDetermineCLCCompiler.cmake > ++++ b/cmake/CMakeDetermineCLCCompiler.cmake > +@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) > + > + set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") > + set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") > +-find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > ++set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) > + # configure all variables set in this file > + configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) > + mark_as_advanced(clc_comp_in) > +diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake > +index 1c424c7..dd3bfb6 100644 > +--- a/cmake/CMakeDetermineLLAsmCompiler.cmake > ++++ b/cmake/CMakeDetermineLLAsmCompiler.cmake > +@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) > + set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") > + set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") > + set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") > +-find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > ++set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) > + # configure all variables set in this file > + configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) > + mark_as_advanced(ll_comp_in) > +-- > +2.17.1 > + > diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash > index 2af64bc8e8..c496291d81 100644 > --- a/package/libclc/libclc.hash > +++ b/package/libclc/libclc.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz > +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz > sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT > diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk > index 6fe8e10a77..5d246cf4f8 100644 > --- a/package/libclc/libclc.mk > +++ b/package/libclc/libclc.mk > @@ -4,43 +4,39 @@ > # > ################################################################################ > > -# Use the latest commit from release_90 branch. > -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 > -LIBCLC_SITE = https://github.com/llvm-mirror/libclc > -LIBCLC_SITE_METHOD = git > +LIBCLC_VERSION = 13.0.1 > +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) > +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz > LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT > LIBCLC_LICENSE_FILES = LICENSE.TXT > > -LIBCLC_DEPENDENCIES = host-clang host-llvm > +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator > LIBCLC_INSTALL_STAGING = YES > > -# C++ compiler is used to build a small tool (prepare-builtins) for the host. > -# It must be built with the C++ compiler from the host. > +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes > +# llvm-config provided values > +# > +# CMAKE_*_COMPILER has to be set to the host compiler to build a host > +# 'prepare_builtins' tool used during the build process > # > # The headers are installed in /usr/share and not /usr/include, > # because they are needed at runtime on the target to build the OpenCL > # kernels. > LIBCLC_CONF_OPTS = \ > - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ > - --prefix=/usr \ > - --includedir=/usr/share \ > - --pkgconfigdir=/usr/lib/pkgconfig \ > - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) > - > -define LIBCLC_CONFIGURE_CMDS > - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) > -endef > - > -define LIBCLC_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > -endef > - > -define LIBCLC_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > -endef > - > -define LIBCLC_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install > -endef > - > -$(eval $(generic-package)) > + -DCMAKE_SYSROOT="" \ > + -DCMAKE_C_COMPILER_FORCED=ON \ > + -DCMAKE_CXX_COMPILER_FORCED=ON \ > + -DCMAKE_CLC_COMPILER_FORCED=ON \ > + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ > + -DCMAKE_INSTALL_DATADIR="share" \ > + -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ > + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ > + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ > + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > + -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > + -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ > + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ > + -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" At least a comment about the issue with the cmake toolchain file is needed. I don't understand the libclc cmake and why this workaround is needed. Best regards, Romain > + > +$(eval $(cmake-package)) From romain.naour at gmail.com Thu Mar 31 21:04:51 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 23:04:51 +0200 Subject: [Buildroot] [PATCH v12 09/11] package/clang: help host-clang to find our external toolchain In-Reply-To: <20220322232224.2842266-9-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-9-james.hilliard1@gmail.com> Message-ID: Hi James, Le 23/03/2022 ? 00:22, James Hilliard a ?crit?: > From: Romain Naour > > To build libfuzzer package Matthew Weber noticed that (host) clang > doesn't run on the host without "-B $(HOST_DIR)/opt/ext-toolchain" > option. This option add a new search path for binaries and object > files used implicitly. > > Without -B clang fail to link due to missing crtbeging.o file and libgcc: > output/host/bin/aarch64-linux-gnu-ld: cannot find crtbegin.o: No such file or directory > output/host/bin/aarch64-linux-gnu-ld: cannot find -lgcc > > Indeed, clang search path doesn't include the dafault cross-gcc's search paths: > > $ output/host/bin/clang -print-search-dirs > programs: = output/host/bin:output/host/bin:/..//bin > libraries: = output/host/lib/clang/8.0.0: > output/host/bin/../lib64: > /lib/../lib64: > /usr/lib/../lib64: > output/host/bin/../lib: > /lib:/usr/lib > > Here is the same command for cross-gcc: > > $ output/host/bin/aarch64-linux-gnu-gcc -print-search-dirs > install: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/ > programs: = output/host/opt/ext-toolchain/bin/../libexec/gcc/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../libexec/gcc/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/ > libraries: = output/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../lib/gcc/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/../lib64/: > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/aarch64-linux-gnu/8.3.0/: > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/../lib64/: > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/8.3.0/: > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/../lib64/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/: > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/: > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/ > > We can see that gcc default search path contains > "output/host/opt/ext-toolchain" directory where the external toolchain > has been extracted. > > Since we want to use clang without additional option like -B, > patch clang in order to use GCC_INSTALL_PREFIX instead of > using automatic detection (which doesn't work for Buildroot). > > We eventually want to relocate the Buildroot SDK containing the clang > cross-compiler, so we provide a relative path to GCC_INSTALL_PREFIX > in order to avoid to hardcode the path to the GCC toolchain. > > Also the path between clang and the GCC external toolchain is not always > the same, we have the following case: > > * Toolchain to be downloaded and installed > The toolchain is extracted into $(HOST_DIR)/opt/ext-toolchain, so the > path is "../opt/ext-toolchain". > > * Pre-installed toolchain > The toolchain is localed somewhere in the host filesystem and > defined by the user using BR2_TOOLCHAIN_EXTERNAL_PATH. > > So, set GCC_INSTALL_PREFIX using realpath: > > -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > When we use a Buildroot's internal toolchain, clang will find theses > crt*.o files and libgcc. > > http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > > Signed-off-by: Romain Naour > Cc: Matthew Weber > Cc: Valentin Korenblit > Tested-by: Matt Weber > --- > Changes v1 -> v2 > [Arnout > - Can't dropped ":PATH" from "-DGCC_INSTALL_PREFIX:PATH=" as suggested, > The string isn't set correctly and results in "cannot find crtbegin.o" > - Attempting to post patch upstream > - I did not address the relative vs absolute path comment. The > current approach seemed correct per my understanding for handling > the two toolchain install location cases > --- > ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 78 +++++++++++++++++++ > package/clang/clang.mk | 7 ++ > 2 files changed, 85 insertions(+) > create mode 100644 package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > new file mode 100644 > index 0000000000..08371154d5 > --- /dev/null > +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > @@ -0,0 +1,78 @@ > +From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 > +From: Romain Naour > +Date: Mon, 5 Aug 2019 16:06:48 +0200 > +Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set > + of prefixes for searching the gcc toolchain > + > +By default, the Gnu Toolchains driver is looking at the parent > +directory while looking for the gcc toolchain when clang is installed > +at "D.InstalledDir" > + > +But this doesn't work with Buildroot since the external > +toolchain is installed in host/opt/ext-toolchain and the sysroot is > +moved to host/-buildroot-linux-gnu/sysroot/ directory. > + > +We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang > +but it doesn't work since we already provide a sysroot [1]. > + > +Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. > + > +Since we want to be able to relocate the clang toolchain, > +allow to use a relative path with GCC_INSTALL_PREFIX. > + > +Buildroot will provide such relative path by using: > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > + > +Doing so allow to use clang without providing additional search > +paths with -B option on the clang's command line. > + > +[1] https://reviews.llvm.org/D49244 > +[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > + > +Signed-off-by: Romain Naour > +Signed-off-by: Matthew Weber > +--- > +Pending, access to llvm mailing lists to submit it is pending. They > +seem to be having issues with their listserv. Sadly, this patch (hack) never reach the upstream project and need to be rebased over llvm/clang releases... Best regards, Romain > +--- > + lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp > +index 2ad45097dc..90d6b5b748 100644 > +--- a/lib/Driver/ToolChains/Gnu.cpp > ++++ b/lib/Driver/ToolChains/Gnu.cpp > +@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( > + > + Prefixes.push_back(GCCToolchainDir); > + } else { > ++ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; > ++ > + // If we have a SysRoot, try that first. > + if (!D.SysRoot.empty()) { > + Prefixes.push_back(D.SysRoot); > +@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( > + // Then look for gcc installed alongside clang. > + Prefixes.push_back(D.InstalledDir + "/.."); > + > ++ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. > ++ if (!GccIinstallPrefix.empty()) > ++ { > ++ if (llvm::sys::path::is_relative(GccIinstallPrefix)) > ++ { > ++ // Use a relative path to gcc from clang install path. > ++ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); > ++ } > ++ else > ++ { > ++ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. > ++ Prefixes.push_back(GCC_INSTALL_PREFIX); > ++ } > ++ } > ++ > + // Next, look for prefix(es) that correspond to distribution-supplied gcc > + // installations. > + if (D.SysRoot.empty()) { > +-- > +2.20.1 > + > diff --git a/package/clang/clang.mk b/package/clang/clang.mk > index d1667d79b6..95b4964be3 100644 > --- a/package/clang/clang.mk > +++ b/package/clang/clang.mk > @@ -105,5 +105,12 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > > +# Help host-clang to find our external toolchain, use a relative path from the clang > +# installation directory to the external toolchain installation directory in order to > +# not hardcode the toolchain absolute path. > +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > +endif > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) From fontaine.fabrice at gmail.com Thu Mar 31 21:00:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 31 Mar 2022 23:00:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/apr: fix CVE-2021-35940 Message-ID: <20220331210046.35887-1-fontaine.fabrice@gmail.com> An out-of-bounds array read in the apr_time_exp*() functions was fixed in the Apache Portable Runtime 1.6.3 release (CVE-2017-12613). The fix for this issue was not carried forward to the APR 1.7.x branch, and hence version 1.7.0 regressed compared to 1.6.3 and is vulnerable to the same issue. Signed-off-by: Fabrice Fontaine --- .../apr/0004-apr-1.7.0-CVE-2021-35940.patch | 57 +++++++++++++++++++ package/apr/apr.mk | 3 + 2 files changed, 60 insertions(+) create mode 100644 package/apr/0004-apr-1.7.0-CVE-2021-35940.patch diff --git a/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch b/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch new file mode 100644 index 0000000000..b065a3330a --- /dev/null +++ b/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch @@ -0,0 +1,57 @@ + +SECURITY: CVE-2021-35940 (cve.mitre.org) + +Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though +was addressed in 1.6.x in 1.6.3 and later via r1807976. + +The fix was merged back to 1.7.x in r1891198. + +Since this was a regression in 1.7.0, a new CVE name has been assigned +to track this, CVE-2021-35940. + +Thanks to Iveta Cesalova for reporting this issue. + +https://svn.apache.org/viewvc?view=revision&revision=1891198 + +[Retrieved from: +https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch] +Signed-off-by: Fabrice Fontaine + +Index: ./time/unix/time.c +=================================================================== +--- ./time/unix/time.c (revision 1891197) ++++ ./time/unix/time.c (revision 1891198) +@@ -142,6 +142,9 @@ + static const int dayoffset[12] = + {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + ++ if (xt->tm_mon < 0 || xt->tm_mon >= 12) ++ return APR_EBADDATE; ++ + /* shift new year to 1st March in order to make leap year calc easy */ + + if (xt->tm_mon < 2) +Index: ./time/win32/time.c +=================================================================== +--- ./time/win32/time.c (revision 1891197) ++++ ./time/win32/time.c (revision 1891198) +@@ -54,6 +54,9 @@ + static const int dayoffset[12] = + {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; + ++ if (tm->wMonth < 1 || tm->wMonth > 12) ++ return APR_EBADDATE; ++ + /* Note; the caller is responsible for filling in detailed tm_usec, + * tm_gmtoff and tm_isdst data when applicable. + */ +@@ -228,6 +231,9 @@ + static const int dayoffset[12] = + {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + ++ if (xt->tm_mon < 0 || xt->tm_mon >= 12) ++ return APR_EBADDATE; ++ + /* shift new year to 1st March in order to make leap year calc easy */ + + if (xt->tm_mon < 2) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index c45829aacc..74129ed77e 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -16,6 +16,9 @@ APR_INSTALL_STAGING = YES # so we need to autoreconf: APR_AUTORECONF = YES +# 0004-apr-1.7.0-CVE-2021-35940.patch +APR_IGNORE_CVES += CVE-2021-35940 + # avoid apr_hints.m4 by setting apr_preload_done=yes and set # the needed CFLAGS on our own (avoids '-D_REENTRANT' in case # not supported by toolchain and subsequent configure failure) -- 2.35.1 From james.hilliard1 at gmail.com Thu Mar 31 21:29:48 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 31 Mar 2022 15:29:48 -0600 Subject: [Buildroot] [PATCH v12 05/11] support/misc/toolchainfile.cmake.in: allow variables to be overridden In-Reply-To: <9c9f7692-3739-a421-1417-be75bb4a2053@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-5-james.hilliard1@gmail.com> <9c9f7692-3739-a421-1417-be75bb4a2053@gmail.com> Message-ID: On Thu, Mar 31, 2022 at 2:38 PM Romain Naour wrote: > > Hello James, > > Le 23/03/2022 ? 00:22, James Hilliard a ?crit : > > Some packages such as libclc need to override cmake toolchain > > variables, to avoid errors caused by trying to set overriden > > variables ensure that they are not defined before being set. > > > > This prevents difficult to debug silent dropping of overriden > > variables. > > Actually, it seems using the toolchainfile.cmake itself should be avoided for > such case. Not really IMO, we only want to override some toolchain variables in most cases, rather than all of them, this makes that easy to do. It also prevents difficult to debug errors since accidentally overriding a toolchain variable seems to cause other toolchain variables to fail to apply properly otherwise. > For now only libclc package seems requires to override cmake toolchain variable, > I'm not sure about potential side effect of this change. There's another pending series that this helps, see discussion: https://lore.kernel.org/buildroot/057A8C3C-8DAC-46A3-86AB-2DAA92A9368B at gmail.com/ Since overriding a toolchain variable without this change causes basically everything to break I don't think there should be any side effects. > > Best regards, > Romain > > > > > Signed-off-by: James Hilliard > > --- > > support/misc/toolchainfile.cmake.in | 108 +++++++++++++++++++++------- > > 1 file changed, 81 insertions(+), 27 deletions(-) > > > > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > > index be575566a4..30c0e63bf2 100644 > > --- a/support/misc/toolchainfile.cmake.in > > +++ b/support/misc/toolchainfile.cmake.in > > @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR > > # so that it can find our custom platform description. > > list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) > > > > -set(CMAKE_SYSTEM_NAME Buildroot) > > -set(CMAKE_SYSTEM_VERSION 1) > > -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > +if(NOT DEFINED CMAKE_SYSTEM_NAME) > > + set(CMAKE_SYSTEM_NAME Buildroot) > > +endif() > > +if(NOT DEFINED CMAKE_SYSTEM_VERSION) > > + set(CMAKE_SYSTEM_VERSION 1) > > +endif() > > +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) > > + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > +endif() > > > > # Set the {C,CXX}FLAGS appended by CMake depending on the build type > > # defined by Buildroot. CMake defaults these variables with -g and/or > > @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > # Note: > > # if the project forces some of these flag variables, Buildroot is > > # screwed up and there is nothing Buildroot can do about that :( > > -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > > -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > > +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) > > + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > > +endif() > > +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) > > + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > > +endif() > > > > # Build type from the Buildroot configuration > > -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > > +if(NOT DEFINED CMAKE_BUILD_TYPE) > > + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > > +endif() > > > > # Buildroot defaults flags. > > # If you are using this toolchainfile.cmake file outside of Buildroot and > > @@ -41,33 +53,75 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur > > # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... > > # * and make sure the project's CMake code extends them like this if needed: > > # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") > > -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > > -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > > -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > > -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > > +if(NOT DEFINED CMAKE_C_FLAGS) > > + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > > +endif() > > +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) > > + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > > +endif() > > +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) > > + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > > +endif() > > +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) > > + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > > +endif() > > > > -set(CMAKE_INSTALL_SO_NO_EXE 0) > > +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) > > + set(CMAKE_INSTALL_SO_NO_EXE 0) > > +endif() > > > > -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > > -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > > -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > > -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > > -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > > +if(NOT DEFINED CMAKE_PROGRAM_PATH) > > + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > > +endif() > > +if(NOT DEFINED CMAKE_SYSROOT) > > + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) > > + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) > > + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) > > + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) > > + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) > > + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > > +endif() > > set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > > > # This toolchain file can be used both inside and outside Buildroot. > > -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > > +if(NOT DEFINED CMAKE_C_COMPILER) > > + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > > +endif() > > if(@@TOOLCHAIN_HAS_CXX@@) > > - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > > - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > > - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > > - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > > + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) > > + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) > > + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_CXX_FLAGS) > > + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_CXX_COMPILER) > > + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > > + endif() > > endif() > > if(@@TOOLCHAIN_HAS_FORTRAN@@) > > - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > > - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > > - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > > - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > > + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) > > + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) > > + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_Fortran_FLAGS) > > + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_Fortran_COMPILER) > > + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > > + endif() > > endif() > From fontaine.fabrice at gmail.com Thu Mar 31 21:29:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 31 Mar 2022 23:29:25 +0200 Subject: [Buildroot] [PATCH 1/1] package/ed: bump to version 1.18 Message-ID: <20220331212925.39676-1-fontaine.fabrice@gmail.com> license has been switched back to GPL-2.0+: https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00002.html https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine --- package/ed/ed.hash | 6 +++--- package/ed/ed.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 90d467d1f3..36f9b9c1e4 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2021-01/msg00000.html -sha256 71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54 ed-1.17.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00000.html +sha256 aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f ed-1.18.tar.lz # Locally calculated -sha256 f03a12bef9dfb7281864a0dd965166d4f4ec7a66633df2bc72fa4363e57de02c COPYING +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 975cf3be10..645cfb7696 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,10 +4,10 @@ # ################################################################################ -ED_VERSION = 1.17 +ED_VERSION = 1.18 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz -ED_LICENSE = GPL-3.0+ +ED_LICENSE = GPL-2.0+ ED_LICENSE_FILES = COPYING ED_CPE_ID_VENDOR = gnu -- 2.35.1 From james.hilliard1 at gmail.com Thu Mar 31 21:38:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 31 Mar 2022 15:38:52 -0600 Subject: [Buildroot] [PATCH v12 06/11] package/libclc: bump version to 13.0.1 In-Reply-To: References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-6-james.hilliard1@gmail.com> Message-ID: On Thu, Mar 31, 2022 at 2:50 PM Romain Naour wrote: > > Hi James, > > Le 23/03/2022 ? 00:22, James Hilliard a ?crit : > > From: Matt Weber > > > > * Converts to the cmake pkg type > > * Updates download site > > * Adds a crosscompile fixups patch > > * Allow prepare_builtins utility to be directly called > > (it isn't installed into the path when cross compiling) > > * Fix file_find() for root search limitation > > > > Signed-off-by: Matthew Weber > > Signed-off-by: James Hilliard > > --- > > Changes v11 -> v12: > > - update to 13.0.1 instead of 11.1.0 > > libclc is part of llvm project, the same version than llvm/clang should be used > here. Doesn't seem to be required, just needs minimum 3.9.0: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.1/libclc/CMakeLists.txt#L33 > > Ideally, llvm/clang should be updated to 13.0.1 first (or to the latest version > if possible). There were some issues with lld in anything newer than 11.1.0, see: https://lore.kernel.org/buildroot/20220131015937.4113728-1-james.hilliard1 at gmail.com/ https://bugs.llvm.org/show_bug.cgi?id=49228 So I held off on going beyond 11.1.0 for now due to that. > > > - pass required host cmake options for C/CXX compilers > > --- > > .../0001-support-out-of-tree-build.patch | 71 +++++++++++++++++++ > > package/libclc/libclc.hash | 2 +- > > package/libclc/libclc.mk | 56 +++++++-------- > > 3 files changed, 98 insertions(+), 31 deletions(-) > > create mode 100644 package/libclc/0001-support-out-of-tree-build.patch > > > > diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch > > new file mode 100644 > > index 0000000000..de7207bedb > > --- /dev/null > > +++ b/package/libclc/0001-support-out-of-tree-build.patch > > @@ -0,0 +1,71 @@ > > +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 > > +From: Matt Weber > > +Date: Tue, 9 Mar 2021 15:55:17 -0600 > > +Subject: [PATCH] support out of tree build > > + > > +(1) The package has a prepare_builtins tool which is built > > +but not placed in the path for later use in the build. This > > +fix allows the later build steps to use the binary in-place. > > + > > +(2) With cmake, find_file() when used for non-host builds is > > +limited by CMAKE_FIND_ROOT_PATH* scope. > > + > > +In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the > > +following target settings for CMAKE_FIND_ROOT_PATH* which > > +limit the scope. > > +set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") > > +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > > +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > > +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > > +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > > + > > + > > +Signed-off-by: Matthew Weber > > +--- > > + CMakeLists.txt | 2 +- > > + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ > > + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ > > + 3 files changed, 9 insertions(+), 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 9472f19..a784519 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > > + > > + # Add prepare target > > + add_custom_command( OUTPUT "${obj_suffix}" > > +- COMMAND prepare_builtins -o > > ++ COMMAND ./prepare_builtins -o > > + "${obj_suffix}" > > + "builtins.opt.${obj_suffix}" > > + DEPENDS "opt.${obj_suffix}" > > +diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake > > +index 94d85d9..5de6a48 100644 > > +--- a/cmake/CMakeDetermineCLCCompiler.cmake > > ++++ b/cmake/CMakeDetermineCLCCompiler.cmake > > +@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) > > + > > + set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") > > + set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") > > +-find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > > ++set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) > > + # configure all variables set in this file > > + configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) > > + mark_as_advanced(clc_comp_in) > > +diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake > > +index 1c424c7..dd3bfb6 100644 > > +--- a/cmake/CMakeDetermineLLAsmCompiler.cmake > > ++++ b/cmake/CMakeDetermineLLAsmCompiler.cmake > > +@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) > > + set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") > > + set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") > > + set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") > > +-find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > > ++set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) > > + # configure all variables set in this file > > + configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) > > + mark_as_advanced(ll_comp_in) > > +-- > > +2.17.1 > > + > > diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash > > index 2af64bc8e8..c496291d81 100644 > > --- a/package/libclc/libclc.hash > > +++ b/package/libclc/libclc.hash > > @@ -1,3 +1,3 @@ > > # locally calculated > > -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz > > +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz > > sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT > > diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk > > index 6fe8e10a77..5d246cf4f8 100644 > > --- a/package/libclc/libclc.mk > > +++ b/package/libclc/libclc.mk > > @@ -4,43 +4,39 @@ > > # > > ################################################################################ > > > > -# Use the latest commit from release_90 branch. > > -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 > > -LIBCLC_SITE = https://github.com/llvm-mirror/libclc > > -LIBCLC_SITE_METHOD = git > > +LIBCLC_VERSION = 13.0.1 > > +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) > > +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz > > LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT > > LIBCLC_LICENSE_FILES = LICENSE.TXT > > > > -LIBCLC_DEPENDENCIES = host-clang host-llvm > > +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator > > LIBCLC_INSTALL_STAGING = YES > > > > -# C++ compiler is used to build a small tool (prepare-builtins) for the host. > > -# It must be built with the C++ compiler from the host. > > +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes > > +# llvm-config provided values > > +# > > +# CMAKE_*_COMPILER has to be set to the host compiler to build a host > > +# 'prepare_builtins' tool used during the build process > > # > > # The headers are installed in /usr/share and not /usr/include, > > # because they are needed at runtime on the target to build the OpenCL > > # kernels. > > LIBCLC_CONF_OPTS = \ > > - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ > > - --prefix=/usr \ > > - --includedir=/usr/share \ > > - --pkgconfigdir=/usr/lib/pkgconfig \ > > - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) > > - > > -define LIBCLC_CONFIGURE_CMDS > > - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) > > -endef > > - > > -define LIBCLC_BUILD_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > > -endef > > - > > -define LIBCLC_INSTALL_TARGET_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > > -endef > > - > > -define LIBCLC_INSTALL_STAGING_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install > > -endef > > - > > -$(eval $(generic-package)) > > + -DCMAKE_SYSROOT="" \ > > + -DCMAKE_C_COMPILER_FORCED=ON \ > > + -DCMAKE_CXX_COMPILER_FORCED=ON \ > > + -DCMAKE_CLC_COMPILER_FORCED=ON \ > > + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ > > + -DCMAKE_INSTALL_DATADIR="share" \ > > + -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ > > + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ > > + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ > > + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > > + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > > + -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > > + -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ > > + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ > > + -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" > > At least a comment about the issue with the cmake toolchain file is needed. > I don't understand the libclc cmake and why this workaround is needed. The cmake toolchain issue is not libclc specific, it's an issue for anything that needs to override a toolchain variable. The host toolchain being needed for prepare_builtins is basically the same as before it's just that the build system was changed to cmake. > > Best regards, > Romain > > > > + > > +$(eval $(cmake-package)) > From james.hilliard1 at gmail.com Thu Mar 31 21:40:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 31 Mar 2022 15:40:19 -0600 Subject: [Buildroot] [PATCH v12 09/11] package/clang: help host-clang to find our external toolchain In-Reply-To: References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-9-james.hilliard1@gmail.com> Message-ID: On Thu, Mar 31, 2022 at 3:04 PM Romain Naour wrote: > > Hi James, > > Le 23/03/2022 ? 00:22, James Hilliard a ?crit : > > From: Romain Naour > > > > To build libfuzzer package Matthew Weber noticed that (host) clang > > doesn't run on the host without "-B $(HOST_DIR)/opt/ext-toolchain" > > option. This option add a new search path for binaries and object > > files used implicitly. > > > > Without -B clang fail to link due to missing crtbeging.o file and libgcc: > > output/host/bin/aarch64-linux-gnu-ld: cannot find crtbegin.o: No such file or directory > > output/host/bin/aarch64-linux-gnu-ld: cannot find -lgcc > > > > Indeed, clang search path doesn't include the dafault cross-gcc's search paths: > > > > $ output/host/bin/clang -print-search-dirs > > programs: = output/host/bin:output/host/bin:/..//bin > > libraries: = output/host/lib/clang/8.0.0: > > output/host/bin/../lib64: > > /lib/../lib64: > > /usr/lib/../lib64: > > output/host/bin/../lib: > > /lib:/usr/lib > > > > Here is the same command for cross-gcc: > > > > $ output/host/bin/aarch64-linux-gnu-gcc -print-search-dirs > > install: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/ > > programs: = output/host/opt/ext-toolchain/bin/../libexec/gcc/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../libexec/gcc/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/ > > libraries: = output/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/../lib64/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/aarch64-linux-gnu/8.3.0/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/../lib64/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/8.3.0/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/../lib64/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/ > > > > We can see that gcc default search path contains > > "output/host/opt/ext-toolchain" directory where the external toolchain > > has been extracted. > > > > Since we want to use clang without additional option like -B, > > patch clang in order to use GCC_INSTALL_PREFIX instead of > > using automatic detection (which doesn't work for Buildroot). > > > > We eventually want to relocate the Buildroot SDK containing the clang > > cross-compiler, so we provide a relative path to GCC_INSTALL_PREFIX > > in order to avoid to hardcode the path to the GCC toolchain. > > > > Also the path between clang and the GCC external toolchain is not always > > the same, we have the following case: > > > > * Toolchain to be downloaded and installed > > The toolchain is extracted into $(HOST_DIR)/opt/ext-toolchain, so the > > path is "../opt/ext-toolchain". > > > > * Pre-installed toolchain > > The toolchain is localed somewhere in the host filesystem and > > defined by the user using BR2_TOOLCHAIN_EXTERNAL_PATH. > > > > So, set GCC_INSTALL_PREFIX using realpath: > > > > -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > > > When we use a Buildroot's internal toolchain, clang will find theses > > crt*.o files and libgcc. > > > > http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > > > > Signed-off-by: Romain Naour > > Cc: Matthew Weber > > Cc: Valentin Korenblit > > Tested-by: Matt Weber > > --- > > Changes v1 -> v2 > > [Arnout > > - Can't dropped ":PATH" from "-DGCC_INSTALL_PREFIX:PATH=" as suggested, > > The string isn't set correctly and results in "cannot find crtbegin.o" > > - Attempting to post patch upstream > > - I did not address the relative vs absolute path comment. The > > current approach seemed correct per my understanding for handling > > the two toolchain install location cases > > --- > > ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 78 +++++++++++++++++++ > > package/clang/clang.mk | 7 ++ > > 2 files changed, 85 insertions(+) > > create mode 100644 package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > > > diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > new file mode 100644 > > index 0000000000..08371154d5 > > --- /dev/null > > +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > @@ -0,0 +1,78 @@ > > +From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 > > +From: Romain Naour > > +Date: Mon, 5 Aug 2019 16:06:48 +0200 > > +Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set > > + of prefixes for searching the gcc toolchain > > + > > +By default, the Gnu Toolchains driver is looking at the parent > > +directory while looking for the gcc toolchain when clang is installed > > +at "D.InstalledDir" > > + > > +But this doesn't work with Buildroot since the external > > +toolchain is installed in host/opt/ext-toolchain and the sysroot is > > +moved to host/-buildroot-linux-gnu/sysroot/ directory. > > + > > +We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang > > +but it doesn't work since we already provide a sysroot [1]. > > + > > +Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. > > + > > +Since we want to be able to relocate the clang toolchain, > > +allow to use a relative path with GCC_INSTALL_PREFIX. > > + > > +Buildroot will provide such relative path by using: > > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > + > > +Doing so allow to use clang without providing additional search > > +paths with -B option on the clang's command line. > > + > > +[1] https://reviews.llvm.org/D49244 > > +[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > > + > > +Signed-off-by: Romain Naour > > +Signed-off-by: Matthew Weber > > +--- > > +Pending, access to llvm mailing lists to submit it is pending. They > > +seem to be having issues with their listserv. > > Sadly, this patch (hack) never reach the upstream project and need to be rebased > over llvm/clang releases... I didn't bump the llvm/clang version so it still works as is. > > Best regards, > Romain > > > +--- > > + lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ > > + 1 file changed, 17 insertions(+) > > + > > +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp > > +index 2ad45097dc..90d6b5b748 100644 > > +--- a/lib/Driver/ToolChains/Gnu.cpp > > ++++ b/lib/Driver/ToolChains/Gnu.cpp > > +@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( > > + > > + Prefixes.push_back(GCCToolchainDir); > > + } else { > > ++ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; > > ++ > > + // If we have a SysRoot, try that first. > > + if (!D.SysRoot.empty()) { > > + Prefixes.push_back(D.SysRoot); > > +@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( > > + // Then look for gcc installed alongside clang. > > + Prefixes.push_back(D.InstalledDir + "/.."); > > + > > ++ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. > > ++ if (!GccIinstallPrefix.empty()) > > ++ { > > ++ if (llvm::sys::path::is_relative(GccIinstallPrefix)) > > ++ { > > ++ // Use a relative path to gcc from clang install path. > > ++ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); > > ++ } > > ++ else > > ++ { > > ++ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. > > ++ Prefixes.push_back(GCC_INSTALL_PREFIX); > > ++ } > > ++ } > > ++ > > + // Next, look for prefix(es) that correspond to distribution-supplied gcc > > + // installations. > > + if (D.SysRoot.empty()) { > > +-- > > +2.20.1 > > + > > diff --git a/package/clang/clang.mk b/package/clang/clang.mk > > index d1667d79b6..95b4964be3 100644 > > --- a/package/clang/clang.mk > > +++ b/package/clang/clang.mk > > @@ -105,5 +105,12 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > > HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > > CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > > > > +# Help host-clang to find our external toolchain, use a relative path from the clang > > +# installation directory to the external toolchain installation directory in order to > > +# not hardcode the toolchain absolute path. > > +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) > > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > +endif > > + > > $(eval $(cmake-package)) > > $(eval $(host-cmake-package)) > From neal.frager at amd.com Thu Mar 31 19:20:30 2022 From: neal.frager at amd.com (Neal Frager) Date: Thu, 31 Mar 2022 13:20:30 -0600 Subject: [Buildroot] [PATCH v1 1/1] configs/zynq_qmtech_defconfig: move post-image.sh to board/qmtech/zynq Message-ID: <20220331192030.3871720-1-neal.frager@amd.com> This patch creates a post-image.sh in the board/qmtech/zynq directory, so that the zynq_qmtech_defconfig can be updated independently from the other zynq defconfigs. Signed-off-by: Neal Frager --- board/qmtech/zynq/genimage.cfg | 27 +++++++++++++++++++++++++++ board/qmtech/zynq/post-image.sh | 13 +++++++++++++ configs/zynq_qmtech_defconfig | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 board/qmtech/zynq/genimage.cfg create mode 100755 board/qmtech/zynq/post-image.sh diff --git a/board/qmtech/zynq/genimage.cfg b/board/qmtech/zynq/genimage.cfg new file mode 100644 index 0000000000..67baca795e --- /dev/null +++ b/board/qmtech/zynq/genimage.cfg @@ -0,0 +1,27 @@ +image boot.vfat { + vfat { + files = { + "boot.bin", + "u-boot.img", + "devicetree.dtb", + "uImage" + } + + file uramdisk.image.gz { + image = "rootfs.cpio.uboot" + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } +} diff --git a/board/qmtech/zynq/post-image.sh b/board/qmtech/zynq/post-image.sh new file mode 100755 index 0000000000..54c5493b4e --- /dev/null +++ b/board/qmtech/zynq/post-image.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +# By default U-Boot loads DTB from a file named "devicetree.dtb", so +# let's use a symlink with that name that points to the *first* +# devicetree listed in the config. + +FIRST_DT=$(sed -n \ + 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ + ${BR2_CONFIG}) + +[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/devicetree.dtb + +support/scripts/genimage.sh -c board/qmtech/zynq/genimage.cfg diff --git a/configs/zynq_qmtech_defconfig b/configs/zynq_qmtech_defconfig index 4db3f68b1f..dc3b22c876 100644 --- a/configs/zynq_qmtech_defconfig +++ b/configs/zynq_qmtech_defconfig @@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qmtech/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2019.2.01)/linux-xilinx-v2019.2.01.tar.gz" -- 2.17.1 From bugzilla at busybox.net Tue Mar 1 09:49:12 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 01 Mar 2022 09:49:12 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 --- Comment #5 from Frank Rogall --- Bug still exists in 2021.11.2 with nodejs-14.18.3 Ubuntu 20.04.3 LTS -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 1 14:20:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 01 Mar 2022 14:20:11 +0000 Subject: [Buildroot] [Bug 14621] New: RISC-V External Toolchain build fails for latest riscv-gnu-toolchain Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14621 Bug ID: 14621 Summary: RISC-V External Toolchain build fails for latest riscv-gnu-toolchain Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: noahhuetter at gmail.com CC: buildroot at uclibc.org Target Milestone: --- I want to use the RISC-V GNU toolchain as external toolchain from [1] to use in buildroot. When I specify it and start the build process, the first package fails to link with the message libpthread.so: read failed. Is a directory. Buildroot creates a symlink in the sysroot of output/host that points to `../../` which is a directory. On older versions with GCC 8 it works. riscv-gnu-toolchain: tag: 2022.02.25 buildroot: 2022.02-rc3 host: Linux 3.10.0-1160.42.2.el7.x86_64 [1]: https://github.com/riscv-collab/riscv-gnu-toolchain -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Tue Mar 1 18:31:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Mar 2022 19:31:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: disable man pages Message-ID: <20220301183110.925959-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: FAILED: doc/man/rygel.1 /home/giuliobenetti/autobuild/run/instance-2/output-1/host/bin/xsltproc --nonet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style ansi --stringparam man.authors.section.enabled 1 --stringparam man.copyright.section.enabled 1 -o doc/man/rygel.1 http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ../doc/man/rygel.xml I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl Fixes: - http://autobuild.buildroot.org/results/297859cdb544e980826df28b446a75d32c06d839 Signed-off-by: Fabrice Fontaine --- ...01-build-Add-man_pages-build-options.patch | 150 ++++++++++++++++++ package/rygel/rygel.mk | 1 + 2 files changed, 151 insertions(+) create mode 100644 package/rygel/0001-build-Add-man_pages-build-options.patch diff --git a/package/rygel/0001-build-Add-man_pages-build-options.patch b/package/rygel/0001-build-Add-man_pages-build-options.patch new file mode 100644 index 0000000000..cdd7cc7721 --- /dev/null +++ b/package/rygel/0001-build-Add-man_pages-build-options.patch @@ -0,0 +1,150 @@ +From 5a54c5bb1c9609b7bffe6b3e05f934030e4e990e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 26 Dec 2020 18:40:51 +0100 +Subject: [PATCH] build: Add man_pages build options + +Check if xsltproc runs succesfully and fail otherwise + +Fixes #192 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/rygel/-/commit/5a54c5bb1c9609b7bffe6b3e05f934030e4e990e] +Signed-off-by: Fabrice Fontaine +--- + doc/man/meson.build | 98 +++++++++++++++++++++++++++------------------ + doc/meson.build | 5 ++- + meson_options.txt | 1 + + 3 files changed, 64 insertions(+), 40 deletions(-) + +diff --git a/doc/man/meson.build b/doc/man/meson.build +index ef3fcfbf5..4c92eab2b 100644 +--- a/doc/man/meson.build ++++ b/doc/man/meson.build +@@ -1,43 +1,63 @@ + xsltproc = find_program('xsltproc', required: false) + + if xsltproc.found() +- xlstproc_flags = [ +- '--nonet', +- '--stringparam', 'man.output.quietly', '1', +- '--stringparam', 'funcsynopsis.style', 'ansi', +- '--stringparam', 'man.authors.section.enabled', '1', +- '--stringparam', 'man.copyright.section.enabled', '1', +- ] +- +- xsltproc_args = [ +- xsltproc, +- xlstproc_flags, +- '-o', '@OUTPUT@', +- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', +- '@INPUT@', +- ] +- +- man_input_files = [ +- 'rygel.xml', +- 'rygel.conf.xml' +- ] +- +- man_output_files = [ +- 'rygel.1', +- 'rygel.conf.5' +- ] +- +- custom_target('man 1 pages', +- input: 'rygel.xml', +- output: 'rygel.1', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man1')) +- +- custom_target('man 5 pages', +- input: 'rygel.conf.xml', +- output: 'rygel.conf.5', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man5')) ++ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' ++ ++ xlstproc_flags = [ ++ '--nonet', ++ '--stringparam', 'man.output.quietly', '1', ++ '--stringparam', 'funcsynopsis.style', 'ansi', ++ '--stringparam', 'man.authors.section.enabled', '1', ++ '--stringparam', 'man.copyright.section.enabled', '1', ++ ] ++ ++ xsltproc_args = [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '@OUTPUT@', ++ stylesheet, ++ '@INPUT@', ++ ] ++ ++ man_input_files = [ ++ 'rygel.xml', ++ 'rygel.conf.xml' ++ ] ++ ++ man_output_files = [ ++ 'rygel.1', ++ 'rygel.conf.5' ++ ] ++ ++ r = run_command( ++ [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '/dev/null', ++ stylesheet, ++ 'rygel.xml' ++ ] ++ ) ++ ++ if (r.returncode() == 0) ++ custom_target( ++ 'man 1 pages', ++ input: 'rygel.xml', ++ output: 'rygel.1', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man1') ++ ) ++ ++ custom_target( ++ 'man 5 pages', ++ input: 'rygel.conf.xml', ++ output: 'rygel.conf.5', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man5') ++ ) ++ else ++ error('Cannot bulid man pages, failed to run xsltproc') ++ endif + endif +diff --git a/doc/meson.build b/doc/meson.build +index 41c733e50..91c08fae5 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,2 +1,5 @@ +-subdir('man') ++if get_option('man_pages') ++ subdir('man') ++endif ++ + subdir('reference') +diff --git a/meson_options.txt b/meson_options.txt +index cb604c4e9..c60ff1a9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') + option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') ++option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') + option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') + option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) + option('engines', type : 'array', choices : ['simple', 'gstreamer']) +-- +GitLab + diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index bfcd5df3c6..e05297456d 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -26,6 +26,7 @@ RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ -Dintrospection=enabled \ + -Dman_pages=false \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih -- 2.34.1 From bugzilla at busybox.net Tue Mar 1 19:49:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 01 Mar 2022 19:49:59 +0000 Subject: [Buildroot] [Bug 14631] New: host-go-bootstrap: go not being built for package in external tree Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 Bug ID: 14631 Summary: host-go-bootstrap: go not being built for package in external tree Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: contact at martb.dev CC: buildroot at uclibc.org Target Milestone: --- Hey, running on 2022.02-rc2. I tried adding a local go package inside my external tree using the following stripped down config. Config.in (included correctly, showing up inside menuconfig) ``` config BR2_PACKAGE_APOGEE bool "apogee" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS help my help string ``` .mk ``` APOGEE_SITE = $(BR2_EXTERNAL_MYTREE_PATH)/src/apogee APOGEE_SITE_METHOD = local APOGEE_BUILD_TARGETS = cmd/apogee APOGEE_INSTALL_BINS = apogee APOGEE_GOMOD = "/apogee" ... $(eval $(golang-package)) ``` Whenever i try building this package i get: ``` /bin/sh: Line 1: /home//Schreibtisch//mytree/output/host/bin/go: File or directory not found ``` Building a different go package like tinifier seems to trigger the bootstrap build fine though. Is this some limitation due to the "local" site source or due to the external tree im using? Kind regards Martin -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Tue Mar 1 22:34:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Mar 2022 23:34:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ace: bump to version 7.0.6 Message-ID: <20220301223416.947624-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/ace/ace.hash | 5 ++++- package/ace/ace.mk | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/ace/ace.hash b/package/ace/ace.hash index 92fd42e131..2387927879 100644 --- a/package/ace/ace.hash +++ b/package/ace/ace.hash @@ -1,3 +1,6 @@ +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 + # Locally Computed: -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk index 8df89d8c6f..7299f0d40c 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -4,8 +4,8 @@ # ################################################################################ -ACE_VERSION = 7.0.1 -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_VERSION = 7.0.6 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions ACE_LICENSE = DOC ACE_LICENSE_FILES = COPYING -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 1 22:51:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 1 Mar 2022 23:51:07 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libfreeglut: bump to version 3.2.2 Message-ID: <20220301225107.988549-1-fontaine.fabrice@gmail.com> - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...ropped-up-with-the-release-of-gcc-10.patch | 69 ------------------- package/libfreeglut/libfreeglut.hash | 10 +-- package/libfreeglut/libfreeglut.mk | 2 +- 3 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch deleted file mode 100644 index e98e71537f..0000000000 --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 -From: jtsiomb -Date: Fri, 21 Feb 2020 22:25:31 +0000 -Subject: [PATCH] Work-around for an issue which cropped up with the release of - gcc-10. In their infinite wisdom, they decided to build with -fno-common as - default from now on, breaking every piece of C code which used to declare - common symbols in header files, as was the convention since the dawn of time. - We now have to duplicate all declarations to an arbitrary source file, and - change the header-file ones to prefix them with extern. - -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk at 1863 7f0cb862-5218-0410-a997-914c9d46530a -[Retrieved from: -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] -Signed-off-by: Fabrice Fontaine ---- - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c -index 38b0acbb..54b4285b 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index 2771cbde2f..ce9fb9e299 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ +md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz +sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz # Locally computed -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING +sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 379de3121b..484b0f4b97 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.1 +LIBFREEGLUT_VERSION = 3.2.2 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut LIBFREEGLUT_LICENSE = MIT -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 1 23:05:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 00:05:04 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/parted: bump to version 3.4 Message-ID: <20220301230504.1000454-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://git.savannah.gnu.org/cgit/parted.git/tree/NEWS?h=v3.4 Signed-off-by: Fabrice Fontaine --- package/parted/parted.hash | 4 ++-- package/parted/parted.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 2c466eb8d2..392436ec4b 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz +sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz # Locally calculated -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 66940fc516..23158179e4 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.3 +PARTED_VERSION = 3.4 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 1 23:21:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 00:21:11 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libscrypt: bump to version 1.22 Message-ID: <20220301232111.1092975-1-fontaine.fabrice@gmail.com> - Drop patch and use {C,LD}FLAGS_EXTRA which are available since https://github.com/technion/libscrypt/commit/bdfec26744122e8f52a58bc086c89b27faaf5888 - While at it, also move PREFIX to LIBSCRYPT_MAKE_OPTS as advocated by Arnout in https://patchwork.ozlabs.org/project/buildroot/patch/20220221172900.1937856-1-fontaine.fabrice at gmail.com/ - Update indentation in hash file (two spaces) https://github.com/technion/libscrypt/compare/v1.21...v1.22 Signed-off-by: Fabrice Fontaine --- ...ions-to-CFLAGS-and-LDFLAGS-variables.patch | 34 ------------------- package/libscrypt/libscrypt.hash | 4 +-- package/libscrypt/libscrypt.mk | 14 +++++--- 3 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch deleted file mode 100644 index a023a6fe1c..0000000000 --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Tue, 14 Mar 2017 09:23:51 +0100 -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This also removes a number of hard-coded CFLAGS, leaving it up to the -user to pass appropriate optimization/hardening flags. - -Signed-off-by: Stefan S?rensen ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7022a4a..3098a9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d - INSTALL_DATA ?= install - - CC?=gcc --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version -+override CFLAGS+=-fPIC -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - CFLAGS_EXTRA?=-Wl,-rpath=. - - all: reference --- -2.7.4 - diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash index fda63d1c0d..fcdc4bbeeb 100644 --- a/package/libscrypt/libscrypt.hash +++ b/package/libscrypt/libscrypt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index fa89ed31bc..d28bd4e900 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -4,23 +4,29 @@ # ################################################################################ -LIBSCRYPT_VERSION = 1.21 +LIBSCRYPT_VERSION = 1.22 LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) LIBSCRYPT_LICENSE = BSD-2-Clause LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES +LIBSCRYPT_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ + PREFIX=/usr + define LIBSCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) endef define LIBSCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(STAGING_DIR) install endef define LIBSCRYPT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) install endef -- 2.34.1 From stefan at agner.ch Wed Mar 2 10:32:06 2022 From: stefan at agner.ch (Stefan Agner) Date: Wed, 2 Mar 2022 11:32:06 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: Add Intel WiFi 22000 series Message-ID: <200a0dbe075eee7e2c6d309e8a00d68f74b671c7.1646217112.git.stefan@agner.ch> Add Intel WiFi 22000 series firmware. This firmware supports WiFi 6 models like AX200/AX201/AX210. Signed-off-by: Stefan Agner --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index c94ffe24de..c9294956cc 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 + bool "Intel Wireless 22000 series" + help + Firmware files for the Intel Wifi 22000 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c..6502b90e2d 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -- 2.35.1 From bernd.kuhls at t-online.de Wed Mar 2 17:34:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 2 Mar 2022 18:34:33 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.7 Message-ID: <20220302173433.28939-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c8573fafad..736dedc25e 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.6 +MESA3D_HEADERS_VERSION = 21.3.7 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d64b833100..b680411051 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html -sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz -sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html +sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz +sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 95618b2072..d0b12932c4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.6 +MESA3D_VERSION = 21.3.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From fontaine.fabrice at gmail.com Wed Mar 2 17:44:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 18:44:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf-xlib: new package Message-ID: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/gdk-pixbuf-xlib/Config.in create mode 100644 package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash create mode 100644 package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2b2cb8c357..897a4dcfee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -877,6 +877,7 @@ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ F: package/freeipmi/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index fb0595377e..85fa91190e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1492,6 +1492,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 17:44:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 18:44:56 +0100 Subject: [Buildroot] [PATCH 2/2] package/xscreensaver: add gdk-pixbuf-xlib dependency In-Reply-To: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Message-ID: <20220302174456.1641125-2-fontaine.fabrice@gmail.com> gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.0 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 787c3130ae..10b2b7012c 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index f73a75bf14..46dedc3211 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -15,6 +15,7 @@ XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ -- 2.34.1 From peter at korsgaard.com Wed Mar 2 18:36:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Mar 2022 19:36:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/seatd: security bump to version 0.6.4 In-Reply-To: <20220228213432.3289480-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Mon, 28 Feb 2022 23:34:32 +0200") References: <20220228213432.3289480-1-aperez@igalia.com> Message-ID: <87v8wwb3rt.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This release contains a security fix in seatd-launch which prevents > removal of files that the calling user did not have privileges to > remove. Release notes: > https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 2 18:36:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 02 Mar 2022 19:36:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: disable man pages In-Reply-To: <20220301183110.925959-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 1 Mar 2022 19:31:10 +0100") References: <20220301183110.925959-1-fontaine.fabrice@gmail.com> Message-ID: <87r17kb3rg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 0.40.2 in > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > FAILED: doc/man/rygel.1 > /home/giuliobenetti/autobuild/run/instance-2/output-1/host/bin/xsltproc > --nonet --stringparam man.output.quietly 1 --stringparam > funcsynopsis.style ansi --stringparam man.authors.section.enabled 1 > --stringparam man.copyright.section.enabled 1 -o doc/man/rygel.1 > http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl > ../doc/man/rygel.xml > I/O error : Attempt to load network entity > http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl > Fixes: > - http://autobuild.buildroot.org/results/297859cdb544e980826df28b446a75d32c06d839 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 2 18:35:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Mar 2022 19:35:26 +0100 Subject: [Buildroot] [git commit] package/seatd: security bump to version 0.6.4 Message-ID: <20220302182850.E4EA9837AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=41139cb0997af800c7d89213c5d89652b65ec6cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release contains a security fix in seatd-launch which prevents removal of files that the calling user did not have privileges to remove. Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 18f65d3aeb..88793b6dd5 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8 0.6.3.tar.gz +sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27d3155b2b..5382cad39b 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.3 +SEATD_VERSION = 0.6.4 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT From peter at korsgaard.com Wed Mar 2 18:35:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 2 Mar 2022 19:35:38 +0100 Subject: [Buildroot] [git commit] package/rygel: disable man pages Message-ID: <20220302182850.EDD1D838CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3739f0bf135e1cfe9034dc2797bdef3a2c981ecf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: FAILED: doc/man/rygel.1 /home/giuliobenetti/autobuild/run/instance-2/output-1/host/bin/xsltproc --nonet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style ansi --stringparam man.authors.section.enabled 1 --stringparam man.copyright.section.enabled 1 -o doc/man/rygel.1 http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ../doc/man/rygel.xml I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl Fixes: - http://autobuild.buildroot.org/results/297859cdb544e980826df28b446a75d32c06d839 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-build-Add-man_pages-build-options.patch | 150 +++++++++++++++++++++ package/rygel/rygel.mk | 1 + 2 files changed, 151 insertions(+) diff --git a/package/rygel/0001-build-Add-man_pages-build-options.patch b/package/rygel/0001-build-Add-man_pages-build-options.patch new file mode 100644 index 0000000000..cdd7cc7721 --- /dev/null +++ b/package/rygel/0001-build-Add-man_pages-build-options.patch @@ -0,0 +1,150 @@ +From 5a54c5bb1c9609b7bffe6b3e05f934030e4e990e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 26 Dec 2020 18:40:51 +0100 +Subject: [PATCH] build: Add man_pages build options + +Check if xsltproc runs succesfully and fail otherwise + +Fixes #192 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/rygel/-/commit/5a54c5bb1c9609b7bffe6b3e05f934030e4e990e] +Signed-off-by: Fabrice Fontaine +--- + doc/man/meson.build | 98 +++++++++++++++++++++++++++------------------ + doc/meson.build | 5 ++- + meson_options.txt | 1 + + 3 files changed, 64 insertions(+), 40 deletions(-) + +diff --git a/doc/man/meson.build b/doc/man/meson.build +index ef3fcfbf5..4c92eab2b 100644 +--- a/doc/man/meson.build ++++ b/doc/man/meson.build +@@ -1,43 +1,63 @@ + xsltproc = find_program('xsltproc', required: false) + + if xsltproc.found() +- xlstproc_flags = [ +- '--nonet', +- '--stringparam', 'man.output.quietly', '1', +- '--stringparam', 'funcsynopsis.style', 'ansi', +- '--stringparam', 'man.authors.section.enabled', '1', +- '--stringparam', 'man.copyright.section.enabled', '1', +- ] +- +- xsltproc_args = [ +- xsltproc, +- xlstproc_flags, +- '-o', '@OUTPUT@', +- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', +- '@INPUT@', +- ] +- +- man_input_files = [ +- 'rygel.xml', +- 'rygel.conf.xml' +- ] +- +- man_output_files = [ +- 'rygel.1', +- 'rygel.conf.5' +- ] +- +- custom_target('man 1 pages', +- input: 'rygel.xml', +- output: 'rygel.1', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man1')) +- +- custom_target('man 5 pages', +- input: 'rygel.conf.xml', +- output: 'rygel.conf.5', +- command: xsltproc_args, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man5')) ++ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' ++ ++ xlstproc_flags = [ ++ '--nonet', ++ '--stringparam', 'man.output.quietly', '1', ++ '--stringparam', 'funcsynopsis.style', 'ansi', ++ '--stringparam', 'man.authors.section.enabled', '1', ++ '--stringparam', 'man.copyright.section.enabled', '1', ++ ] ++ ++ xsltproc_args = [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '@OUTPUT@', ++ stylesheet, ++ '@INPUT@', ++ ] ++ ++ man_input_files = [ ++ 'rygel.xml', ++ 'rygel.conf.xml' ++ ] ++ ++ man_output_files = [ ++ 'rygel.1', ++ 'rygel.conf.5' ++ ] ++ ++ r = run_command( ++ [ ++ xsltproc, ++ xlstproc_flags, ++ '-o', '/dev/null', ++ stylesheet, ++ 'rygel.xml' ++ ] ++ ) ++ ++ if (r.returncode() == 0) ++ custom_target( ++ 'man 1 pages', ++ input: 'rygel.xml', ++ output: 'rygel.1', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man1') ++ ) ++ ++ custom_target( ++ 'man 5 pages', ++ input: 'rygel.conf.xml', ++ output: 'rygel.conf.5', ++ command: xsltproc_args, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man5') ++ ) ++ else ++ error('Cannot bulid man pages, failed to run xsltproc') ++ endif + endif +diff --git a/doc/meson.build b/doc/meson.build +index 41c733e50..91c08fae5 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,2 +1,5 @@ +-subdir('man') ++if get_option('man_pages') ++ subdir('man') ++endif ++ + subdir('reference') +diff --git a/meson_options.txt b/meson_options.txt +index cb604c4e9..c60ff1a9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') + option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') ++option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') + option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') + option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) + option('engines', type : 'array', choices : ['simple', 'gstreamer']) +-- +GitLab + diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index bfcd5df3c6..e05297456d 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -26,6 +26,7 @@ RYGEL_CONF_OPTS += \ -Dapi-docs=false \ -Dexamples=false \ -Dintrospection=enabled \ + -Dman_pages=false \ -Dtests=false RYGEL_PLUGINS = external,lms,mpris,ruih From fontaine.fabrice at gmail.com Wed Mar 2 18:42:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 19:42:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcamera-apps: link with -latomic if needed Message-ID: <20220302184209.2081120-1-fontaine.fabrice@gmail.com> Link with -latomic if needed to avoid the following build failure raised since the addition of the package in commit 7227d005d2435ec7b38995a6247d233ddb5ba365: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: CMakeFiles/libcamera-still.dir/libcamera_still.cpp.o: undefined reference to symbol '__atomic_fetch_sub_4@@LIBATOMIC_1.0' Fixes: - http://autobuild.buildroot.org/results/b20465140f3a5281f9b586f442b67fd400e7184a Signed-off-by: Fabrice Fontaine --- package/libcamera-apps/libcamera-apps.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 210d4e1e52..f4fc019c17 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -45,4 +45,8 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) -- 2.34.1 From ju.o at free.fr Wed Mar 2 21:01:50 2022 From: ju.o at free.fr (Julien Olivain) Date: Wed, 2 Mar 2022 22:01:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/{gnupg, gnupg2}: use gnupg2 by default Message-ID: <20220302210150.33658-1-ju.o@free.fr> This patch reverses the logic to select gnupg2 by default, while still allowing to select gnupg (v1). Quoting: https://gnupg.org/download/index.html """ GnuPG 1.4 is the old, single binary version which still support the unsafe PGP-2 keys. This branch has no dependencies on the above listed libraries or the Pinentry. However, it lacks many modern features and will receive only important updates. """ gnupg 1.4 is kept in Buildroot for now, as the package is still maintained upstream. It might still be useful is some specific cases: - it has a smaller footprint (compared to v2), - it has less dependencies (only zlib), - it has less build dependencies (can build static, no need for MMU/threads, ...) Most Linux distributions are now shipping gnupg2 by default. gnupg v1 is now more for legacy/compatibility/specific cases. There is currently only two packages selecting gnupg in Buildroot: gpgme and python-gnupg This commit also reverses the logic for those packages. Signed-off-by: Julien Olivain --- Tested with: support/testing/run-tests \ -d dl -o output_folder \ -k tests.package.test_python_gnupg.TestPythonPy3GnuPG Note: this change was quickly discussed in: https://lists.buildroot.org/pipermail/buildroot/2022-January/634021.html --- package/gnupg/Config.in | 1 - package/gnupg2/Config.in | 1 + package/libgpgme/Config.in | 2 +- package/python-gnupg/Config.in | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in index 2db46318f1..e92fca709d 100644 --- a/package/gnupg/Config.in +++ b/package/gnupg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_GNUPG bool "gnupg" - depends on !BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_ZLIB help GnuPG is the GNU project's complete and free implementation diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index ef1817ef02..9438cf69f6 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GNUPG2 depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth depends on BR2_USE_MMU # libassuan, libnpth depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_GNUPG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGCRYPT diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in index 4aabd06367..20f491b664 100644 --- a/package/libgpgme/Config.in +++ b/package/libgpgme/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBGPGME depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_USE_MMU # libassuan #gnupg is not needed to build, but at runtime. - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBASSUAN help diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in index 038a940778..54f8fb6a29 100644 --- a/package/python-gnupg/Config.in +++ b/package/python-gnupg/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_GNUPG bool "python-gnupg" - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime help A wrapper for the Gnu Privacy Guard (GPG or GnuPG). -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:17:24 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:17:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220302211724.2351984-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: pattern.c: In function 'is_valid_dns_name': pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code pattern.c: In function 'is_valid_dns_name_pattern': pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ Fixes: - http://autobuild.buildroot.org/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 Signed-off-by: Fabrice Fontaine --- ...src-pattern.c-fix-build-with-gcc-4.8.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch diff --git a/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..90bb02b23a --- /dev/null +++ b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,57 @@ +From 0c89dd2fa0fe50b00bca638dbbacfbd361526e0a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 21:57:52 +0100 +Subject: [PATCH] src/pattern.c: fix build with gcc 4.8 + +Fix the following build failure: + +pattern.c: In function 'is_valid_dns_name': +pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ +pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code +pattern.c: In function 'is_valid_dns_name_pattern': +pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=b2690415bfa1bc105e61b75f642fb5c1aaf0fae8] +--- + src/pattern.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/pattern.c b/src/pattern.c +index 03e23b9..928d259 100644 +--- a/src/pattern.c ++++ b/src/pattern.c +@@ -129,9 +129,9 @@ int is_valid_dns_name(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '-' && *c != '.' && +@@ -242,11 +242,11 @@ int is_valid_dns_name_pattern(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; + size_t num_wildcards = 0; + int previous_label_has_wildcard = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '*' && /* Wildcard. */ +-- +2.20.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:26:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:26:21 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libss7: bump to version 2.0.1 Message-ID: <20220302212621.2357671-1-fontaine.fabrice@gmail.com> http://downloads.asterisk.org/pub/telephony/libss7/releases/libss7-2.0.1-summary.html Signed-off-by: Fabrice Fontaine --- package/libss7/libss7.hash | 4 ++-- package/libss7/libss7.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash index 8e1d6635db..442422fcd9 100644 --- a/package/libss7/libss7.hash +++ b/package/libss7/libss7.hash @@ -1,6 +1,6 @@ # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz # License file, locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk index 151b6a61b5..faa147c78e 100644 --- a/package/libss7/libss7.mk +++ b/package/libss7/libss7.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSS7_VERSION = 2.0.0 +LIBSS7_VERSION = 2.0.1 LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases LIBSS7_LICENSE = GPL-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:44:04 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:44:04 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/xdotool: bump to version 3.20211022.1 Message-ID: <20220302214404.2476680-1-fontaine.fabrice@gmail.com> - Retrieve official tarball - Update indentation in hash file (two spaces) https://github.com/jordansissel/xdotool/blob/v3.20211022.1/CHANGELIST Signed-off-by: Fabrice Fontaine --- package/xdotool/xdotool.hash | 4 ++-- package/xdotool/xdotool.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/xdotool/xdotool.hash b/package/xdotool/xdotool.hash index b0d5a7582a..549e807ccc 100644 --- a/package/xdotool/xdotool.hash +++ b/package/xdotool/xdotool.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a xdotool-3.20160805.1.tar.gz -sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT +sha256 96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada xdotool-3.20211022.1.tar.gz +sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT diff --git a/package/xdotool/xdotool.mk b/package/xdotool/xdotool.mk index 5c5603bd62..c430a49d06 100644 --- a/package/xdotool/xdotool.mk +++ b/package/xdotool/xdotool.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDOTOOL_VERSION = 3.20160805.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,v$(XDOTOOL_VERSION)) +XDOTOOL_VERSION = 3.20211022.1 +XDOTOOL_SITE = https://github.com/jordansissel/xdotool/releases/download/v$(XDOTOOL_VERSION) XDOTOOL_LICENSE = BSD-3-Clause XDOTOOL_LICENSE_FILES = COPYRIGHT XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 2 21:51:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 2 Mar 2022 22:51:31 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tree: bump to version 2.0.2 Message-ID: <20220302215131.2479736-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) http://mama.indstate.edu/users/ice/tree/changes.html Signed-off-by: Fabrice Fontaine --- package/tree/tree.hash | 4 ++-- package/tree/tree.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 6bffaa5ec0..298153c89c 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 tree-1.8.0.tgz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf tree-2.0.2.tgz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index b6c63c0244..7c111b47d2 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 1.8.0 +TREE_VERSION = 2.0.2 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://mama.indstate.edu/users/ice/tree/src TREE_LICENSE = GPL-2.0+ -- 2.34.1 From francois.perrad at gadz.org Thu Mar 3 06:12:50 2022 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Thu, 3 Mar 2022 07:12:50 +0100 Subject: [Buildroot] Buildroot 2022.02-rc3 released In-Reply-To: <87pmn6y8hv.fsf@dell.be.48ers.dk> References: <87pmn6y8hv.fsf@dell.be.48ers.dk> Message-ID: Le lun. 28 f?vr. 2022 ? 22:41, Peter Korsgaard a ?crit : > Hi, > > Buildroot 2022.02-rc3 is released - Go download it at: > > http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz > > or > > http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.xz > > These 2 links are broken. Fran?ois $ wget http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz --2022-03-03 07:11:19-- http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz Resolving buildroot.net (buildroot.net)... 140.211.167.122 Connecting to buildroot.net (buildroot.net)|140.211.167.122|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2022-03-03 07:11:19 ERROR 404: Not Found. > Or get it from Git: > > git://git.buildroot.net/buildroot > > Another week, another release candidate. > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Thu Mar 3 06:44:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 07:44:34 +0100 Subject: [Buildroot] Buildroot 2022.02-rc3 released In-Reply-To: (=?utf-8?Q?=22Fran=C3=A7ois?= Perrad"'s message of "Thu, 3 Mar 2022 07:12:50 +0100") References: <87pmn6y8hv.fsf@dell.be.48ers.dk> Message-ID: <87mti7bkml.fsf@dell.be.48ers.dk> >>>>> "Fran?ois" == Fran?ois Perrad writes: > Le lun. 28 f?vr. 2022 ? 22:41, Peter Korsgaard a > ?crit : >> Hi, >> >> Buildroot 2022.02-rc3 is released - Go download it at: >> >> http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz >> >> or >> >> http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.xz >> >> > These 2 links are broken. > Fran?ois > $ wget http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz > --2022-03-03 07:11:19-- > http://buildroot.net/downloads/buildroot-2022.02-rc3.tar.gz > Resolving buildroot.net (buildroot.net)... 140.211.167.122 > Connecting to buildroot.net (buildroot.net)|140.211.167.122|:80... > connected. > HTTP request sent, awaiting response... 404 Not Found > 2022-03-03 07:11:19 ERROR 404: Not Found. Ups, something went wrong with the upload. Fixed now, thanks! -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Thu Mar 3 07:12:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 03 Mar 2022 07:12:36 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-02 Message-ID: <20220303071242.017E860B66@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-03-02 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 57 | 9 | 0 | 66 | 2021.11.x | 25 | 1 | 0 | 26 | master | 106 | 57 | 1 | 164 | Classification of failures by reason for master ----------------------------------------------- frr-8.1 | 14 host-libselinux-3.3 | 14 bpftool-v6.7.0 | 4 python-greenlet-1.1.2 | 3 unknown | 3 google-breakpad-7515ab13768... | 2 vlc-3.0.16 | 2 android-tools-4.2.2+git2013... | 1 bluez5_utils-5.63 | 1 dnsmasq-2.86 | 1 exempi-2.6.1 | 1 file-5.41 | 1 ghostscript-9.55.0 | 1 host-go-1.17.7 | 1 libcamera-apps-2d1009e3badc... | 1 libuwsc | 1 Makefile:734: target-finalize | 1 mongodb-4.2.18 | 1 mpv-0.33.1 | 1 osm2pgsql-1.6.0 | 1 tovid-87c676f4aadb7303d2cd9... | 1 wavemon-0.9.4 | 1 wpa_supplicant-2.10 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | android-tools-4.2.2+git2013... | NOK | http://autobuild.buildroot.net/results/275851e3d79a7166fe28e0a0f8c04a4db3c4ceb3 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/e1af3f9a80755384617a2eb1c137393048e7ab1b | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/4c34010da5311b93d62477f1d3a989452fe1fe6f | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/31565641bdafe8b303bade66764c428c49355072 | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/f6c5b6f65e49f28ee973046dbc31301d6be7765a | arm | bpftool-v6.7.0 | NOK | http://autobuild.buildroot.net/results/198183e4c2d85212ceb12ec588cd93b4f1e01c6c | arm | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 | arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/70b050ec463b8fc45cd9e886efa1d2be4bb2d737 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/4379726288f89fd53f56cafed4b4a151acea896d | ORPH nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/efefcf149af610d9be0d76f1f2bcfadceaa2f738 | powerpc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2a0bc37f535035eb24d3129982c83da3a43127cc | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/2068459734556e09d5d12cefabd624d9e47c6c5f | mipsel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/592dc62c4d2d197d16367a243fd77376a7cfda7a | nios2 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/0f7104f07e170f48873cb7e33993f25247191313 | riscv64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/da98920735e4597d21a7fe9d0a0dd4ab284c55d2 | powerpc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/7140ed2843be622d15d7fbd1278f2c638add08f8 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/8d6f6374e691362ddf70de7f41cee645024fe7c2 | mipsel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/aa01104d9e99e16d11799ccb039dc05966546327 | arm | frr-8.1 | NOK | http://autobuild.buildroot.net/results/a0e31d4426db29c8005e144ed3201da271e437cb | riscv64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/e4b5dffe5e8104e9fcb34ad8de5f980552101830 | powerpc64 | frr-8.1 | NOK | http://autobuild.buildroot.net/results/42fb90cf286a5d081b0ebedaf55d2dc14b325556 | xtensa | frr-8.1 | NOK | http://autobuild.buildroot.net/results/17a06dc06b28f4de0b48afd5c7e5f1cdca01f7ee | mipsel | frr-8.1 | NOK | http://autobuild.buildroot.net/results/717a61b8b1b3dfcaa34dcfcc9849e7f8d4961927 | arm | ghostscript-9.55.0 | NOK | http://autobuild.buildroot.net/results/b3e5c8c98e77e5f5e3661b31ad3d192260fe3dc9 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/586b77332930f1a59ed14defcc2b2546eb327152 | mipsel | google-breakpad-7515ab13768... | NOK | http://autobuild.buildroot.net/results/ea3bc5ec1e2946e11cf449a943adbd42eed57f15 | mips64el | host-go-1.17.7 | NOK | http://autobuild.buildroot.net/results/00d3143f485192019eda60e4246e08bfcfd0eb51 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/8c846d6b962610b0ab2f0a1cb82aae3a5f386e72 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1fe5d8e9a0b2e5b8ace8273694c47b435cfdf18c | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/0090c4476dbe4c6f45f07a6a41e7f951f40f0838 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/c7178239648e0b48fd00937cb9d958f2291ab7b1 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/eb57c0ece7ffe66982fa4904f3603f27341de849 | xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/1b24f64c4eee66056b550544c34a76b7cc412d70 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5122b102bbc22c772e232b69eb47c550d9a48552 | riscv64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/34ee2422bf4af2112eab2b92852c27e90f3ce0db | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/e110384926873327db2d56fc5bf54dd6db29b000 | powerpc64 | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/fd39bfab03356f38fc9ecdd49b8322b6084c2ca2 | microblazeel | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/861e304e27bc94a6078f28bab19e392e10acc8b6 | powerpc | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/93f14e8bedcbb510a35429587b1a5bda80c20e7c | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/5f981cd9a1d5fb0ab858f18b01d9b692131ab950 | arm | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/211427becf05ce040c5d6f78d1140727a9110755 | sparc | libcamera-apps-2d1009e3badc... | NOK | http://autobuild.buildroot.net/results/b20465140f3a5281f9b586f442b67fd400e7184a | arc | libuwsc | TIM | http://autobuild.buildroot.net/results/31d98d07e1fc36381548804c224a771403bb16c0 | arm | Makefile:734: target-finalize | NOK | http://autobuild.buildroot.net/results/ecf4de273c4ba888264085e6f2b69656208c6a04 | arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/d252d52aa9f045e04a51110335bf3a6b1561562a | arc | mpv-0.33.1 | NOK | http://autobuild.buildroot.net/results/63efa19f8bb5760ed44d18d9942954dfb376ea62 | sh4 | osm2pgsql-1.6.0 | NOK | http://autobuild.buildroot.net/results/521a28c64d9689777d9e5d4f81fc8de3c8996d92 | m68k | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5978d008d48374d74bc2137fb977f6231fce2481 | mipsel | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/db222f0ff8bc9ff7b5f4e829986cf7dc46259a57 | arm | python-greenlet-1.1.2 | NOK | http://autobuild.buildroot.net/results/5f5d5cc9d90a1207a9af9608f4254f64e2a89bdc | riscv32 | tovid-87c676f4aadb7303d2cd9... | NOK | http://autobuild.buildroot.net/results/c77ede55ccb6e1db9a7a0d0c01c48cfc6c3bfb2c | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/c78687bb093854a5df3751a531fdca0bd1096423 | arm | unknown | NOK | http://autobuild.buildroot.net/results/6b896c8c38e44eba430eb71fc08ade1eb04c4649 | riscv32 | unknown | NOK | http://autobuild.buildroot.net/results/977b8f322f897663003f5cee99f5a32c0ab87d5f | arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/06188ad302c5e33bcb237f70afa3483bdb3358f6 | m68k | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/d13fe134dfa53fc531b1d72642fd9a0cdcb4bf35 | nios2 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/6bb7891ec0b991ec7e9532e5a568a58c8eaf554c | powerpc64 | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/846ab8364c306e1c8d0643b571bef848b7fd21a6 | Classification of failures by reason for 2021.02.x -------------------------------------------------- azure-iot-sdk-c-LTS_07_2020... | 1 erlang-jiffy-1.0.6 | 1 host-sentry-cli-1.57.0 | 1 monkey-f54856ce250c4e257354... | 1 netopeer2-1.1.53 | 1 openldap-2.4.59 | 1 python-pyqt5-5.7 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | azure-iot-sdk-c-LTS_07_2020... | NOK | http://autobuild.buildroot.net/results/ed8acf7835e2c7894cf3f68fe65fb6b1315691c7 | mipsel | erlang-jiffy-1.0.6 | NOK | http://autobuild.buildroot.net/results/de6457a6de4f03c4a029dda7ffe17004f24f3434 | aarch64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/a076eee8988dca3b471daa0a63e20a0e6b1d5b12 | x86_64 | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/086424878b46fcbcdb56fb04a7484e69db0104a5 | riscv32 | netopeer2-1.1.53 | NOK | http://autobuild.buildroot.net/results/80bc83a1aa91be2ab61cf5b519f85131d839c519 | riscv32 | openldap-2.4.59 | NOK | http://autobuild.buildroot.net/results/c30c6ce39f7f3df0e1c112d202ecd57fbeea5821 | or1k | python-pyqt5-5.7 | NOK | http://autobuild.buildroot.net/results/de5db9a34968239662d1432c95b850367547652f | arm | unknown | NOK | http://autobuild.buildroot.net/results/9c0750573af93bacf9c4ae68063fd2f55624e1f5 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e6392e051caf3da4eb77d4456a9c3e031c76a307 | Classification of failures by reason for 2021.11.x -------------------------------------------------- openal-1.21.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | openal-1.21.1 | NOK | http://autobuild.buildroot.net/results/7dd952755a90cc66a59e6a78c4af3c04391de74a | Gitlab CI results for 2022-03-02 ================================ Detail of runtime-test failures for 2021.02.10 ---------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ ...inMips64n32GlibcStable | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462298 | ORPH TestLuajitLuaLdap | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462014 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462027 | ORPH TestRedis | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462156 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/2149462162 | ORPH -- http://autobuild.buildroot.net From bugzilla at busybox.net Thu Mar 3 08:02:53 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 03 Mar 2022 08:02:53 +0000 Subject: [Buildroot] [Bug 14611] 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14611 --- Comment #1 from Frank Rogall --- These Bug still exists in 2022.02-rc3 INSTALL /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot/usr/include if ! support/scripts/check-kernel-headers.sh /home/fr/work/egate/x/egate/build /home/fr/work/egate/x/egate/host/x86_64-buildroot-linux-gnu/sysroot 5.16 loose; then exit 1; fi Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x make[1]: *** [package/pkg-generic.mk:332: /home/fr/work/egate/x/egate/build/linux-headers-5.15.13/.stamp_staging_installed] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Thu Mar 3 17:35:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Mar 2022 18:35:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi: bump version to 19.4 Message-ID: <20220303173516.53272-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 56e901fa17..371c375e74 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) -- 2.30.2 From bernd.kuhls at t-online.de Thu Mar 3 17:38:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Mar 2022 18:38:33 +0100 Subject: [Buildroot] [PATCH/next v2 1/1] package/kodi: bump version to 19.4 Message-ID: <20220303173833.54609-1-bernd.kuhls@t-online.de> Add dependencies to giflib, libjpeg and libpng due to https://github.com/xbmc/xbmc/pull/20462 Signed-off-by: Bernd Kuhls --- v2: added dependencies to giflib, libjpeg and libpng package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/Config.in | 3 +++ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 7 +++++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f31bf19b99..ebc95343a9 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 56e901fa17..f4c5bfc685 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,9 +6,9 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix -KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) +KODI_VERSION = 6586a6c535b72896e00733f25fde93980d5f0cca KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ -- 2.30.2 From bernd.kuhls at t-online.de Thu Mar 3 17:41:21 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 3 Mar 2022 18:41:21 +0100 Subject: [Buildroot] [PATCH/next v3 1/1] package/kodi: bump version to 19.4 Message-ID: <20220303174121.55867-1-bernd.kuhls@t-online.de> Add dependencies to giflib, libjpeg and libpng due to https://github.com/xbmc/xbmc/pull/20462 Signed-off-by: Bernd Kuhls --- v3: removed remnants from internal patch, sorry for the noise v2: added dependencies to giflib, libjpeg and libpng package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/Config.in | 3 +++ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 5 ++++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f31bf19b99..ebc95343a9 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 56e901fa17..7326cd536d 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ -- 2.30.2 From geomatsi at gmail.com Thu Mar 3 19:19:45 2022 From: geomatsi at gmail.com (Sergey Matyukevich) Date: Thu, 3 Mar 2022 22:19:45 +0300 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix libwpa_client.so build Message-ID: <20220303191945.3952450-1-geomatsi@gmail.com> Build target libwpa_client.so is not built regardless of whether the option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that fixes wpa_supplicant build regression. Fixes: http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ Signed-off-by: Sergey Matyukevich --- Hi all, Note that the patch has been posted to hostapd mailing list and discussed, but not yet accepted: https://patchwork.ozlabs.org/project/hostap/patch/20220222085219.3996729-1-geomatsi at gmail.com/ Regards, Sergey ...le-options-for-libwpa_client.so-and-.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch new file mode 100644 index 0000000000..156d0e7e2c --- /dev/null +++ b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch @@ -0,0 +1,68 @@ +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Sun, 20 Feb 2022 10:12:28 +0300 +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced regression into wpa_supplicant build process. Build +target libwpa_client.so is not built regardless of whether the option +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config +option is used before it is imported from the configuration file. +Moving its usage after including build.rules does not help: variable +ALL is processed by build.rules and further changes are not applied. +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as +expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +This commit re-enables options adding both build targets to _all +dependencies. + +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..e384cc6b8 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/wpa_supplicant at .service + ALL += systemd/wpa_supplicant-nl80211 at .service + ALL += systemd/wpa_supplicant-wired at .service + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 + -- 2.35.1 From peter at korsgaard.com Thu Mar 3 21:27:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 22:27:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix build with gcc 4.8 In-Reply-To: <20220302211724.2351984-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 22:17:24 +0100") References: <20220302211724.2351984-1-fontaine.fabrice@gmail.com> Message-ID: <87o82mafq9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: > pattern.c: In function 'is_valid_dns_name': > pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (const char *c = value;; c++) > ^ > pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code > pattern.c: In function 'is_valid_dns_name_pattern': > pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode > for (const char *c = value;; c++) > ^ > Fixes: > - http://autobuild.buildroot.org/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 3 21:26:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 22:26:01 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix build with gcc 4.8 Message-ID: <20220303212029.865F083901@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=610f52f3bea153a3293e67b95f7c4f31e74d2ffd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.86 in commit 5b29096f8fcb0acd8890073a56ba9d620b1f911c: pattern.c: In function 'is_valid_dns_name': pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code pattern.c: In function 'is_valid_dns_name_pattern': pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode for (const char *c = value;; c++) ^ Fixes: - http://autobuild.buildroot.org/results/eb0c34ff58eaf103f51c7171ecd97a3bdb887601 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...0004-src-pattern.c-fix-build-with-gcc-4.8.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..90bb02b23a --- /dev/null +++ b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,57 @@ +From 0c89dd2fa0fe50b00bca638dbbacfbd361526e0a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jan 2022 21:57:52 +0100 +Subject: [PATCH] src/pattern.c: fix build with gcc 4.8 + +Fix the following build failure: + +pattern.c: In function 'is_valid_dns_name': +pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ +pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code +pattern.c: In function 'is_valid_dns_name_pattern': +pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (const char *c = value;; c++) + ^ + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=b2690415bfa1bc105e61b75f642fb5c1aaf0fae8] +--- + src/pattern.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/pattern.c b/src/pattern.c +index 03e23b9..928d259 100644 +--- a/src/pattern.c ++++ b/src/pattern.c +@@ -129,9 +129,9 @@ int is_valid_dns_name(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '-' && *c != '.' && +@@ -242,11 +242,11 @@ int is_valid_dns_name_pattern(const char *value) + + size_t num_bytes = 0; + size_t num_labels = 0; +- const char *label = NULL; ++ const char *c, *label = NULL; + int is_label_numeric = 1; + size_t num_wildcards = 0; + int previous_label_has_wildcard = 1; +- for (const char *c = value;; c++) ++ for (c = value;; c++) + { + if (*c && + *c != '*' && /* Wildcard. */ +-- +2.20.1 + From peter at korsgaard.com Thu Mar 3 21:57:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 22:57:46 +0100 Subject: [Buildroot] [git commit] package/linux-headers: default to 5.15 series for _HEADERS_AS_KERNEL / KERNEL_LATEST_VERSION Message-ID: <20220303215200.D1F5E8144C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dc3cfbff11934a3b29f8b2b98aed22ec01e7c42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes #14611 BR2_KERNEL_HEADERS_LATEST_VERSION selects a 5.15.x series kernel (as that is current LTS), but support for 5.16.x kernel headers has been added, so by default the "custom kernel headers series" option ends up with 5.16.x (the first option), leading to confusing errors: Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x As a help, default to the correct 5.15.x series when this combination is used. Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 248a9a2d97..8543f1cd21 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -127,6 +127,8 @@ endif choice bool "Custom kernel headers series" + default BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 if \ + (BR2_KERNEL_HEADERS_AS_KERNEL && BR2_LINUX_KERNEL_LATEST_VERSION) depends on BR2_KERNEL_HEADERS_VERSION || BR2_KERNEL_HEADERS_AS_KERNEL || \ BR2_KERNEL_HEADERS_CUSTOM_TARBALL || BR2_KERNEL_HEADERS_CUSTOM_GIT help From bugzilla at busybox.net Thu Mar 3 22:00:42 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 03 Mar 2022 22:00:42 +0000 Subject: [Buildroot] [Bug 14611] 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_LATEST_VERSION=y broken In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14611 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Peter Korsgaard --- Fixed in git, thanks: https://git.buildroot.org/buildroot/commit/?id=5dc3cfbff11934a3b29f8b2b98aed22ec01e7c42 -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Thu Mar 3 22:09:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 23:09:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf-xlib: new package In-Reply-To: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:55 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Message-ID: <87k0daadsk.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Deprecated Xlib integration for GdkPixbuf. > gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since > version 2.42.0 and > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c > resulting in the following "hidden" warnings with xscreensaver since > commit a7b51ed3013c919b293deb95299e33363fb9df70: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 3 22:10:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 03 Mar 2022 23:10:12 +0100 Subject: [Buildroot] [PATCH 2/2] package/xscreensaver: add gdk-pixbuf-xlib dependency In-Reply-To: <20220302174456.1641125-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:56 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> <20220302174456.1641125-2-fontaine.fabrice@gmail.com> Message-ID: <87fsnyadrv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version > 2.42.0 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the 2.42.2, not 2.42.0. > following "hidden" warnings: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 3 22:08:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 23:08:05 +0100 Subject: [Buildroot] [git commit] package/xscreensaver: add gdk-pixbuf-xlib dependency Message-ID: <20220303220221.C157F81D5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35f02050be12b86cdd2220e09c72fd2586346068 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.2 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 787c3130ae..10b2b7012c 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index f73a75bf14..46dedc3211 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -15,6 +15,7 @@ XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ From peter at korsgaard.com Thu Mar 3 22:03:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 3 Mar 2022 23:03:03 +0100 Subject: [Buildroot] [git commit] package/gdk-pixbuf-xlib: new package Message-ID: <20220303220221.B764C819DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=559df4ef2888efda8a0142a9b61a1206e6ab0fff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..b7a7c8771c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -877,6 +877,7 @@ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ F: package/freeipmi/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..8d2d550a64 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1492,6 +1492,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) From christian at paral.in Fri Mar 4 04:25:02 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 3 Mar 2022 20:25:02 -0800 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.8 Message-ID: <20220304042502.56629-1-christian@paral.in> go1.17.8 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. https://go.dev/doc/devel/release#go1.17.minor Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index fdf342e602..85e6adfb8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz +sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 56a21dfe55..3df16c9a68 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.7 +GO_VERSION = 1.17.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.35.1 From yegorslists at googlemail.com Fri Mar 4 08:48:48 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Fri, 4 Mar 2022 09:48:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix libwpa_client.so build In-Reply-To: <20220303191945.3952450-1-geomatsi@gmail.com> References: <20220303191945.3952450-1-geomatsi@gmail.com> Message-ID: Hi Sergey, all, On Thu, Mar 3, 2022 at 8:19 PM Sergey Matyukevich wrote: > > Build target libwpa_client.so is not built regardless of whether the > option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that > fixes wpa_supplicant build regression. > > Fixes: > http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ > http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ > > Signed-off-by: Sergey Matyukevich Tested-by: Yegor Yefremov The patch was already merged upstream. Yegor > --- > > Hi all, > > Note that the patch has been posted to hostapd mailing list > and discussed, but not yet accepted: > > https://patchwork.ozlabs.org/project/hostap/patch/20220222085219.3996729-1-geomatsi at gmail.com/ > > Regards, > Sergey > > ...le-options-for-libwpa_client.so-and-.patch | 68 +++++++++++++++++++ > 1 file changed, 68 insertions(+) > create mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch > > diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch > new file mode 100644 > index 0000000000..156d0e7e2c > --- /dev/null > +++ b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch > @@ -0,0 +1,68 @@ > +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 > +From: Sergey Matyukevich > +Date: Sun, 20 Feb 2022 10:12:28 +0300 > +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase > + > +Commit a41a29192e5d ("build: Pull common fragments into a build.rules > +file") introduced regression into wpa_supplicant build process. Build > +target libwpa_client.so is not built regardless of whether the option > +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config > +option is used before it is imported from the configuration file. > +Moving its usage after including build.rules does not help: variable > +ALL is processed by build.rules and further changes are not applied. > +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as > +expected: wpa_passphrase is always built regardless of whether the > +option is set or not. > + > +This commit re-enables options adding both build targets to _all > +dependencies. > + > +Signed-off-by: Sergey Matyukevich > +--- > + wpa_supplicant/Makefile | 19 ++++++++++++------- > + 1 file changed, 12 insertions(+), 7 deletions(-) > + > +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile > +index cb66defac..e384cc6b8 100644 > +--- a/wpa_supplicant/Makefile > ++++ b/wpa_supplicant/Makefile > +@@ -1,24 +1,29 @@ > + BINALL=wpa_supplicant wpa_cli > + > +-ifndef CONFIG_NO_WPA_PASSPHRASE > +-BINALL += wpa_passphrase > +-endif > +- > + ALL = $(BINALL) > + ALL += systemd/wpa_supplicant.service > + ALL += systemd/wpa_supplicant at .service > + ALL += systemd/wpa_supplicant-nl80211 at .service > + ALL += systemd/wpa_supplicant-wired at .service > + ALL += dbus/fi.w1.wpa_supplicant1.service > +-ifdef CONFIG_BUILD_WPA_CLIENT_SO > +-ALL += libwpa_client.so > +-endif > + > + EXTRA_TARGETS=dynamic_eap_methods > + > + CONFIG_FILE=.config > + include ../src/build.rules > + > ++ifdef CONFIG_BUILD_WPA_CLIENT_SO > ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO > ++# being set in the config which is read by build.rules > ++_all: libwpa_client.so > ++endif > ++ > ++ifndef CONFIG_NO_WPA_PASSPHRASE > ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE > ++# being set in the config which is read by build.rules > ++_all: wpa_passphrase > ++endif > ++ > + ifdef LIBS > + # If LIBS is set with some global build system defaults, clone those for > + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. > +-- > +2.35.1 > + > -- > 2.35.1 > From peter at korsgaard.com Fri Mar 4 17:09:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Mar 2022 18:09:07 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220304170907.157687-1-peter@korsgaard.com> Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..df5261e5ff 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d0813e5db4..01325348ef 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz +sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8543f1cd21..8cfbd41831 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -380,14 +380,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 - default "5.15.13" if BR2_KERNEL_HEADERS_5_15 - default "5.16" if BR2_KERNEL_HEADERS_5_16 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 + default "5.15.26" if BR2_KERNEL_HEADERS_5_15 + default "5.16.12" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ -- 2.30.2 From peter at korsgaard.com Fri Mar 4 17:10:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 04 Mar 2022 18:10:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: security bump to 1.17.8 In-Reply-To: <20220304042502.56629-1-christian@paral.in> (Christian Stewart's message of "Thu, 3 Mar 2022 20:25:02 -0800") References: <20220304042502.56629-1-christian@paral.in> Message-ID: <87bkylabke.fsf@dell.be.48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.17.8 includes a security fix to the regexp/syntax package, as well as bug > fixes to the compiler, runtime, the go command, and the crypto/x509, and net > packages. > https://go.dev/doc/devel/release#go1.17.minor > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 4 17:11:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 4 Mar 2022 18:11:36 +0100 Subject: [Buildroot] [git commit] package/go: security bump to 1.17.8 Message-ID: <20220304170333.BD28382A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cd8faa8d3b525fc01c21bc03ddd617062516699 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.17.8 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. https://go.dev/doc/devel/release#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index fdf342e602..85e6adfb8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz +sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 56a21dfe55..3df16c9a68 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.7 +GO_VERSION = 1.17.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From fontaine.fabrice at gmail.com Fri Mar 4 17:24:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 18:24:39 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: remove override in conditional Message-ID: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 17:38:51 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 18:38:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: fix build without libvirtd Message-ID: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 7b0ed5e52e..1dc61a7549 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -39,7 +39,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -196,7 +195,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -235,7 +237,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 19:06:00 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 20:06:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop Message-ID: <20220304190600.4021243-1-fontaine.fabrice@gmail.com> Fix the following build failure without shell-desktop raised since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: In file included from ../tests/weston-test-client-helper.c:43: ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory 40 | #include "weston-screenshooter-client-protocol.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 Signed-off-by: Fabrice Fontaine --- ...ncy-on-screenshooter-client-protocol.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch new file mode 100644 index 0000000000..927215380e --- /dev/null +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch @@ -0,0 +1,38 @@ +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Tue, 8 Feb 2022 22:39:42 +0000 +Subject: [PATCH] tests: Add dependency on screenshooter client protocol + +Given that the test-helper code relies on the screenshooter protocol, +make sure it's available for us to build, and the dependency ensures we +build in order. + +Fixes: #588 + +Signed-off-by: Daniel Stone + +[Retrieved from: +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] +Signed-off-by: Fabrice Fontaine +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 2d464ddcc..222091cd1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -29,8 +29,9 @@ lib_test_client = static_library( + 'weston-test-client-helper.c', + 'weston-test-fixture-compositor.c', + weston_test_client_protocol_h, +- weston_screenshooter_protocol_c, + weston_test_protocol_c, ++ weston_screenshooter_client_protocol_h, ++ weston_screenshooter_protocol_c, + viewporter_client_protocol_h, + viewporter_protocol_c, + 'color_util.h', +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 19:32:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 20:32:10 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/jpeg-turbo: bump to version 2.1.3 Message-ID: <20220304193210.4025746-1-fontaine.fabrice@gmail.com> Update hash of license file (date updated with https://github.com/libjpeg-turbo/libjpeg-turbo/commit/172972394a51352d0b67c30f20041e69a98d78b7) https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.3 Signed-off-by: Fabrice Fontaine --- package/jpeg-turbo/jpeg-turbo.hash | 10 +++++----- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index de82199659..a892fd3eaa 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/ -sha1 65c51c543b1fbba6db9ff5bee474ccb0b52a929f libjpeg-turbo-2.1.2.tar.gz -md5 e181bd78884dd5392a869209bfa41d4a libjpeg-turbo-2.1.2.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.3/ +sha1 6dec48193bb27e1c07abae8230031ce9ecb1cfec libjpeg-turbo-2.1.3.tar.gz +md5 85244dedeaf06f636a9e7ddea6d236d8 libjpeg-turbo-2.1.3.tar.gz # Locally computed -sha256 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 libjpeg-turbo-2.1.2.tar.gz -sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 LICENSE.md +sha256 467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0 libjpeg-turbo-2.1.3.tar.gz +sha256 ee1eaf194d5924b6360af8a6ba6a4e1554037091f7505943300cdeec65f1aebb LICENSE.md sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index ddae019839..475eb5fa84 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.1.2 +JPEG_TURBO_VERSION = 2.1.3 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Mar 4 19:40:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 4 Mar 2022 20:40:02 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/faketime: bump to version 0.9.10 Message-ID: <20220304194002.4028347-1-fontaine.fabrice@gmail.com> https://github.com/wolfcw/libfaketime/releases/tag/v0.9.10 Signed-off-by: Fabrice Fontaine --- package/faketime/faketime.hash | 2 +- package/faketime/faketime.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index 0628ff9ae6..a7d8d62dba 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 729ad33b9c750a50d9c68e97b90499680a74afd1568d859c574c0fe56fe7947f faketime-0.9.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 355477ba3b..6fc684f852 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.9 +FAKETIME_VERSION = 0.9.10 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING -- 2.34.1 From buildroot at busybox.net Fri Mar 4 20:33:36 2022 From: buildroot at busybox.net (jack) Date: Sat, 05 Mar 2022 04:33:36 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220304203338.DD4AC8293F@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From buildroot at uclibc.org Fri Mar 4 20:33:36 2022 From: buildroot at uclibc.org (jack) Date: Sat, 05 Mar 2022 04:33:36 +0800 Subject: [Buildroot] =?utf-8?q?wholesale_old_mobile_phones_at_cheap_price?= =?utf-8?q?s?= Message-ID: <20220304203338.E51458244D@smtp1.osuosl.org> An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Fri Mar 4 20:43:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 4 Mar 2022 21:43:17 +0100 Subject: [Buildroot] [git commit] package/weston: fix build without shell-desktop Message-ID: <20220304205027.7E6B182B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f3b4f9402b7f5da8f0e0840523d43ef40c3f73f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without shell-desktop raised since bump to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: In file included from ../tests/weston-test-client-helper.c:43: ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory 40 | #include "weston-screenshooter-client-protocol.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...pendency-on-screenshooter-client-protocol.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch new file mode 100644 index 0000000000..927215380e --- /dev/null +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch @@ -0,0 +1,38 @@ +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Tue, 8 Feb 2022 22:39:42 +0000 +Subject: [PATCH] tests: Add dependency on screenshooter client protocol + +Given that the test-helper code relies on the screenshooter protocol, +make sure it's available for us to build, and the dependency ensures we +build in order. + +Fixes: #588 + +Signed-off-by: Daniel Stone + +[Retrieved from: +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] +Signed-off-by: Fabrice Fontaine +--- + tests/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 2d464ddcc..222091cd1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -29,8 +29,9 @@ lib_test_client = static_library( + 'weston-test-client-helper.c', + 'weston-test-fixture-compositor.c', + weston_test_client_protocol_h, +- weston_screenshooter_protocol_c, + weston_test_protocol_c, ++ weston_screenshooter_client_protocol_h, ++ weston_screenshooter_protocol_c, + viewporter_client_protocol_h, + viewporter_protocol_c, + 'color_util.h', +-- +GitLab + From yann.morin.1998 at free.fr Fri Mar 4 20:58:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 4 Mar 2022 21:58:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/weston: fix build without shell-desktop In-Reply-To: <20220304190600.4021243-1-fontaine.fabrice@gmail.com> References: <20220304190600.4021243-1-fontaine.fabrice@gmail.com> Message-ID: <20220304205840.GA228549@scaer> Fabrice, All, On 2022-03-04 20:06 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure without shell-desktop raised since bump > to version 10.0.0 in commit f67a6e9b7a7be9adbc405b3126000056120a01af and > https://gitlab.freedesktop.org/wayland/weston/-/commit/9e90760ab054db2234f73374600489fa5584ad7c: > > In file included from ../tests/weston-test-client-helper.c:43: > ../tests/weston-test-client-helper.h:40:10: fatal error: weston-screenshooter-client-protocol.h: No such file or directory > 40 | #include "weston-screenshooter-client-protocol.h" > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/8ece588f52fc1b4e422f8bce9b106d9d3822f1a1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ncy-on-screenshooter-client-protocol.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch > > diff --git a/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch > new file mode 100644 > index 0000000000..927215380e > --- /dev/null > +++ b/package/weston/0001-tests-Add-dependency-on-screenshooter-client-protocol.patch > @@ -0,0 +1,38 @@ > +From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001 > +From: Daniel Stone > +Date: Tue, 8 Feb 2022 22:39:42 +0000 > +Subject: [PATCH] tests: Add dependency on screenshooter client protocol > + > +Given that the test-helper code relies on the screenshooter protocol, > +make sure it's available for us to build, and the dependency ensures we > +build in order. > + > +Fixes: #588 > + > +Signed-off-by: Daniel Stone > + > +[Retrieved from: > +https://gitlab.freedesktop.org/wayland/weston/-/commit/2ac6b6b084a877adde64db7faff2ed22eb3ea97a] > +Signed-off-by: Fabrice Fontaine > +--- > + tests/meson.build | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/tests/meson.build b/tests/meson.build > +index 2d464ddcc..222091cd1 100644 > +--- a/tests/meson.build > ++++ b/tests/meson.build > +@@ -29,8 +29,9 @@ lib_test_client = static_library( > + 'weston-test-client-helper.c', > + 'weston-test-fixture-compositor.c', > + weston_test_client_protocol_h, > +- weston_screenshooter_protocol_c, > + weston_test_protocol_c, > ++ weston_screenshooter_client_protocol_h, > ++ weston_screenshooter_protocol_c, > + viewporter_client_protocol_h, > + viewporter_protocol_c, > + 'color_util.h', > +-- > +GitLab > + > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Fri Mar 4 21:38:28 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 4 Mar 2022 22:38:28 +0100 Subject: [Buildroot] [PATCH/next] package/libnss: bump to version 3.76 Message-ID: <20220304213828.3870123-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 07fb340c33..b4b8be11f6 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_RTM/src/SHA256SUMS +sha256 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 nss-3.76.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a9549e48dd..2f7a265136 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.75 +LIBNSS_VERSION = 3.76 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist -- 2.25.1 From bugzilla at busybox.net Fri Mar 4 23:28:14 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Fri, 04 Mar 2022 23:28:14 +0000 Subject: [Buildroot] [Bug 14636] New: azure-iot-sdk-c: Installed headers do not compile Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14636 Bug ID: 14636 Summary: azure-iot-sdk-c: Installed headers do not compile Product: buildroot Version: 2021.02.10 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jcowgill+busybox at jcowgill.uk CC: buildroot at uclibc.org Target Milestone: --- After building azure-iot-sdk-c... test.c contains: #include Running this: $ output/host/bin/aarch64-none-linux-gnu-gcc -c test.c Gives: In file included from test.c:1: .../output/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/iothub_client.h:22:10: fatal error: umock_c/umock_c_prod.h: No such file or directory 22 | #include "umock_c/umock_c_prod.h" | ^~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Most of the headers seem to depend on umock_c which isn't installed. $ find output/staging/usr/include -name umock_c $ This bug pretty much makes the package unusable. ---- It's only slightly related, but I also wonder why the headers are installed directly into "/usr/include" even though upstream installs them under "/usr/include/azureiot". -- You are receiving this mail because: You are on the CC list for the bug. From mmayer at broadcom.com Sat Mar 5 00:00:51 2022 From: mmayer at broadcom.com (Markus Mayer) Date: Fri, 4 Mar 2022 16:00:51 -0800 Subject: [Buildroot] [PATCH 0/1] linux: limit YYLTYPE kernel modification Message-ID: <20220305000052.491721-1-mmayer@broadcom.com> Hi, It took me a while to find out why our kernel builds were suddenly failing with the 2022.02-rcX sources. Oddly, building DTC for the host would error out like so: dtc-parser.y: In function `print_error': dtc-parser.y:478:17: error: `yylloc' undeclared (first use in this function); did you mean `yyalloc'? dtc-parser.y:478:17: note: each undeclared identifier is reported only once for each function it appears in dtc-lexer.lex.c: In function `yylex': dtc-lexer.l:46:18: error: `yylloc' undeclared (first use in this function); did you mean `yyalloc'? dtc-lexer.lex.c:845:2: note: in expansion of macro `YY_USER_ACTION' dtc-lexer.lex.c:939:1: note: in expansion of macro `YY_RULE_SETUP' dtc-lexer.l:46:18: note: each undeclared identifier is reported only once for each function it appears in dtc-lexer.lex.c:845:2: note: in expansion of macro `YY_USER_ACTION' dtc-lexer.lex.c:939:1: note: in expansion of macro `YY_RULE_SETUP' The kernel build that's failing is Linux 4.1 with GCC 6.3. Yes, I know. Old kernel, old toolchain. Still, this used to work, and now it doesn't. (We have newer toolchains and newer kernels, too. They seem fine.) Eventually, I tracked it down to this change: https://git.buildroot.net/buildroot/commit/?id=9b41b54be077 I think there are two issues with it. It claims to be for GCC 10+, but it is applied at all times. I believe it should be conditional upon BR2_TOOLCHAIN_GCC_AT_LEAST_10 if the intention is to fix up the sources for GCC 10 and newer. Secondly, this code works its magic completely silently and quietly. There is no indication that anything is being done to the kernel sources. That makes it really, *REALLY* challenging to figure out what's going on when things go sideways. I think an informational message to the user is absolutely crucial. At least that way it'll show up in the build logs if one searches for "YYLTYPE". That'll give the users a hint where the sources are being touched. Modifying source code like this should not happen quietly. Regards, -Markus Markus Mayer (1): linux: limit YYLTYPE kernel modification linux/linux.mk | 3 +++ 1 file changed, 3 insertions(+) -- 2.25.1 From mmayer at broadcom.com Sat Mar 5 00:22:09 2022 From: mmayer at broadcom.com (Markus Mayer) Date: Fri, 4 Mar 2022 16:22:09 -0800 Subject: [Buildroot] [PATCH 1/1] linux: limit YYLTYPE kernel modification In-Reply-To: <20220305000052.491721-1-mmayer@broadcom.com> References: <20220305000052.491721-1-mmayer@broadcom.com> Message-ID: <20220305002209.493816-1-mmayer@broadcom.com> Commit 9b41b54be07711c10ad13ce157be272ed1cf402e addresses a build issue regarding re-defined YACC symbols. Unfortunately, this can break the build for older toolchains. To prevent unintentional breakage, make the source code modification conditional on BR2_TOOLCHAIN_GCC_AT_LEAST_10. Also inform the user about the modification when it is performed, so it becomes more obvious what is happening in case of unforseen problems. Signed-off-by: Markus Mayer --- linux/linux.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 940dc2849f..382a3f679e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -293,12 +293,15 @@ endef LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) # Older versions break on gcc 10+ because of redefined symbols define LINUX_DROP_YYLLOC + @echo "Removing 'YYLTYPE yylloc;' from kernel sources..." $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' endef LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC +endif # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions -- 2.25.1 From buildroot at busybox.net Sat Mar 5 07:47:22 2022 From: buildroot at busybox.net (buildroot at busybox.net) Date: Sat, 5 Mar 2022 09:47:22 +0200 (EET) Subject: [Buildroot] Alveks Friend Message-ID: <20220305074722.8995E344165@bizzi.btv.lv> Name: ???? Veronica want to meet you! Click here: https://clck.ru/dX8h6?ulqsc ???? E-mail: buildroot at busybox.net Info: ttq6oxmg -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sat Mar 5 09:18:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 5 Mar 2022 10:18:49 +0100 Subject: [Buildroot] [PATCH 1/1] linux: limit YYLTYPE kernel modification In-Reply-To: <20220305002209.493816-1-mmayer@broadcom.com> References: <20220305000052.491721-1-mmayer@broadcom.com> <20220305002209.493816-1-mmayer@broadcom.com> Message-ID: <20220305091849.GB228549@scaer> Markus, All, On 2022-03-04 16:22 -0800, Markus Mayer spake thusly: > Commit 9b41b54be07711c10ad13ce157be272ed1cf402e addresses a build issue > regarding re-defined YACC symbols. Unfortunately, this can break the > build for older toolchains. > > To prevent unintentional breakage, make the source code modification > conditional on BR2_TOOLCHAIN_GCC_AT_LEAST_10. Also inform the user about > the modification when it is performed, so it becomes more obvious what > is happening in case of unforseen problems. > > Signed-off-by: Markus Mayer > --- > linux/linux.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 940dc2849f..382a3f679e 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -293,12 +293,15 @@ endef > > LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) That is wrong, because this is built with the _host_ compiler, not the target compiler, and BR2_TOOLCHAIN_GCC_AT_LEAST_XX is about the target compiler. So, if we wanted to make that conditional, that would have to be conditional on BR2_HOST_GCC_AT_LEAST_10 (we only have up to gcc-9 for the host for now, so we'd need to add it for gcc-10 and 11; hint: search for BR2_HOST_GCC_AT_LEAST_9, HOST_GCC_VERSION, HOSTCC_VERSION, and HOSTCC_MAX_VERSION). Furthermore, that is still wrong in your case: if you switch to a distribution that has gcc 10 (so, as host compler!), then this fixup will be applied again, and your build will break again, because your kernel is (probably) missing the following commits (of the 29 that touch scripts/dtc/ between 4.1 and e33a814e772c): $ git slog -G'YYLTYPE yylloc;' v4.1..e33a814e772cdc36436c8c188d8c42d019fda639 -- scripts/dtc/ e33a814e772cd scripts/dtc: Remove redundant YYLOC global declaration e039139be8c25 scripts/dtc: generate lexer and parser during build instead of shipping 4760597116e34 scripts/dtc: Update to upstream version 9d3649bd3be245c9 However, you still have a point: this is breaking older kernels that do not have a recent-enough bundled dtc, whether they be built with a host gcc 10+ or not... Maybe we need to find a better heuristic to detect the case when we need to apply the fix, but then I am afraid this is going to be a nightmare of so many corner cases with vendor-specific franken-kernels. I am not sure where to go from here, though... > # Older versions break on gcc 10+ because of redefined symbols > define LINUX_DROP_YYLLOC > + @echo "Removing 'YYLTYPE yylloc;' from kernel sources..." There are so many fixes and tweaks we do without informing the user. If we were to, the build would be even more verbose than it currently is. Finding a reference to yylloc in the build log would just mean grepping for it, so you would achieve about the same by running: $ make V=1 as that would print the fixup line. Regards, Yann E. MORIN. > $(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \ > |xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d' > endef > LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC > +endif > > # Older linux kernels use deprecated perl constructs in timeconst.pl > # that were removed for perl 5.22+ so it breaks on newer distributions > -- > 2.25.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 5 14:46:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:46:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: needs headers >= 4.12 In-Reply-To: <20220213193336.1102940-1-fontaine.fabrice@gmail.com> References: <20220213193336.1102940-1-fontaine.fabrice@gmail.com> Message-ID: <5a736030-ecc7-6415-2e15-f73f564f6ea5@mind.be> On 13/02/2022 20:33, Fabrice Fontaine wrote: > NETLINK_EXT_ACK is only available since kernel 4.12 and > https://github.com/torvalds/linux/commit/2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5 > resulting in the following build failure since addition of the package > in commit 3675131e6c654d7536a184db0184fde7a97040e0: > > net.c: In function 'netlink_open': > net.c:110:36: error: 'NETLINK_EXT_ACK' undeclared (first use in this function); did you mean 'NETLINK_CAP_ACK'? > 110 | if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, > | ^~~~~~~~~~~~~~~ > | NETLINK_CAP_ACK > > Fixes: > - http://autobuild.buildroot.org/results/c61678e56bd73609838747048f27068818c21150 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/bpftool/Config.in | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in > index 39475aa962..e81d874343 100644 > --- a/package/bpftool/Config.in > +++ b/package/bpftool/Config.in > @@ -5,14 +5,16 @@ config BR2_PACKAGE_BPFTOOL > depends on !BR2_STATIC_LIBS # elfutils > depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils > depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 > select BR2_PACKAGE_BINUTILS > select BR2_PACKAGE_ELFUTILS > help > bpftool is a tool for for inspection and simple manipulation > of eBPF programs and maps. > > -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" > +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" > depends on !BR2_nios2 > depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ > || !BR2_TOOLCHAIN_HAS_THREADS \ > - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) > + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ > + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 From arnout at mind.be Sat Mar 5 14:46:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:46:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/zabbix: add ZABBIX_CPE_ID_VENDOR In-Reply-To: <20220213203219.1206327-1-fontaine.fabrice@gmail.com> References: <20220213203219.1206327-1-fontaine.fabrice@gmail.com> Message-ID: On 13/02/2022 21:32, Fabrice Fontaine wrote: > cpe:2.3:a:zabbix:zabbix is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Azabbix%3Azabbix > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/zabbix/zabbix.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index e72d831b46..e6564e68fd 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -9,6 +9,7 @@ ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 > ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) > ZABBIX_LICENSE = GPL-2.0+ > ZABBIX_LICENSE_FILES = README COPYING > +ZABBIX_CPE_ID_VENDOR = zabbix > > ZABBIX_DEPENDENCIES = pcre > ZABBIX_CONF_OPTS = \ From arnout at mind.be Sat Mar 5 14:47:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:47:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: add PYTHON_GNUPG_CPE_ID_VENDOR In-Reply-To: <20220213204327.1206836-1-fontaine.fabrice@gmail.com> References: <20220213204327.1206836-1-fontaine.fabrice@gmail.com> Message-ID: On 13/02/2022 21:43, Fabrice Fontaine wrote: > cpe:2.3:a:python:python-gnupg is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apython%3Apython-gnupg > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-gnupg/python-gnupg.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk > index f16910e517..fda264a0ed 100644 > --- a/package/python-gnupg/python-gnupg.mk > +++ b/package/python-gnupg/python-gnupg.mk > @@ -8,6 +8,7 @@ PYTHON_GNUPG_VERSION = 0.4.8 > PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 > PYTHON_GNUPG_LICENSE = BSD-3-Clause > PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt > +PYTHON_GNUPG_CPE_ID_VENDOR = python > PYTHON_GNUPG_SETUP_TYPE = setuptools > > $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:49:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:49:44 +0100 Subject: [Buildroot] [PATCH] package/gdb: bump 11.x version to 11.2 In-Reply-To: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> References: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> Message-ID: <94702c85-4a62-54fe-017b-eb2cd6ffa26c@mind.be> On 13/02/2022 23:01, Thomas Petazzoni via buildroot wrote: > This is a minor corrective release over GDB 11.1, fixing the following issues: > > PR sim/28302 (gdb fails to build with glibc 2.34) > PR build/28318 (std::thread support configure check does not use > CXX_DIALECT) > PR gdb/28405 (arm-none-eabi: internal-error: ptid_t > remote_target::select_thread_for_ambiguous_stop_reply(const > target_waitstatus*): Assertion `first_resumed_thread != nullptr' > failed) > PR tui/28483 ([gdb/tui] breakpoint creation not displayed) > PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) > PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) > PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) > PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) > > Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was > merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. > > Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as > commit df9ebc472a162306dee8ba6e02b99963c2babb7c? > > Drop patch 0009-gdbserver-aarch64-support.patch, which was merged > upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. > > Signed-off-by: Thomas Petazzoni Bugfix bump, so applied to master, thanks. Regards, Arnout > --- > ...sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------ > .../gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ----------- > .../11.1/0010-gdbserver-aarch64-support.patch | 320 ------------------ > ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 > ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 > .../0003-use-asm-sgidefs.h.patch | 0 > .../0004-gdbserver-fix-build-for-m68k.patch | 0 > ...fork-inferior-include-linux-ptrace.h.patch | 0 > ...etrandom-compile-for-uclibc-v1.0.35.patch} | 0 > .../0007-fix-musl-build-on-riscv.patch | 0 > ...gdbserver-Makefile.in-fix-NLS-build.patch} | 0 > package/gdb/Config.in.host | 2 +- > package/gdb/gdb.hash | 2 +- > 13 files changed, 2 insertions(+), 626 deletions(-) > delete mode 100644 package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch > delete mode 100644 package/gdb/11.1/0008-Fix-build-on-rhES5.patch > delete mode 100644 package/gdb/11.1/0010-gdbserver-aarch64-support.patch > rename package/gdb/{11.1 => 11.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) > rename package/gdb/{11.1 => 11.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) > rename package/gdb/{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch (100%) > rename package/gdb/{11.1 => 11.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) > rename package/gdb/{11.1 => 11.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) > rename package/gdb/{11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch => 11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch} (100%) > rename package/gdb/{11.1 => 11.2}/0007-fix-musl-build-on-riscv.patch (100%) > rename package/gdb/{11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch => 11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch} (100%) > > diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch > deleted file mode 100644 > index d969d98831..0000000000 > --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch > +++ /dev/null > @@ -1,110 +0,0 @@ > -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 > -From: Mike Frysinger > -Date: Sun, 3 Oct 2021 12:02:53 -0400 > -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] > - > -We map target signals to host signals so we can propagate signals > -between the host & simulated worlds. That means we need to know > -the symbolic names & values of all signals that might be sent. > - > -The tools that generate that list use signal.h and include all > -symbols that start with "SIG" so as to automatically include any > -new symbols that the C library might add. Unfortunately, this > -also picks up "SIGSTKSZ" which is not actually a signal itself, > -but a signal related setting -- it's the size of the stack when > -a signal is handled. > - > -By itself this doesn't super matter as we will never see a signal > -with that same value (since the range of valid signals tend to be > -way less than 1024, and the size of the default signal stack will > -never be that small). But with recent glibc changes that make this > -into a dynamic value instead of a compile-time constant, some users > -see build failures when building the sim. > - > -As suggested by Adam Sampson, update our scripts to ignore this > -symbol to simplify everything and avoid the build failure. > - > -Bug: https://sourceware.org/PR28302 > - > -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] > -Signed-off-by: Peter Seiderer > ---- > - sim/bfin/linux-targ-map.h | 5 +---- > - sim/common/gennltvals.py | 6 ++++-- > - sim/common/nltvals.def | 1 - > - 3 files changed, 5 insertions(+), 7 deletions(-) > - > -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h > -index e9c8c8f..0340ed5 100644 > ---- a/sim/bfin/linux-targ-map.h > -+++ b/sim/bfin/linux-targ-map.h > -@@ -30,6 +30,7 @@ echo > - # XXX: nothing uses this ? > - echo '#include ' | \ > - bfin-uclinux-gcc -E -dD -P - | \ > -+grep -v SIGSTKSZ | \ > - sed -r -n \ > - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ > - -e '$i\ \ { 0, -1, -1 }\n};' \ > -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = > - #ifdef SIG_SETMASK > - # define TARGET_LINUX_SIG_SETMASK 2 > - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, > --#endif > --#ifdef SIGSTKSZ > --# define TARGET_LINUX_SIGSTKSZ 8192 > -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, > - #endif > - { 0, -1, -1 } > - }; > -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py > -index b3e558d..bd4d7e9 100755 > ---- a/sim/common/gennltvals.py > -+++ b/sim/common/gennltvals.py > -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ > - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, > - headers: Iterable[str], > - pattern: str, > -+ filter: str = r'^$', > - target: str = None): > - """Extract constants from the specified files using a regular expression. > - > -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, > - srcfile = ''.join(f'#include <{x}>\n' for x in headers) > - syms = set() > - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') > -+ filter_pattern = re.compile(filter) > - for header in headers: > - with open(srcdir / header, 'r', encoding='utf-8') as fp: > - data = fp.read() > - for line in data.splitlines(): > - m = define_pattern.match(line) > -- if m: > -+ if m and not filter_pattern.search(line): > - syms.add(m.group(1)) > - for sym in sorted(syms): > - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' > -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): > - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') > - > - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', > -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') > -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') > - > - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', > - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') > -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def > -index 8ae8839..8bc6ae5 100644 > ---- a/sim/common/nltvals.def > -+++ b/sim/common/nltvals.def > -@@ -116,7 +116,6 @@ > - { "SIGPROF", 27 }, > - { "SIGQUIT", 3 }, > - { "SIGSEGV", 11 }, > -- { "SIGSTKSZ", 8192 }, > - { "SIGSTOP", 17 }, > - { "SIGSYS", 12 }, > - { "SIGTERM", 15 }, > --- > -2.33.1 > - > diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch > deleted file mode 100644 > index 2d4e30ffe1..0000000000 > --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch > +++ /dev/null > @@ -1,194 +0,0 @@ > -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 > -From: Tom Tromey > -Date: Wed, 12 May 2021 12:39:22 -0600 > -Subject: [PATCH] Fix build on rhES5 > - > -The rhES5 build failed due to an upstream import a while back. The > -bug here is that, while the 'personality' function exists, > -ADDR_NO_RANDOMIZE is only defined in , not > -. > - > -However, does not declare the 'personality' > -function, and and cannot > -both be included. > - > -This patch restores one of the removed configure checks and updates > -the code to check it. > - > -We had this as a local patch at AdaCore, because it seemed like there > -was no interest upstream. However, now it turns out that this fixes > -PR build/28555, so I'm sending it now. > - > -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] > -Signed-off-by: Peter Seiderer > ---- > - gdb/config.in | 4 ++++ > - gdb/configure | 16 ++++++++++++++++ > - gdb/nat/linux-personality.c | 4 ++++ > - gdbserver/config.in | 4 ++++ > - gdbserver/configure | 16 ++++++++++++++++ > - gdbsupport/common.m4 | 5 +++++ > - gdbsupport/config.in | 4 ++++ > - gdbsupport/configure | 16 ++++++++++++++++ > - 8 files changed, 69 insertions(+) > - > -diff --git a/gdb/config.in b/gdb/config.in > -index 2c30504..776bee9 100644 > ---- a/gdb/config.in > -+++ b/gdb/config.in > -@@ -96,6 +96,10 @@ > - /* define if the compiler supports basic C++11 syntax */ > - #undef HAVE_CXX11 > - > -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if > -+ you don't. */ > -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE > -+ > - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you > - don't. */ > - #undef HAVE_DECL_ASPRINTF > -diff --git a/gdb/configure b/gdb/configure > -index 5d89635..27e3194 100755 > ---- a/gdb/configure > -+++ b/gdb/configure > -@@ -13838,6 +13838,22 @@ fi > - done > - > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include > -+" > -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : > -+ ac_have_decl=1 > -+else > -+ ac_have_decl=0 > -+fi > -+ > -+cat >>confdefs.h <<_ACEOF > -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl > -+_ACEOF > -+ > -+ > - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" > - if test "x$ac_cv_have_decl_strstr" = xyes; then : > - ac_have_decl=1 > -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c > -index 9ce345b..27999fd 100644 > ---- a/gdb/nat/linux-personality.c > -+++ b/gdb/nat/linux-personality.c > -@@ -22,6 +22,10 @@ > - > - #include > - > -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE > -+# define ADDR_NO_RANDOMIZE 0x0040000 > -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ > -+ > - /* See comment on nat/linux-personality.h. */ > - > - maybe_disable_address_space_randomization:: > -diff --git a/gdbserver/config.in b/gdbserver/config.in > -index cf06c56..c9258b3 100644 > ---- a/gdbserver/config.in > -+++ b/gdbserver/config.in > -@@ -31,6 +31,10 @@ > - /* define if the compiler supports basic C++11 syntax */ > - #undef HAVE_CXX11 > - > -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if > -+ you don't. */ > -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE > -+ > - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you > - don't. */ > - #undef HAVE_DECL_ASPRINTF > -diff --git a/gdbserver/configure b/gdbserver/configure > -index b227167..d399d71 100755 > ---- a/gdbserver/configure > -+++ b/gdbserver/configure > -@@ -7131,6 +7131,22 @@ fi > - done > - > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include > -+" > -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : > -+ ac_have_decl=1 > -+else > -+ ac_have_decl=0 > -+fi > -+ > -+cat >>confdefs.h <<_ACEOF > -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl > -+_ACEOF > -+ > -+ > - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" > - if test "x$ac_cv_have_decl_strstr" = xyes; then : > - ac_have_decl=1 > -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 > -index 901c454..56a355e 100644 > ---- a/gdbsupport/common.m4 > -+++ b/gdbsupport/common.m4 > -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ > - ptrace64 sbrk setns sigaltstack sigprocmask \ > - setpgid setpgrp getrusage getauxval sigtimedwait]) > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) > -+ > - AC_CHECK_DECLS([strstr]) > - > - # ----------------------- # > -diff --git a/gdbsupport/config.in b/gdbsupport/config.in > -index f46e261..6945a62 100644 > ---- a/gdbsupport/config.in > -+++ b/gdbsupport/config.in > -@@ -28,6 +28,10 @@ > - /* define if the compiler supports basic C++11 syntax */ > - #undef HAVE_CXX11 > - > -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if > -+ you don't. */ > -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE > -+ > - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you > - don't. */ > - #undef HAVE_DECL_ASPRINTF > -diff --git a/gdbsupport/configure b/gdbsupport/configure > -index a9dd02c..243a03f 100755 > ---- a/gdbsupport/configure > -+++ b/gdbsupport/configure > -@@ -8144,6 +8144,22 @@ fi > - done > - > - > -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. > -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, > -+ # only in linux/personality.h. > -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include > -+" > -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : > -+ ac_have_decl=1 > -+else > -+ ac_have_decl=0 > -+fi > -+ > -+cat >>confdefs.h <<_ACEOF > -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl > -+_ACEOF > -+ > -+ > - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" > - if test "x$ac_cv_have_decl_strstr" = xyes; then : > - ac_have_decl=1 > --- > -2.33.1 > - > diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch > deleted file mode 100644 > index 3718b1b6fd..0000000000 > --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch > +++ /dev/null > @@ -1,320 +0,0 @@ > -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 > -From: Luis Machado > -Date: Fri, 29 Oct 2021 14:54:36 -0300 > -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic > - > -The current register set selection mechanism for AArch64 is static, based > -on a pre-populated array of register sets. > - > -This means that we might potentially probe register sets that are not > -available. This is OK if the kernel errors out during ptrace, but probing the > -tag_ctl register, for example, does not result in a ptrace error if the kernel > -supports the tagged address ABI but not MTE (PR 28355). > - > -Making the register set selection dynamic, based on feature checks, solves > -this and simplifies the code a bit. It allows us to list all of the register > -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. > - > -gdb/ChangeLog: > - > -2021-11-03 Luis Machado > - > - PR gdb/28355 > - > - * arch/aarch64.h (struct aarch64_features): New struct. > - > -gdbserver/ChangeLog: > - > -2021-11-03 Luis Machado > - > - PR gdb/28355 > - > - * linux-aarch64-low.cc (is_sve_tdesc): Remove. > - (aarch64_target::low_arch_setup): Rework to adjust the register sets. > - (aarch64_regsets): Update to list all register sets. > - (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. > - (aarch64_sve_regsets, aarch64_sve_regsets_info) > - (regs_info_aarch64_sve): Remove. > - (aarch64_adjust_register_sets): New. > - (aarch64_target::get_regs_info): Remove references to removed structs. > - (initialize_low_arch): Likewise. > - > -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 > -Signed-off-by: Joachim Wiberg > ---- > - gdb/arch/aarch64.h | 9 ++ > - gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- > - 4 files changed, 130 insertions(+), 85 deletions(-) > - > -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h > -index 0eb702c5b5e..95edb664b55 100644 > ---- a/gdb/arch/aarch64.h > -+++ b/gdb/arch/aarch64.h > -@@ -22,6 +22,15 @@ > - > - #include "gdbsupport/tdesc.h" > - > -+/* Holds information on what architectural features are available. This is > -+ used to select register sets. */ > -+struct aarch64_features > -+{ > -+ bool sve = false; > -+ bool pauth = false; > -+ bool mte = false; > -+}; > -+ > - /* Create the aarch64 target description. A non zero VQ value indicates both > - the presence of SVE and the Vector Quotient - the number of 128bit chunks in > - an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH > -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc > -index daccfef746e..9a8cb4169a7 100644 > ---- a/gdbserver/linux-aarch64-low.cc > -+++ b/gdbserver/linux-aarch64-low.cc > -@@ -196,16 +196,6 @@ is_64bit_tdesc (void) > - return register_size (regcache->tdesc, 0) == 8; > - } > - > --/* Return true if the regcache contains the number of SVE registers. */ > -- > --static bool > --is_sve_tdesc (void) > --{ > -- struct regcache *regcache = get_thread_regcache (current_thread, 0); > -- > -- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); > --} > -- > - static void > - aarch64_fill_gregset (struct regcache *regcache, void *buf) > - { > -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, > - *child->priv->arch_private = *parent->priv->arch_private; > - } > - > --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ > --#define AARCH64_HWCAP_PACA (1 << 30) > -- > --/* Implementation of linux target ops method "low_arch_setup". */ > -- > --void > --aarch64_target::low_arch_setup () > --{ > -- unsigned int machine; > -- int is_elf64; > -- int tid; > -- > -- tid = lwpid_of (current_thread); > -- > -- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); > -- > -- if (is_elf64) > -- { > -- uint64_t vq = aarch64_sve_get_vq (tid); > -- unsigned long hwcap = linux_get_hwcap (8); > -- unsigned long hwcap2 = linux_get_hwcap2 (8); > -- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; > -- /* MTE is AArch64-only. */ > -- bool mte_p = hwcap2 & HWCAP2_MTE; > -- > -- current_process ()->tdesc > -- = aarch64_linux_read_description (vq, pauth_p, mte_p); > -- } > -- else > -- current_process ()->tdesc = aarch32_linux_read_description (); > -- > -- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); > --} > -- > - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ > - > - static void > -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) > - return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); > - } > - > -+/* Array containing all the possible register sets for AArch64/Linux. During > -+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for > -+ validity and enabled/disabled accordingly. > -+ > -+ Their sizes are set to 0 here, but they will be adjusted later depending > -+ on whether each register set is available or not. */ > - static struct regset_info aarch64_regsets[] = > - { > -+ /* GPR registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, > -- sizeof (struct user_pt_regs), GENERAL_REGS, > -+ 0, GENERAL_REGS, > - aarch64_fill_gregset, aarch64_store_gregset }, > -+ /* Floating Point (FPU) registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, > -- sizeof (struct user_fpsimd_state), FP_REGS, > -+ 0, FP_REGS, > - aarch64_fill_fpregset, aarch64_store_fpregset > - }, > -+ /* Scalable Vector Extension (SVE) registers. */ > -+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, > -+ 0, EXTENDED_REGS, > -+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache > -+ }, > -+ /* PAC registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, > -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, > -- NULL, aarch64_store_pauthregset }, > -+ 0, OPTIONAL_REGS, > -+ nullptr, aarch64_store_pauthregset }, > -+ /* Tagged address control / MTE registers. */ > - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, > -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, > -- aarch64_store_mteregset }, > -+ 0, OPTIONAL_REGS, > -+ aarch64_fill_mteregset, aarch64_store_mteregset }, > - NULL_REGSET > - }; > - > -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = > - { > - aarch64_regsets, /* regsets */ > - 0, /* num_regsets */ > -- NULL, /* disabled_regsets */ > -+ nullptr, /* disabled_regsets */ > - }; > - > - static struct regs_info regs_info_aarch64 = > - { > -- NULL, /* regset_bitmap */ > -- NULL, /* usrregs */ > -+ nullptr, /* regset_bitmap */ > -+ nullptr, /* usrregs */ > - &aarch64_regsets_info, > - }; > - > --static struct regset_info aarch64_sve_regsets[] = > -+/* Given FEATURES, adjust the available register sets by setting their > -+ sizes. A size of 0 means the register set is disabled and won't be > -+ used. */ > -+ > -+static void > -+aarch64_adjust_register_sets (const struct aarch64_features &features) > - { > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, > -- sizeof (struct user_pt_regs), GENERAL_REGS, > -- aarch64_fill_gregset, aarch64_store_gregset }, > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, > -- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, > -- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache > -- }, > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, > -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, > -- NULL, aarch64_store_pauthregset }, > -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, > -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, > -- aarch64_store_mteregset }, > -- NULL_REGSET > --}; > -+ struct regset_info *regset; > - > --static struct regsets_info aarch64_sve_regsets_info = > -- { > -- aarch64_sve_regsets, /* regsets. */ > -- 0, /* num_regsets. */ > -- NULL, /* disabled_regsets. */ > -- }; > -+ for (regset = aarch64_regsets; regset->size >= 0; regset++) > -+ { > -+ switch (regset->nt_type) > -+ { > -+ case NT_PRSTATUS: > -+ /* General purpose registers are always present. */ > -+ regset->size = sizeof (struct user_pt_regs); > -+ break; > -+ case NT_FPREGSET: > -+ /* This is unavailable when SVE is present. */ > -+ if (!features.sve) > -+ regset->size = sizeof (struct user_fpsimd_state); > -+ break; > -+ case NT_ARM_SVE: > -+ if (features.sve) > -+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); > -+ break; > -+ case NT_ARM_PAC_MASK: > -+ if (features.pauth) > -+ regset->size = AARCH64_PAUTH_REGS_SIZE; > -+ break; > -+ case NT_ARM_TAGGED_ADDR_CTRL: > -+ if (features.mte) > -+ regset->size = AARCH64_LINUX_SIZEOF_MTE; > -+ break; > -+ default: > -+ gdb_assert_not_reached ("Unknown register set found."); > -+ } > -+ } > -+} > - > --static struct regs_info regs_info_aarch64_sve = > -- { > -- NULL, /* regset_bitmap. */ > -- NULL, /* usrregs. */ > -- &aarch64_sve_regsets_info, > -- }; > -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ > -+#define AARCH64_HWCAP_PACA (1 << 30) > -+ > -+/* Implementation of linux target ops method "low_arch_setup". */ > -+ > -+void > -+aarch64_target::low_arch_setup () > -+{ > -+ unsigned int machine; > -+ int is_elf64; > -+ int tid; > -+ > -+ tid = lwpid_of (current_thread); > -+ > -+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); > -+ > -+ if (is_elf64) > -+ { > -+ struct aarch64_features features; > -+ > -+ uint64_t vq = aarch64_sve_get_vq (tid); > -+ features.sve = (vq > 0); > -+ /* A-profile PAC is 64-bit only. */ > -+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; > -+ /* A-profile MTE is 64-bit only. */ > -+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; > -+ > -+ current_process ()->tdesc > -+ = aarch64_linux_read_description (vq, features.pauth, features.mte); > -+ > -+ /* Adjust the register sets we should use for this particular set of > -+ features. */ > -+ aarch64_adjust_register_sets (features); > -+ } > -+ else > -+ current_process ()->tdesc = aarch32_linux_read_description (); > -+ > -+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); > -+} > - > - /* Implementation of linux target ops method "get_regs_info". */ > - > -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () > - if (!is_64bit_tdesc ()) > - return ®s_info_aarch32; > - > -- if (is_sve_tdesc ()) > -- return ®s_info_aarch64_sve; > -- > -+ /* AArch64 64-bit registers. */ > - return ®s_info_aarch64; > - } > - > -@@ -3294,5 +3311,4 @@ initialize_low_arch (void) > - initialize_low_arch_aarch32 (); > - > - initialize_regsets_info (&aarch64_regsets_info); > -- initialize_regsets_info (&aarch64_sve_regsets_info); > - } > --- > -2.27.0 > - > diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch > similarity index 100% > rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch > rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch > diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch > similarity index 100% > rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch > rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch > diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch > similarity index 100% > rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch > rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch > diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch > similarity index 100% > rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch > rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch > diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch > similarity index 100% > rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch > rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch > diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch > similarity index 100% > rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch > rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch > diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch > similarity index 100% > rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch > rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch > diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch > similarity index 100% > rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch > rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index 56999fa9e0..d3dea0b0a7 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -71,7 +71,7 @@ config BR2_GDB_VERSION > default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky > default "9.2" if BR2_GDB_VERSION_9_2 > default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB > - default "11.1" if BR2_GDB_VERSION_11 > + default "11.2" if BR2_GDB_VERSION_11 > depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB > > # recent gdb versions (>= 10) have gdbserver moved at the top-level, > diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash > index d3e83af0b9..e7933374f1 100644 > --- a/package/gdb/gdb.hash > +++ b/package/gdb/gdb.hash > @@ -1,7 +1,7 @@ > # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum > sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz > sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz > -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz > +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz > > # Locally calculated (fetched from Github) > sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From arnout at mind.be Sat Mar 5 14:50:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:50:11 +0100 Subject: [Buildroot] [PATCH] package/python-cryptography: needs cargo env when downloading In-Reply-To: <20220214102829.156331-1-yann.morin.1998@free.fr> References: <20220214102829.156331-1-yann.morin.1998@free.fr> Message-ID: <03a17198-1047-f356-908e-358a2936f899@mind.be> On 14/02/2022 11:28, Yann E. MORIN wrote: > python-cryptography is a python package, but it internally builds a rust > crate. As such, it needs to be vendored at install time. > > Currently, we only pass the path to the sub-directory where the rust > source is in the package tree, but calling cargo needs additional > variables, most notably it needs CARGO_HOME to be set in the > environment, otherwise it ends up writing in the user's own cargo home, > which is by default ~/.cargo/ > > We do not really know what variables are used at vendor tie, so we pass > the full Cargo environment, that we pass when building target packages. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Yegor Yefremov > Cc: Asaf Kahlon Applied to master, thanks. Regards, Arnout > --- > package/python-cryptography/python-cryptography.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index e642691bc5..a524f729c8 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -24,6 +24,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \ > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > + $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:50:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:50:40 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libgee: bump to version 0.20.5 In-Reply-To: <20220214102959.1740165-1-fontaine.fabrice@gmail.com> References: <20220214102959.1740165-1-fontaine.fabrice@gmail.com> Message-ID: <89896379-d684-bd0d-0017-4c0c5ed14c02@mind.be> On 14/02/2022 11:29, Fabrice Fontaine wrote: > Drop patch (already in version) and so autoreconf > > https://gitlab.gnome.org/GNOME/libgee/-/blob/0.20.5/NEWS > > Signed-off-by: Fabrice Fontaine Bugfix version bump, so applied to master, thanks. Regards, Arnout > --- > ...le.am-include-Makefile.introspection.patch | 40 ------------------- > package/libgee/libgee.hash | 4 +- > package/libgee/libgee.mk | 4 +- > 3 files changed, 3 insertions(+), 45 deletions(-) > delete mode 100644 package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch > > diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch > deleted file mode 100644 > index 0906275ae3..0000000000 > --- a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 20 Nov 2021 23:57:33 +0100 > -Subject: [PATCH] gee/Makefile.am: include Makefile.introspection > - > -Include Makefile.introspection instead of using a custom rule which will > -result in the following build failure when cross-compiling on buildroot > -because of missing --includedir: > - > -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la > -Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir > -error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 > - > -Fixes: > - - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: > -https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] > ---- > - gee/Makefile.am | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/gee/Makefile.am b/gee/Makefile.am > -index 5634bcb..e0d950e 100644 > ---- a/gee/Makefile.am > -+++ b/gee/Makefile.am > -@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ > - -l $(libgee_dlname) > - Gee-0.8.gir: libgee_0_8_la_vala.stamp > - Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la > -- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ > -+ > -+-include $(INTROSPECTION_MAKEFILE) > - endif > - > - MOSTLYCLEANFILES = \ > --- > -2.33.0 > - > diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash > index 72d2c21ced..54a46f954c 100644 > --- a/package/libgee/libgee.hash > +++ b/package/libgee/libgee.hash > @@ -1,5 +1,5 @@ > -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum > -sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz > +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum > +sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz > > # Hash for license file: > sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING > diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk > index 64beef30df..7d8d3d4863 100644 > --- a/package/libgee/libgee.mk > +++ b/package/libgee/libgee.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGEE_VERSION_MAJOR = 0.20 > -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 > +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 > LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) > LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz > LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 > @@ -13,8 +13,6 @@ LIBGEE_INSTALL_STAGING = YES > LIBGEE_LICENSE = LGPL-2.1+ > LIBGEE_LICENSE_FILES = COPYING > LIBGEE_CPE_ID_VENDOR = gnome > -# We're patching gee/Makefile.am > -LIBGEE_AUTORECONF = YES > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > LIBGEE_CONF_OPTS += --enable-introspection From arnout at mind.be Sat Mar 5 14:51:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:51:20 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) In-Reply-To: <20220214154925.6014-1-ps.report@gmx.net> References: <20220214154925.6014-1-ps.report@gmx.net> Message-ID: <2c28b619-784f-6cf5-b2e1-6cae707051be@mind.be> On 14/02/2022 16:49, Peter Seiderer wrote: > For details see [1] and [2]. > > [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog > [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes > > Signed-off-by: Peter Seiderer Bugfix bump, so applied to master, thanks. Regards, Arnout > --- > package/util-linux/util-linux.hash | 2 +- > package/util-linux/util-linux.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash > index 9c10a42dca..748a36e0be 100644 > --- a/package/util-linux/util-linux.hash > +++ b/package/util-linux/util-linux.hash > @@ -1,5 +1,5 @@ > # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc > -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz > +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz > # License files, locally calculated > sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing > sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index a25b69d910..891c17d1d9 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -8,7 +8,7 @@ > # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. > > UTIL_LINUX_VERSION_MAJOR = 2.37 > -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 > +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 > UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz > UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) > From arnout at mind.be Sat Mar 5 14:54:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:54:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: put back riscv32 patch In-Reply-To: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> References: <20220217134637.3728619-1-fontaine.fabrice@gmail.com> Message-ID: <16d9e405-ee35-a02c-c17f-5abfd21d4b87@mind.be> On 17/02/2022 14:46, Fabrice Fontaine wrote: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 > patch resulting in the following build failure: > > In file included from thread/qmutex_linux.cpp:45, > from thread/qmutex.cpp:806: > thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > | ^~~~~~~~~~ > | _q_futex > > Fixes: > - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../qt5base/0007-Fix-build-on-riscv32.patch | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > > diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > new file mode 100644 > index 0000000000..5561acb9ae > --- /dev/null > +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch > @@ -0,0 +1,46 @@ > +From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 27 Aug 2021 16:28:32 +0200 > +Subject: Fix build on riscv32 > + > +riscv32 fails to build because __NR_futex is not defined on this > +architecture: > + > +In file included from thread/qmutex_linux.cpp:45, > + from thread/qmutex.cpp:804: > +thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': > +thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? > + 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); > + | ^~~~~~~~~~ > + | _q_futex > + > +Pick-to: 6.1 6.2 > +Fixes: QTBUG-96067 > +Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 > +Reviewed-by: Thiago Macieira > +[Retrieved from: > +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] > +Signed-off-by: Fabrice Fontaine > +--- > + src/corelib/thread/qfutex_p.h | 5 +++++ > + 1 file changed, 5 insertions(+) > + > +diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h > +index 40482b6fc1..037207a5c0 100644 > +--- a/src/corelib/thread/qfutex_p.h > ++++ b/src/corelib/thread/qfutex_p.h > +@@ -103,6 +103,11 @@ QT_END_NAMESPACE > + // if not defined in linux/futex.h > + # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 > + > ++// RISC-V does not supply __NR_futex > ++# ifndef __NR_futex > ++# define __NR_futex __NR_futex_time64 > ++# endif > ++ > + QT_BEGIN_NAMESPACE > + namespace QtLinuxFutex { > + constexpr inline bool futexAvailable() { return true; } > +-- > +cgit v1.2.1 > + From arnout at mind.be Sat Mar 5 14:05:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:05:44 +0100 Subject: [Buildroot] [git commit] package/zabbix: add ZABBIX_CPE_ID_VENDOR Message-ID: <20220305144636.A98E9826CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff3b0a0aee9e49de9c11dbc889f718969fdbc256 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:zabbix:zabbix is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Azabbix%3Azabbix Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e72d831b46..e6564e68fd 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -9,6 +9,7 @@ ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING +ZABBIX_CPE_ID_VENDOR = zabbix ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ From arnout at mind.be Sat Mar 5 14:05:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:05:55 +0100 Subject: [Buildroot] [git commit] package/python-gnupg: add PYTHON_GNUPG_CPE_ID_VENDOR Message-ID: <20220305144636.B2491826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b314ce8f7efe6c6cd6b57b35b86d7e973f2d919f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:python:python-gnupg is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apython%3Apython-gnupg Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-gnupg/python-gnupg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index f16910e517..fda264a0ed 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -8,6 +8,7 @@ PYTHON_GNUPG_VERSION = 0.4.8 PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt +PYTHON_GNUPG_CPE_ID_VENDOR = python PYTHON_GNUPG_SETUP_TYPE = setuptools $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:05:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:05:19 +0100 Subject: [Buildroot] [git commit] package/bpftool: needs headers >= 4.12 Message-ID: <20220305144636.9F725826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0d94c6104496373476919931553fe58d5e927a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master NETLINK_EXT_ACK is only available since kernel 4.12 and https://github.com/torvalds/linux/commit/2d4bc93368f5a0ddb57c8c885cdad9c9b7a10ed5 resulting in the following build failure since addition of the package in commit 3675131e6c654d7536a184db0184fde7a97040e0: net.c: In function 'netlink_open': net.c:110:36: error: 'NETLINK_EXT_ACK' undeclared (first use in this function); did you mean 'NETLINK_CAP_ACK'? 110 | if (setsockopt(sock, SOL_NETLINK, NETLINK_EXT_ACK, | ^~~~~~~~~~~~~~~ | NETLINK_CAP_ACK Fixes: - http://autobuild.buildroot.org/results/c61678e56bd73609838747048f27068818c21150 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bpftool/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index 39475aa962..e81d874343 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -5,14 +5,16 @@ config BR2_PACKAGE_BPFTOOL depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 select BR2_PACKAGE_BINUTILS select BR2_PACKAGE_ELFUTILS help bpftool is a tool for for inspection and simple manipulation of eBPF programs and maps. -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 From arnout at mind.be Sat Mar 5 14:08:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:08:29 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: needs cargo env when downloading Message-ID: <20220305144636.C8B13826CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2baaf5bcd748521a3bfcc178c284bc2b302993ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-cryptography is a python package, but it internally builds a rust crate. As such, it needs to be vendored at install time. Currently, we only pass the path to the sub-directory where the rust source is in the package tree, but calling cargo needs additional variables, most notably it needs CARGO_HOME to be set in the environment, otherwise it ends up writing in the user's own cargo home, which is by default ~/.cargo/ We do not really know what variables are used at vendor time, so we pass the full Cargo environment, that we pass when building target packages. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Yegor Yefremov Cc: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-cryptography/python-cryptography.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index e642691bc5..a524f729c8 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -24,6 +24,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \ PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) From arnout at mind.be Sat Mar 5 14:19:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:19:16 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: put back riscv32 patch Message-ID: <20220305144636.E3D97826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad25ca1c1f7a61a6cfaa1ef32c19f219fce82ff5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e wrongly removed riscv32 patch resulting in the following build failure: In file included from thread/qmutex_linux.cpp:45, from thread/qmutex.cpp:806: thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); | ^~~~~~~~~~ | _q_futex Fixes: - http://autobuild.buildroot.org/results/ff90bc7680acf1487ed58e5e25cf1a5f13dfaedb Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../qt5/qt5base/0007-Fix-build-on-riscv32.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch new file mode 100644 index 0000000000..5561acb9ae --- /dev/null +++ b/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch @@ -0,0 +1,46 @@ +From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 27 Aug 2021 16:28:32 +0200 +Subject: Fix build on riscv32 + +riscv32 fails to build because __NR_futex is not defined on this +architecture: + +In file included from thread/qmutex_linux.cpp:45, + from thread/qmutex.cpp:804: +thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': +thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? + 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); + | ^~~~~~~~~~ + | _q_futex + +Pick-to: 6.1 6.2 +Fixes: QTBUG-96067 +Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 +Reviewed-by: Thiago Macieira +[Retrieved from: +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] +Signed-off-by: Fabrice Fontaine +--- + src/corelib/thread/qfutex_p.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h +index 40482b6fc1..037207a5c0 100644 +--- a/src/corelib/thread/qfutex_p.h ++++ b/src/corelib/thread/qfutex_p.h +@@ -103,6 +103,11 @@ QT_END_NAMESPACE + // if not defined in linux/futex.h + # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 + ++// RISC-V does not supply __NR_futex ++# ifndef __NR_futex ++# define __NR_futex __NR_futex_time64 ++# endif ++ + QT_BEGIN_NAMESPACE + namespace QtLinuxFutex { + constexpr inline bool futexAvailable() { return true; } +-- +cgit v1.2.1 + From arnout at mind.be Sat Mar 5 14:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:10:36 +0100 Subject: [Buildroot] [git commit] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220305144636.DAC20826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a586f0a283cd69f436bc6d0cff484460b412a1ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..748a36e0be 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index a25b69d910..891c17d1d9 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From arnout at mind.be Sat Mar 5 14:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:09:59 +0100 Subject: [Buildroot] [git commit] package/libgee: bump to version 0.20.5 Message-ID: <20220305144636.D1A11826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10780e8d6df83d7a92b6dd3282e91fdc0ba369af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) and so autoreconf https://gitlab.gnome.org/GNOME/libgee/-/blob/0.20.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...akefile.am-include-Makefile.introspection.patch | 40 ---------------------- package/libgee/libgee.hash | 4 +-- package/libgee/libgee.mk | 4 +-- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch b/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch deleted file mode 100644 index 0906275ae3..0000000000 --- a/package/libgee/0001-gee-Makefile.am-include-Makefile.introspection.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d771e8ddb5e40f234459966e46880d10f34aaa1a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Nov 2021 23:57:33 +0100 -Subject: [PATCH] gee/Makefile.am: include Makefile.introspection - -Include Makefile.introspection instead of using a custom rule which will -result in the following build failure when cross-compiling on buildroot -because of missing --includedir: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler -l `/usr/bin/sed -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgee-0.8.la` -o Gee-0.8.typelib Gee-0.8.gir libgee-0.8.la -Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir -error parsing file Gee-0.8.gir: Failed to parse included gir GObject-2.0 - -Fixes: - - http://autobuild.buildroot.org/results/884faa0f84c8dc43ed1ca6cde9caf21c731a4b35 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libgee/-/merge_requests/8] ---- - gee/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gee/Makefile.am b/gee/Makefile.am -index 5634bcb..e0d950e 100644 ---- a/gee/Makefile.am -+++ b/gee/Makefile.am -@@ -167,7 +167,8 @@ INTROSPECTION_COMPILER_ARGS= \ - -l $(libgee_dlname) - Gee-0.8.gir: libgee_0_8_la_vala.stamp - Gee-0.8.typelib: Gee-0.8.gir libgee-0.8.la -- @INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^ -+ -+-include $(INTROSPECTION_MAKEFILE) - endif - - MOSTLYCLEANFILES = \ --- -2.33.0 - diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 72d2c21ced..54a46f954c 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.4.sha256sum -sha256 524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e libgee-0.20.4.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum +sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 64beef30df..7d8d3d4863 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).4 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 @@ -13,8 +13,6 @@ LIBGEE_INSTALL_STAGING = YES LIBGEE_LICENSE = LGPL-2.1+ LIBGEE_LICENSE_FILES = COPYING LIBGEE_CPE_ID_VENDOR = gnome -# We're patching gee/Makefile.am -LIBGEE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBGEE_CONF_OPTS += --enable-introspection From arnout at mind.be Sat Mar 5 14:06:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 15:06:29 +0100 Subject: [Buildroot] [git commit] package/gdb: bump 11.x version to 11.2 Message-ID: <20220305144636.BE4E6826C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8cfbda109fc41d7567a67666f1f8a541ea1d1f61 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor corrective release over GDB 11.1, fixing the following issues: PR sim/28302 (gdb fails to build with glibc 2.34) PR build/28318 (std::thread support configure check does not use CXX_DIALECT) PR gdb/28405 (arm-none-eabi: internal-error: ptid_t remote_target::select_thread_for_ambiguous_stop_reply(const target_waitstatus*): Assertion `first_resumed_thread != nullptr' failed) PR tui/28483 ([gdb/tui] breakpoint creation not displayed) PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as commit df9ebc472a162306dee8ba6e02b99963c2babb7c? Drop patch 0009-gdbserver-aarch64-support.patch, which was merged upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------- package/gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ------------- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 --------------------- ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...efine-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-nat-fork-inferior-include-linux-ptrace.h.patch | 0 ...Fix-getrandom-compile-for-uclibc-v1.0.35.patch} | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...0008-gdbserver-Makefile.in-fix-NLS-build.patch} | 0 package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 13 files changed, 2 insertions(+), 626 deletions(-) diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch deleted file mode 100644 index d969d98831..0000000000 --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 3 Oct 2021 12:02:53 -0400 -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] - -We map target signals to host signals so we can propagate signals -between the host & simulated worlds. That means we need to know -the symbolic names & values of all signals that might be sent. - -The tools that generate that list use signal.h and include all -symbols that start with "SIG" so as to automatically include any -new symbols that the C library might add. Unfortunately, this -also picks up "SIGSTKSZ" which is not actually a signal itself, -but a signal related setting -- it's the size of the stack when -a signal is handled. - -By itself this doesn't super matter as we will never see a signal -with that same value (since the range of valid signals tend to be -way less than 1024, and the size of the default signal stack will -never be that small). But with recent glibc changes that make this -into a dynamic value instead of a compile-time constant, some users -see build failures when building the sim. - -As suggested by Adam Sampson, update our scripts to ignore this -symbol to simplify everything and avoid the build failure. - -Bug: https://sourceware.org/PR28302 - -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] -Signed-off-by: Peter Seiderer ---- - sim/bfin/linux-targ-map.h | 5 +---- - sim/common/gennltvals.py | 6 ++++-- - sim/common/nltvals.def | 1 - - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h -index e9c8c8f..0340ed5 100644 ---- a/sim/bfin/linux-targ-map.h -+++ b/sim/bfin/linux-targ-map.h -@@ -30,6 +30,7 @@ echo - # XXX: nothing uses this ? - echo '#include ' | \ - bfin-uclinux-gcc -E -dD -P - | \ -+grep -v SIGSTKSZ | \ - sed -r -n \ - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ - -e '$i\ \ { 0, -1, -1 }\n};' \ -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = - #ifdef SIG_SETMASK - # define TARGET_LINUX_SIG_SETMASK 2 - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, --#endif --#ifdef SIGSTKSZ --# define TARGET_LINUX_SIGSTKSZ 8192 -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, - #endif - { 0, -1, -1 } - }; -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py -index b3e558d..bd4d7e9 100755 ---- a/sim/common/gennltvals.py -+++ b/sim/common/gennltvals.py -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - headers: Iterable[str], - pattern: str, -+ filter: str = r'^$', - target: str = None): - """Extract constants from the specified files using a regular expression. - -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - srcfile = ''.join(f'#include <{x}>\n' for x in headers) - syms = set() - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') -+ filter_pattern = re.compile(filter) - for header in headers: - with open(srcdir / header, 'r', encoding='utf-8') as fp: - data = fp.read() - for line in data.splitlines(): - m = define_pattern.match(line) -- if m: -+ if m and not filter_pattern.search(line): - syms.add(m.group(1)) - for sym in sorted(syms): - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') - - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') - - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def -index 8ae8839..8bc6ae5 100644 ---- a/sim/common/nltvals.def -+++ b/sim/common/nltvals.def -@@ -116,7 +116,6 @@ - { "SIGPROF", 27 }, - { "SIGQUIT", 3 }, - { "SIGSEGV", 11 }, -- { "SIGSTKSZ", 8192 }, - { "SIGSTOP", 17 }, - { "SIGSYS", 12 }, - { "SIGTERM", 15 }, --- -2.33.1 - diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch deleted file mode 100644 index 2d4e30ffe1..0000000000 --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch +++ /dev/null @@ -1,194 +0,0 @@ -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Wed, 12 May 2021 12:39:22 -0600 -Subject: [PATCH] Fix build on rhES5 - -The rhES5 build failed due to an upstream import a while back. The -bug here is that, while the 'personality' function exists, -ADDR_NO_RANDOMIZE is only defined in , not -. - -However, does not declare the 'personality' -function, and and cannot -both be included. - -This patch restores one of the removed configure checks and updates -the code to check it. - -We had this as a local patch at AdaCore, because it seemed like there -was no interest upstream. However, now it turns out that this fixes -PR build/28555, so I'm sending it now. - -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] -Signed-off-by: Peter Seiderer ---- - gdb/config.in | 4 ++++ - gdb/configure | 16 ++++++++++++++++ - gdb/nat/linux-personality.c | 4 ++++ - gdbserver/config.in | 4 ++++ - gdbserver/configure | 16 ++++++++++++++++ - gdbsupport/common.m4 | 5 +++++ - gdbsupport/config.in | 4 ++++ - gdbsupport/configure | 16 ++++++++++++++++ - 8 files changed, 69 insertions(+) - -diff --git a/gdb/config.in b/gdb/config.in -index 2c30504..776bee9 100644 ---- a/gdb/config.in -+++ b/gdb/config.in -@@ -96,6 +96,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdb/configure b/gdb/configure -index 5d89635..27e3194 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -13838,6 +13838,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c -index 9ce345b..27999fd 100644 ---- a/gdb/nat/linux-personality.c -+++ b/gdb/nat/linux-personality.c -@@ -22,6 +22,10 @@ - - #include - -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE -+# define ADDR_NO_RANDOMIZE 0x0040000 -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -+ - /* See comment on nat/linux-personality.h. */ - - maybe_disable_address_space_randomization:: -diff --git a/gdbserver/config.in b/gdbserver/config.in -index cf06c56..c9258b3 100644 ---- a/gdbserver/config.in -+++ b/gdbserver/config.in -@@ -31,6 +31,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbserver/configure b/gdbserver/configure -index b227167..d399d71 100755 ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -7131,6 +7131,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 -index 901c454..56a355e 100644 ---- a/gdbsupport/common.m4 -+++ b/gdbsupport/common.m4 -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait]) - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) -+ - AC_CHECK_DECLS([strstr]) - - # ----------------------- # -diff --git a/gdbsupport/config.in b/gdbsupport/config.in -index f46e261..6945a62 100644 ---- a/gdbsupport/config.in -+++ b/gdbsupport/config.in -@@ -28,6 +28,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbsupport/configure b/gdbsupport/configure -index a9dd02c..243a03f 100755 ---- a/gdbsupport/configure -+++ b/gdbsupport/configure -@@ -8144,6 +8144,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 --- -2.33.1 - diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch deleted file mode 100644 index 3718b1b6fd..0000000000 --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch +++ /dev/null @@ -1,320 +0,0 @@ -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 -From: Luis Machado -Date: Fri, 29 Oct 2021 14:54:36 -0300 -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic - -The current register set selection mechanism for AArch64 is static, based -on a pre-populated array of register sets. - -This means that we might potentially probe register sets that are not -available. This is OK if the kernel errors out during ptrace, but probing the -tag_ctl register, for example, does not result in a ptrace error if the kernel -supports the tagged address ABI but not MTE (PR 28355). - -Making the register set selection dynamic, based on feature checks, solves -this and simplifies the code a bit. It allows us to list all of the register -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. - -gdb/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * arch/aarch64.h (struct aarch64_features): New struct. - -gdbserver/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * linux-aarch64-low.cc (is_sve_tdesc): Remove. - (aarch64_target::low_arch_setup): Rework to adjust the register sets. - (aarch64_regsets): Update to list all register sets. - (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. - (aarch64_sve_regsets, aarch64_sve_regsets_info) - (regs_info_aarch64_sve): Remove. - (aarch64_adjust_register_sets): New. - (aarch64_target::get_regs_info): Remove references to removed structs. - (initialize_low_arch): Likewise. - -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 -Signed-off-by: Joachim Wiberg ---- - gdb/arch/aarch64.h | 9 ++ - gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- - 4 files changed, 130 insertions(+), 85 deletions(-) - -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h -index 0eb702c5b5e..95edb664b55 100644 ---- a/gdb/arch/aarch64.h -+++ b/gdb/arch/aarch64.h -@@ -22,6 +22,15 @@ - - #include "gdbsupport/tdesc.h" - -+/* Holds information on what architectural features are available. This is -+ used to select register sets. */ -+struct aarch64_features -+{ -+ bool sve = false; -+ bool pauth = false; -+ bool mte = false; -+}; -+ - /* Create the aarch64 target description. A non zero VQ value indicates both - the presence of SVE and the Vector Quotient - the number of 128bit chunks in - an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc -index daccfef746e..9a8cb4169a7 100644 ---- a/gdbserver/linux-aarch64-low.cc -+++ b/gdbserver/linux-aarch64-low.cc -@@ -196,16 +196,6 @@ is_64bit_tdesc (void) - return register_size (regcache->tdesc, 0) == 8; - } - --/* Return true if the regcache contains the number of SVE registers. */ -- --static bool --is_sve_tdesc (void) --{ -- struct regcache *regcache = get_thread_regcache (current_thread, 0); -- -- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); --} -- - static void - aarch64_fill_gregset (struct regcache *regcache, void *buf) - { -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, - *child->priv->arch_private = *parent->priv->arch_private; - } - --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ --#define AARCH64_HWCAP_PACA (1 << 30) -- --/* Implementation of linux target ops method "low_arch_setup". */ -- --void --aarch64_target::low_arch_setup () --{ -- unsigned int machine; -- int is_elf64; -- int tid; -- -- tid = lwpid_of (current_thread); -- -- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -- -- if (is_elf64) -- { -- uint64_t vq = aarch64_sve_get_vq (tid); -- unsigned long hwcap = linux_get_hwcap (8); -- unsigned long hwcap2 = linux_get_hwcap2 (8); -- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; -- /* MTE is AArch64-only. */ -- bool mte_p = hwcap2 & HWCAP2_MTE; -- -- current_process ()->tdesc -- = aarch64_linux_read_description (vq, pauth_p, mte_p); -- } -- else -- current_process ()->tdesc = aarch32_linux_read_description (); -- -- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); --} -- - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ - - static void -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) - return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); - } - -+/* Array containing all the possible register sets for AArch64/Linux. During -+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for -+ validity and enabled/disabled accordingly. -+ -+ Their sizes are set to 0 here, but they will be adjusted later depending -+ on whether each register set is available or not. */ - static struct regset_info aarch64_regsets[] = - { -+ /* GPR registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -+ 0, GENERAL_REGS, - aarch64_fill_gregset, aarch64_store_gregset }, -+ /* Floating Point (FPU) registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, -- sizeof (struct user_fpsimd_state), FP_REGS, -+ 0, FP_REGS, - aarch64_fill_fpregset, aarch64_store_fpregset - }, -+ /* Scalable Vector Extension (SVE) registers. */ -+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -+ 0, EXTENDED_REGS, -+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -+ }, -+ /* PAC registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -+ 0, OPTIONAL_REGS, -+ nullptr, aarch64_store_pauthregset }, -+ /* Tagged address control / MTE registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -+ 0, OPTIONAL_REGS, -+ aarch64_fill_mteregset, aarch64_store_mteregset }, - NULL_REGSET - }; - -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = - { - aarch64_regsets, /* regsets */ - 0, /* num_regsets */ -- NULL, /* disabled_regsets */ -+ nullptr, /* disabled_regsets */ - }; - - static struct regs_info regs_info_aarch64 = - { -- NULL, /* regset_bitmap */ -- NULL, /* usrregs */ -+ nullptr, /* regset_bitmap */ -+ nullptr, /* usrregs */ - &aarch64_regsets_info, - }; - --static struct regset_info aarch64_sve_regsets[] = -+/* Given FEATURES, adjust the available register sets by setting their -+ sizes. A size of 0 means the register set is disabled and won't be -+ used. */ -+ -+static void -+aarch64_adjust_register_sets (const struct aarch64_features &features) - { -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -- aarch64_fill_gregset, aarch64_store_gregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, -- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -- }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -- NULL_REGSET --}; -+ struct regset_info *regset; - --static struct regsets_info aarch64_sve_regsets_info = -- { -- aarch64_sve_regsets, /* regsets. */ -- 0, /* num_regsets. */ -- NULL, /* disabled_regsets. */ -- }; -+ for (regset = aarch64_regsets; regset->size >= 0; regset++) -+ { -+ switch (regset->nt_type) -+ { -+ case NT_PRSTATUS: -+ /* General purpose registers are always present. */ -+ regset->size = sizeof (struct user_pt_regs); -+ break; -+ case NT_FPREGSET: -+ /* This is unavailable when SVE is present. */ -+ if (!features.sve) -+ regset->size = sizeof (struct user_fpsimd_state); -+ break; -+ case NT_ARM_SVE: -+ if (features.sve) -+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); -+ break; -+ case NT_ARM_PAC_MASK: -+ if (features.pauth) -+ regset->size = AARCH64_PAUTH_REGS_SIZE; -+ break; -+ case NT_ARM_TAGGED_ADDR_CTRL: -+ if (features.mte) -+ regset->size = AARCH64_LINUX_SIZEOF_MTE; -+ break; -+ default: -+ gdb_assert_not_reached ("Unknown register set found."); -+ } -+ } -+} - --static struct regs_info regs_info_aarch64_sve = -- { -- NULL, /* regset_bitmap. */ -- NULL, /* usrregs. */ -- &aarch64_sve_regsets_info, -- }; -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ -+#define AARCH64_HWCAP_PACA (1 << 30) -+ -+/* Implementation of linux target ops method "low_arch_setup". */ -+ -+void -+aarch64_target::low_arch_setup () -+{ -+ unsigned int machine; -+ int is_elf64; -+ int tid; -+ -+ tid = lwpid_of (current_thread); -+ -+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -+ -+ if (is_elf64) -+ { -+ struct aarch64_features features; -+ -+ uint64_t vq = aarch64_sve_get_vq (tid); -+ features.sve = (vq > 0); -+ /* A-profile PAC is 64-bit only. */ -+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; -+ /* A-profile MTE is 64-bit only. */ -+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; -+ -+ current_process ()->tdesc -+ = aarch64_linux_read_description (vq, features.pauth, features.mte); -+ -+ /* Adjust the register sets we should use for this particular set of -+ features. */ -+ aarch64_adjust_register_sets (features); -+ } -+ else -+ current_process ()->tdesc = aarch32_linux_read_description (); -+ -+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); -+} - - /* Implementation of linux target ops method "get_regs_info". */ - -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () - if (!is_64bit_tdesc ()) - return ®s_info_aarch32; - -- if (is_sve_tdesc ()) -- return ®s_info_aarch64_sve; -- -+ /* AArch64 64-bit registers. */ - return ®s_info_aarch64; - } - -@@ -3294,5 +3311,4 @@ initialize_low_arch (void) - initialize_low_arch_aarch32 (); - - initialize_regsets_info (&aarch64_regsets_info); -- initialize_regsets_info (&aarch64_sve_regsets_info); - } --- -2.27.0 - diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 56999fa9e0..d3dea0b0a7 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -71,7 +71,7 @@ config BR2_GDB_VERSION default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.1" if BR2_GDB_VERSION_11 + default "11.2" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index d3e83af0b9..e7933374f1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From arnout at mind.be Sat Mar 5 14:55:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 15:55:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: disable tests In-Reply-To: <20220217135539.3784058-1-fontaine.fabrice@gmail.com> References: <20220217135539.3784058-1-fontaine.fabrice@gmail.com> Message-ID: <80abb66f-709f-a91d-d183-c9a72693428a@mind.be> On 17/02/2022 14:55, Fabrice Fontaine wrote: > Disable tests to avoid the following build failure raised since bump to > version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and > https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: > > In file included from perf_memcpy32_s.c:7: > perf_private.h: In function 'rdtsc': > perf_private.h:72:3: error: 'asm' undeclared (first use in this function) > 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); > | ^~~ > > Fixes: > - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 > > Signed-off-by: Fabrice Fontaine The patch was rejected upstream, and instead the underlying issue was fixed. Care to submit the upstream patch instead? Regards, Arnout > --- > .../0001-Add-an-option-to-disable-tests.patch | 66 +++++++++++++++++++ > package/safeclib/safeclib.mk | 4 +- > 2 files changed, 69 insertions(+), 1 deletion(-) > create mode 100644 package/safeclib/0001-Add-an-option-to-disable-tests.patch > > diff --git a/package/safeclib/0001-Add-an-option-to-disable-tests.patch b/package/safeclib/0001-Add-an-option-to-disable-tests.patch > new file mode 100644 > index 0000000000..420578fe2e > --- /dev/null > +++ b/package/safeclib/0001-Add-an-option-to-disable-tests.patch > @@ -0,0 +1,66 @@ > +From 55b861a098434843f5614adcaab469defed95321 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 17 Feb 2022 14:36:51 +0100 > +Subject: [PATCH] Add an option to disable tests > + > +Add an option to disable tests which are not always needed (e.g. on > +embedded systems) and can raise the following build failure on some > +architectures such as ARM cortex-a9: > + > +In file included from perf_memcpy32_s.c:7: > +perf_private.h: In function 'rdtsc': > +perf_private.h:72:3: error: 'asm' undeclared (first use in this function) > + 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); > + | ^~~ > + > +Fixes: > + - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/rurban/safeclib/pull/115] > +--- > + Makefile.am | 6 +++++- > + configure.ac | 10 ++++++++++ > + 2 files changed, 15 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index 429a84b2..7d14afb6 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -34,7 +34,11 @@ > + ACLOCAL_AMFLAGS = -I m4 --install ${ACLOCAL_FLAGS} > + > + # Sub-directories to preform recursive make in > +-SUBDIRS = src tests > ++SUBDIRS = src > ++ > ++if ENABLE_TESTS > ++SUBDIRS += tests > ++endif > + > + # Library header files > + pkginclude_HEADERS = \ > +diff --git a/configure.ac b/configure.ac > +index b7fd03e9..8c8fbee7 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -360,6 +360,16 @@ AC_ARG_ENABLE(doc, > + esac], [enable_doc=true]) > + AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") > + > ++AC_ARG_ENABLE(tests, > ++ AS_HELP_STRING([--disable-tests], > ++ [disable tests @<:@default=no@:>@]), > ++ [case "${enableval}" in > ++ yes) enable_tests=true ;; > ++ no) enable_tests=false ;; > ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-tests]) ;; > ++ esac], [enable_tests=true]) > ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xtrue") > ++ > + dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, > + dnl but this is only enabled for the shared objs, and we need it in the config > + dnl for our tests. > +-- > +2.34.1 > + > diff --git a/package/safeclib/safeclib.mk b/package/safeclib/safeclib.mk > index bc58c1a38c..8f909f729b 100644 > --- a/package/safeclib/safeclib.mk > +++ b/package/safeclib/safeclib.mk > @@ -11,9 +11,11 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz > SAFECLIB_LICENSE = MIT > SAFECLIB_LICENSE_FILES = COPYING > SAFECLIB_INSTALL_STAGING = YES > +# We're patching configure.ac > +SAFECLIB_AUTORECONF = YES > SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" > # -fstack-protector-strong is used by default. Disable that so the > # BR2_SSP_* options in the toolchain wrapper are used instead > -SAFECLIB_CONF_OPTS = --disable-hardening > +SAFECLIB_CONF_OPTS = --disable-hardening --disable-tests > > $(eval $(autotools-package)) From arnout at mind.be Sat Mar 5 15:01:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 16:01:55 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt In-Reply-To: <20220217155549.1084829-3-marcus.hoffmann@othermo.de> References: <20220217155549.1084829-1-marcus.hoffmann@othermo.de> <20220217155549.1084829-3-marcus.hoffmann@othermo.de> Message-ID: <863fa1b5-dd78-2643-580e-fb5b231e5da1@mind.be> On 17/02/2022 16:55, Marcus Hoffmann wrote: > Fixes the following error during image generation: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid > for mbr and hybrid partition-table-type > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Arnout > --- > board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg > index c94e0bc7cc..a02166172f 100644 > --- a/board/orangepi/orangepi-rk3399/genimage.cfg > +++ b/board/orangepi/orangepi-rk3399/genimage.cfg > @@ -26,14 +26,13 @@ image sdcard.img { > } > > partition boot { > - partition-type = 0xC > + partition-type-uuid = F > bootable = "true" > image = "boot.vfat" > offset = 16M > } > > partition rootfs { > - partition-type = 0x83 > image = "rootfs.ext4" > } > } From arnout at mind.be Sat Mar 5 15:01:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 5 Mar 2022 16:01:27 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-rk3399/genimage: fix partition types for gpt Message-ID: <20220305145417.7A75181761@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b677a7bedb1a4c862944beeda53b104bd91cb2c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following error during image generation: ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784375 Signed-off-by: Marcus Hoffmann Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-rk3399/genimage.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg index c94e0bc7cc..a02166172f 100644 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ b/board/orangepi/orangepi-rk3399/genimage.cfg @@ -26,14 +26,13 @@ image sdcard.img { } partition boot { - partition-type = 0xC + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M } partition rootfs { - partition-type = 0x83 image = "rootfs.ext4" } } From arnout at mind.be Sat Mar 5 15:09:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 5 Mar 2022 16:09:24 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: support mismatched merged usr In-Reply-To: <20220215124619.563502-1-nolange79@gmail.com> References: <20220215124619.563502-1-nolange79@gmail.com> Message-ID: <2086ffec-82b8-ec71-41f0-55253c3cd8eb@mind.be> On 15/02/2022 13:46, Norbert Lange wrote: > Look at the case where the source toolchain has non-merged usr, > yet the target will have merged usr. > > sysroot/lib/ld-musl-x86_64.so.1 -> ../usr/lib/libc.so > sysroot/usr/lib/libc.so Where do you get an external toolchain with such a weird layout? Normally libc is in sysroot/lib and ld-musl*.so.1 is a symlink to either /lib/libc.so or ../lib/libc.so. Regards, Arnout > > What happens is that buildroot copies the ld-*so* symlink > into usr/lib, at which point it becomes broken. > > We now detect these broken symlinks, then try to find the target > binary in the library directories and fix the link. > > Fix the case where the lib directory is a symlink, and no ld-*so* > is installed by adding -H to find. > > Also use `cp -t` instead of some rarely used xargs tricks. > > Signed-off-by: Norbert Lange > --- > toolchain/helpers.mk | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > index ef8e9a5f64..aaf2aecd80 100644 > --- a/toolchain/helpers.mk > +++ b/toolchain/helpers.mk > @@ -135,8 +135,17 @@ copy_toolchain_sysroot = \ > $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ > done ; \ > fi ; \ > - if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > - find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ > + for i in $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -xtype l); do \ > + LINKTARGET=`readlink $$i`; \ > + rm $$i; \ > + NEWLINKTARGET=$$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/lib $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/lib -name "`basename $${LINKTARGET}`" -print -quit); \ > + if [ -n "$${NEWLINKTARGET}" -a -e "$${NEWLINKTARGET}" ]; then \ > + ln -sr $${NEWLINKTARGET} $$i; \ > + echo "Symlinking $$i -> `readlink $$i`" ; \ > + fi; \ > + done; \ > + if [[ ! $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 cp -t $(STAGING_DIR)/lib/; \ > fi ; \ > if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ > if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ From peter at korsgaard.com Sat Mar 5 16:27:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Mar 2022 17:27:55 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: remove override in conditional In-Reply-To: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:24:39 +0100") References: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> Message-ID: <8735jw9xf8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 5 16:28:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Mar 2022 17:28:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: fix build without libvirtd In-Reply-To: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:38:51 +0100") References: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> Message-ID: <87y21o8it9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without libvirtd raised since the > addition of the package in commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and > https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: > ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem > encountered: Requested the Interface driver without netcf or udev and > libvirtd support > Fixes: > - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 5 16:30:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 05 Mar 2022 17:30:45 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series In-Reply-To: <20220304170907.157687-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 4 Mar 2022 18:09:07 +0100") References: <20220304170907.157687-1-peter@korsgaard.com> Message-ID: <87tucc8iq2.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 5 16:28:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Mar 2022 17:28:34 +0100 Subject: [Buildroot] [git commit] package/libvirt: fix build without libvirtd Message-ID: <20220305162320.04936827FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87f1dd7b52deedb5a7f50a43e4b1dd1d23313395 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 7b0ed5e52e..1dc61a7549 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -39,7 +39,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -196,7 +195,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -235,7 +237,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif From peter at korsgaard.com Sat Mar 5 16:27:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Mar 2022 17:27:04 +0100 Subject: [Buildroot] [git commit] docs/manual: remove override in conditional Message-ID: <20220305162319.F0267827E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d7f852ac5afb09f0a9a0b5f441403a98bc0f410 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) From peter at korsgaard.com Sat Mar 5 16:26:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 5 Mar 2022 17:26:53 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220305162319.E8286827CC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=949aee637738341690b3a29a7dc2eb7572c164f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 16 ++++++++-------- package/linux-headers/Config.in.host | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 13d99bd09d..df5261e5ff 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index d0813e5db4..01325348ef 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb linux-5.16.tar.xz -sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz +sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8543f1cd21..8cfbd41831 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -380,14 +380,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 - default "5.15.13" if BR2_KERNEL_HEADERS_5_15 - default "5.16" if BR2_KERNEL_HEADERS_5_16 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 + default "5.15.26" if BR2_KERNEL_HEADERS_5_15 + default "5.16.12" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From fontaine.fabrice at gmail.com Sat Mar 5 17:39:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Mar 2022 18:39:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.7 Message-ID: <20220305173913.229445-1-fontaine.fabrice@gmail.com> This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.34.1 From ju.o at free.fr Sat Mar 5 17:50:41 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 5 Mar 2022 18:50:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: bump to version v0.3.20 Message-ID: <20220305175041.2225915-1-ju.o@free.fr> This commit dropped a patch included upstream. The other patch was rebased. For change log since v0.3.18, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19 - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20 Signed-off-by: Julien Olivain --- Tested with: make check-package ... 0 warnings generated ./utils/test-pkg -p openblas -a ... 45 builds, 25 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...nsider-Os-when-determining-LAPACK_NO.patch | 31 ------------------- ...on-t-specify-optimization-level-bui.patch} | 9 +++--- package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 2 +- 4 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename package/openblas/{0002-Makefile.system-don-t-specify-optimization-level-bui.patch => 0001-Makefile.system-don-t-specify-optimization-level-bui.patch} (86%) diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch deleted file mode 100644 index f9278bd099..0000000000 --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:15:52 +0100 -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags - -gcc also supports -O, -Og and -Os as optimization flags. -They may be given on the make command-line by users. - -For the calculation of LAPACK_NOOPT, all such flags should be considered. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a22e16ba..fc5fe3f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ export NOFORTRAN - export NO_LAPACK - endif - --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) - - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test - --- -2.26.2 - diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 86% rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch index bcc3e0eb6a..e0c738748a 100644 --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -1,4 +1,4 @@ -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 5 Mar 2021 14:09:23 +0100 Subject: [PATCH] Makefile.system: don't specify optimization level @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. Remove the optimization level specified in openblas itself. Signed-off-by: Thomas De Schampheleire - --- Makefile.system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system -index 1e30d05a..04b0be16 100644 +index 438a8148..9de1bbd5 100644 --- a/Makefile.system +++ b/Makefile.system -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g endif ifndef COMMON_OPT @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644 override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -- -2.26.2 +2.35.1 diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a1e35f4fc4..71fc4d34c5 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz +sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..608c2f24ea 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.18 +OPENBLAS_VERSION = 0.3.20 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE -- 2.35.1 From ju.o at free.fr Sat Mar 5 20:07:30 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 5 Mar 2022 21:07:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/octave: new package Message-ID: <20220305200730.11060-1-ju.o@free.fr> GNU Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments using a language that is mostly compatible with Matlab. It may also be used as a batch-oriented language. Octave has extensive tools for solving common numerical linear algebra problems, finding the roots of nonlinear equations, integrating ordinary functions, manipulating polynomials, and integrating ordinary differential and differential-algebraic equations. It is easily extensible and customizable via user-defined functions written in Octave's own language, or using dynamically loaded modules written in C++, C, Fortran, or other languages. https://www.octave.org/ Signed-off-by: Julien Olivain --- Package tested with: make check-package ... 0 warnings generated ./utils/test-pkg -a -p octave ... 45 builds, 35 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_octave.TestOctave ... OK >From qemu_aarch64_virt_defconfig with Octave, on target: octave --eval 'oruntests general' ... [all general tests passed] --- DEVELOPERS | 2 + package/Config.in | 1 + ...-BLAS-library-integer-size-detection.patch | 40 +++++++++++++ package/octave/Config.in | 42 +++++++++++++ package/octave/octave.hash | 3 + package/octave/octave.mk | 28 +++++++++ support/testing/tests/package/test_octave.py | 60 +++++++++++++++++++ 7 files changed, 176 insertions(+) create mode 100644 package/octave/0001-Fix-BLAS-library-integer-size-detection.patch create mode 100644 package/octave/Config.in create mode 100644 package/octave/octave.hash create mode 100644 package/octave/octave.mk create mode 100644 support/testing/tests/package/test_octave.py diff --git a/DEVELOPERS b/DEVELOPERS index b7a7c8771c..af35af0bd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1611,6 +1611,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/octave/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ @@ -1619,6 +1620,7 @@ F: package/riscv-isa-sim/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py diff --git a/package/Config.in b/package/Config.in index 8d2d550a64..c87bf04a7e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -756,6 +756,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/octave/Config.in" source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL diff --git a/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch b/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch new file mode 100644 index 0000000000..81126c99e7 --- /dev/null +++ b/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch @@ -0,0 +1,40 @@ +From 024bea5f3f78db166d3a97aca413cc2b96619673 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Mar 2022 12:36:09 +0100 +Subject: [PATCH] Fix BLAS library integer size detection + +When cross-compiling, octave ./configure script fails to detect the BLAS +library integer size and fails with the message: + + configure: error: unrecognized BLAS library integer size + +This patch fixes this detection. + +Patch adapted from: +https://github.com/openembedded/meta-openembedded/commit/0ad153f721ef99de585c4452a997a7104f45d71d + +Signed-off-by: Julien Olivain +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 31e656fa20..a6a6350b48 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -760,6 +760,12 @@ if test $ax_blas_ok = no || test $ax_lapack_ok = no; then + AC_MSG_ERROR([BLAS and LAPACK libraries are required]) + fi + ++if ac_fn_f77_try_run "$LINENO"; then : ++ ax_blas_integer_size=8 ++else ++ ax_blas_integer_size=4 ++fi ++ + case $ax_blas_integer_size in + 4) + HAVE_64_BIT_BLAS=no +-- +2.35.1 + diff --git a/package/octave/Config.in b/package/octave/Config.in new file mode 100644 index 0000000000..b504310d19 --- /dev/null +++ b/package/octave/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_OCTAVE + bool "octave" + depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_FORTRAN + # Some Bootlin x86_64 toolchains (like version + # bleeding-edge-2021.11-1) has a file + # "x86_64-buildroot-linux-gnu/lib64/libgfortran.la" including + # a "dependency_libs=" entry with an incorrect absolute path + # to linquadmath.la on the bootlin build host. This breaks + # builds using libtool with libgfortran. Those toolchains are + # used by the "utils/test-pkg" script. + depends on !BR2_TOOLCHAIN_EXTERNAL_BOOTLIN || !BR2_x86_64 + select BR2_PACKAGE_OPENBLAS + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UTF + help + GNU Octave is a high-level language, primarily intended for + numerical computations. It provides a convenient command + line interface for solving linear and nonlinear problems + numerically, and for performing other numerical experiments + using a language that is mostly compatible with Matlab. It + may also be used as a batch-oriented language. Octave has + extensive tools for solving common numerical linear algebra + problems, finding the roots of nonlinear equations, + integrating ordinary functions, manipulating polynomials, + and integrating ordinary differential and + differential-algebraic equations. It is easily extensible + and customizable via user-defined functions written in + Octave's own language, or using dynamically loaded modules + written in C++, C, Fortran, or other languages. + + https://www.octave.org/ + +comment "octave needs a toolchain w/ C++11 and fortran" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_FORTRAN + +comment "octave needs the openblas package" + depends on !BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS diff --git a/package/octave/octave.hash b/package/octave/octave.hash new file mode 100644 index 0000000000..62f6aa3e80 --- /dev/null +++ b/package/octave/octave.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 40eaa1492ec1baf5084a1694288febdcba568838f4983450f8dac5819934059a octave-6.4.0.tar.lz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk new file mode 100644 index 0000000000..6048305280 --- /dev/null +++ b/package/octave/octave.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# octave +# +################################################################################ + +OCTAVE_VERSION = 6.4.0 +OCTAVE_SITE = https://ftp.gnu.org/gnu/octave +OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz +OCTAVE_LICENSE = GPL-3.0+ +OCTAVE_LICENSE_FILES = COPYING +OCTAVE_AUTORECONF = YES + +OCTAVE_CONF_OPTS = --disable-java + +OCTAVE_DEPENDENCIES = \ + host-gperf \ + openblas \ + pcre + +ifeq ($(BR2_PACKAGE_READLINE),y) +OCTAVE_CONF_OPTS += --enable-readline +OCTAVE_DEPENDENCIES += readline +else +OCTAVE_CONF_OPTS += --disable-readline +endif + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_octave.py b/support/testing/tests/package/test_octave.py new file mode 100644 index 0000000000..f218b219d8 --- /dev/null +++ b/support/testing/tests/package/test_octave.py @@ -0,0 +1,60 @@ +import os + +import infra.basetest + + +class TestOctave(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it does + # not include gfortran. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.26" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_OCTAVE=y + """ + + def octave_cmd(self, octave_expr): + return "octave --quiet --eval '{}'".format(octave_expr) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + # Check Euler identity + cmd = self.octave_cmd("assert (exp(i*pi)+1, 0, 1e-10)") + self.assertRunOk(cmd) + + # Solve equation system example from Octave homepage + octave_expr = "b = [4; 9; 2]; " + octave_expr += "A = [ 3 4 5; 1 3 1; 3 5 9 ]; " + octave_expr += "x = A \ b; " + octave_expr += "assert(x, [-1.5; 4; -1.5], 1e-10)" + cmd = self.octave_cmd(octave_expr) + self.assertRunOk(cmd) + + # Check octave can fail + cmd = self.octave_cmd("assert(false)") + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Check string output + string = "Hello World" + cmd = self.octave_cmd("printf(\"{}\\n\")".format(string)) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output, [string]) -- 2.35.1 From fontaine.fabrice at gmail.com Sat Mar 5 20:44:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 5 Mar 2022 21:44:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220305204446.823802-1-fontaine.fabrice@gmail.com> Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ---------------------- 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) -- 2.34.1 From bugzilla at busybox.net Sun Mar 6 09:05:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 06 Mar 2022 09:05:10 +0000 Subject: [Buildroot] [Bug 14636] azure-iot-sdk-c: Installed headers do not compile In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14636 --- Comment #1 from Fabrice Fontaine --- Thanks for your bug report, can you confirm that the following patch fixes your issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220305204446.823802-1-fontaine.fabrice at gmail.com/ -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Sun Mar 6 09:13:23 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Mar 2022 10:13:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libglfw: fiw wayland build Message-ID: <20220306091323.93313-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 3.3.6 in commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: CMake Error at CMakeLists.txt:252 (find_package): Could not find a package configuration file provided by "ECM" with any of the following names: ECMConfig.cmake ecm-config.cmake Fixes: - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 Signed-off-by: Fabrice Fontaine --- ...emove-extra-cmake-modules-dependency.patch | 121 ++++++++++++++++++ ...xt-allow-override-of-wayland-pkgdata.patch | 32 +++++ package/libglfw/Config.in | 2 + package/libglfw/libglfw.mk | 6 +- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch create mode 100644 package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch new file mode 100644 index 0000000000..d5ee7c829a --- /dev/null +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -0,0 +1,121 @@ +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From: Joel Winarske +Date: Mon, 28 Sep 2020 22:23:02 -0700 +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency + +Fixes #1774. + +[Retrieved (and backported) from: +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 4 --- + CMakeLists.txt | 16 ++++++------ + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ + 3 files changed, 45 insertions(+), 37 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42bfa1806d..394827520b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,20 +191,18 @@ endif() + # Use Wayland for window creation + #-------------------------------------------------------------------- + if (_GLFW_WAYLAND) +- find_package(ECM REQUIRED NO_MODULE) +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + +- find_package(Wayland REQUIRED Client Cursor Egl) +- find_package(WaylandScanner REQUIRED) +- find_package(WaylandProtocols 1.15 REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(Wayland REQUIRED ++ wayland-client>=0.2.7 ++ wayland-cursor>=0.2.7 ++ wayland-egl>=0.2.7 ++ xkbcommon) + + list(APPEND glfw_PKG_DEPS "wayland-client") + + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") +- +- find_package(XKBCommon REQUIRED) +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") + + include(CheckIncludeFiles) + include(CheckFunctionExists) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f2bdd883d..e834506c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) + posix_time.c posix_thread.c xkb_unicode.c + egl_context.c osmesa_context.c) + +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" +- BASENAME xdg-shell) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" +- BASENAME xdg-decoration) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" +- BASENAME viewporter) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" +- BASENAME relative-pointer-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" +- BASENAME pointer-constraints-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" +- BASENAME idle-inhibit-unstable-v1) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ ++ macro(wayland_generate protocol_file output_file) ++ add_custom_command(OUTPUT ${output_file}.h ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header ++ < ${protocol_file} > ${output_file}.h ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.h) ++ ++ add_custom_command(OUTPUT ${output_file}.c ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code ++ < ${protocol_file} > ${output_file}.c ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.c) ++ endmacro() ++ ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) ++ + elseif (_GLFW_OSMESA) + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h + posix_time.h posix_thread.h osmesa_context.h) diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch new file mode 100644 index 0000000000..4bcb5e4eb7 --- /dev/null +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -0,0 +1,32 @@ +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Mar 2022 17:59:19 +0100 +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir + +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} +(needed when cross-compiling) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glfw/glfw/pull/2053] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01f191c9..475ce882 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) + include(FindPkgConfig) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ if (NOT WAYLAND_PROTOCOLS_BASE) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ endif() + + macro(wayland_generate protocol_file output_file) + add_custom_command(OUTPUT "${output_file}.h" +-- +2.34.1 + diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 281b55df7b..e5e96036ff 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 2ba31fd674..0a3986f662 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +# Override pkg-config pkgdatadir variable, it needs the prefix +LIBGLFW_CONF_OPTS += \ + -DGLFW_USE_WAYLAND=1 \ + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 6 10:27:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Mar 2022 11:27:22 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libglfw: fix wayland build Message-ID: <20220306102722.129713-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 3.3.6 in commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: CMake Error at CMakeLists.txt:252 (find_package): Could not find a package configuration file provided by "ECM" with any of the following names: ECMConfig.cmake ecm-config.cmake Fixes: - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo in title ...emove-extra-cmake-modules-dependency.patch | 121 ++++++++++++++++++ ...xt-allow-override-of-wayland-pkgdata.patch | 32 +++++ package/libglfw/Config.in | 2 + package/libglfw/libglfw.mk | 6 +- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch create mode 100644 package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch new file mode 100644 index 0000000000..d5ee7c829a --- /dev/null +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -0,0 +1,121 @@ +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From: Joel Winarske +Date: Mon, 28 Sep 2020 22:23:02 -0700 +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency + +Fixes #1774. + +[Retrieved (and backported) from: +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 4 --- + CMakeLists.txt | 16 ++++++------ + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ + 3 files changed, 45 insertions(+), 37 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42bfa1806d..394827520b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,20 +191,18 @@ endif() + # Use Wayland for window creation + #-------------------------------------------------------------------- + if (_GLFW_WAYLAND) +- find_package(ECM REQUIRED NO_MODULE) +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + +- find_package(Wayland REQUIRED Client Cursor Egl) +- find_package(WaylandScanner REQUIRED) +- find_package(WaylandProtocols 1.15 REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(Wayland REQUIRED ++ wayland-client>=0.2.7 ++ wayland-cursor>=0.2.7 ++ wayland-egl>=0.2.7 ++ xkbcommon) + + list(APPEND glfw_PKG_DEPS "wayland-client") + + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") +- +- find_package(XKBCommon REQUIRED) +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") + + include(CheckIncludeFiles) + include(CheckFunctionExists) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f2bdd883d..e834506c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) + posix_time.c posix_thread.c xkb_unicode.c + egl_context.c osmesa_context.c) + +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" +- BASENAME xdg-shell) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" +- BASENAME xdg-decoration) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" +- BASENAME viewporter) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" +- BASENAME relative-pointer-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" +- BASENAME pointer-constraints-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" +- BASENAME idle-inhibit-unstable-v1) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ ++ macro(wayland_generate protocol_file output_file) ++ add_custom_command(OUTPUT ${output_file}.h ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header ++ < ${protocol_file} > ${output_file}.h ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.h) ++ ++ add_custom_command(OUTPUT ${output_file}.c ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code ++ < ${protocol_file} > ${output_file}.c ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.c) ++ endmacro() ++ ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) ++ + elseif (_GLFW_OSMESA) + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h + posix_time.h posix_thread.h osmesa_context.h) diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch new file mode 100644 index 0000000000..4bcb5e4eb7 --- /dev/null +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -0,0 +1,32 @@ +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Mar 2022 17:59:19 +0100 +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir + +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} +(needed when cross-compiling) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glfw/glfw/pull/2053] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01f191c9..475ce882 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) + include(FindPkgConfig) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ if (NOT WAYLAND_PROTOCOLS_BASE) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ endif() + + macro(wayland_generate protocol_file output_file) + add_custom_command(OUTPUT "${output_file}.h" +-- +2.34.1 + diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 281b55df7b..e5e96036ff 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 2ba31fd674..0a3986f662 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +# Override pkg-config pkgdatadir variable, it needs the prefix +LIBGLFW_CONF_OPTS += \ + -DGLFW_USE_WAYLAND=1 \ + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -- 2.34.1 From fperrad at gmail.com Sun Mar 6 12:09:02 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 6 Mar 2022 13:09:02 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 Message-ID: <20220306120902.132254-1-francois.perrad@gadz.org> - fix CVE-2021-30560 - remove merged patch - moved from xmlsoft.org to gnome.org Signed-off-by: Francois Perrad --- ...ml2-config-check-in-configure-script.patch | 31 ------------------- package/libxslt/libxslt.hash | 6 ++-- package/libxslt/libxslt.mk | 5 +-- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb23..000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839..39523a695 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d252..9c7be6822 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING -- 2.32.0 From jacques.samoun33 at gmail.com Sun Mar 6 12:46:54 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Sun, 6 Mar 2022 14:46:54 +0200 Subject: [Buildroot] cannot make the device_table Message-ID: Hello, despite all my tries, i just cannot make the "device_table" feature work as described in the manual. Basically, i am trying to set 666 rights to /dev/tty + add a dialout group, so i created the following file (device_table.txt" /dev/tty c 666 root dialout 5 0 - - - and have set the correct variable in menuconfig. I know for sure that the build has handled this file ... but looking at the /dev/tty, it is clear that nothing has happened, the permissions are still 600 and the dialout group has not been set. Am I missing something ? -------------- next part -------------- An HTML attachment was scrubbed... URL: From post at lespocky.de Sun Mar 6 12:44:46 2022 From: post at lespocky.de (Alexander Dahl) Date: Sun, 6 Mar 2022 13:44:46 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 In-Reply-To: <20220306120902.132254-1-francois.perrad@gadz.org> References: <20220306120902.132254-1-francois.perrad@gadz.org> Message-ID: <20220306124445.GB10202@falbala.internal.home.lespocky.de> Hello Francois, there's a typo in the subject, should read libxslt. Greets Alex On Sun, Mar 06, 2022 at 01:09:02PM +0100, Francois Perrad wrote: > - fix CVE-2021-30560 > - remove merged patch > - moved from xmlsoft.org to gnome.org > > Signed-off-by: Francois Perrad > --- > ...ml2-config-check-in-configure-script.patch | 31 ------------------- > package/libxslt/libxslt.hash | 6 ++-- > package/libxslt/libxslt.mk | 5 +-- > 3 files changed, 6 insertions(+), 36 deletions(-) > delete mode 100644 package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > > diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > deleted file mode 100644 > index 3848dcb23..000000000 > --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 > -From: Nick Wellnhofer > -Date: Fri, 15 Nov 2019 11:53:11 +0100 > -Subject: [PATCH] Fix xml2-config check in configure script > - > -A 'print' option has never been supported. After a recent change to > -libxml2, invalid options cause xml2-config to fail. > - > -[Retrieved from: > -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 3da57b18..585b9d7c 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, > - dnl test version and init our variables > - dnl > - > --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 > -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 > - then > - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) > - XMLVERS=`$XML_CONFIG --version` > --- > -GitLab > - > diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash > index 25aa30839..39523a695 100644 > --- a/package/libxslt/libxslt.hash > +++ b/package/libxslt/libxslt.hash > @@ -1,5 +1,5 @@ > -# Locally calculated after checking pgp signature > -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz > +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum > +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz > > # Hash for license file: > -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk > index d0f79d252..9c7be6822 100644 > --- a/package/libxslt/libxslt.mk > +++ b/package/libxslt/libxslt.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -LIBXSLT_VERSION = 1.1.34 > -LIBXSLT_SITE = http://xmlsoft.org/sources > +LIBXSLT_VERSION = 1.1.35 > +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz > +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 > LIBXSLT_INSTALL_STAGING = YES > LIBXSLT_LICENSE = MIT > LIBXSLT_LICENSE_FILES = COPYING > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- /"\ ASCII RIBBON | ?With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.? / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From bugzilla at busybox.net Sun Mar 6 15:33:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 06 Mar 2022 15:33:04 +0000 Subject: [Buildroot] [Bug 14631] host-go-bootstrap: go not being built for package in external tree In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 --- Comment #1 from Fabrice Fontaine --- Hello, Thanks for your bug report, the following patch should fix your issue: https://patchwork.ozlabs.org/project/buildroot/patch/11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin at orange.com/ Unfortunately, this patch has not been applied to master yet. Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Sun Mar 6 20:28:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 21:28:55 +0100 Subject: [Buildroot] [git commit] package/libxslt: security bump to version 1.1.35 Message-ID: <20220306202200.C153082945@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=acf5b437cc329a392f26e5367de1f64b3601b605 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - fix CVE-2021-30560 - remove merged patch, drop autoreconf - moved from xmlsoft.org to gnome.org - spaces in hash file Signed-off-by: Francois Perrad [yann.morin.1998 at free.fr: - drop autoreconf as no longer patching - also switch home in Config.in ] Signed-off-by: Yann E. MORIN --- ...Fix-xml2-config-check-in-configure-script.patch | 31 ---------------------- package/libxslt/Config.in | 2 +- package/libxslt/libxslt.hash | 6 ++--- package/libxslt/libxslt.mk | 7 +++-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb235..0000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index dfe5b99f04..643bce2a61 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://xmlsoft.org/xslt/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839e..39523a6953 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d2521..df0286e986 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft -# We're patching configure.ac -LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ From yann.morin.1998 at free.fr Sun Mar 6 20:32:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 21:32:40 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 In-Reply-To: <20220306120902.132254-1-francois.perrad@gadz.org> References: <20220306120902.132254-1-francois.perrad@gadz.org> Message-ID: <20220306203240.GE228549@scaer> Fran?ois, All, As noticed by Alexander: typo fixed in title On 2022-03-06 13:09 +0100, Francois Perrad spake thusly: > - fix CVE-2021-30560 > - remove merged patch ... so we can also drop the autoreconf, done. > - moved from xmlsoft.org to gnome.org ... so we can also fix it in Config.in, done. > Signed-off-by: Francois Perrad Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > --- > ...ml2-config-check-in-configure-script.patch | 31 ------------------- > package/libxslt/libxslt.hash | 6 ++-- > package/libxslt/libxslt.mk | 5 +-- > 3 files changed, 6 insertions(+), 36 deletions(-) > delete mode 100644 package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > > diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > deleted file mode 100644 > index 3848dcb23..000000000 > --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 > -From: Nick Wellnhofer > -Date: Fri, 15 Nov 2019 11:53:11 +0100 > -Subject: [PATCH] Fix xml2-config check in configure script > - > -A 'print' option has never been supported. After a recent change to > -libxml2, invalid options cause xml2-config to fail. > - > -[Retrieved from: > -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] > -Signed-off-by: Fabrice Fontaine > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 3da57b18..585b9d7c 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, > - dnl test version and init our variables > - dnl > - > --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 > -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 > - then > - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) > - XMLVERS=`$XML_CONFIG --version` > --- > -GitLab > - > diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash > index 25aa30839..39523a695 100644 > --- a/package/libxslt/libxslt.hash > +++ b/package/libxslt/libxslt.hash > @@ -1,5 +1,5 @@ > -# Locally calculated after checking pgp signature > -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz > +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum > +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz > > # Hash for license file: > -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING > diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk > index d0f79d252..9c7be6822 100644 > --- a/package/libxslt/libxslt.mk > +++ b/package/libxslt/libxslt.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -LIBXSLT_VERSION = 1.1.34 > -LIBXSLT_SITE = http://xmlsoft.org/sources > +LIBXSLT_VERSION = 1.1.35 > +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz > +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 > LIBXSLT_INSTALL_STAGING = YES > LIBXSLT_LICENSE = MIT > LIBXSLT_LICENSE_FILES = COPYING > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 6 20:38:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 21:38:12 +0100 Subject: [Buildroot] [git commit] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220306205305.36AFE82A4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1debbb4c7eb205d3ccddaa7849e3121a4929c6c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sun Mar 6 21:01:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:01:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: drop custom install rules In-Reply-To: <20220305204446.823802-1-fontaine.fabrice@gmail.com> References: <20220305204446.823802-1-fontaine.fabrice@gmail.com> Message-ID: <20220306210155.GF228549@scaer> Fabrice, All, On 2022-03-05 21:44 +0100, Fabrice Fontaine spake thusly: > Drop custom install rules which have been added since the addition of > the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are > now resulting in a broken installion > > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14636 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ---------------------- > 1 file changed, 58 deletions(-) > > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > index 3f00db3ff4..e6de8c851b 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES > AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux > AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON > > -# The project only supports building one kind of library. > -# Further the install target installs the wrong files, so we do it here: > -ifeq ($(BR2_STATIC_LIBS),y) > -AZURE_IOT_SDK_C_LIBS += \ > - uamqp/libuamqp.a \ > - c-utility/libaziotsharedutil.a \ > - iothub_client/libiothub_client.a \ > - iothub_client/libiothub_client_mqtt_ws_transport.a \ > - iothub_client/libiothub_client_amqp_ws_transport.a \ > - iothub_client/libiothub_client_http_transport.a \ > - iothub_client/libiothub_client_amqp_transport.a \ > - iothub_client/libiothub_client_mqtt_transport.a \ > - iothub_service_client/libiothub_service_client.a \ > - serializer/libserializer.a \ > - umqtt/libumqtt.a \ > - deps/uhttp/libuhttp.a \ > - deps/umock-c/libumock_c.a \ > - libparson.a > -else > -AZURE_IOT_SDK_C_LIBS += \ > - uamqp/libuamqp.so \ > - c-utility/libaziotsharedutil.so \ > - iothub_client/libiothub_client.so \ > - iothub_client/libiothub_client_mqtt_ws_transport.so \ > - iothub_client/libiothub_client_amqp_ws_transport.so \ > - iothub_client/libiothub_client_http_transport.so \ > - iothub_client/libiothub_client_amqp_transport.so \ > - iothub_client/libiothub_client_mqtt_transport.so \ > - iothub_service_client/libiothub_service_client.so \ > - serializer/libserializer.so \ > - umqtt/libumqtt.so.1.1.12 \ > - deps/uhttp/libuhttp.so \ > - deps/umock-c/libumock_c.so \ > - libparson.so > - > -define AZURE_IOT_SDK_C_CREATE_SYMLINKS > - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 > - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so > -endef > -endif > - > -define AZURE_IOT_SDK_C_INSTALL_LIBS > - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ > - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) > - ) > - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) > -endef > - > -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS > - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) > - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ > - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ > -endef > - > -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS > - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) > -endef > - > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Sun Mar 6 21:04:39 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sun, 06 Mar 2022 21:04:39 +0000 Subject: [Buildroot] [Bug 14636] azure-iot-sdk-c: Installed headers do not compile In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14636 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED CC| |yann.morin.1998 at free.fr Status|NEW |RESOLVED --- Comment #2 from Yann E. MORIN --- James, All, Thanks for the report. We believe fis is now fixed with the patch from Fabrice applied to master: d1debbb4c7eb package/azure-iot-sdk-c: drop custom install rules Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Sun Mar 6 21:20:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:20:37 +0100 Subject: [Buildroot] [git commit] package/libglfw: fix wayland build Message-ID: <20220306211541.AFBB682983@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bbb12eff3b9f9d9719c48644c2b3d563e80de48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 3.3.6 in commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: CMake Error at CMakeLists.txt:252 (find_package): Could not find a package configuration file provided by "ECM" with any of the following names: ECMConfig.cmake ecm-config.cmake Fixes: - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...and-Remove-extra-cmake-modules-dependency.patch | 121 +++++++++++++++++++++ ...sts.txt-allow-override-of-wayland-pkgdata.patch | 32 ++++++ package/libglfw/Config.in | 2 + package/libglfw/libglfw.mk | 6 +- 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch new file mode 100644 index 0000000000..d5ee7c829a --- /dev/null +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch @@ -0,0 +1,121 @@ +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 +From: Joel Winarske +Date: Mon, 28 Sep 2020 22:23:02 -0700 +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency + +Fixes #1774. + +[Retrieved (and backported) from: +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 4 --- + CMakeLists.txt | 16 ++++++------ + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ + 3 files changed, 45 insertions(+), 37 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42bfa1806d..394827520b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,20 +191,18 @@ endif() + # Use Wayland for window creation + #-------------------------------------------------------------------- + if (_GLFW_WAYLAND) +- find_package(ECM REQUIRED NO_MODULE) +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + +- find_package(Wayland REQUIRED Client Cursor Egl) +- find_package(WaylandScanner REQUIRED) +- find_package(WaylandProtocols 1.15 REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(Wayland REQUIRED ++ wayland-client>=0.2.7 ++ wayland-cursor>=0.2.7 ++ wayland-egl>=0.2.7 ++ xkbcommon) + + list(APPEND glfw_PKG_DEPS "wayland-client") + + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") +- +- find_package(XKBCommon REQUIRED) +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") + + include(CheckIncludeFiles) + include(CheckFunctionExists) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f2bdd883d..e834506c6c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) + posix_time.c posix_thread.c xkb_unicode.c + egl_context.c osmesa_context.c) + +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" +- BASENAME xdg-shell) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" +- BASENAME xdg-decoration) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" +- BASENAME viewporter) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" +- BASENAME relative-pointer-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" +- BASENAME pointer-constraints-unstable-v1) +- ecm_add_wayland_client_protocol(glfw_SOURCES +- PROTOCOL +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" +- BASENAME idle-inhibit-unstable-v1) ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ ++ macro(wayland_generate protocol_file output_file) ++ add_custom_command(OUTPUT ${output_file}.h ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header ++ < ${protocol_file} > ${output_file}.h ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.h) ++ ++ add_custom_command(OUTPUT ${output_file}.c ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code ++ < ${protocol_file} > ${output_file}.c ++ DEPENDS ${protocol_file}) ++ list(APPEND glfw_SOURCES ${output_file}.c) ++ endmacro() ++ ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) ++ wayland_generate( ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) ++ + elseif (_GLFW_OSMESA) + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h + posix_time.h posix_thread.h osmesa_context.h) diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch new file mode 100644 index 0000000000..4bcb5e4eb7 --- /dev/null +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch @@ -0,0 +1,32 @@ +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 4 Mar 2022 17:59:19 +0100 +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir + +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} +(needed when cross-compiling) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glfw/glfw/pull/2053] +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 01f191c9..475ce882 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) + include(FindPkgConfig) + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ if (NOT WAYLAND_PROTOCOLS_BASE) ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) ++ endif() + + macro(wayland_generate protocol_file output_file) + add_custom_command(OUTPUT "${output_file}.h" +-- +2.34.1 + diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in index 281b55df7b..e5e96036ff 100644 --- a/package/libglfw/Config.in +++ b/package/libglfw/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW bool "libglfw" depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 2ba31fd674..0a3986f662 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +# Override pkg-config pkgdatadir variable, it needs the prefix +LIBGLFW_CONF_OPTS += \ + -DGLFW_USE_WAYLAND=1 \ + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) From yann.morin.1998 at free.fr Sun Mar 6 21:24:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:24:25 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/libglfw: fix wayland build In-Reply-To: <20220306102722.129713-1-fontaine.fabrice@gmail.com> References: <20220306102722.129713-1-fontaine.fabrice@gmail.com> Message-ID: <20220306212425.GG228549@scaer> Fabrice, All, On 2022-03-06 11:27 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 3.3.6 in > commit 3cd9bb4f2a91d3739c5da96f5e4dd37d3ae13799: > > CMake Error at CMakeLists.txt:252 (find_package): > Could not find a package configuration file provided by "ECM" with any of > the following names: > > ECMConfig.cmake > ecm-config.cmake > > Fixes: > - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - Fix typo in title > > ...emove-extra-cmake-modules-dependency.patch | 121 ++++++++++++++++++ > ...xt-allow-override-of-wayland-pkgdata.patch | 32 +++++ > package/libglfw/Config.in | 2 + > package/libglfw/libglfw.mk | 6 +- > 4 files changed, 160 insertions(+), 1 deletion(-) > create mode 100644 package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch > create mode 100644 package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch > > diff --git a/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch > new file mode 100644 > index 0000000000..d5ee7c829a > --- /dev/null > +++ b/package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch > @@ -0,0 +1,121 @@ > +From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001 > +From: Joel Winarske > +Date: Mon, 28 Sep 2020 22:23:02 -0700 > +Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency > + > +Fixes #1774. > + > +[Retrieved (and backported) from: > +https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb] > +Signed-off-by: Fabrice Fontaine > +--- > + .gitignore | 4 --- > + CMakeLists.txt | 16 ++++++------ > + src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------ > + 3 files changed, 45 insertions(+), 37 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 42bfa1806d..394827520b 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -191,20 +191,18 @@ endif() > + # Use Wayland for window creation > + #-------------------------------------------------------------------- > + if (_GLFW_WAYLAND) > +- find_package(ECM REQUIRED NO_MODULE) > +- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") > + > +- find_package(Wayland REQUIRED Client Cursor Egl) > +- find_package(WaylandScanner REQUIRED) > +- find_package(WaylandProtocols 1.15 REQUIRED) > ++ include(FindPkgConfig) > ++ pkg_check_modules(Wayland REQUIRED > ++ wayland-client>=0.2.7 > ++ wayland-cursor>=0.2.7 > ++ wayland-egl>=0.2.7 > ++ xkbcommon) > + > + list(APPEND glfw_PKG_DEPS "wayland-client") > + > + list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}") > +- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") > +- > +- find_package(XKBCommon REQUIRED) > +- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}") > ++ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}") > + > + include(CheckIncludeFiles) > + include(CheckFunctionExists) > +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > +index 2f2bdd883d..e834506c6c 100644 > +--- a/src/CMakeLists.txt > ++++ b/src/CMakeLists.txt > +@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND) > + posix_time.c posix_thread.c xkb_unicode.c > + egl_context.c osmesa_context.c) > + > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml" > +- BASENAME xdg-shell) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml" > +- BASENAME xdg-decoration) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml" > +- BASENAME viewporter) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml" > +- BASENAME relative-pointer-unstable-v1) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml" > +- BASENAME pointer-constraints-unstable-v1) > +- ecm_add_wayland_client_protocol(glfw_SOURCES > +- PROTOCOL > +- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml" > +- BASENAME idle-inhibit-unstable-v1) > ++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) > ++ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) > ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) > ++ > ++ macro(wayland_generate protocol_file output_file) > ++ add_custom_command(OUTPUT ${output_file}.h > ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header > ++ < ${protocol_file} > ${output_file}.h > ++ DEPENDS ${protocol_file}) > ++ list(APPEND glfw_SOURCES ${output_file}.h) > ++ > ++ add_custom_command(OUTPUT ${output_file}.c > ++ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code > ++ < ${protocol_file} > ${output_file}.c > ++ DEPENDS ${protocol_file}) > ++ list(APPEND glfw_SOURCES ${output_file}.c) > ++ endmacro() > ++ > ++ set(GLFW_WAYLAND_PROTOCOL_SOURCES) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) > ++ wayland_generate( > ++ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml > ++ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) > ++ > + elseif (_GLFW_OSMESA) > + set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h > + posix_time.h posix_thread.h osmesa_context.h) > diff --git a/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch > new file mode 100644 > index 0000000000..4bcb5e4eb7 > --- /dev/null > +++ b/package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch > @@ -0,0 +1,32 @@ > +From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 4 Mar 2022 17:59:19 +0100 > +Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir > + > +Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR} > +(needed when cross-compiling) > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/glfw/glfw/pull/2053] > +--- > + src/CMakeLists.txt | 8 ++++++-- > + 1 file changed, 6 insertions(+), 2 deletions(-) > + > +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > +index 01f191c9..475ce882 100644 > +--- a/src/CMakeLists.txt > ++++ b/src/CMakeLists.txt > +@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND) > + include(FindPkgConfig) > + find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) > + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15) > +- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) > ++ if (NOT WAYLAND_PROTOCOLS_BASE) > ++ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir) > ++ endif() > + > + macro(wayland_generate protocol_file output_file) > + add_custom_command(OUTPUT "${output_file}.h" > +-- > +2.34.1 > + > diff --git a/package/libglfw/Config.in b/package/libglfw/Config.in > index 281b55df7b..e5e96036ff 100644 > --- a/package/libglfw/Config.in > +++ b/package/libglfw/Config.in > @@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW > bool "libglfw" > depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES > + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND > + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND > select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7 > diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk > index 2ba31fd674..0a3986f662 100644 > --- a/package/libglfw/libglfw.mk > +++ b/package/libglfw/libglfw.mk > @@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles > endif > > ifeq ($(BR2_PACKAGE_WAYLAND),y) > -LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1 > +LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols > +# Override pkg-config pkgdatadir variable, it needs the prefix > +LIBGLFW_CONF_OPTS += \ > + -DGLFW_USE_WAYLAND=1 \ > + -DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols > endif > > ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 6 21:32:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 6 Mar 2022 22:32:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 In-Reply-To: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> References: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> Message-ID: <20220306213212.GH228549@scaer> Fabrice, All, On 2022-02-22 21:40 +0100, Fabrice Fontaine spake thusly: > 2.6.0 is an maintenance and security release. > > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 You claim 'security bump' in the title, but the announcement does not seem to identify any actual security fix, as compared to 2.5.0 which did explicitly list security fixes: https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 So, I don;t think this is material for master, is it? Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/freerdp/freerdp.hash | 4 ++-- > package/freerdp/freerdp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash > index e31b8d5b96..780061bdbb 100644 > --- a/package/freerdp/freerdp.hash > +++ b/package/freerdp/freerdp.hash > @@ -1,5 +1,5 @@ > -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 > -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz > +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 > +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz > > # Locally calculated > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index c536f6cb1c..edbfb6801a 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FREERDP_VERSION = 2.5.0 > +FREERDP_VERSION = 2.6.0 > FREERDP_SITE = https://pub.freerdp.com/releases > FREERDP_DEPENDENCIES = libglib2 openssl zlib > FREERDP_LICENSE = Apache-2.0 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 6 21:43:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 6 Mar 2022 22:43:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 In-Reply-To: <20220306213212.GH228549@scaer> References: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> <20220306213212.GH228549@scaer> Message-ID: Yann, Le dim. 6 mars 2022 ? 22:32, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-02-22 21:40 +0100, Fabrice Fontaine spake thusly: > > 2.6.0 is an maintenance and security release. > > > > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 > > You claim 'security bump' in the title, but the announcement does not > seem to identify any actual security fix, as compared to 2.5.0 which did > explicitly list security fixes: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 > > So, I don;t think this is material for master, is it? I don't know, indeed the announcement doesn't identify security fixes but the first sentence is "2.6.0 is an maintenance and security release." At least, a crash with wayland is fixed with: https://github.com/FreeRDP/FreeRDP/issues/7426 So feel free to apply it to next or master. > > Regards, > Yann E. MORIN. > > > Signed-off-by: Fabrice Fontaine > > --- > > package/freerdp/freerdp.hash | 4 ++-- > > package/freerdp/freerdp.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash > > index e31b8d5b96..780061bdbb 100644 > > --- a/package/freerdp/freerdp.hash > > +++ b/package/freerdp/freerdp.hash > > @@ -1,5 +1,5 @@ > > -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 > > -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz > > +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 > > +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz > > > > # Locally calculated > > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > > index c536f6cb1c..edbfb6801a 100644 > > --- a/package/freerdp/freerdp.mk > > +++ b/package/freerdp/freerdp.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -FREERDP_VERSION = 2.5.0 > > +FREERDP_VERSION = 2.6.0 > > FREERDP_SITE = https://pub.freerdp.com/releases > > FREERDP_DEPENDENCIES = libglib2 openssl zlib > > FREERDP_LICENSE = Apache-2.0 > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From joel at jms.id.au Mon Mar 7 05:28:57 2022 From: joel at jms.id.au (Joel Stanley) Date: Mon, 7 Mar 2022 15:58:57 +1030 Subject: [Buildroot] [PATCH] package/pdbg: bump version to v3.5 Message-ID: <20220307052858.1245393-1-joel@jms.id.au> Signed-off-by: Joel Stanley --- package/pdbg/pdbg.hash | 2 +- package/pdbg/pdbg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index df7ba314bfbc..58c256e6ceb2 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5b721fd5551591cd5626ccf72c8d9096d902de4da10324097a37b4763815f0d7 pdbg-3.4.tar.gz +sha256 7bdbab4e14b8cf50dbf6242955e46e58882c37b1a52671d9e6f3073885629dfa pdbg-3.5.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 5a5cfbc62d8a..871bf953f23e 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 3.4 +PDBG_VERSION = 3.5 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING -- 2.34.1 From jan.havran at audified.com Mon Mar 7 09:35:00 2022 From: jan.havran at audified.com (Jan Havran) Date: Mon, 7 Mar 2022 10:35:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack2: bump to version 1.9.20 Message-ID: - Fix URL for 'JACK DBus packaging' GitHub Wiki page. https://github.com/jackaudio/jack2/releases/tag/v1.9.18 https://github.com/jackaudio/jack2/releases/tag/v1.9.19 https://github.com/jackaudio/jack2/releases/tag/v1.9.20 Signed-off-by: Jan Havran --- package/jack2/Config.in | 4 ++-- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d5..8abdda6376 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca5..6361473cf7 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..2e55169984 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.20 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING -- 2.35.1 From bugzilla at busybox.net Mon Mar 7 10:08:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 10:08:10 +0000 Subject: [Buildroot] [Bug 14641] New: oprofile can not find the events files Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 Bug ID: 14641 Summary: oprofile can not find the events files Product: buildroot Version: 2020.02.12 Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: sergey.velykokhatko at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Hi all, We are using Intel ApolloLake AtomE3930 SOC with goldmont microarchitecture. Buildroot configure file contains the BR2_x86_64=y. When we starting the operf, we get following error: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted It looks for me a problem in OPROFILE_INSTALL_TARGET_CMDS. It copies the x86-64 for our SOC, but oprofile awaits them at i386 Architecture, s. https://docs.fedoraproject.org/en-US/fedora/f34/system-administrators-guide/monitoring-and-automation/OProfile/#s2-oprofile-events Best Regards, Sergey -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Mar 7 10:32:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 2.4.13 In-Reply-To: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 21:46:01 +0100") References: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> Message-ID: <87o82i834r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://www.mail-archive.com/haproxy at formilux.org/msg41834.html > https://www.mail-archive.com/haproxy at formilux.org/msg41698.html > https://www.mail-archive.com/haproxy at formilux.org/msg41685.html > https://www.mail-archive.com/haproxy at formilux.org/msg41618.html > https://www.mail-archive.com/haproxy at formilux.org/msg41512.html > Signed-off-by: Fabrice Fontaine Committed given the bugfixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:37:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:37:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-mach64: fix build error In-Reply-To: <20220223155128.818822-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 23 Feb 2022 16:51:28 +0100") References: <20220223155128.818822-1-bernd.kuhls@t-online.de> Message-ID: <87k0d682ve.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Add upstream commit to fix build with xorg-server 21.1 which was bumped > with commit d9185c6ba38430a017ed996c4180e141881ba570. > Fixes: > http://autobuild.buildroot.net/results/f0a/f0a0224a2b368c11236fcc7d14db5175c0a829d1/ > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:39:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:39:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-nouveau: fix build error In-Reply-To: <20220223155942.831349-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 23 Feb 2022 16:59:42 +0100") References: <20220223155942.831349-1-bernd.kuhls@t-online.de> Message-ID: <87fsnu82st.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Add upstream commit to fix build with xorg-server 21.1 which was bumped > with commit d9185c6ba38430a017ed996c4180e141881ba570. > No autobuild errors found yet. > Signed-off-by: Bernd Kuhls .. > ++++ b/src/nv_driver.c > +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) > + { > + RegionRec pixregion; > + > +- PixmapRegionInit(&pixregion, dirty->slave_dst); > ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); > + > +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); > ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); Grr, silly PC churn. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:39:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:39:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-qxl: fix build error In-Reply-To: <20220223160630.835866-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 23 Feb 2022 17:06:30 +0100") References: <20220223160630.835866-1-bernd.kuhls@t-online.de> Message-ID: <87bkyi82so.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Add upstream commit to fix build with xorg-server 21.1 which was bumped > with commit d9185c6ba38430a017ed996c4180e141881ba570. > No autobuild errors found yet. > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:41:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 11:41:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.7 In-Reply-To: <20220305173913.229445-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Mar 2022 18:39:13 +0100") References: <20220305173913.229445-1-fontaine.fabrice@gmail.com> Message-ID: <877d9682on.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release relaxes the fix to CVE-2022-25236 (introduced with release > 2.4.5) which some of you have been waiting for, due to related > incompatibilities. > https://blog.hartwork.org/posts/expat-2-4-7-released > https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 10:32:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:32:34 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-mach64: fix build error Message-ID: <20220307103351.338CD82A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5beea70361d08cf737c6be4fafd7f8e32b8434b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. Fixes: http://autobuild.buildroot.net/results/f0a/f0a0224a2b368c11236fcc7d14db5175c0a829d1/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...-Rename-bool-to-boolean-for-OptionInfoRec.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch new file mode 100644 index 0000000000..fe3e21f8c2 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch @@ -0,0 +1,84 @@ +From 3ab2c144ef34199ceaf95115538a67f932e76f7d Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Thu, 18 Nov 2021 13:18:25 +0000 +Subject: [PATCH] Rename bool to boolean for OptionInfoRec. + +* src/aticonfig.c: Change uses of .value.bool to .value.boolean + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/-/commit/3ab2c144ef34199ceaf95115538a67f932e76f7d + +Signed-off-by: Bernd Kuhls +--- + src/aticonfig.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/aticonfig.c b/src/aticonfig.c +index bad6474..6995b9a 100644 +--- a/src/aticonfig.c ++++ b/src/aticonfig.c +@@ -311,42 +311,42 @@ ATIProcessOptions + + (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); + +-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool +-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool +-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool +-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool +-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool +-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool +-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool +-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool +-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool ++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean ++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean ++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean ++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean ++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean ++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean ++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean ++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean ++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean + + #ifdef XF86DRI_DEVEL + +-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool ++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean + # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str + # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num + # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num +-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool ++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean + # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num + + #endif /* XF86DRI_DEVEL */ + + #ifdef TV_OUT + +-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool ++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean + # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str + + #endif /* TV_OUT */ + +-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool +-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool +-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool +-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool +-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool ++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean ++# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean ++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean ++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean ++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean + # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str +-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool +-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool ++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean ++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean + + # define ReferenceClock \ + PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq +-- +GitLab + From peter at korsgaard.com Mon Mar 7 10:41:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:41:38 +0100 Subject: [Buildroot] [git commit] package/expat: bump to version 2.4.7 Message-ID: <20220307103351.5601D82A79@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=402d85ef4e3d5161869d5da918ec679a9571c417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 7 10:35:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:35:34 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-nouveau: fix build error Message-ID: <20220307103351.3E4AD82A91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b78caa449844fa12b5dbc89bde28786999a3b238 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...nouveau-fixup-driver-for-new-X-server-ABI.patch | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch new file mode 100644 index 0000000000..96be4909e7 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch @@ -0,0 +1,68 @@ +From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commit/e80e73ced69b15662103d0fd6837db4ce6c6eb5b + +Signed-off-by: Bernd Kuhls +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b..8a1fcf9 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8..db3b112 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b6..f9ab4af 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +GitLab + From peter at korsgaard.com Mon Mar 7 10:31:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:31:54 +0100 Subject: [Buildroot] [git commit] package/haproxy: bump to version 2.4.13 Message-ID: <20220307103351.2A13F81586@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e60d4f11cd56544d6c23a1f7c3c8bbd98edbec3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://www.mail-archive.com/haproxy at formilux.org/msg41834.html https://www.mail-archive.com/haproxy at formilux.org/msg41698.html https://www.mail-archive.com/haproxy at formilux.org/msg41685.html https://www.mail-archive.com/haproxy at formilux.org/msg41618.html https://www.mail-archive.com/haproxy at formilux.org/msg41512.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index c29857cd9c..e3120b521f 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 -sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 +sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 33a2e92777..83d9cfee37 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Mon Mar 7 10:37:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 11:37:14 +0100 Subject: [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-qxl: fix build error Message-ID: <20220307103351.4A66981586@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=512b329882bfb773badb6b5e5df31a38dfabd2e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add upstream commit to fix build with xorg-server 21.1 which was bumped with commit d9185c6ba38430a017ed996c4180e141881ba570. No autobuild errors found yet. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Fix-a-build-error-with-Xorg-master.patch | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch new file mode 100644 index 0000000000..d3257fba20 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch @@ -0,0 +1,106 @@ +From 4e1963a812f2c1777ba5d56ea9e939a3e40a0496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Sat, 28 Aug 2021 15:38:40 +0200 +Subject: [PATCH] Fix a build error with Xorg master +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use xf86ReturnOptValBool() in get_bool_option() instead of +options[option_index].value.bool to fix a compiler error with +current Xorg xserver master branch. + +Also use xf86GetOptValInteger() in get_int_option() and +xf86GetOptValString() in get_str_option() for consistency. + +The change causes a slight performance drop during option parsing +because the passed-in index_value is no longer used as an index +into the options array. + +Instead, it's used as a token now for the standard option getter +functions which works since the index_value to the get_*_option() +functions are identical to the value of options[n].token in the +passed-in OptionInfoRec array. + +Also rename "int option_index" to "int token" for clarity in all +three functions. + +Signed-off-by: Zolt??n B??sz??rm??nyi + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/commit/4e1963a812f2c1777ba5d56ea9e939a3e40a0496 + +Signed-off-by: Bernd Kuhls +--- + src/qxl_option_helpers.c | 13 +++++++------ + src/qxl_option_helpers.h | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c +index 2aba677..7707b7c 100644 +--- a/src/qxl_option_helpers.c ++++ b/src/qxl_option_helpers.c +@@ -10,31 +10,32 @@ + + #include "qxl_option_helpers.h" + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name) + { ++ int value; + if (env_name && getenv(env_name)) { + return atoi(getenv(env_name)); + } +- return options[option_index].value.num; ++ return xf86GetOptValInteger(options, token, &value) ? value : 0; + } + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name) + { + if (getenv(env_name)) { + return getenv(env_name); + } +- return options[option_index].value.str; ++ return xf86GetOptValString(options, token); + } + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name) + { + const char* value = getenv(env_name); + + if (!value) { +- return options[option_index].value.bool; ++ return xf86ReturnOptValBool(options, token, FALSE); + } + if (strcmp(value, "0") == 0 || + strcasecmp(value, "off") == 0 || +diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h +index 7c54c72..66d0a17 100644 +--- a/src/qxl_option_helpers.h ++++ b/src/qxl_option_helpers.h +@@ -4,13 +4,13 @@ + #include + #include + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name); + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name); + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name); + + #endif // OPTION_HELPERS_H +-- +GitLab + From yann.morin at orange.com Mon Mar 7 15:42:56 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Mon, 7 Mar 2022 16:42:56 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: fix build with per-package directories Message-ID: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> From: "Yann E. MORIN" Build with per-package directory is broken, because go is not found in the PATH, when trying to download and vendor a go package. This is because FOO_DL_ENV contains $(HOST_GO_COMMON_ENV), which defines the PATH as PATH=$(BR_PATH). This is correct, except this is expanded at the time the golang-package macro is evaluated, which means PATH contains the 'global' BR_PATH, i.e.: $(O)/host/bin:$(O)/host/sbin:... However, with PPD, this does not yet exist at build time; only the per-package hoqt directory exists. We want to have it expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. At the same time, also $$-expand two other variables (even though those are benign, it is better for consistency that they be $$-expanded). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart --- package/pkg-golang.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index ddefdf1214..f1c5cfd350 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,7 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. @@ -86,7 +86,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ - $(HOST_GO_COMMON_ENV) \ + $$(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) @@ -134,7 +134,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) ) endef endif @@ -143,7 +143,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) ) endef endif -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From yann.morin at orange.com Mon Mar 7 15:43:13 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Mon, 7 Mar 2022 16:43:13 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD Message-ID: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> From: "Yann E. MORIN" BR_GOMOD is a remnant from a previous iteration of the golang download infrastructure; it is currently used nowhere. Do not set it. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart --- package/pkg-golang.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index f1c5cfd350..0cb2ed73cc 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -87,8 +87,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ - BR_GOMOD=$$($(2)_GOMOD) + GOPROXY=direct # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From dopsi at dopsi.ch Mon Mar 7 14:13:21 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Mon, 7 Mar 2022 15:13:21 +0100 Subject: [Buildroot] [PATCH] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220307141321.307200-1-dopsi@dopsi.ch> When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: -- 2.25.1 From christian at paral.in Mon Mar 7 18:41:49 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 10:41:49 -0800 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> Message-ID: Hi Yann, On Mon, Mar 7, 2022 at 7:43 AM wrote: > > From: "Yann E. MORIN" > > BR_GOMOD is a remnant from a previous iteration of the golang download > infrastructure; it is currently used nowhere. > > Do not set it. > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart > --- > package/pkg-golang.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index f1c5cfd350..0cb2ed73cc 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -87,8 +87,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD > $(2)_DOWNLOAD_POST_PROCESS = go > $(2)_DL_ENV += \ > $$(HOST_GO_COMMON_ENV) \ > - GOPROXY=direct \ > - BR_GOMOD=$$($(2)_GOMOD) > + GOPROXY=direct Reviewed-by: Christian Stewart Thanks, Christian From christian at paral.in Mon Mar 7 18:42:28 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 10:42:28 -0800 Subject: [Buildroot] [PATCH] package/pkg-golang: fix build with per-package directories In-Reply-To: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> References: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> Message-ID: Hi Yann, On Mon, Mar 7, 2022 at 7:43 AM wrote: > We want to have it expanded at the time the recipe is run, so like all > other variables, we need to $$-expand it. > > At the same time, also $$-expand two other variables (even though those > are benign, it is better for consistency that they be $$-expanded). > > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart > --- > package/pkg-golang.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk > index ddefdf1214..f1c5cfd350 100644 > --- a/package/pkg-golang.mk > +++ b/package/pkg-golang.mk > @@ -45,7 +45,7 @@ $(2)_BUILD_OPTS += \ > -modcacherw \ > -tags "$$($(2)_TAGS)" \ > -trimpath \ > - -p $(PARALLEL_JOBS) > + -p $$(PARALLEL_JOBS) > > # Target packages need the Go compiler on the host at download time (for > # vendoring), and at build and install time. > @@ -86,7 +86,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD > > $(2)_DOWNLOAD_POST_PROCESS = go > $(2)_DL_ENV += \ > - $(HOST_GO_COMMON_ENV) \ > + $$(HOST_GO_COMMON_ENV) \ > GOPROXY=direct \ > BR_GOMOD=$$($(2)_GOMOD) > > @@ -134,7 +134,7 @@ endif > ifndef $(2)_INSTALL_TARGET_CMDS > define $(2)_INSTALL_TARGET_CMDS > $$(foreach d,$$($(2)_INSTALL_BINS),\ > - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) > + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) > ) > endef > endif > @@ -143,7 +143,7 @@ endif > ifndef $(2)_INSTALL_CMDS > define $(2)_INSTALL_CMDS > $$(foreach d,$$($(2)_INSTALL_BINS),\ > - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) > + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) > ) Reviewed-by: Christian Stewart Thanks, Christian From bugzilla at busybox.net Mon Mar 7 19:02:10 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 19:02:10 +0000 Subject: [Buildroot] [Bug 14631] host-go-bootstrap: go not being built for package in external tree In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 --- Comment #2 from contact at martb.dev --- Thanks for bringing this to my attention Fabrice! Applied for now, i hope it makes its way into 2022.02 sooner or later. -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Mar 7 19:11:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:11:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtorrent: fix build with libexecinfo In-Reply-To: <20220226103344.1850433-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 11:33:44 +0100") References: <20220226103344.1850433-1-fontaine.fabrice@gmail.com> Message-ID: <8735jt8tn7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the folllowing build failure on rtorrent raised on uclibc and musl s/folllowing/following/ > since the addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: > /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/libtorrent.so: > undefined reference to `backtrace_symbols' > Fixes: > - http://autobuild.buildroot.org/results/6cb4ba56fc0a3a8bd02b246ab9bc82edaa552ad9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:12:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:12:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: fix elf_py TLS section handling In-Reply-To: <20220226155233.2605318-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 16:52:33 +0100") References: <20220226155233.2605318-1-fontaine.fabrice@gmail.com> Message-ID: <87y21l7f0m.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on mipsel, or1k, powerpc raised > since bump to version 8.1 in commit > ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: > struct.error: unpack requires a buffer of 20 bytes > Fixes: > - http://autobuild.buildroot.org/results/74f39c6f14e3f60babdcabceb5e42656f69cdaa7 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:22:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:22:57 +0100 Subject: [Buildroot] [PATCH] package/rauc: only install systemd service if built with dbus/service support In-Reply-To: ("Nuno =?utf-8?Q?Gon=C3=A7alves=22's?= message of "Sun, 27 Feb 2022 19:54:14 +0000") References: Message-ID: <87tuc97ejy.fsf@dell.be.48ers.dk> >>>>> "Nuno" == Nuno Gon?alves writes: > The systemd service will try to call rauc in service mode, so it is useless > and will fail if rauc does not have such support > Signed-off-by: Nuno Gon?alves > --- > package/rauc/rauc.mk | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk > index 39f5255812..d29ef66046 100644 > --- a/package/rauc/rauc.mk > +++ b/package/rauc/rauc.mk > @@ -15,6 +15,15 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 > ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) > RAUC_CONF_OPTS += --enable-service > RAUC_DEPENDENCIES += dbus > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +# configure uses pkg-config --variable=systemdsystemunitdir systemd > +RAUC_DEPENDENCIES += systemd > +define RAUC_INSTALL_INIT_SYSTEMD > + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d > + printf '[Install]\nWantedBy=multi-user.target\n' \ > + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf Your mailer had corrupted the patch (tabs to spaces), so I couldn't apply the patch and had to manually fix it up. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:28:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:28:03 +0100 Subject: [Buildroot] [PATCH 2/2] docs: fix links to AsciiDoc In-Reply-To: <20220228163238.405627-1-theo.lebrun@bootlin.com> (=?utf-8?Q?=22Th=C3=A9o?= Lebrun via buildroot"'s message of "Mon, 28 Feb 2022 17:32:38 +0100") References: <20220228163238.405627-1-theo.lebrun@bootlin.com> Message-ID: <87pmmx7ebg.fsf@dell.be.48ers.dk> >>>>> "Th?o" == Th?o Lebrun via buildroot writes: > Links were aimed at the methods.co.nz domain, which is now returning > 404s. The current situation of AsciiDoc is unclear to me: the Fedora > package points to this website, they own asciidoc.org, Wikipedia points > to this project as well but their Git repo's README includes the > following paragraph: >> AsciiDoc.py is a legacy processor for this syntax, handling an older >> rendition of AsciiDoc. As such, this will not properly handle the >> current AsciiDoc specification. It is suggested that unless you >> specifically require the AsciiDoc.py toolchain, you should find a >> processor that handles the modern AsciiDoc syntax. > --- https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md This is listed as patch 2/2, but I don't see a 1/2? Notice that --- ends the commit message, so everything after this get dropped when applying the patch with git am. Committed with that fixed, thanks. > "AsciiDoc specification" pointing towards: > https://projects.eclipse.org/projects/asciidoc.asciidoc-lang > Signed-off-by: Th?o Lebrun > --- > docs/conf/asciidoc-text.conf | 2 +- > docs/manual/writing-rules.txt | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf > index 470bdecfc2..bb614b9d85 100644 > --- a/docs/conf/asciidoc-text.conf > +++ b/docs/conf/asciidoc-text.conf > @@ -1,5 +1,5 @@ > # Refer to following asciidoc documentation: > -# http://www.methods.co.nz/asciidoc/userguide.html > +# https://asciidoc-py.github.io/userguide.html > # In particular sections "Macros" and "Attribute References" > # > # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' > diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt > index 57ba61bdb1..84d8f76431 100644 > --- a/docs/manual/writing-rules.txt > +++ b/docs/manual/writing-rules.txt > @@ -207,10 +207,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. > === The documentation > The documentation uses the > -http://www.methods.co.nz/asciidoc/[asciidoc] format. > +https://asciidoc-py.github.io/[asciidoc] format. > For further details about the asciidoc syntax, refer to > -http://www.methods.co.nz/asciidoc/userguide.html[]. > +https://asciidoc-py.github.io/userguide.html[]. > === Support scripts > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:29:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:29:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcamera-apps: link with -latomic if needed In-Reply-To: <20220302184209.2081120-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 19:42:09 +0100") References: <20220302184209.2081120-1-fontaine.fabrice@gmail.com> Message-ID: <87lexl7e9r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Link with -latomic if needed to avoid the following build failure raised > since the addition of the package in commit > 7227d005d2435ec7b38995a6247d233ddb5ba365: > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: > CMakeFiles/libcamera-still.dir/libcamera_still.cpp.o: undefined > reference to symbol '__atomic_fetch_sub_4@@LIBATOMIC_1.0' > Fixes: > - http://autobuild.buildroot.org/results/b20465140f3a5281f9b586f442b67fd400e7184a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:21:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:21:19 +0100 Subject: [Buildroot] [git commit] package/rauc: only install systemd service if built with dbus/service support Message-ID: <20220307192114.1612F82DBE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec532199d6b404a1e51b5ed0dfdb21b18a8a3ed5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The systemd service will try to call rauc in service mode, so it is useless and will fail if rauc does not have such support Signed-off-by: Nuno Gon??alves Signed-off-by: Peter Korsgaard --- package/rauc/rauc.mk | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 39f5255812..7a10470cf2 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -15,6 +15,18 @@ RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 ifeq ($(BR2_PACKAGE_RAUC_DBUS),y) RAUC_CONF_OPTS += --enable-service RAUC_DEPENDENCIES += dbus + +# systemd service uses dbus interface +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +# configure uses pkg-config --variable=systemdsystemunitdir systemd +RAUC_DEPENDENCIES += systemd +define RAUC_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf +endef +endif + else RAUC_CONF_OPTS += --disable-service endif @@ -33,17 +45,6 @@ else RAUC_CONF_OPTS += --disable-json endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -# configure uses pkg-config --variable=systemdsystemunitdir systemd -RAUC_DEPENDENCIES += systemd -endif - -define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d - printf '[Install]\nWantedBy=multi-user.target\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf -endef - HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \ From peter at korsgaard.com Mon Mar 7 19:10:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:10:48 +0100 Subject: [Buildroot] [git commit] package/libtorrent: fix build with libexecinfo Message-ID: <20220307192114.0474281D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=301b7c3c8120e6bd05872777b6c292ebc8230a27 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on rtorrent raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/libtorrent.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/6cb4ba56fc0a3a8bd02b246ab9bc82edaa552ad9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libtorrent/libtorrent.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk index c8310cab65..b966a72788 100644 --- a/package/libtorrent/libtorrent.mk +++ b/package/libtorrent/libtorrent.mk @@ -14,6 +14,11 @@ LIBTORRENT_INSTALL_STAGING = YES LIBTORRENT_LICENSE = GPL-2.0 LIBTORRENT_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +LIBTORRENT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +LIBTORRENT_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBTORRENT_CONF_OPTS += --enable-openssl LIBTORRENT_DEPENDENCIES += openssl From peter at korsgaard.com Mon Mar 7 19:12:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:12:30 +0100 Subject: [Buildroot] [git commit] package/frr: fix elf_py TLS section handling Message-ID: <20220307192114.0C5C882DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43c8f8b77bf2d318882c5fffb886852872ca74b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on mipsel, or1k, powerpc raised since bump to version 8.1 in commit ca2753fd47d47e5ad0eec16ea62f7b7f096331b6: struct.error: unpack requires a buffer of 20 bytes Fixes: - http://autobuild.buildroot.org/results/74f39c6f14e3f60babdcabceb5e42656f69cdaa7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0002-lib-fix-elf_py-TLS-section-handling.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch new file mode 100644 index 0000000000..d491cb1a7d --- /dev/null +++ b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch @@ -0,0 +1,31 @@ +From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 +From: David Lamparter +Date: Wed, 10 Nov 2021 15:30:07 +0100 +Subject: [PATCH] lib: fix elf_py TLS section handling + +... need to ignore TLS sections, their address is effectively +meaningless but can overlap other sections we actually need to access. + +Signed-off-by: David Lamparter + +[Retrieved from: +https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] +Signed-off-by: Fabrice Fontaine +--- + lib/elf_py.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/elf_py.c b/lib/elf_py.c +index 1c306893ad8..f230add6957 100644 +--- a/lib/elf_py.c ++++ b/lib/elf_py.c +@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) + Elf_Scn *scn = elf_getscn(ef->elf, i); + GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); + ++ /* virtual address is kinda meaningless for TLS sections */ ++ if (shdr->sh_flags & SHF_TLS) ++ continue; + if (addr < shdr->sh_addr || + addr >= shdr->sh_addr + shdr->sh_size) + continue; From peter at korsgaard.com Mon Mar 7 19:26:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:26:24 +0100 Subject: [Buildroot] [git commit] docs: fix links to AsciiDoc Message-ID: <20220307192114.1FA8B81D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efcb7eeabc22df47ca09e69c99f73e9183ed6cf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th??o Lebrun Signed-off-by: Peter Korsgaard --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 57ba61bdb1..84d8f76431 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -207,10 +207,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts From peter at korsgaard.com Mon Mar 7 19:28:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:28:53 +0100 Subject: [Buildroot] [git commit] package/libcamera-apps: link with -latomic if needed Message-ID: <20220307192114.288D082DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f41d47f15b63a4bbe026834478e63acba85d33fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Link with -latomic if needed to avoid the following build failure raised since the addition of the package in commit 7227d005d2435ec7b38995a6247d233ddb5ba365: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: CMakeFiles/libcamera-still.dir/libcamera_still.cpp.o: undefined reference to symbol '__atomic_fetch_sub_4@@LIBATOMIC_1.0' Fixes: - http://autobuild.buildroot.org/results/b20465140f3a5281f9b586f442b67fd400e7184a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcamera-apps/libcamera-apps.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 210d4e1e52..f4fc019c17 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -45,4 +45,8 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_QT=0 endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 7 19:33:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:33:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix libwpa_client.so build In-Reply-To: <20220303191945.3952450-1-geomatsi@gmail.com> (Sergey Matyukevich's message of "Thu, 3 Mar 2022 22:19:45 +0300") References: <20220303191945.3952450-1-geomatsi@gmail.com> Message-ID: <87h7897e31.fsf@dell.be.48ers.dk> >>>>> "Sergey" == Sergey Matyukevich writes: > Build target libwpa_client.so is not built regardless of whether the > option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that > fixes wpa_supplicant build regression. > Fixes: > http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ > http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ > Signed-off-by: Sergey Matyukevich > --- > Hi all, > Note that the patch has been posted to hostapd mailing list > and discussed, but not yet accepted: > https://patchwork.ozlabs.org/project/hostap/patch/20220222085219.3996729-1-geomatsi at gmail.com/ I see that in the mean time it has been applied, great! Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:30:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:30:24 +0100 Subject: [Buildroot] [git commit] package/wpa_supplicant: fix libwpa_client.so build Message-ID: <20220307192455.3B9FA82815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4eebf191c781a3ea6b5eb1811cc17ae92ea2fb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build target libwpa_client.so is not built regardless of whether the option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that fixes wpa_supplicant build regression. Fixes: http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/ http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/ Signed-off-by: Sergey Matyukevich Tested-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- ...-enable-options-for-libwpa_client.so-and-.patch | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch new file mode 100644 index 0000000000..156d0e7e2c --- /dev/null +++ b/package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch @@ -0,0 +1,68 @@ +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Sun, 20 Feb 2022 10:12:28 +0300 +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced regression into wpa_supplicant build process. Build +target libwpa_client.so is not built regardless of whether the option +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config +option is used before it is imported from the configuration file. +Moving its usage after including build.rules does not help: variable +ALL is processed by build.rules and further changes are not applied. +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as +expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +This commit re-enables options adding both build targets to _all +dependencies. + +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..e384cc6b8 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/wpa_supplicant at .service + ALL += systemd/wpa_supplicant-nl80211 at .service + ALL += systemd/wpa_supplicant-wired at .service + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 + From peter at korsgaard.com Mon Mar 7 19:39:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:39:08 +0100 Subject: [Buildroot] [PATCH] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib In-Reply-To: <20220224154118.220408-1-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 16:41:18 +0100") References: <20220224154118.220408-1-romain.naour@gmail.com> Message-ID: <87czix7dsz.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > -sh: ipython: not found > ipython use a wrong shebang on the target: It looks like git ate your '# ' line, so I've added # ipython -c 'import math; math.floor(12.3)' And committed, thanks. > # head -n 1 /usr/bin/ipython > #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python > The issue come from python3-setuptools 60.0.0 that changed > SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use > its local copy of distutils. This is actually a "breaking" change [2]. > We have to override SETUPTOOLS_USE_DISTUTILS to the previous value > "stdlib" to fixes the issue. > While at it, use distutils from stdlib for the host. > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 > [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 > [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes > Signed-off-by: Romain Naour > Cc: James Hilliard > --- > package/pkg-python.mk | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index b8dc9cd9e5..e81a1a3102 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ > LDSHARED="$(TARGET_CROSS)gcc -shared" \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_DISTUTILS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ > @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ > $(TARGET_CONFIGURE_OPTS) \ > PYTHONPATH="$(PYTHON3_PATH)" \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > _python_sysroot=$(STAGING_DIR) \ > _python_prefix=/usr \ > _python_exec_prefix=/usr > @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ > PATH=$(BR_PATH) \ > PYTHONNOUSERSITE=1 \ > + SETUPTOOLS_USE_DISTUTILS=stdlib \ > $(HOST_CONFIGURE_OPTS) > HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:38:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:38:09 +0100 Subject: [Buildroot] [git commit] package/pkg-python: use SETUPTOOLS_USE_DISTUTILS=stdlib Message-ID: <20220307193103.47D9C82A9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4386bbdf0895dbb35e02c25f42603bae9af64451 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master # ipython -c 'import math; math.floor(12.3)' -sh: ipython: not found ipython use a wrong shebang on the target: # head -n 1 /usr/bin/ipython #!/home/kubu/buildroot/testsuite-master/TestIPythonPy3/host/bin/python The issue come from python3-setuptools 60.0.0 that changed SETUPTOOLS_USE_DISTUTILS default value from stdlib to local [1] to use its local copy of distutils. This is actually a "breaking" change [2]. We have to override SETUPTOOLS_USE_DISTUTILS to the previous value "stdlib" to fixes the issue. While at it, use distutils from stdlib for the host. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2088684091 [1] https://github.com/pypa/setuptools/commit/b6fcbbd00cb6d5607c9272dec452a50457bdb292 [2] https://github.com/pypa/setuptools/blob/v60.0.0/CHANGES.rst#breaking-changes Signed-off-by: Romain Naour Cc: James Hilliard Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index b8dc9cd9e5..e81a1a3102 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -40,6 +40,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ @@ -62,6 +63,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ @@ -76,6 +78,7 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ $(TARGET_CONFIGURE_OPTS) \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr @@ -96,6 +99,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) \ PYTHONNOUSERSITE=1 \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ From peter at korsgaard.com Mon Mar 7 19:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:43:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site In-Reply-To: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> (Andrei Gherghescu via buildroot's message of "Thu, 24 Feb 2022 21:36:33 +0000") References: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> Message-ID: <878rtl7dmb.fsf@dell.be.48ers.dk> >>>>> "Andrei" == Andrei Gherghescu via buildroot writes: > The http://www.directfb.org/ has been down since 2015. > Use the Buildroot backup download site. > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=13731 That bug is about readline. I guess you mean https://bugs.busybox.net/show_bug.cgi?id=13126 instead? Committed, thanks. > Signed-off-by: Andrei Gherghescu > --- > package/directfb-examples/Config.in | 6 ++++-- > package/directfb-examples/directfb-examples.mk | 2 +- > package/directfb/directfb.mk | 2 +- > 3 files changed, 6 insertions(+), 4 deletions(-) > diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in > index 216e036577..4d5de03068 100644 > --- a/package/directfb-examples/Config.in > +++ b/package/directfb-examples/Config.in > @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES > help > The DirectFB-examples package contains a set of simple > DirectFB applications that can be used to test and demonstrate > - various DirectFB features. > + various DirectFB features. As of 4 October 2015, DirectFB's > + website http://www.directfb.org/ is down. See alternative site > + listed below. > - http://directfb.org/downloads/Extras/README.DirectFB-examples > + http://elinux.org/DirectFB > diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk > index 46263da733..c8d09b3e33 100644 > --- a/package/directfb-examples/directfb-examples.mk > +++ b/package/directfb-examples/directfb-examples.mk > @@ -5,7 +5,7 @@ > ################################################################################ > DIRECTFB_EXAMPLES_VERSION = 1.7.0 > -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras > +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples > DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz > DIRECTFB_EXAMPLES_LICENSE = MIT > DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING > diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk > index 0b32162d8f..56a396ab99 100644 > --- a/package/directfb/directfb.mk > +++ b/package/directfb/directfb.mk > @@ -6,7 +6,7 @@ > DIRECTFB_VERSION_MAJOR = 1.7 > DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 > -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) > +DIRECTFB_SITE = http://sources.buildroot.net/directfb > DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz > DIRECTFB_LICENSE = LGPL-2.1+ > DIRECTFB_LICENSE_FILES = COPYING > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:41:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:41:54 +0100 Subject: [Buildroot] [git commit] package/directfb: change upstream site Message-ID: <20220307193518.DAE1C82A9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13126 Signed-off-by: Andrei Gherghescu Signed-off-by: Peter Korsgaard --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING From bugzilla at busybox.net Mon Mar 7 19:44:26 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 19:44:26 +0000 Subject: [Buildroot] [Bug 13126] make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.gz aren't tarballs In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13126 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Peter Korsgaard --- Fixed for directfb{,-examples} as well with https://git.buildroot.org/buildroot/commit/?id=89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Mon Mar 7 19:45:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:45:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.1 In-Reply-To: <20220224232159.1103756-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Fri, 25 Feb 2022 01:21:59 +0200") References: <20220224232159.1103756-1-aperez@igalia.com> Message-ID: <874k497di8.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This is a minor release which fixes an installation path and a crash > with certain Wayland compositors. Release notes can be found at: > https://wpewebkit.org/release/cog-0.12.1.html > Signed-off-by: Adrian Perez de Castro Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:54:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 20:54:36 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: <20220225171148.701977-1-romain.naour@gmail.com> (Romain Naour's message of "Fri, 25 Feb 2022 18:11:48 +0100") References: <20220225171148.701977-1-romain.naour@gmail.com> Message-ID: <87zgm15yir.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both > _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot > already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first > release tag 2009.02. > _TIME_BITS is not needed for musl libc since it already year2038 > ready [2]. > The uclibc-ng libc only support time_t 32-bit (long int) so it will be > affected by the year2038 issue [3]. > Fixes (in French, chapter Buildroot 2022 and GlibC): > https://www.blaess.fr/christophe/2038 > Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc > bleeding-edge 2021.11-1 toolchain. > Before: > # date > Tue Jan 19 03:14:07 UTC 2038 > # date > Thu Jan 1 00:00:00 UTC 1970 > After: > # date > Tue Jan 19 03:14:07 UTC 2038 > # date > Tue Jan 19 03:14:08 UTC 2038 > # date > Tue Jan 19 03:14:09 UTC 2038 Ahh, good catch. Maybe something to add a runtime test for? Committed, thanks. > [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 > [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 > [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 > Signed-off-by: Romain Naour > Cc: Christophe Blaess > --- > package/Makefile.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/Makefile.in b/package/Makefile.in > index 508ea7c366..cde050ca82 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) > TARGET_HARDENED += -D_FORTIFY_SOURCE=2 > endif > -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) > TARGET_CXXFLAGS = $(TARGET_CFLAGS) > TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 19:52:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:52:04 +0100 Subject: [Buildroot] [git commit] package/Makefile.in: Use 64-bit time_t with glibc toolchains for > year 2038 support Message-ID: <20220307194833.7AB7B81E16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e33e5908086a511294296f317f6e6f86fa84b1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first release tag 2009.02. _TIME_BITS is not needed for musl libc since it already year2038 ready [2]. The uclibc-ng libc only support time_t 32-bit (long int) so it will be affected by the year2038 issue [3]. Fixes (in French, chapter Buildroot 2022 and GlibC): https://www.blaess.fr/christophe/2038 Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc bleeding-edge 2021.11-1 toolchain. Before: # date Tue Jan 19 03:14:07 UTC 2038 # date Thu Jan 1 00:00:00 UTC 1970 After: # date Tue Jan 19 03:14:07 UTC 2038 # date Tue Jan 19 03:14:08 UTC 2038 # date Tue Jan 19 03:14:09 UTC 2038 [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 Signed-off-by: Romain Naour Cc: Christophe Blaess Signed-off-by: Peter Korsgaard --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c366..cde050ca82 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) From peter at korsgaard.com Mon Mar 7 19:45:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 20:45:29 +0100 Subject: [Buildroot] [git commit] package/cog: bump to version 0.12.1 Message-ID: <20220307194833.7033D81EBF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a4972a9a46738e57b66d1434f074ecfe8adc07 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor release which fixes an installation path and a crash with certain Wayland compositors. Release notes can be found at: https://wpewebkit.org/release/cog-0.12.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 6a9af1845d..839b12e619 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.0.tar.xz.sums -md5 30d6f68914af0ba5c32ac14df504215a cog-0.12.0.tar.xz -sha1 de367b33fb45a1bca9e443ca5c1d6cae3833d759 cog-0.12.0.tar.xz -sha256 aad413a8aaf15d400d70f9c909a28b92b138f7b0c0d825978de8788d0d75208a cog-0.12.0.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums +md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz +sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz +sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 606374d9c3..2f6ef402fb 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.0 +COG_VERSION = 0.12.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 7 20:01:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:01:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> (TIAN Yuanhao's message of "Mon, 21 Feb 2022 04:06:57 -0800") References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: <87v8wp5y6x.fsf@dell.be.48ers.dk> >>>>> "TIAN" == TIAN Yuanhao writes: > Dependency on sqlite has been removed since v17.04.0-ce. > See: https://github.com/moby/moby/pull/30208 > Signed-off-by: TIAN Yuanhao Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:01:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:01:34 +0100 Subject: [Buildroot] [git commit] package/docker-engine: remove unused sqlite Message-ID: <20220307195347.0C4348103D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6105ad3f72fcb98a7d9aba543c6bb7311827c1d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 911cbfe428..1f0efb8fcc 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. From peter at korsgaard.com Mon Mar 7 20:05:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:05:39 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/re2: fix build with gcc <= 5 In-Reply-To: <20220221220703.2198424-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 21 Feb 2022 23:07:03 +0100") References: <20220221220703.2198424-1-fontaine.fabrice@gmail.com> Message-ID: <87r17d5y0c.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc <= 5 raised since bump to > version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f > and > https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 > ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 > SparseArray::SparseArray() = default; > ^ > ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': > ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' > std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); > ^ > Fixes: > - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Don't set prefix in build step Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:05:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:05:34 +0100 Subject: [Buildroot] [git commit] package/re2: fix build with gcc <= 5 Message-ID: <20220307195855.785D982A9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fd3b0a523805db14682f7c559cc1c9c366ed55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc <= 5 raised since bump to version 2022-02-01 in commit d2cf91e0c6a082261cc7ebb06dfdbd7bc2c2956f and https://github.com/google/re2/commit/a022cc0c55b0519629d64d775e7a5195af34a477 ./re2/sparse_array.h:266:37: warning: defaulted and deleted functions only available with -std=c++11 or -std=gnu++11 SparseArray::SparseArray() = default; ^ ./re2/sparse_array.h: In copy constructor 're2::SparseArray::SparseArray(const re2::SparseArray&)': ./re2/sparse_array.h:273:3: error: 'copy_n' is not a member of 'std' std::copy_n(src.sparse_.data(), src.max_size(), sparse_.data()); ^ Fixes: - http://autobuild.buildroot.org/results/8ebbac67f32fe24416a1f72aad0afd42b567b403 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/re2/re2.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 41392cb179..30791a68e5 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -10,19 +10,23 @@ RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES +RE2_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" + define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef define RE2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef From peter at korsgaard.com Mon Mar 7 20:36:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:36:09 +0100 Subject: [Buildroot] [PATCH] docs/manual: Document Kconfig requirements for uboot In-Reply-To: <20220307141321.307200-1-dopsi@dopsi.ch> (Simon Doppler's message of "Mon, 7 Mar 2022 15:13:21 +0100") References: <20220307141321.307200-1-dopsi@dopsi.ch> Message-ID: <87h7895wli.fsf@dell.be.48ers.dk> >>>>> "Simon" == Simon Doppler writes: > When using uboot's legacy build system, the 'make uboot-menuconfig' > and 'make uboot-savedefconfig' targets are not available as they > are created by 'kconfig-package'. > Signed-off-by: Simon Doppler Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:36:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:36:03 +0100 Subject: [Buildroot] [git commit] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220307202940.9212782B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ca9e55ad11271cb26b0bffba336cf5a0d74ba378 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler Signed-off-by: Peter Korsgaard --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: From peter at korsgaard.com Mon Mar 7 20:39:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:39:40 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> (yann morin's message of "Mon, 7 Mar 2022 16:43:13 +0100") References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> Message-ID: <87czix5wfn.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > BR_GOMOD is a remnant from a previous iteration of the golang download > infrastructure; it is currently used nowhere. > Do not set it. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:41:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:41:53 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <87czix5wfn.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Mon, 07 Mar 2022 21:39:40 +0100") References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> <87czix5wfn.fsf@dell.be.48ers.dk> Message-ID: <878rtl5wby.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> writes: >> From: "Yann E. MORIN" >> BR_GOMOD is a remnant from a previous iteration of the golang download >> infrastructure; it is currently used nowhere. >> Do not set it. >> Signed-off-by: Yann E. MORIN >> Cc: Thomas Petazzoni >> Cc: Anisse Astier >> Cc: Christian Stewart > Committed, thanks. Ups, hold that - It doesn't apply to master as it is done on top of the other pending golang fixes. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:47:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:47:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/sconeserver: fix build with gcc 4.8 In-Reply-To: <20220222175226.3086883-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 18:52:26 +0100") References: <20220222175226.3086883-1-fontaine.fabrice@gmail.com> Message-ID: <874k495w2q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with gcc 4.8 raised since the addition > of -std=c++11 in commit b9eca021594470341bec2876edc0a27251f3f9b2: > sconex.cpp: In function 'scx::Date& scx::build_time()': > sconex.cpp:52:36: error: unable to find string literal operator 'operator"" __TIME__' > static Date s_build_time(__DATE__" "__TIME__,true); > ^ > Fixes: > - http://autobuild.buildroot.org/results/83ecf772965b4586eaea2682871a85732df7d62f > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:50:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 21:50:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: disable JIT with mips32r6 In-Reply-To: <20220222201418.3087618-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 21:14:18 +0100") References: <20220222201418.3087618-1-fontaine.fabrice@gmail.com> Message-ID: <87zgm14hcx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable JIT with mips32r6 to avoid the following build failure raised > since bump to version 5.212.0-alpha4 in commit > df0b0fe6919c0d0f3750f439a3cfa765232bd569: > /tmp/ccHw2rHQ.s:18: Error: opcode not supported on this processor: mips32r6 (mips32r6) `addi $a0,$sp,-8' > Fixes: > - http://autobuild.buildroot.org/results/5191600b463cda078203eeffae880ed989f8ac0f > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ > 1 file changed, 4 insertions(+) > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 2e96acc00f..6f8714140a 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -20,6 +20,10 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause > # in the archive. > QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 > +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) > +QT5WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF Looking a webkitgtk.mk we might need to disable it for older ARM and MIPS64R6 as well, but OK - That can be done later if needed. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 20:49:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:49:44 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: disable JIT with mips32r6 Message-ID: <20220307204241.7F26482DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a6b348b3c74b829868347b827612a451851c7247 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable JIT with mips32r6 to avoid the following build failure raised since bump to version 5.212.0-alpha4 in commit df0b0fe6919c0d0f3750f439a3cfa765232bd569: /tmp/ccHw2rHQ.s:18: Error: opcode not supported on this processor: mips32r6 (mips32r6) `addi $a0,$sp,-8' Fixes: - http://autobuild.buildroot.org/results/5191600b463cda078203eeffae880ed989f8ac0f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/qt5/qt5webkit/qt5webkit.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 6401c39d3d..9012a588d4 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -20,6 +20,10 @@ QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause # in the archive. QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) +QT5WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF +endif + ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) QT5WEBKIT_CONF_OPTS += \ -DENABLE_OPENGL=ON \ From peter at korsgaard.com Mon Mar 7 20:46:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 21:46:16 +0100 Subject: [Buildroot] [git commit] package/sconeserver: fix build with gcc 4.8 Message-ID: <20220307204241.764108269F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d0aedaa45b1a4711416a8b1247aed21f0614774 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since the addition of -std=c++11 in commit b9eca021594470341bec2876edc0a27251f3f9b2: sconex.cpp: In function 'scx::Date& scx::build_time()': sconex.cpp:52:36: error: unable to find string literal operator 'operator"" __TIME__' static Date s_build_time(__DATE__" "__TIME__,true); ^ Fixes: - http://autobuild.buildroot.org/results/83ecf772965b4586eaea2682871a85732df7d62f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sconeserver/0002-CMake-ify.patch | 173 +++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/package/sconeserver/0002-CMake-ify.patch b/package/sconeserver/0002-CMake-ify.patch new file mode 100644 index 0000000000..810c803469 --- /dev/null +++ b/package/sconeserver/0002-CMake-ify.patch @@ -0,0 +1,173 @@ +From 0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Mon Sep 17 00:00:00 2001 +From: Andrew Wedgbury +Date: Mon, 19 Aug 2019 21:12:59 +0000 +Subject: [PATCH] CMake-ify + +[Retrieve (and updated to only keep fix on sconex.cpp) from: +https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419] +Signed-off-by: Fabrice Fontaine +--- + .gitignore | 5 + + CMakeLists.txt | 52 ++++ + Makefile.am | 58 ---- + autogen.sh | 8 - + bluetooth/CMakeLists.txt | 16 + + bluetooth/Makefile.am | 22 -- + config.h.in | 335 +-------------------- + configure.in | 451 ---------------------------- + debian/rules | 10 +- + debian/sconeserver-base.install | 2 +- + debian/sconeserver-dev.install | 4 +- + examples/Makefile.am | 4 - + examples/rot13/CMakeLists.txt | 9 + + examples/rot13/Makefile.am | 24 -- + examples/tuesdayonly/CMakeLists.txt | 7 + + examples/tuesdayonly/Makefile.am | 18 -- + exec/CMakeLists.txt | 9 + + exec/Makefile.am | 24 -- + forward/CMakeLists.txt | 8 + + forward/Makefile.am | 19 -- + http/CMakeLists.txt | 51 ++++ + http/Makefile.am | 58 ---- + image/CMakeLists.txt | 12 + + image/Makefile.am | 20 -- + ip/CMakeLists.txt | 9 + + ip/Makefile.am | 21 -- + ip6/CMakeLists.txt | 9 + + ip6/Makefile.am | 21 -- + local/CMakeLists.txt | 9 + + local/Makefile.am | 21 -- + location/CMakeLists.txt | 11 + + location/Makefile.am | 18 -- + main.cpp | 4 +- + markdown/CMakeLists.txt | 20 ++ + markdown/Makefile.am | 21 -- + maths/CMakeLists.txt | 32 ++ + maths/Makefile.am | 33 -- + mime/CMakeLists.txt | 8 + + mime/Makefile.am | 19 -- + mysql/CMakeLists.txt | 16 + + mysql/Makefile.am | 25 -- + rss/CMakeLists.txt | 15 + + rss/Makefile.am | 23 -- + sconeserver.cmake | 31 ++ + sconesite/CMakeLists.txt | 42 +++ + sconesite/Makefile.am | 79 ----- + sconex/Base64.cpp | 2 +- + sconex/CMakeLists.txt | 97 ++++++ + sconex/Database.cpp | 2 +- + sconex/FileDir.h | 4 +- + sconex/Makefile.am | 156 ---------- + sconex/ModuleLoader.cpp | 2 +- + sconex/Process.cpp | 8 - + sconex/RegExp.cpp | 4 - + sconex/RegExp.h | 4 +- + sconex/ScriptContext.cpp | 7 +- + sconex/ScriptTypes.cpp | 2 +- + sconex/TermBuffer.cpp | 7 +- + sconex/sconex.cpp | 4 +- + sconex/sconex.h | 176 +++-------- + sconex/utils.cpp | 4 - + server/CMakeLists.txt | 19 ++ + server/Makefile.am | 26 -- + simple/CMakeLists.txt | 15 + + simple/Makefile.am | 21 -- + smtp/CMakeLists.txt | 15 + + smtp/Makefile.am | 21 -- + sqlite/CMakeLists.txt | 23 ++ + sqlite/Makefile.am | 25 -- + ssl/CMakeLists.txt | 23 ++ + ssl/Makefile.am | 30 -- + stat/CMakeLists.txt | 17 ++ + stat/Makefile.am | 23 -- + test/CMakeLists.txt | 13 + + test/Makefile.am | 53 ---- + testbuilder/CMakeLists.txt | 23 ++ + testbuilder/Makefile.am | 36 --- + tftp/CMakeLists.txt | 17 ++ + tftp/Makefile.am | 23 -- + upstart | 13 - + 80 files changed, 695 insertions(+), 1933 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile.am + delete mode 100755 autogen.sh + create mode 100644 bluetooth/CMakeLists.txt + delete mode 100644 bluetooth/Makefile.am + delete mode 100644 configure.in + delete mode 100644 examples/Makefile.am + create mode 100644 examples/rot13/CMakeLists.txt + delete mode 100644 examples/rot13/Makefile.am + create mode 100644 examples/tuesdayonly/CMakeLists.txt + delete mode 100644 examples/tuesdayonly/Makefile.am + create mode 100644 exec/CMakeLists.txt + delete mode 100644 exec/Makefile.am + create mode 100644 forward/CMakeLists.txt + delete mode 100644 forward/Makefile.am + create mode 100644 http/CMakeLists.txt + delete mode 100644 http/Makefile.am + create mode 100644 image/CMakeLists.txt + delete mode 100644 image/Makefile.am + create mode 100644 ip/CMakeLists.txt + delete mode 100644 ip/Makefile.am + create mode 100644 ip6/CMakeLists.txt + delete mode 100644 ip6/Makefile.am + create mode 100644 local/CMakeLists.txt + delete mode 100644 local/Makefile.am + create mode 100644 location/CMakeLists.txt + delete mode 100644 location/Makefile.am + create mode 100644 markdown/CMakeLists.txt + delete mode 100644 markdown/Makefile.am + create mode 100644 maths/CMakeLists.txt + delete mode 100644 maths/Makefile.am + create mode 100644 mime/CMakeLists.txt + delete mode 100644 mime/Makefile.am + create mode 100644 mysql/CMakeLists.txt + delete mode 100644 mysql/Makefile.am + create mode 100644 rss/CMakeLists.txt + delete mode 100644 rss/Makefile.am + create mode 100644 sconeserver.cmake + create mode 100644 sconesite/CMakeLists.txt + delete mode 100644 sconesite/Makefile.am + create mode 100644 sconex/CMakeLists.txt + delete mode 100644 sconex/Makefile.am + create mode 100644 server/CMakeLists.txt + delete mode 100644 server/Makefile.am + create mode 100644 simple/CMakeLists.txt + delete mode 100644 simple/Makefile.am + create mode 100644 smtp/CMakeLists.txt + delete mode 100644 smtp/Makefile.am + create mode 100644 sqlite/CMakeLists.txt + delete mode 100644 sqlite/Makefile.am + create mode 100644 ssl/CMakeLists.txt + delete mode 100644 ssl/Makefile.am + create mode 100644 stat/CMakeLists.txt + delete mode 100644 stat/Makefile.am + create mode 100644 test/CMakeLists.txt + delete mode 100644 test/Makefile.am + create mode 100644 testbuilder/CMakeLists.txt + delete mode 100644 testbuilder/Makefile.am + create mode 100644 tftp/CMakeLists.txt + delete mode 100644 tftp/Makefile.am + delete mode 100644 upstart + +diff --git a/sconex/sconex.cpp b/sconex/sconex.cpp +index 1b9fc97..a0ba8c1 100644 +--- a/sconex/sconex.cpp ++++ b/sconex/sconex.cpp +@@ -35,7 +35,7 @@ VersionTag& version() + const std::string& sconex_copyright() + { + static std::string s_copyright = +- "Copyright (c) 2000-2017 Andrew Wedgbury "; ++ "Copyright (c) 2000-2018 Andrew Wedgbury "; + return s_copyright; + } + +@@ -49,7 +49,7 @@ const std::string& build_type() + //========================================================================= + Date& build_time() + { +- static Date s_build_time(__DATE__" "__TIME__,true); ++ static Date s_build_time( __DATE__ " " __TIME__ ,true); + return s_build_time; + } From peter at korsgaard.com Mon Mar 7 21:04:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:04:44 +0100 Subject: [Buildroot] [PATCH 1/5 v3] package/pkg-cargo: allow packages to define download environment In-Reply-To: <19116_1644506970_62052F5A_19116_77_1_cb2a6466cea018c4bf8b8877140a9f389bb7918f.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:24 +0100") References: <19116_1644506970_62052F5A_19116_77_1_cb2a6466cea018c4bf8b8877140a9f389bb7918f.1644506959.git.yann.morin@orange.com> Message-ID: <87v8wp4gpf.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, the cargo infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > We fix that by using an append-assignment. > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Acked-by: Thomas Petazzoni Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:06:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:06:40 +0100 Subject: [Buildroot] [PATCH 2/5 v3] package/pkg-cargo: allow building in a sub-directory In-Reply-To: <11477_1644506971_62052F5B_11477_140_26_81fca21f2b24da16bb9e6d3af5add173f382f242.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:25 +0100") References: <11477_1644506971_62052F5B_11477_140_26_81fca21f2b24da16bb9e6d3af5add173f382f242.1644506959.git.yann.morin@orange.com> Message-ID: <87r17d4gm7.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Some packages have their rust sources as a sub-directory, rather > than at the root of the source tree. > Do like we do for autotools-package, and use the package's _SRCDIR > rather than the top-level directory $(@D). > Additionally, in such a situation, it is more than probable that > the Cargo.toml is also present in that sub-directory, so use that > when vendoring the package. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > --- > Changes v2 -> v3: > - always consider Cargo.toml to be in _SUBDIR (Thomas) > - add _SUBDIR to the manual (Thomas) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:07:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:07:18 +0100 Subject: [Buildroot] [PATCH 3/5 v3] package/pkg-cargo: host-rustc is also a build dependency In-Reply-To: <11363_1644506973_62052F5D_11363_173_9_da4c09036712600e0ab76db801a5a5c693bfa267.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:26 +0100") References: <11363_1644506973_62052F5D_11363_173_9_da4c09036712600e0ab76db801a5a5c693bfa267.1644506959.git.yann.morin@orange.com> Message-ID: <87mti14gl5.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, host-rustc is a download dependency, because we need cargo > for the vendoring during the download step. > However, when using a package in override-srcdir, there is no download > step, so host-rustc is not pulled in as a dependency which breaks > running the build of a single package from scratch: > $ make clean > $ make my-rust-package > [...] > [...] cargo build --offline --release --manifest-path Cargo.toml --locked > /bin/sh: cargo: command not found > We fix that by adding host-rustc as a standard dependency too. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Acked-by: Thomas Petazzoni Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:07:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:07:39 +0100 Subject: [Buildroot] [PATCH 4/5 v3] package/pkg-golang: allow packages to define download environment In-Reply-To: <1449_1644506975_62052F5F_1449_399_1_68889e1f1d960c99ade7457d58a115bf955a7b64.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:27 +0100") References: <1449_1644506975_62052F5F_1449_399_1_68889e1f1d960c99ade7457d58a115bf955a7b64.1644506959.git.yann.morin@orange.com> Message-ID: <87ilsp4gkk.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, the golang infrastructure forcibly sets the package _DL_ENV > variable, instead of appending to it, which prevents packages from > providing their own download environment variables. > We fix that by using an append-assignment. > Note: when introduced, that variable was explicitly not documented, and > is supposed to only be used by packages infrastructures. However, that > variable exists, and it can be (ab)used by br2-external packages (most > probably to ill effects, but heh!). We anyway leave it undocumented, > like _ROOTFS_PRE_CMD_HOOKS. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > Acked-by: Thomas Petazzoni > Reviewed-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:08:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:08:03 +0100 Subject: [Buildroot] [PATCH 5/5 v3] package/pkg-golang: host-go is also a build dependency In-Reply-To: <11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin@orange.com> (yann morin's message of "Thu, 10 Feb 2022 16:29:28 +0100") References: <11477_1644506977_62052F61_11477_142_1_1cfdf4aa3ac96d2d2cf246385325f93b451d773b.1644506959.git.yann.morin@orange.com> Message-ID: <87ee3d4gjw.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Currently, host-go is a download dependency, because we need go for the > vendoring during the download step. > However, when using a package in override-srcdir, there is no download > step, so host-go is not pulled in as a dependency, which will break the > build of a single package from scratch. > We fix that by adding host-go as a standard dependency too. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Christian Stewart > Cc: Anisse Astier > Acked-by: Thomas Petazzoni > Reviewed-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:10:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: fix build with per-package directories In-Reply-To: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> (yann morin's message of "Mon, 7 Mar 2022 16:42:56 +0100") References: <817_1646667779_62262803_817_313_1_9705b574ea82a36b8f676e04876817b58ebb6e3c.1646667776.git.yann.morin@orange.com> Message-ID: <87a6e14ggm.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > Build with per-package directory is broken, because go is not found in > the PATH, when trying to download and vendor a go package. > This is because FOO_DL_ENV contains $(HOST_GO_COMMON_ENV), which defines > the PATH as PATH=$(BR_PATH). This is correct, except this is expanded at > the time the golang-package macro is evaluated, which means PATH > contains the 'global' BR_PATH, i.e.: $(O)/host/bin:$(O)/host/sbin:... > However, with PPD, this does not yet exist at build time; only the > per-package hoqt directory exists. s/hoqt/host/ > We want to have it expanded at the time the recipe is run, so like all > other variables, we need to $$-expand it. > At the same time, also $$-expand two other variables (even though those > are benign, it is better for consistency that they be $$-expanded). > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:10:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 07 Mar 2022 22:10:07 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: don't export unused BR_GOMOD In-Reply-To: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> (yann morin's message of "Mon, 7 Mar 2022 16:43:13 +0100") References: <22645_1646667795_62262813_22645_170_3_aabbdb8dc24868de9188190a6e1e7e1f1b6b12bc.1646667793.git.yann.morin@orange.com> Message-ID: <875yop4ggg.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > BR_GOMOD is a remnant from a previous iteration of the golang download > infrastructure; it is currently used nowhere. > Do not set it. > Signed-off-by: Yann E. MORIN > Cc: Thomas Petazzoni > Cc: Anisse Astier > Cc: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 7 21:04:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:04:20 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: allow packages to define download environment Message-ID: <20220307210210.D3B19826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d508d8e45a4b4afcb7f5291181393c9a249d8cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the cargo infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index e74a8358bc..66bea513e0 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -69,7 +69,7 @@ define inner-cargo-package $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV = CARGO_HOME=$$(HOST_DIR)/share/cargo +$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. From peter at korsgaard.com Mon Mar 7 21:07:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:07:29 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: allow packages to define download environment Message-ID: <20220307210210.EF7DC826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1ef4c1d9ad1b0fc5c94cbb7aa85347243006b64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the golang infrastructure forcibly sets the package _DL_ENV variable, instead of appending to it, which prevents packages from providing their own download environment variables. We fix that by using an append-assignment. Note: when introduced, that variable was explicitly not documented, and is supposed to only be used by packages infrastructures. However, that variable exists, and it can be (ab)used by br2-external packages (most probably to ill effects, but heh!). We anyway leave it undocumented, like _ROOTFS_PRE_CMD_HOOKS. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 35bcb1673b..69eae02830 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -83,7 +83,7 @@ endef $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go -$(2)_DL_ENV = \ +$(2)_DL_ENV += \ $(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) From peter at korsgaard.com Mon Mar 7 21:07:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:07:49 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: host-go is also a build dependency Message-ID: <20220307210211.04A3C82DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3539f45ca09558a22fb5816baae9088c34490380 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, host-go is a download dependency, because we need go for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-go is not pulled in as a dependency, which will break the build of a single package from scratch. We fix that by adding host-go as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Christian Stewart Cc: Anisse Astier Acked-by: Thomas Petazzoni Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 69eae02830..ddefdf1214 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -47,8 +47,10 @@ $(2)_BUILD_OPTS += \ -trimpath \ -p $(PARALLEL_JOBS) -# Target packages need the Go compiler on the host. +# Target packages need the Go compiler on the host at download time (for +# vendoring), and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-go +$(2)_DEPENDENCIES += host-go $(2)_BUILD_TARGETS ?= . From peter at korsgaard.com Mon Mar 7 21:06:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:06:53 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: host-rustc is also a build dependency Message-ID: <20220307210210.E64E182DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7327aeafca93c68bcc120180d0cea1cd8cf1667 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single package from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 8b246abfed..6f5125f1d4 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo From peter at korsgaard.com Mon Mar 7 21:09:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:09:40 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: don't export unused BR_GOMOD Message-ID: <20220307210211.15E92826D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48e5cc084253bbfeb3cb3957deb4e125060f5dcb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BR_GOMOD is a remnant from a previous iteration of the golang download infrastructure; it is currently used nowhere. Do not set it. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index f1c5cfd350..0cb2ed73cc 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -87,8 +87,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ - BR_GOMOD=$$($(2)_GOMOD) + GOPROXY=direct # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. From peter at korsgaard.com Mon Mar 7 21:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:04:54 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: allow building in a sub-directory Message-ID: <20220307210210.DC44F82DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b59ed35a2d08fedd8b77e4c70d10bf22a0ce1e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some packages have their rust sources as a sub-directory, rather than at the root of the source tree. Do like we do for autotools-package, and use the package's _SRCDIR rather than the top-level directory $(@D). Additionally, in such a situation, it is more than probable that the Cargo.toml is also present in that sub-directory, so use that when vendoring the package. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-cargo.txt | 5 +++++ package/pkg-cargo.mk | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index 5343fbd4e6..e18fd9ce23 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -73,6 +73,11 @@ A few additional variables, specific to the Cargo infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them. +* +FOO_SUBDIR+ may contain the name of a subdirectory inside the package + that contains the Cargo.toml file. This is useful, if for example, it + is not at the root of the tree extracted by the tarball. If + +HOST_FOO_SUBDIR+ is not specified, it defaults to +FOO_SUBDIR+. + * +FOO_CARGO_ENV+ can be used to pass additional variables in the environment of +cargo+ invocations. It used at both build and installation time diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 66bea513e0..8b246abfed 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -71,6 +71,11 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +# If building in a sub directory, use that to find the Cargo.toml +ifneq ($$($(2)_SUBDIR),) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml +endif + # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -97,7 +102,7 @@ $(2)_LICENSE += , vendored dependencies licenses probably not listed ifndef $(2)_BUILD_CMDS ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -111,7 +116,7 @@ define $(2)_BUILD_CMDS endef else # ifeq ($(4),target) define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ @@ -133,7 +138,7 @@ endif # ifndef $(2)_BUILD_CMDS # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) \ $$(TARGET_CONFIGURE_OPTS) \ $$(PKG_CARGO_ENV) \ @@ -152,7 +157,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ From peter at korsgaard.com Mon Mar 7 21:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 7 Mar 2022 22:09:08 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: fix build with per-package directories Message-ID: <20220307210211.0CBE782DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ad1437c5ec697bdef0a567ea47f1dc696a7d64d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Build with per-package directory is broken, because go is not found in the PATH, when trying to download and vendor a go package. This is because FOO_DL_ENV contains $(HOST_GO_COMMON_ENV), which defines the PATH as PATH=$(BR_PATH). This is correct, except this is expanded at the time the golang-package macro is evaluated, which means PATH contains the 'global' BR_PATH, i.e.: $(O)/host/bin:$(O)/host/sbin:... However, with PPD, this does not yet exist at build time; only the per-package host directory exists. We want to have it expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. At the same time, also $$-expand two other variables (even though those are benign, it is better for consistency that they be $$-expanded). Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Anisse Astier Cc: Christian Stewart Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index ddefdf1214..f1c5cfd350 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,7 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. @@ -86,7 +86,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ - $(HOST_GO_COMMON_ENV) \ + $$(HOST_GO_COMMON_ENV) \ GOPROXY=direct \ BR_GOMOD=$$($(2)_GOMOD) @@ -134,7 +134,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) ) endef endif @@ -143,7 +143,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) + $$(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) ) endef endif From kris at embeddedTS.com Mon Mar 7 21:14:55 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Mon, 7 Mar 2022 13:14:55 -0800 Subject: [Buildroot] [PATCH 1/1] fix links to Technologic Systems web resources Message-ID: <20220307211455.9630-1-kris@embeddedTS.com> Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen --- RESEND: - Was not subscribed to Buildroot list with this email board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 2 +- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..ed2941079a 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) -- 2.11.0 From arnout at mind.be Mon Mar 7 21:22:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:22:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/pulseview: fix build with glibmm 2.68 In-Reply-To: <20220218090533.645612-1-fontaine.fabrice@gmail.com> References: <20220218090533.645612-1-fontaine.fabrice@gmail.com> Message-ID: <96905b6b-a8f7-7110-772b-bc835c219253@mind.be> On 18/02/2022 10:05, Fabrice Fontaine wrote: > Fixes: > - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../pulseview/0003-Support-glibmm-2.68.patch | 89 +++++++++++++++++++ > 1 file changed, 89 insertions(+) > create mode 100644 package/pulseview/0003-Support-glibmm-2.68.patch > > diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch > new file mode 100644 > index 0000000000..00e4e696d9 > --- /dev/null > +++ b/package/pulseview/0003-Support-glibmm-2.68.patch > @@ -0,0 +1,89 @@ > +From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 30 Dec 2021 16:19:46 +0100 > +Subject: [PATCH] Support glibmm 2.68 > + > +Support glibmm 2.68 which has been released one year ago and is the > +first stable release in the glibmm-2.68 ABI series: > +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS > + > +C++17 support is mandatory with glibmm 2.68 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: not sent yet] > +--- > + CMakeLists.txt | 23 +++++++++++++++++++---- > + INSTALL | 2 +- > + 2 files changed, 20 insertions(+), 5 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 7791b1b1..58a9cf92 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -75,7 +75,14 @@ add_subdirectory(manual) > + #------------------------------------------------------------------------------- > + > + list(APPEND PKGDEPS glib-2.0>=2.28.0) > +-list(APPEND PKGDEPS glibmm-2.4>=2.28.0) > ++ > ++set(LIBSR_GLIBMM "glibmm-2.4>=2.28.0") > ++find_package(PkgConfig) > ++pkg_check_modules(LIBSRGLIBMM24 ${LIBSR_GLIBMM}) > ++if(NOT LIBSRGLIBMM24_FOUND) > ++ set(LIBSR_GLIBMM "glibmm-2.68>=2.68.0") > ++endif() > ++list(APPEND PKGDEPS ${LIBSR_GLIBMM}) > + > + if(ENABLE_FLOW) > + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) > +@@ -93,7 +100,6 @@ if(ANDROID) > + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) > + endif() > + > +-find_package(PkgConfig) > + pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) > + if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) > + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") > +@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) > + set(PV_TITLE PulseView) > + set(PV_VERSION_STRING "0.5.0") > + > +-set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) > ++if(LIBSRGLIBMM24_FOUND) > ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) > ++else() > ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.68_VERSION}) > ++endif() > + > + include(GetGitRevisionDescription) > + > +@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) > + add_definitions(-DQT_NO_KEYWORDS) > + add_definitions(-D__STDC_LIMIT_MACROS) > + add_definitions(-Wall -Wextra) > +-add_definitions(-std=c++11) > ++if(LIBSRGLIBMM24_FOUND) > ++ add_definitions(-std=c++11) > ++else() > ++ # glibmm-2.68 reuires c++17 > ++ add_definitions(-std=c++17) > ++endif() > + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) > + if(WIN32) > + add_definitions(-Wa,-mbig-obj -O3) > +diff --git a/INSTALL b/INSTALL > +index da89be8d..8003fcfb 100644 > +--- a/INSTALL > ++++ b/INSTALL > +@@ -14,7 +14,7 @@ Requirements > + - pkg-config >= 0.22 > + - cmake >= 2.8.12 > + - libglib >= 2.28.0 > +- - glibmm-2.4 (>= 2.28.0) > ++ - glibmm-2.4 (>= 2.28.0) or glibmm-2.68 (>= 2.68.0) > + - Qt5 (>= 5.3), including the following components: > + - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools > + - Qt translation package (optional; needed at runtime, not build time) > +-- > +2.34.1 > + From arnout at mind.be Mon Mar 7 21:23:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:23:11 +0100 Subject: [Buildroot] [PATCH 2/2] package/kf5: bump to version 5.91 In-Reply-To: <20220217163655.221545-2-fontaine.fabrice@gmail.com> References: <20220217163655.221545-1-fontaine.fabrice@gmail.com> <20220217163655.221545-2-fontaine.fabrice@gmail.com> Message-ID: On 17/02/2022 17:36, Fabrice Fontaine wrote: > This bump will fix the following build failure of kf5-kcoreaddons with > python 3.10 raised since commit > 25b1fc2898d68ddf2674b14c738045875fc5a2dc: > > CMake Error at /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/ECM/find-modules/FindPythonModuleGeneration.cmake:149 (message): > The max python version in PythonModuleGeneration must be updated. > Call Stack (most recent call first): > src/lib/CMakeLists.txt:208 (find_package) > > It will also fix the following build failure of kf5-kcoreaddons raised > since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: > > In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qchar.h:43, > from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qstring.h:49, > from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/QString:1, > from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.h:27, > from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:22: > /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qglobal.h:1274:80: note: declared here > 1274 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); > | ^~~~~ > /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp: In function 'QString KRandom::randomString(int)': > /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:76:27: error: use of deleted function 'QCharRef& QCharRef::operator=(char)' > 76 | str[i++] = char(r); > | ^ > > - Update indentation in hash file (two spaces) > - Update licenses due to > https://invent.kde.org/frameworks/kcoreaddons/-/commit/93480398b551aee572f9f1a0ee48ed45a8476580 > https://invent.kde.org/frameworks/modemmanager-qt/-/commit/8ad494d957cab343a60a61a2163f1ca23e9e3511 > https://invent.kde.org/frameworks/networkmanager-qt/-/commit/fa9ef0d84898ad5e1f28857307bd5fcb8eb38e20 > > Fixes: > - http://autobuild.buildroot.org/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 > - http://autobuild.buildroot.org/results/694a2322d9161b55f5db66d1ace57d836360ed84 > > Signed-off-by: Fabrice Fontaine Although we shouldn't be doing version bumps just before the release, this fixes a build issue and kf5 is anyway a leaf package, so applied both to master, thanks. Regards, Arnout > --- > .../kf5-extra-cmake-modules.hash | 4 ++-- > .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 17 ++++++++++++++-- > .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 20 +++++++++++++++++-- > .../kf5-modemmanager-qt.hash | 11 ++++++++-- > .../kf5-modemmanager-qt.mk | 13 ++++++++++-- > .../kf5-networkmanager-qt.hash | 11 ++++++++-- > .../kf5-networkmanager-qt.mk | 12 +++++++++-- > package/kf5/kf5.mk | 2 +- > 8 files changed, 75 insertions(+), 15 deletions(-) > > diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash > index 733e267fdb..70b776b5d7 100644 > --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash > +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz > -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS > +sha256 9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c extra-cmake-modules-5.91.0.tar.xz > +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS > diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash > index 0cd8dcfc15..e4ebf2bb39 100644 > --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash > +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash > @@ -1,3 +1,16 @@ > # Locally calculated > -sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz > -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB > +sha256 dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b kcoreaddons-5.91.0.tar.xz > + > +# Hash for license files > +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt > +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt > +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt > +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-only.txt > +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-or-later.txt > +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt > +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt > +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt > +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > +sha256 272bc0fa06a23d3c807375f95f8d6ccd98541321d2882732668ab139c16f9bf4 LICENSES/LicenseRef-Qt-Commercial.txt > +sha256 a3b538a7d81c4935d185056479d12fd43042bb9f3a21c9cbb4a8500fab8e5880 LICENSES/MPL-1.1.txt > +sha256 7dea3adab58690d8ee14775da755cd30a52649a47704ff78ae85197ae0d37c60 LICENSES/Qt-LGPL-exception-1.1.txt > diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > index 9a034ba763..e2f67f15b2 100644 > --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk > @@ -7,8 +7,24 @@ > KF5_KCOREADDONS_VERSION = $(KF5_VERSION) > KF5_KCOREADDONS_SITE = $(KF5_SITE) > KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz > -KF5_KCOREADDONS_LICENSE = LGPL-2.1 > -KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB > +KF5_KCOREADDONS_LICENSE = \ > + LGPL-2.0+, LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ > + MPL.1.1 or GPL-2.0+ or LGPL-2.1+ (posix_fallocate_mac.h), \ > + LGPL-2.1 with Qt-LGPL-exception-1.1 or LicenseRef-Qt-Commercial (kprocesslist), \ > + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests) > +KF5_KCOREADDONS_LICENSE_FILES = \ > + LICENSES/GPL-2.0-only.txt \ > + LICENSES/GPL-2.0-or-later.txt \ > + LICENSES/GPL-3.0-only.txt \ > + LICENSES/LGPL-2.0-only.txt \ > + LICENSES/LGPL-2.0-or-later.txt \ > + LICENSES/LGPL-2.1-only.txt \ > + LICENSES/LGPL-3.0-only.txt \ > + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ > + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt \ > + LICENSES/LicenseRef-Qt-Commercial.txt \ > + LICENSES/MPL-1.1.txt \ > + LICENSES/Qt-LGPL-exception-1.1.txt > > KF5_KCOREADDONS_DEPENDENCIES = \ > kf5-extra-cmake-modules \ > diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash > index 408eb0c0b0..4b6c03a3bb 100644 > --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash > +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash > @@ -1,3 +1,10 @@ > # Locally calculated > -sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz > -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > +sha256 a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 modemmanager-qt-5.91.0.tar.xz > + > +# Hash for license files > +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt > +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt > +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt > +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt > +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt > +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > index 81617492c0..38c80d3da8 100644 > --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk > @@ -7,8 +7,17 @@ > KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) > KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) > KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz > -KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ > -KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB > +KF5_MODEMMANAGER_QT_LICENSE = \ > + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ > + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) > + > +KF5_MODEMMANAGER_QT_LICENSE_FILES = \ > + LICENSES/GPL-2.0-only.txt \ > + LICENSES/GPL-3.0-only.txt \ > + LICENSES/LGPL-2.1-only.txt \ > + LICENSES/LGPL-3.0-only.txt \ > + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ > + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > > KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base > KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES > diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash > index 8ccada455e..de4504064f 100644 > --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash > +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash > @@ -1,3 +1,10 @@ > # Locally calculated > -sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz > -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > +sha256 2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 networkmanager-qt-5.91.0.tar.xz > + > +# Hash for license files > +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt > +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt > +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt > +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt > +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt > +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > index c383f98e9b..7adff2deb7 100644 > --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk > @@ -7,8 +7,16 @@ > KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) > KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) > KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz > -KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ > -KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB > +KF5_NETWORKMANAGER_QT_LICENSE = \ > + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ > + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) > +KF5_NETWORKMANAGER_QT_LICENSE_FILES = \ > + LICENSES/GPL-2.0-only.txt \ > + LICENSES/GPL-3.0-only.txt \ > + LICENSES/LGPL-2.1-only.txt \ > + LICENSES/LGPL-3.0-only.txt \ > + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ > + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt > > KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base > KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES > diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk > index 8360fc9b63..64b08bae4f 100644 > --- a/package/kf5/kf5.mk > +++ b/package/kf5/kf5.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KF5_VERSION_MAJOR = 5.47 > +KF5_VERSION_MAJOR = 5.91 > KF5_VERSION = $(KF5_VERSION_MAJOR).0 > KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) > From arnout at mind.be Mon Mar 7 21:23:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:23:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix building cargo packages on 32bit arm In-Reply-To: <20220217230638.98748-1-moritz@h6t.eu> References: <20220217230638.98748-1-moritz@h6t.eu> Message-ID: On 18/02/2022 00:06, Moritz Bitsch via buildroot wrote: > From: Moritz Bitsch > > there are duplicated symbols between rustc and gcc. Specifying > --allow-multiple-definition to the linker as workaround until > rustc is fixed. > > rust-lang issue: https://github.com/rust-lang/compiler-builtins/issues/420 > > Fixes: http://autobuild.buildroot.net/results/53f/53f5598b8e520caaa135fb4923c09da382dab329 > Signed-off-by: Moritz Bitsch Applied to master, thanks. Regards, Arnout > --- > package/pkg-cargo.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index e74a8358bc..71d695d926 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -46,6 +46,14 @@ PKG_CARGO_ENV = \ > CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ > CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc > > +# > +# This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 > +# and should be removed when fixed upstream > +# > +ifeq ($(NORMALIZED_ARCH),arm) > + PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" > +endif > + > HOST_PKG_CARGO_ENV = \ > $(PKG_COMMON_CARGO_ENV) > From arnout at mind.be Mon Mar 7 21:23:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:23:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/{hostapd, wpa_s}: modify config options handling In-Reply-To: <20220217211823.402414-1-geomatsi@gmail.com> References: <20220217211823.402414-1-geomatsi@gmail.com> Message-ID: On 17/02/2022 22:18, Sergey Matyukevich wrote: > Makefiles hostapd.mk and wpa_supplicant.mk define different macros for > different defconfig options. Options that are not listed in defconfig, > can be set using CONFIG_SET. Options that are listed in defconfig, can > be enabled or disabled using CONFIG_ENABLE or CONFIG_DISABLE. Starting > from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. > So it would be time to switch to enable/disable macros for this option. > > On the other hand, this approach looks fragile: we have to track > 'promoted' defconfig options for each hostapd/wpa_s update. This patch > removes CONFIG_SET macros, keeping only CONFIG_ENABLED/CONFIG_DISABLED. > CONFIG_SET is replaced by the additional pass over enabled options. All > such options that are not listed in defconfig, will be appended to the > configuration file. > > Fixes: > - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ > > Signed-off-by: Sergey Matyukevich Applied to master, thanks. Regards, Arnout > --- > > v1 -> v2: > > - drop patch for mesh fix > - remove CONFIG_SET macro as per suggestion by Thomas > > > package/hostapd/hostapd.mk | 20 +++++++++++++------- > package/wpa_supplicant/wpa_supplicant.mk | 9 +++++++-- > 2 files changed, 20 insertions(+), 9 deletions(-) > > diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk > index 075cb2a8d0..99f0cdf1b8 100644 > --- a/package/hostapd/hostapd.mk > +++ b/package/hostapd/hostapd.mk > @@ -15,7 +15,6 @@ HOSTAPD_LICENSE_FILES = README > > HOSTAPD_CPE_ID_VENDOR = w1.fi > HOSTAPD_SELINUX_MODULES = hostapd > -HOSTAPD_CONFIG_SET = > > HOSTAPD_CONFIG_ENABLE = \ > CONFIG_INTERNAL_LIBTOMMATH \ > @@ -83,13 +82,14 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_WPS > endif > > ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) > -HOSTAPD_CONFIG_SET += \ > - CONFIG_DPP \ > - CONFIG_SAE > HOSTAPD_CONFIG_ENABLE += \ > + CONFIG_DPP \ > + CONFIG_SAE \ > CONFIG_OWE > else > HOSTAPD_CONFIG_DISABLE += \ > + CONFIG_DPP \ > + CONFIG_SAE \ > CONFIG_OWE > endif > > @@ -98,8 +98,9 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN > endif > > ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) > -HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN > -HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL > +HOSTAPD_CONFIG_ENABLE += \ > + CONFIG_FULL_DYNAMIC_VLAN \ > + NEED_LINUX_IOCTL > endif > > ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) > @@ -123,9 +124,14 @@ define HOSTAPD_CONFIGURE_CMDS > cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) > sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ > $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ > - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ > $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ > $(HOSTAPD_CONFIG) > + # set requested configuration options not listed in hostapd defconfig > + for s in $(HOSTAPD_CONFIG_ENABLE) ; do \ > + if ! grep -q "^$${s}" $(HOSTAPD_CONFIG); then \ > + echo "$${s}=y" >> $(HOSTAPD_CONFIG) ; \ > + fi \ > + done > endef > > define HOSTAPD_BUILD_CMDS > diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk > index b414144774..f0eb36e083 100644 > --- a/package/wpa_supplicant/wpa_supplicant.mk > +++ b/package/wpa_supplicant/wpa_supplicant.mk > @@ -164,7 +164,7 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE > endif > > ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) > -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO > +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO > define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO > $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ > $(TARGET_DIR)/usr/lib/libwpa_client.so > @@ -183,9 +183,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS > cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) > sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ > $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ > - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ > $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ > $(WPA_SUPPLICANT_CONFIG) > + # set requested configuration options not listed in wpa_s defconfig > + for s in $(WPA_SUPPLICANT_CONFIG_ENABLE) ; do \ > + if ! grep -q "^$${s}" $(WPA_SUPPLICANT_CONFIG); then \ > + echo "$${s}=y" >> $(WPA_SUPPLICANT_CONFIG) ; \ > + fi \ > + done > endef > > # LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/kf5/kf5-kcoreaddons: add python3 optional dependency Message-ID: <20220307211545.EDFE482DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=338acc3d440a5ade6c0d79b86a7b67342ea3f371 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python3 is an optional dependency since the addition of the package in commit bf48bf86295bc4628bcd14fd4ca415d6971c8ab8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 76be8876cc..9a034ba763 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -10,7 +10,10 @@ KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz KF5_KCOREADDONS_LICENSE = LGPL-2.1 KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB -KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools +KF5_KCOREADDONS_DEPENDENCIES = \ + kf5-extra-cmake-modules \ + qt5tools \ + $(if $(BR2_PACKAGE_PYTHON3),python3) KF5_KCOREADDONS_INSTALL_STAGING = YES KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS) From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo.mk: fix building cargo packages on 32bit arm Message-ID: <20220307211545.E45B480118@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f439f7c60b3734d3920c32aee027c2cb73621682 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master There are duplicated symbols between rustc and gcc. Specifying --allow-multiple-definition to the linker as workaround until rustc is fixed. rust-lang issue: https://github.com/rust-lang/compiler-builtins/issues/420 Fixes: http://autobuild.buildroot.net/results/53f/53f5598b8e520caaa135fb4923c09da382dab329 Signed-off-by: Moritz Bitsch Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-cargo.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 6f5125f1d4..f7e3f39503 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -46,6 +46,14 @@ PKG_CARGO_ENV = \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc +# +# This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 +# and should be removed when fixed upstream +# +ifeq ($(NORMALIZED_ARCH),arm) + PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" +endif + HOST_PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/kf5: bump to version 5.91 Message-ID: <20220307211546.039E68263F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84e7062cba31f64fbca98b042d3ac1da1866418e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure of kf5-kcoreaddons with python 3.10 raised since commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc: CMake Error at /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/ECM/find-modules/FindPythonModuleGeneration.cmake:149 (message): The max python version in PythonModuleGeneration must be updated. Call Stack (most recent call first): src/lib/CMakeLists.txt:208 (find_package) It will also fix the following build failure of kf5-kcoreaddons raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qchar.h:43, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qstring.h:49, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/QString:1, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.h:27, from /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:22: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/qt5/QtCore/qglobal.h:1274:80: note: declared here 1274 | Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); | ^~~~~ /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp: In function 'QString KRandom::randomString(int)': /home/peko/autobuild/instance-0/output-1/build/kf5-kcoreaddons-5.47.0/src/lib/randomness/krandom.cpp:76:27: error: use of deleted function 'QCharRef& QCharRef::operator=(char)' 76 | str[i++] = char(r); | ^ - Update indentation in hash file (two spaces) - Update licenses due to https://invent.kde.org/frameworks/kcoreaddons/-/commit/93480398b551aee572f9f1a0ee48ed45a8476580 https://invent.kde.org/frameworks/modemmanager-qt/-/commit/8ad494d957cab343a60a61a2163f1ca23e9e3511 https://invent.kde.org/frameworks/networkmanager-qt/-/commit/fa9ef0d84898ad5e1f28857307bd5fcb8eb38e20 Fixes: - http://autobuild.buildroot.org/results/0267ff54ee82d853476ff7d6b14edb4aba308aa2 - http://autobuild.buildroot.org/results/694a2322d9161b55f5db66d1ace57d836360ed84 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../kf5-extra-cmake-modules.hash | 4 ++-- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash | 17 +++++++++++++++-- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 20 ++++++++++++++++++-- .../kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash | 11 +++++++++-- .../kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk | 13 +++++++++++-- .../kf5-networkmanager-qt/kf5-networkmanager-qt.hash | 11 +++++++++-- .../kf5-networkmanager-qt/kf5-networkmanager-qt.mk | 12 ++++++++++-- package/kf5/kf5.mk | 2 +- 8 files changed, 75 insertions(+), 15 deletions(-) diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash index 733e267fdb..70b776b5d7 100644 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz -sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS +sha256 9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c extra-cmake-modules-5.91.0.tar.xz +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash index 0cd8dcfc15..e4ebf2bb39 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash @@ -1,3 +1,16 @@ # Locally calculated -sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b kcoreaddons-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd LICENSES/GPL-2.0-or-later.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-only.txt +sha256 de588a8b1c41fe73ffe1201f9d12c718a988ed8e1302929625a6e7c2bced7461 LICENSES/LGPL-2.0-or-later.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt +sha256 272bc0fa06a23d3c807375f95f8d6ccd98541321d2882732668ab139c16f9bf4 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 a3b538a7d81c4935d185056479d12fd43042bb9f3a21c9cbb4a8500fab8e5880 LICENSES/MPL-1.1.txt +sha256 7dea3adab58690d8ee14775da755cd30a52649a47704ff78ae85197ae0d37c60 LICENSES/Qt-LGPL-exception-1.1.txt diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index 9a034ba763..e2f67f15b2 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -7,8 +7,24 @@ KF5_KCOREADDONS_VERSION = $(KF5_VERSION) KF5_KCOREADDONS_SITE = $(KF5_SITE) KF5_KCOREADDONS_SOURCE = kcoreaddons-$(KF5_KCOREADDONS_VERSION).tar.xz -KF5_KCOREADDONS_LICENSE = LGPL-2.1 -KF5_KCOREADDONS_LICENSE_FILES = COPYING.LIB +KF5_KCOREADDONS_LICENSE = \ + LGPL-2.0+, LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + MPL.1.1 or GPL-2.0+ or LGPL-2.1+ (posix_fallocate_mac.h), \ + LGPL-2.1 with Qt-LGPL-exception-1.1 or LicenseRef-Qt-Commercial (kprocesslist), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests) +KF5_KCOREADDONS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.0-only.txt \ + LICENSES/LGPL-2.0-or-later.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt \ + LICENSES/LicenseRef-Qt-Commercial.txt \ + LICENSES/MPL-1.1.txt \ + LICENSES/Qt-LGPL-exception-1.1.txt KF5_KCOREADDONS_DEPENDENCIES = \ kf5-extra-cmake-modules \ diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash index 408eb0c0b0..4b6c03a3bb 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 8b6ab15ce82b7a30b26814178ac33380056ec4398707481aa5ce95cf09d39d03 modemmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 modemmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 81617492c0..38c80d3da8 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -7,8 +7,17 @@ KF5_MODEMMANAGER_QT_VERSION = $(KF5_VERSION) KF5_MODEMMANAGER_QT_SITE = $(KF5_SITE) KF5_MODEMMANAGER_QT_SOURCE = modemmanager-qt-$(KF5_MODEMMANAGER_QT_VERSION).tar.xz -KF5_MODEMMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_MODEMMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_MODEMMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) + +KF5_MODEMMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash index 8ccada455e..de4504064f 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash @@ -1,3 +1,10 @@ # Locally calculated -sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 networkmanager-qt-5.91.0.tar.xz + +# Hash for license files +sha256 d1cf0896da7045d841fe45b0991cf35540bac1a17b5d11f4afcf8fcb950246b5 LICENSES/GPL-2.0-only.txt +sha256 2ca9503d76d1ffab14f599b4741382eec11face60ad1f0d7a41897809003a286 LICENSES/GPL-3.0-only.txt +sha256 211f1b738d1b864bab2648bee9b55becd39fd2d6aa49c1196e7d87b41db4bc07 LICENSES/LGPL-2.1-only.txt +sha256 476b03829862ab7e3ed920f87fad3de3c995f7dd93c26476eb40f0117de43fdc LICENSES/LGPL-3.0-only.txt +sha256 ef839531eb65b0168f9aed14047c84be13e9ea38801a73bc18abe24dc93e6ac9 LICENSES/LicenseRef-KDE-Accepted-GPL.txt +sha256 d9f25707d20e804f15005be46527366b0604bd739754d144a83d3983d94a9a6a LICENSES/LicenseRef-KDE-Accepted-LGPL.txt diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk index c383f98e9b..7adff2deb7 100644 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.mk @@ -7,8 +7,16 @@ KF5_NETWORKMANAGER_QT_VERSION = $(KF5_VERSION) KF5_NETWORKMANAGER_QT_SITE = $(KF5_SITE) KF5_NETWORKMANAGER_QT_SOURCE = networkmanager-qt-$(KF5_NETWORKMANAGER_QT_VERSION).tar.xz -KF5_NETWORKMANAGER_QT_LICENSE = LGPL-2.1+ -KF5_NETWORKMANAGER_QT_LICENSE_FILES = COPYING.LIB +KF5_NETWORKMANAGER_QT_LICENSE = \ + LGPL-2.1 or LGPL-3.0 or LicenseRef-KDE-Accepted-LGPL (library), \ + GPL-2.0 or GPL-3.0 or LicenseRef-KDE-Accepted-GPL (autotests, examples) +KF5_NETWORKMANAGER_QT_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-2.1-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/LicenseRef-KDE-Accepted-GPL.txt \ + LICENSES/LicenseRef-KDE-Accepted-LGPL.txt KF5_NETWORKMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules network-manager qt5base KF5_NETWORKMANAGER_QT_INSTALL_STAGING = YES diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk index 8360fc9b63..64b08bae4f 100644 --- a/package/kf5/kf5.mk +++ b/package/kf5/kf5.mk @@ -4,7 +4,7 @@ # ################################################################################ -KF5_VERSION_MAJOR = 5.47 +KF5_VERSION_MAJOR = 5.91 KF5_VERSION = $(KF5_VERSION_MAJOR).0 KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR) From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/{hostapd, wpa_s}: modify config options handling Message-ID: <20220307211545.DAB7A8263F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08f6960f53b84c6e333548b99fff04928aa454e1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Makefiles hostapd.mk and wpa_supplicant.mk define different macros for different defconfig options. Options that are not listed in defconfig, can be set using CONFIG_SET. Options that are listed in defconfig, can be enabled or disabled using CONFIG_ENABLE or CONFIG_DISABLE. Starting from hostapd v2.10, option CONFIG_DPP is explicitly listed in defconfig. So it would be time to switch to enable/disable macros for this option. On the other hand, this approach looks fragile: we have to track 'promoted' defconfig options for each hostapd/wpa_s update. This patch removes CONFIG_SET macros, keeping only CONFIG_ENABLED/CONFIG_DISABLED. CONFIG_SET is replaced by the additional pass over enabled options. All such options that are not listed in defconfig, will be appended to the configuration file. Fixes: - http://autobuild.buildroot.net/results/3f8058ee6f3913fda795578f206db895731ba1e6/ Signed-off-by: Sergey Matyukevich Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/hostapd/hostapd.mk | 20 +++++++++++++------- package/wpa_supplicant/wpa_supplicant.mk | 9 +++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 075cb2a8d0..99f0cdf1b8 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -15,7 +15,6 @@ HOSTAPD_LICENSE_FILES = README HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_SELINUX_MODULES = hostapd -HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ CONFIG_INTERNAL_LIBTOMMATH \ @@ -83,13 +82,14 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_WPS endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) -HOSTAPD_CONFIG_SET += \ - CONFIG_DPP \ - CONFIG_SAE HOSTAPD_CONFIG_ENABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ CONFIG_OWE endif @@ -98,8 +98,9 @@ HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) -HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN -HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL +HOSTAPD_CONFIG_ENABLE += \ + CONFIG_FULL_DYNAMIC_VLAN \ + NEED_LINUX_IOCTL endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) @@ -123,9 +124,14 @@ define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ $(HOSTAPD_CONFIG) + # set requested configuration options not listed in hostapd defconfig + for s in $(HOSTAPD_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(HOSTAPD_CONFIG); then \ + echo "$${s}=y" >> $(HOSTAPD_CONFIG) ; \ + fi \ + done endef define HOSTAPD_BUILD_CMDS diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index b414144774..f0eb36e083 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -164,7 +164,7 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ $(TARGET_DIR)/usr/lib/libwpa_client.so @@ -183,9 +183,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ $(WPA_SUPPLICANT_CONFIG) + # set requested configuration options not listed in wpa_s defconfig + for s in $(WPA_SUPPLICANT_CONFIG_ENABLE) ; do \ + if ! grep -q "^$${s}" $(WPA_SUPPLICANT_CONFIG); then \ + echo "$${s}=y" >> $(WPA_SUPPLICANT_CONFIG) ; \ + fi \ + done endef # LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase From arnout at mind.be Mon Mar 7 21:21:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:21:54 +0100 Subject: [Buildroot] [git commit] package/pulseview: fix build with glibmm 2.68 Message-ID: <20220307211546.0DA8982DF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c05b5e1007681f8a1d15a6194f84051e7569d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - http://autobuild.buildroot.org/results/ebb73892fd7471de4f0c109554dfdc65b93d3dcf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pulseview/0003-Support-glibmm-2.68.patch | 89 ++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/package/pulseview/0003-Support-glibmm-2.68.patch b/package/pulseview/0003-Support-glibmm-2.68.patch new file mode 100644 index 0000000000..00e4e696d9 --- /dev/null +++ b/package/pulseview/0003-Support-glibmm-2.68.patch @@ -0,0 +1,89 @@ +From a97d5a060a534a3c658578e7f14ab43556db93ca Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 Dec 2021 16:19:46 +0100 +Subject: [PATCH] Support glibmm 2.68 + +Support glibmm 2.68 which has been released one year ago and is the +first stable release in the glibmm-2.68 ABI series: +https://gitlab.gnome.org/GNOME/glibmm/-/blob/2.68.2/NEWS + +C++17 support is mandatory with glibmm 2.68 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + CMakeLists.txt | 23 +++++++++++++++++++---- + INSTALL | 2 +- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7791b1b1..58a9cf92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,14 @@ add_subdirectory(manual) + #------------------------------------------------------------------------------- + + list(APPEND PKGDEPS glib-2.0>=2.28.0) +-list(APPEND PKGDEPS glibmm-2.4>=2.28.0) ++ ++set(LIBSR_GLIBMM "glibmm-2.4>=2.28.0") ++find_package(PkgConfig) ++pkg_check_modules(LIBSRGLIBMM24 ${LIBSR_GLIBMM}) ++if(NOT LIBSRGLIBMM24_FOUND) ++ set(LIBSR_GLIBMM "glibmm-2.68>=2.68.0") ++endif() ++list(APPEND PKGDEPS ${LIBSR_GLIBMM}) + + if(ENABLE_FLOW) + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) +@@ -93,7 +100,6 @@ if(ANDROID) + list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0) + endif() + +-find_package(PkgConfig) + pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING}) + if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION) + message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)") +@@ -225,7 +231,11 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS) + set(PV_TITLE PulseView) + set(PV_VERSION_STRING "0.5.0") + +-set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++if(LIBSRGLIBMM24_FOUND) ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) ++else() ++ set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.68_VERSION}) ++endif() + + include(GetGitRevisionDescription) + +@@ -486,7 +496,12 @@ qt5_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc) + add_definitions(-DQT_NO_KEYWORDS) + add_definitions(-D__STDC_LIMIT_MACROS) + add_definitions(-Wall -Wextra) +-add_definitions(-std=c++11) ++if(LIBSRGLIBMM24_FOUND) ++ add_definitions(-std=c++11) ++else() ++ # glibmm-2.68 reuires c++17 ++ add_definitions(-std=c++17) ++endif() + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) + if(WIN32) + add_definitions(-Wa,-mbig-obj -O3) +diff --git a/INSTALL b/INSTALL +index da89be8d..8003fcfb 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -14,7 +14,7 @@ Requirements + - pkg-config >= 0.22 + - cmake >= 2.8.12 + - libglib >= 2.28.0 +- - glibmm-2.4 (>= 2.28.0) ++ - glibmm-2.4 (>= 2.28.0) or glibmm-2.68 (>= 2.68.0) + - Qt5 (>= 5.3), including the following components: + - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg, Qt5LinguistTools + - Qt translation package (optional; needed at runtime, not build time) +-- +2.34.1 + From bugzilla at busybox.net Mon Mar 7 21:29:43 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 21:29:43 +0000 Subject: [Buildroot] [Bug 14631] host-go-bootstrap: go not being built for package in external tree In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14631 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Peter Korsgaard --- Fixed by https://git.buildroot.org/buildroot/commit/?id=3539f45ca09558a22fb5816baae9088c34490380, thanks -- You are receiving this mail because: You are on the CC list for the bug. From andrei.gherghescu at protonmail.com Mon Mar 7 21:44:47 2022 From: andrei.gherghescu at protonmail.com (Andrei N.G.) Date: Mon, 07 Mar 2022 21:44:47 +0000 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site In-Reply-To: <878rtl7dmb.fsf@dell.be.48ers.dk> References: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> <878rtl7dmb.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, Yes, indeed. Thanks for fixing the wrong url. Regards, Andrei -------- Original Message -------- On 7 Mar 2022, 20:43, Peter Korsgaard wrote: >>>>>> "Andrei" == Andrei Gherghescu via buildroot writes: > >> The http://www.directfb.org/ has been down since 2015. >> Use the Buildroot backup download site. > >> Fixes: >> - https://bugs.busybox.net/show_bug.cgi?id=13731 > > That bug is about readline. I guess you mean > https://bugs.busybox.net/show_bug.cgi?id=13126 instead? > > Committed, thanks. > >> Signed-off-by: Andrei Gherghescu >> --- >> package/directfb-examples/Config.in | 6 ++++-- >> package/directfb-examples/directfb-examples.mk | 2 +- >> package/directfb/directfb.mk | 2 +- >> 3 files changed, 6 insertions(+), 4 deletions(-) > >> diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in >> index 216e036577..4d5de03068 100644 >> --- a/package/directfb-examples/Config.in >> +++ b/package/directfb-examples/Config.in >> @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES >> help >> The DirectFB-examples package contains a set of simple >> DirectFB applications that can be used to test and demonstrate >> - various DirectFB features. >> + various DirectFB features. As of 4 October 2015, DirectFB's >> + website http://www.directfb.org/ is down. See alternative site >> + listed below. > >> - http://directfb.org/downloads/Extras/README.DirectFB-examples >> + http://elinux.org/DirectFB >> diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk >> index 46263da733..c8d09b3e33 100644 >> --- a/package/directfb-examples/directfb-examples.mk >> +++ b/package/directfb-examples/directfb-examples.mk >> @@ -5,7 +5,7 @@ >> ################################################################################ > >> DIRECTFB_EXAMPLES_VERSION = 1.7.0 >> -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras >> +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples >> DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz >> DIRECTFB_EXAMPLES_LICENSE = MIT >> DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING >> diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk >> index 0b32162d8f..56a396ab99 100644 >> --- a/package/directfb/directfb.mk >> +++ b/package/directfb/directfb.mk >> @@ -6,7 +6,7 @@ > >> DIRECTFB_VERSION_MAJOR = 1.7 >> DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 >> -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) >> +DIRECTFB_SITE = http://sources.buildroot.net/directfb >> DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz >> DIRECTFB_LICENSE = LGPL-2.1+ >> DIRECTFB_LICENSE_FILES = COPYING >> -- >> 2.35.1 > >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > Bye, Peter Korsgaard -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Mon Mar 7 21:45:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:45:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: fix headers install In-Reply-To: <20220218102719.693274-1-fontaine.fabrice@gmail.com> References: <20220218102719.693274-1-fontaine.fabrice@gmail.com> Message-ID: <42500a6f-bd28-a8b0-68fe-c9098fe64153@mind.be> On 18/02/2022 11:27, Fabrice Fontaine wrote: > For an unknown reason, installation of headers is broken since commit > 7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 which sets _PYTHON_PROJECT_BASE I've been trying to understand and I don't really understand what is going on either. > As _PYTHON_PROJECT_BASE value seems correct and fix its own build This still looks fishy to me though :-( Still, we need to fix this somehow and this patch indeed fixes the issue. Therefore, applied to master, thanks. Regards, Arnout > failures, use --install-headers to set install path for headers and > avoid the following build failure with python-greenlet or python-pygame: > > python-greenlet: installs files in /home/peko/autobuild/instance-0/output-1/target//home/peko/autobuild/instance-0/output-1 > > python-pygame: installs files in /home/peko/autobuild/instance-1/output-1/target//home/peko/autobuild/instance-1/output-1 > > Fixes: > - http://autobuild.buildroot.org/results/f5b52dee7e72f0a1f72b9f87723bc585743c7b31 > - http://autobuild.buildroot.org/results/9eb2685d32756864000e1b38f8a183b57f6ea528 > > Signed-off-by: Fabrice Fontaine > --- > package/pkg-python.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index b8dc9cd9e5..c4e590bd70 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -51,10 +51,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ > --executable=/usr/bin/python > > PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --root=$(TARGET_DIR) > > PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --root=$(STAGING_DIR) > > @@ -81,12 +83,14 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ > _python_exec_prefix=/usr > > PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --executable=/usr/bin/python \ > --single-version-externally-managed \ > --root=$(TARGET_DIR) > > PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ > + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --prefix=/usr \ > --executable=/usr/bin/python \ > --single-version-externally-managed \ From arnout at mind.be Mon Mar 7 21:46:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:46:12 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: fix build failure due to previous wrong commit In-Reply-To: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> References: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> Message-ID: <67313303-db84-93cd-d96b-56db0c73976b@mind.be> On 18/02/2022 12:09, Giulio Benetti wrote: > Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but > the option was listed in the wrong place. Options must be set in the order Order doesn't matter in kconfig. The problem was the lack of quotes. Updated the commit message and applied to master, thanks. Regards, Arnout > they are specified by Config.in files. So let's move > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" right after BR2_TARGET_ROOTFS_EXT2_4=y > as it should be. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 > > Signed-off-by: Giulio Benetti > --- > configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig > index 00ccd784b5..06e03967c4 100644 > --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig > +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig > @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" > -BR2_TARGET_ROOTFS_EXT2_SIZE=120M > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" > @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y > BR2_PACKAGE_VIM=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > BR2_TARGET_AT91BOOTSTRAP3=y > BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y > BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" From arnout at mind.be Mon Mar 7 21:46:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:46:31 +0100 Subject: [Buildroot] [PATCH] package/gdb: fix when gmp is installed on the host machine In-Reply-To: <20220219154350.1552021-1-john@metanate.com> References: <20220219154350.1552021-1-john@metanate.com> Message-ID: <2fc5dae4-85a8-9197-d5ea-eebd9d77871c@mind.be> On 19/02/2022 16:43, John Keeping wrote: > gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with > /usr/lib/ which can lead to libgmp from the wrong architecture with the > result that the test fails. Even if a libgmp is found there it is now > the one that should be used. > > This is the same macro used for expat and lzma for which there are > already specific CONF_OPTS flags added here. Add the same flag for > libgmp and move the handling down so that it is logically grouped with > the other similar options. > > Note that there is no --with(out)-gmp flag to configure, as the > dependency is mandatory, so only the --with-libgmp-prefix option is > specified. > > Signed-off-by: John Keeping Applied to master, thanks. Regards, Arnout > --- > package/gdb/gdb.mk | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 05de3c14d1..9bde2beea1 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) > HOST_GDB_DEPENDENCIES += host-gmp > endif > > -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and > -# we're building the full gdb for the target, we need gmp as a > -# dependency. For now the default gdb version in Buildroot doesn't > -# require gmp. > -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) > -GDB_DEPENDENCIES += gmp > -endif > - > # When gdb sources are fetched from the binutils-gdb repository, they > # also contain the binutils sources, but binutils shouldn't be built, > # so we disable it (additionally the option --disable-install-libbfd > @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ > --without-curses > endif > > +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and > +# we're building the full gdb for the target, we need gmp as a > +# dependency. For now the default gdb version in Buildroot doesn't > +# require gmp. > +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) > +GDB_CONF_OPTS += \ > + --with-libgmp-prefix=$(STAGING_DIR)/usr > +GDB_DEPENDENCIES += gmp > +endif > + > ifeq ($(BR2_PACKAGE_GDB_SERVER),y) > GDB_CONF_OPTS += --enable-gdbserver > GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Mar 7 21:39:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:39:48 +0100 Subject: [Buildroot] [git commit] package/pkg-python: fix headers install Message-ID: <20220307213817.E2C8482941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37cc5aecf57493e037769f444fdc4f7d8ac8782f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For an unknown reason, installation of headers is broken since commit 7c1bb5c2bfdc9d726c41a66b30b7aa8e759c6596 which sets _PYTHON_PROJECT_BASE As _PYTHON_PROJECT_BASE value seems correct and fix its own build failures, use --install-headers to set install path for headers and avoid the following build failure with python-greenlet or python-pygame: python-greenlet: installs files in /home/peko/autobuild/instance-0/output-1/target//home/peko/autobuild/instance-0/output-1 python-pygame: installs files in /home/peko/autobuild/instance-1/output-1/target//home/peko/autobuild/instance-1/output-1 Fixes: - http://autobuild.buildroot.org/results/f5b52dee7e72f0a1f72b9f87723bc585743c7b31 - http://autobuild.buildroot.org/results/9eb2685d32756864000e1b38f8a183b57f6ea528 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index e81a1a3102..38455e40fb 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,10 +52,12 @@ PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --root=$(STAGING_DIR) @@ -84,12 +86,14 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ _python_exec_prefix=/usr PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ + --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ From arnout at mind.be Mon Mar 7 21:40:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:40:04 +0100 Subject: [Buildroot] [git commit] configs/microchip_sam9x60ek_mmc_dev_defconfig: add quotes around string Message-ID: <20220307213817.EBC8382DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59e62a8e0d556567fa97ea400a7c351f4fa22998 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but forgot to add quotes around it. Thus, kconfig removed the option entirely. While we're at it, move the option to a more appropriate place together with the rest of the ext2 options. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 00ccd784b5..06e03967c4 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" -BR2_TARGET_ROOTFS_EXT2_SIZE=120M BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" From arnout at mind.be Mon Mar 7 21:43:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:43:45 +0100 Subject: [Buildroot] [git commit] package/gdb: fix when gmp is installed on the host machine Message-ID: <20220307213818.0125883235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fa5d641ac4951087bb007e091a799101d294527 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with /usr/lib/ which can lead to libgmp from the wrong architecture with the result that the test fails. Even if a libgmp is found there it is now the one that should be used. This is the same macro used for expat and lzma for which there are already specific CONF_OPTS flags added here. Add the same flag for libgmp and move the handling down so that it is logically grouped with the other similar options. Note that there is no --with(out)-gmp flag to configure, as the dependency is mandatory, so only the --with-libgmp-prefix option is specified. Signed-off-by: John Keeping Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gdb/gdb.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 05de3c14d1..9bde2beea1 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) HOST_GDB_DEPENDENCIES += host-gmp endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) -GDB_DEPENDENCIES += gmp -endif - # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, # so we disable it (additionally the option --disable-install-libbfd @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ --without-curses endif +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and +# we're building the full gdb for the target, we need gmp as a +# dependency. For now the default gdb version in Buildroot doesn't +# require gmp. +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_CONF_OPTS += \ + --with-libgmp-prefix=$(STAGING_DIR)/usr +GDB_DEPENDENCIES += gmp +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) From arnout at mind.be Mon Mar 7 21:48:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 22:48:27 +0100 Subject: [Buildroot] [PATCH v2] manual: board support: add instructions to test defconfig in the official docker In-Reply-To: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> References: <20220219212211.1304441-1-giulio.benetti@benettiengineering.com> Message-ID: <11add763-9e59-52de-65af-d9130a7bdbf7@mind.be> On 19/02/2022 22:22, Giulio Benetti wrote: > Sometimes new boards have not been tested with official docker so let's add > instructions to do it with utils/docker-run. > > Cc: Luca Ceresoli > Signed-off-by: Giulio Benetti Applied to master with Luca's improvement, thanks. Regards, Arnout > --- > V1->V2: > * use the available utils/docker-run > * improve explanation as suggested by Luca Ceresoli > --- > docs/manual/adding-board-support.txt | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt > index 33ed709535..074bab7a00 100644 > --- a/docs/manual/adding-board-support.txt > +++ b/docs/manual/adding-board-support.txt > @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory > +board//+. You can then store your patches > and configurations in these directories, and reference them from the main > Buildroot configuration. Refer to xref:customize[] for more details. > + > +Before submitting patches for new boards it is recommended to test it by > +building it using latest gitlab-CI docker container. To do this use > +utils/docker-run script and inside it hint: > +-------------------- > + $ make +_defconfig+ > + $ make > +-------------------- From arnout at mind.be Mon Mar 7 21:48:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:48:02 +0100 Subject: [Buildroot] [git commit] manual: board support: add instructions to test defconfig in the official docker Message-ID: <20220307214059.6A59982941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e1976a25d2a967759fddb747a074343678b42ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Sometimes new boards have not been tested with official docker so let's add instructions to do it with utils/docker-run. Cc: Luca Ceresoli Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/adding-board-support.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index 33ed709535..cd90a5871f 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -46,3 +46,11 @@ create a directory +board/+ and a subdirectory +board//+. You can then store your patches and configurations in these directories, and reference them from the main Buildroot configuration. Refer to xref:customize[] for more details. + +Before submitting patches for new boards it is recommended to test it by +building it using latest gitlab-CI docker container. To do this use +utils/docker-run script and inside it issue these commands: +-------------------- + $ make +_defconfig+ + $ make +-------------------- From romain.naour at gmail.com Mon Mar 7 21:49:23 2022 From: romain.naour at gmail.com (Romain Naour) Date: Mon, 7 Mar 2022 22:49:23 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: <87zgm15yir.fsf@dell.be.48ers.dk> References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> Message-ID: Hello Peter, Le 07/03/2022 ? 20:54, Peter Korsgaard a ?crit?: >>>>>> "Romain" == Romain Naour writes: > > > To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both > > _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot > > already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first > > release tag 2009.02. > > > _TIME_BITS is not needed for musl libc since it already year2038 > > ready [2]. > > > The uclibc-ng libc only support time_t 32-bit (long int) so it will be > > affected by the year2038 issue [3]. > > > Fixes (in French, chapter Buildroot 2022 and GlibC): > > https://www.blaess.fr/christophe/2038 > > > Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc > > bleeding-edge 2021.11-1 toolchain. > > > Before: > > # date > > Tue Jan 19 03:14:07 UTC 2038 > > # date > > Thu Jan 1 00:00:00 UTC 1970 > > > After: > > # date > > Tue Jan 19 03:14:07 UTC 2038 > > # date > > Tue Jan 19 03:14:08 UTC 2038 > > # date > > Tue Jan 19 03:14:09 UTC 2038 > > Ahh, good catch. Maybe something to add a runtime test for? > > Committed, thanks. Sorry but I guess this patch needs more testing. > > > [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 > > [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 > > [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 > > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 > > > Signed-off-by: Romain Naour > > Cc: Christophe Blaess > > --- > > package/Makefile.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/package/Makefile.in b/package/Makefile.in > > index 508ea7c366..cde050ca82 100644 > > --- a/package/Makefile.in > > +++ b/package/Makefile.in > > @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) > > TARGET_HARDENED += -D_FORTIFY_SOURCE=2 > > endif > > > -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > > +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 I noticed that glibc 2.34 stop the build if _TIME_BITS is set without _FILE_OFFSET_BITS. What if something (build system) unset _FILE_OFFSET_BITS ? There is something weird with libzlib package. I suggest to apply for next first and backport it latter to the stable branch. Best regards, Romain > > TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) > > TARGET_CXXFLAGS = $(TARGET_CFLAGS) > > TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) > > -- > > > 2.35.1 > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > From arnout at mind.be Mon Mar 7 22:04:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:04:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/osm2pgsql: disable external fmt In-Reply-To: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> References: <20220221223842.2201966-1-fontaine.fabrice@gmail.com> Message-ID: <6d5f714c-da1b-1eae-5b73-51622e0f5121@mind.be> On 21/02/2022 23:38, Fabrice Fontaine wrote: > osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build > failure since bump of fmt to version 8.1.1 in commit > ec7fd50d08690a383fec40748ac9b78c3f764316: > > /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt > 1728 | formattable, > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/osm2pgsql/Config.in | 5 ++--- > package/osm2pgsql/osm2pgsql.mk | 5 +++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in > index 315f496d8e..e903e92c49 100644 > --- a/package/osm2pgsql/Config.in > +++ b/package/osm2pgsql/Config.in > @@ -1,17 +1,16 @@ > config BR2_PACKAGE_OSM2PGSQL > bool "osm2pgsql" > - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero > + depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium > depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem > - depends on BR2_USE_WCHAR # boost, fmt, libosmium > + depends on BR2_USE_WCHAR # boost, libosmium > depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future > select BR2_PACKAGE_BOOST > select BR2_PACKAGE_BOOST_SYSTEM > select BR2_PACKAGE_BOOST_FILESYSTEM > select BR2_PACKAGE_BZIP2 > select BR2_PACKAGE_EXPAT > - select BR2_PACKAGE_FMT > select BR2_PACKAGE_LIBOSMIUM > select BR2_PACKAGE_PROTOZERO > select BR2_PACKAGE_ZLIB > diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk > index b00976d28b..d389fff590 100644 > --- a/package/osm2pgsql/osm2pgsql.mk > +++ b/package/osm2pgsql/osm2pgsql.mk > @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ > OSM2PGSQL_LICENSE_FILES = COPYING > OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO > > -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib > +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib > > +# fmt > 8.0 is not yet supported > OSM2PGSQL_CONF_OPTS = \ > -DBUILD_TESTS=OFF \ > -DBUILD_COVERAGE=OFF \ > - -DEXTERNAL_FMT=ON \ > + -DEXTERNAL_FMT=OFF \ > -DEXTERNAL_LIBOSMIUM=ON \ > -DEXTERNAL_PROTOZERO=ON > From arnout at mind.be Mon Mar 7 22:05:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:05:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-treq: fix dependencies In-Reply-To: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> References: <20220221230640.2203877-1-fontaine.fabrice@gmail.com> Message-ID: <4ab837ef-09f1-d7e7-49cb-bb6ac1f6107c@mind.be> On 22/02/2022 00:06, Fabrice Fontaine wrote: > python-treq needs TLS support in twisted so select > BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on > service_identity and pyOpenSSL since version 17.3.0 and > https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 > > Finally, python-idna was never a direct dependency of python-treq > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/python-treq/Config.in | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index f781b37305..7c02a35638 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -1,16 +1,13 @@ > config BR2_PACKAGE_PYTHON_TREQ > bool "python-treq" > - # python-pyopenssl -> python-cryptography > + # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > - # python-idna, python-pyopenssl -> python-cryptography > select BR2_PACKAGE_PYTHON_ATTRS # runtime > - select BR2_PACKAGE_PYTHON_IDNA # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime > select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > treq is an HTTP library inspired by requests but written on > top of Twisted's Agents. It provides a simple, higher level From arnout at mind.be Mon Mar 7 22:05:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:05:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/glib-networking: security bump to version 2.70.1 In-Reply-To: <20220222120034.1748652-1-aperez@igalia.com> References: <20220222120034.1748652-1-aperez@igalia.com> Message-ID: <7b607f83-e892-fb78-5dac-69b22b1ae4e2@mind.be> On 22/02/2022 13:00, Adrian Perez de Castro wrote: > This is a minor release which fixes a couple of crashes and an incorrect > case of TLS certificate velidation when built with the OpenSSL backend. > Release notes: > > https://gitlab.gnome.org/GNOME/glib-networking/-/blob/b0d45b17f745088256c9ad1ae9a7e2467dec6286/NEWS > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Arnout > --- > package/glib-networking/glib-networking.hash | 4 ++-- > package/glib-networking/glib-networking.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash > index 6a53b436b0..347ef6777c 100644 > --- a/package/glib-networking/glib-networking.hash > +++ b/package/glib-networking/glib-networking.hash > @@ -1,3 +1,3 @@ > -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum > -sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz > +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum > +sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk > index 53280700bc..f74e520d31 100644 > --- a/package/glib-networking/glib-networking.mk > +++ b/package/glib-networking/glib-networking.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > GLIB_NETWORKING_VERSION_MAJOR = 2.70 > -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 > +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 > GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) > GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz > GLIB_NETWORKING_INSTALL_STAGING = YES From arnout at mind.be Mon Mar 7 22:05:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:05:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycli: drop package In-Reply-To: <20220222174957.3086493-1-fontaine.fabrice@gmail.com> References: <20220222174957.3086493-1-fontaine.fabrice@gmail.com> Message-ID: <9ad2fb6e-ad1d-8a71-251a-d57efc28157d@mind.be> On 22/02/2022 18:49, Fabrice Fontaine wrote: > Even with the two upstream patches added in commit > b2e6e376a2d7551ccf146855ec4e99a65c35bd16, python-pycli still raises the > following build failure since bump of python3 to version 3.10.1 in > commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple > Exception types without parentheses" exception > (https://docs.python.org/3/whatsnew/3.10.html): > > error: File "/usr/lib/python3.10/site-packages/cli/test.py", line 142 > except raises, e: > ^^^^^^^^^ > SyntaxError: multiple exception types must be parenthesized > > So drop the package as the last release was made 10 years ago. > > Fixes: > - http://autobuild.buildroot.org/results/6112e1830ce608abcea4a26b659c10e5ff09a66a > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > Config.in.legacy | 7 ++++ > DEVELOPERS | 1 - > package/Config.in | 1 - > ...aise-exceptions-in-wrapped-functions.patch | 26 ------------ > ...pt-statement-changed-slightly-in-2-6.patch | 41 ------------------- > package/python-pycli/Config.in | 7 ---- > package/python-pycli/python-pycli.hash | 5 --- > package/python-pycli/python-pycli.mk | 14 ------- > 8 files changed, 7 insertions(+), 95 deletions(-) > delete mode 100644 package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > delete mode 100644 package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > delete mode 100644 package/python-pycli/Config.in > delete mode 100644 package/python-pycli/python-pycli.hash > delete mode 100644 package/python-pycli/python-pycli.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index aefb0ba6ea..99459c7ad3 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_PYTHON_PYCLI > + bool "python-pycli removed" > + select BR2_LEGACY > + help > + Package was removed because it is not compatible with python > + 3.10 and is not maintained anymore (no release since 2012). > + > config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL > bool "bpftool was moved" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index 3e7c753836..6208df974d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1065,7 +1065,6 @@ N: Geoff Levand > F: package/flannel/ > > N: Geoffrey Ragot > -F: package/python-pycli/ > F: package/python-pyyaml/ > > N: Gerome Burlats > diff --git a/package/Config.in b/package/Config.in > index 3213c4a9b4..ed7d9555b2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1144,7 +1144,6 @@ menu "External python modules" > source "package/python-pybind/Config.in" > source "package/python-pycairo/Config.in" > source "package/python-pycares/Config.in" > - source "package/python-pycli/Config.in" > source "package/python-pycparser/Config.in" > source "package/python-pycryptodomex/Config.in" > source "package/python-pycups/Config.in" > diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > deleted file mode 100644 > index 7ac9d7af9f..0000000000 > --- a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 > -From: mmbutter > -Date: Tue, 9 Jun 2020 11:50:41 -0500 > -Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. > - > -[Retrieved from: > -https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] > -Signed-off-by: Fabrice Fontaine > ---- > - lib/cli/app.py | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/lib/cli/app.py b/lib/cli/app.py > -index 7b6db52..f487ab4 100644 > ---- a/lib/cli/app.py > -+++ b/lib/cli/app.py > -@@ -240,6 +240,9 @@ def run(self): > - try: > - returned = self.main(*args) > - except Exception, e: > -+ elif isinstance(e, self.reraise): > -+ # raising the last exception preserves traceback > -+ raise > - returned = e > - > - return self.post_run(returned) > diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > deleted file mode 100644 > index 75869d6d23..0000000000 > --- a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 > -From: mmbutter > -Date: Thu, 11 Jun 2020 15:50:03 -0500 > -Subject: [PATCH] except statement changed slightly in 2.6. This could cause > - problems in newer versions. Updated to the new format. > - > -[Retrieved from: > -https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] > -Signed-off-by: Fabrice Fontaine > ---- > - lib/cli/app.py | 10 +++++----- > - 1 file changed, 5 insertions(+), 5 deletions(-) > - > -diff --git a/lib/cli/app.py b/lib/cli/app.py > -index f487ab4..45256b8 100644 > ---- a/lib/cli/app.py > -+++ b/lib/cli/app.py > -@@ -239,10 +239,10 @@ def run(self): > - args = () > - try: > - returned = self.main(*args) > -- except Exception, e: > -- elif isinstance(e, self.reraise): > -- # raising the last exception preserves traceback > -- raise > -+ except self.reraise: > -+ # raising the last exception preserves traceback > -+ raise > -+ except Exception as e: > - returned = e > - > - return self.post_run(returned) > -@@ -420,7 +420,7 @@ def pre_run(self): > - """ > - try: > - ns = self.argparser.parse_args() > -- except SystemExit, e: > -+ except SystemExit as e: > - if self.exit_after_main: > - raise > - else: > diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in > deleted file mode 100644 > index e1ce3b99a6..0000000000 > --- a/package/python-pycli/Config.in > +++ /dev/null > @@ -1,7 +0,0 @@ > -config BR2_PACKAGE_PYTHON_PYCLI > - bool "python-pycli" > - help > - The cli package is a framework for making simple, correct > - command line applications in Python. > - > - https://pythonhosted.org/pyCLI/ > diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash > deleted file mode 100644 > index f0890e83a9..0000000000 > --- a/package/python-pycli/python-pycli.hash > +++ /dev/null > @@ -1,5 +0,0 @@ > -# md5 from https://pypi.python.org/pypi/pycli/json > -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz > -# Locally computed > -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz > -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py > diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk > deleted file mode 100644 > index 7aff1c6200..0000000000 > --- a/package/python-pycli/python-pycli.mk > +++ /dev/null > @@ -1,14 +0,0 @@ > -################################################################################ > -# > -# python-pycli > -# > -################################################################################ > - > -PYTHON_PYCLI_VERSION = 2.0.3 > -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz > -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 > -PYTHON_PYCLI_LICENSE = ISC-like > -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py > -PYTHON_PYCLI_SETUP_TYPE = setuptools > - > -$(eval $(python-package)) From arnout at mind.be Mon Mar 7 22:06:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:06:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/sord: fix build without threads In-Reply-To: <20220222203746.3139075-1-fontaine.fabrice@gmail.com> References: <20220222203746.3139075-1-fontaine.fabrice@gmail.com> Message-ID: On 22/02/2022 21:37, Fabrice Fontaine wrote: > Fix the following build failure without threads raised since the > addition of the package in commit > 0d4c8ce8a2f26989e0e2d95b977d60e450c090a9: > > /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread > > Fixes: > - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > .../0001-wscript-add-no-threads-option.patch | 59 +++++++++++++++++++ > package/sord/sord.mk | 4 ++ > 2 files changed, 63 insertions(+) > create mode 100644 package/sord/0001-wscript-add-no-threads-option.patch > > diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch > new file mode 100644 > index 0000000000..750ea8f4ad > --- /dev/null > +++ b/package/sord/0001-wscript-add-no-threads-option.patch > @@ -0,0 +1,59 @@ > +From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 22 Feb 2022 21:22:31 +0100 > +Subject: [PATCH] wscript: add -no-threads option > + > +Add -no-threads options to avoid the following build failure on embedded > +toolchains without threads support: > + > +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread > + > +Fixes: > + - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/drobilla/sord/pull/3] > +--- > + wscript | 5 ++++- > + 1 file changed, 4 insertions(+), 1 deletion(-) > + > +diff --git a/wscript b/wscript > +index fd8578e..d71d78c 100644 > +--- a/wscript > ++++ b/wscript > +@@ -35,6 +35,7 @@ def options(ctx): > + {'no-utils': 'do not build command line utilities', > + 'static': 'build static library', > + 'no-shared': 'do not build shared library', > ++ 'no-threads': 'disable threads', > + 'static-progs': 'build programs as static binaries'}) > + > + opt.add_option('--dump', type='string', default='', dest='dump', > +@@ -55,6 +56,7 @@ def configure(conf): > + > + conf.env.BUILD_UTILS = not Options.options.no_utils > + conf.env.BUILD_SHARED = not Options.options.no_shared > ++ conf.env.ENABLE_THREADS = not Options.options.no_threads > + conf.env.STATIC_PROGS = Options.options.static_progs > + conf.env.BUILD_STATIC = (Options.options.static or > + Options.options.static_progs) > +@@ -124,7 +126,7 @@ def configure(conf): > + conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') > + conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) > + > +- if conf.env.HAVE_PCRE: > ++ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: > + if conf.check(cflags=['-pthread'], mandatory=False): > + conf.env.PTHREAD_CFLAGS = ['-pthread'] > + if conf.env.CC_NAME != 'clang': > +@@ -160,6 +162,7 @@ def configure(conf): > + conf, > + {'Static library': bool(conf.env.BUILD_STATIC), > + 'Shared library': bool(conf.env.BUILD_SHARED), > ++ 'Threads': bool(conf.env.ENABLE_THREADS), > + 'Utilities': bool(conf.env.BUILD_UTILS), > + 'Unit tests': bool(conf.env.BUILD_TESTS), > + 'Debug dumping': dump}) > +-- > +2.34.1 > + > diff --git a/package/sord/sord.mk b/package/sord/sord.mk > index f805805e9d..c06ef9c55c 100644 > --- a/package/sord/sord.mk > +++ b/package/sord/sord.mk > @@ -22,4 +22,8 @@ ifeq ($(BR2_STATIC_LIBS),y) > SORD_CONF_OPTS += --static --no-shared --static-progs > endif > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > +SORD_CONF_OPTS += --no-threads > +endif > + > $(eval $(waf-package)) From arnout at mind.be Mon Mar 7 22:08:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:08:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.6.0 In-Reply-To: References: <20220222204034.3139362-1-fontaine.fabrice@gmail.com> <20220306213212.GH228549@scaer> Message-ID: <776aff8d-84bc-4611-8ead-cdb1bb752234@mind.be> On 06/03/2022 22:43, Fabrice Fontaine wrote: > Yann, > > Le dim. 6 mars 2022 ? 22:32, Yann E. MORIN a ?crit : >> >> Fabrice, All, >> >> On 2022-02-22 21:40 +0100, Fabrice Fontaine spake thusly: >>> 2.6.0 is an maintenance and security release. >>> >>> https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 >> >> You claim 'security bump' in the title, but the announcement does not >> seem to identify any actual security fix, as compared to 2.5.0 which did >> explicitly list security fixes: >> https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 >> >> So, I don;t think this is material for master, is it? > > I don't know, indeed the announcement doesn't identify security fixes > but the first sentence is "2.6.0 is an maintenance and security > release." > At least, a crash with wayland is fixed with: > https://github.com/FreeRDP/FreeRDP/issues/7426 > > So feel free to apply it to next or master. It's indeed maintenance branch, not main development, so good for master. I've removed the "security" part though. Applied to master, thanks. Regards, Arnout > >> >> Regards, >> Yann E. MORIN. >> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> package/freerdp/freerdp.hash | 4 ++-- >>> package/freerdp/freerdp.mk | 2 +- >>> 2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash >>> index e31b8d5b96..780061bdbb 100644 >>> --- a/package/freerdp/freerdp.hash >>> +++ b/package/freerdp/freerdp.hash >>> @@ -1,5 +1,5 @@ >>> -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 >>> -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz >>> +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 >>> +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz >>> >>> # Locally calculated >>> sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE >>> diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk >>> index c536f6cb1c..edbfb6801a 100644 >>> --- a/package/freerdp/freerdp.mk >>> +++ b/package/freerdp/freerdp.mk >>> @@ -4,7 +4,7 @@ >>> # >>> ################################################################################ >>> >>> -FREERDP_VERSION = 2.5.0 >>> +FREERDP_VERSION = 2.6.0 >>> FREERDP_SITE = https://pub.freerdp.com/releases >>> FREERDP_DEPENDENCIES = libglib2 openssl zlib >>> FREERDP_LICENSE = Apache-2.0 >>> -- >>> 2.34.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> -- >> .-----------------.--------------------.------------------.--------------------. >> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | >> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | >> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | >> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | >> '------------------------------^-------^------------------^--------------------' > > Best Regards, > > Fabrice > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Mon Mar 7 22:09:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:09:02 +0100 Subject: [Buildroot] [PATCH v2] package/qt5/qt5webkit: needs OpenSSL In-Reply-To: <20220222210024.6013-1-abrodkin@synopsys.com> References: <20220222210024.6013-1-abrodkin@synopsys.com> Message-ID: <9dd7ff0e-ad7b-6407-e569-dc12a8f55e6d@mind.be> On 22/02/2022 22:00, Alexey Brodkin via buildroot wrote: > W/o OpenSSL QT5Webkit fails to build that way: > -------------------------------->8----------------------------- > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ?static bool WebCore::ResourceRequest::alpnIsSupported()?: > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ?QSslSocket? has not been declared > 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && > | ^~~~~~~~~~ > .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ?QSslSocket? has not been declared > 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); > | ^~~~~~~~~~ > -------------------------------->8----------------------------- > > Signed-off-by: Alexey Brodkin > Cc: Fabrice Fontaine > Cc: James Hilliard > Cc: Peter Seiderer > Cc: Yann E. MORIN Applied to master, thanks. Regards, Arnout > --- > > Changes v1 -> v2: > > * Added "openssl" to QT5WEBKIT_DEPENDENCIES, thanks Yann for > spotting this one. > > Note that I interntionally added "openssl" not following > alphabetic order because: > > 1. Existing dependencies are already a bit shufffled > 2. I wanted to keep this diff as small as possible, w/o > re-shuffling multiple lines. If really needed we may do > reordering in a separate patch. > > --- > package/qt5/qt5webkit/Config.in | 1 + > package/qt5/qt5webkit/qt5webkit.mk | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in > index ed87efca95..26c3897d1d 100644 > --- a/package/qt5/qt5webkit/Config.in > +++ b/package/qt5/qt5webkit/Config.in > @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT > select BR2_PACKAGE_JPEG > select BR2_PACKAGE_LEVELDB > select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_QT5BASE_ICU > select BR2_PACKAGE_QT5BASE_GUI > select BR2_PACKAGE_QT5BASE_WIDGETS > diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk > index 2e96acc00f..c9b354e725 100644 > --- a/package/qt5/qt5webkit/qt5webkit.mk > +++ b/package/qt5/qt5webkit/qt5webkit.mk > @@ -10,7 +10,7 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz > QT5WEBKIT_DEPENDENCIES = \ > host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ > gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ > - qt5sensors qt5webchannel sqlite webp woff2 > + openssl qt5sensors qt5webchannel sqlite webp woff2 > QT5WEBKIT_INSTALL_STAGING = YES > > QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 From arnout at mind.be Mon Mar 7 22:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:09:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory In-Reply-To: <20220222213202.642708-1-ju.o@free.fr> References: <20220222213202.642708-1-ju.o@free.fr> Message-ID: On 22/02/2022 22:32, Julien Olivain wrote: > When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd > (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start > with a permission error. See output of command: > > journalctl --unit=mysqld > > Which shows: > > systemd[1]: Starting MySQL database server... > install[102]: install: can't create directory '/var/log/mysql': Permission denied > systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE > > Since the service file includes the "User=mysql" directive, the > "ExecStartPre=" is executed as this user, which does not have > permission to create a directory in "/var/log". > > This commit fixes this issue by adding the "!" prefix, which will > execute the command with full privileges. See the systemd.service manual > page entry for "ExecStart=", table "Special executable prefixes": > https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= > or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 > > Moreover, the "mysql_install_db" invocation does not need this special > prefix, as the "/var/lib/mysql" directory on target is already owned > by the "mysql" user. The "chown" command is also useless and is > removed in this commit. > > Reported-by: Gilles Talis > Signed-off-by: Julien Olivain Applied to master, thanks. Excellent commit message BTW. Regards, Arnout > --- > package/mariadb/mysqld.service | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service > index d9ea74ebc3..537430e9a2 100644 > --- a/package/mariadb/mysqld.service > +++ b/package/mariadb/mysqld.service > @@ -2,8 +2,8 @@ > Description=MySQL database server > > [Service] > -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' > -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql > +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' > +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql > ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log > Restart=always > User=mysql From arnout at mind.be Mon Mar 7 21:53:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:53:39 +0100 Subject: [Buildroot] [git commit] package/python-treq: fix dependencies Message-ID: <20220307220126.D663282DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5b4496c425576e4e444b65474d397aeb4a7cd42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-treq needs TLS support in twisted so select BR2_PACKAGE_PYTHON_TWISTED_TLS moreover it doesn't depend directly on service_identity and pyOpenSSL since version 17.3.0 and https://github.com/twisted/treq/commit/ef2ac7ea2b74774adb9fef7675facc6017bfda89 Finally, python-idna was never a direct dependency of python-treq Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-treq/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index f781b37305..7c02a35638 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,16 +1,13 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" - # python-pyopenssl -> python-cryptography + # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - # python-idna, python-pyopenssl -> python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help treq is an HTTP library inspired by requests but written on top of Twisted's Agents. It provides a simple, higher level From arnout at mind.be Mon Mar 7 21:52:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:52:33 +0100 Subject: [Buildroot] [git commit] package/osm2pgsql: disable external fmt Message-ID: <20220307220126.CB48E82941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4811802acbd16488adc32a7e340067700cec85c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master osm2pgsql doesn't support fmt > 8.0 yet resulting in the following build failure since bump of fmt to version 8.1.1 in commit ec7fd50d08690a383fec40748ac9b78c3f764316: /home/buildroot/autobuild/instance-0/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/fmt/core.h:1728:7: error: static assertion failed: Cannot format an argument. To make type T formattable provide a formatter specialization: https://fmt.dev/latest/api.html#udt 1728 | formattable, | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/5af1a0ea176559a5dc787ba945a3a83823f5b1bb Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/osm2pgsql/Config.in | 5 ++--- package/osm2pgsql/osm2pgsql.mk | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 315f496d8e..e903e92c49 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,17 +1,16 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" - depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero + depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem - depends on BR2_USE_WCHAR # boost, fmt, libosmium + depends on BR2_USE_WCHAR # boost, libosmium depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBOSMIUM select BR2_PACKAGE_PROTOZERO select BR2_PACKAGE_ZLIB diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index b00976d28b..d389fff590 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -10,12 +10,13 @@ OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING OSM2PGSQL_SUPPORTS_IN_SOURCE_BUILD = NO -OSM2PGSQL_DEPENDENCIES = boost bzip2 expat fmt libosmium postgresql protozero zlib +OSM2PGSQL_DEPENDENCIES = boost bzip2 expat libosmium postgresql protozero zlib +# fmt > 8.0 is not yet supported OSM2PGSQL_CONF_OPTS = \ -DBUILD_TESTS=OFF \ -DBUILD_COVERAGE=OFF \ - -DEXTERNAL_FMT=ON \ + -DEXTERNAL_FMT=OFF \ -DEXTERNAL_LIBOSMIUM=ON \ -DEXTERNAL_PROTOZERO=ON From arnout at mind.be Mon Mar 7 21:55:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:55:57 +0100 Subject: [Buildroot] [git commit] package/glib-networking: security bump to version 2.70.1 Message-ID: <20220307220126.E072183235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fc9d586a3acd091653da3a62f471041d329d6bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a minor release which fixes a couple of crashes and an incorrect case of TLS certificate velidation when built with the OpenSSL backend. Release notes: https://gitlab.gnome.org/GNOME/glib-networking/-/blob/b0d45b17f745088256c9ad1ae9a7e2467dec6286/NEWS Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/glib-networking/glib-networking.hash | 4 ++-- package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 6a53b436b0..347ef6777c 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum -sha256 66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35 glib-networking-2.70.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum +sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index 53280700bc..f74e520d31 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -5,7 +5,7 @@ ################################################################################ GLIB_NETWORKING_VERSION_MAJOR = 2.70 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES From arnout at mind.be Mon Mar 7 22:06:49 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:06:49 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.6.0 Message-ID: <20220307220127.0FF1582941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1ff6a67739b29b79c81ee6bc14bd8c94a0a85c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 2.6.0 is an maintenance and security release. https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index e31b8d5b96..780061bdbb 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.5.0.tar.gz.sha256 -sha256 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b freerdp-2.5.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 +sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 5f6ae56d1d..c8978db6ce 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.5.0 +FREERDP_VERSION = 2.6.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From arnout at mind.be Mon Mar 7 22:07:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:07:41 +0100 Subject: [Buildroot] [git commit] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220307220127.258D482DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd03d4f057bdbd343f78360bd732df1b47d774a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain Tested-By: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql From arnout at mind.be Mon Mar 7 21:58:21 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:58:21 +0100 Subject: [Buildroot] [git commit] package/sord: fix build without threads Message-ID: <20220307220127.05E2782DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44306369e9821ee5c9a12114ecd4296b0e374ad4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without threads raised since the addition of the package in commit 0d4c8ce8a2f26989e0e2d95b977d60e450c090a9: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread Fixes: - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../sord/0001-wscript-add-no-threads-option.patch | 59 ++++++++++++++++++++++ package/sord/sord.mk | 4 ++ 2 files changed, 63 insertions(+) diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch new file mode 100644 index 0000000000..750ea8f4ad --- /dev/null +++ b/package/sord/0001-wscript-add-no-threads-option.patch @@ -0,0 +1,59 @@ +From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Feb 2022 21:22:31 +0100 +Subject: [PATCH] wscript: add -no-threads option + +Add -no-threads options to avoid the following build failure on embedded +toolchains without threads support: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread + +Fixes: + - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/drobilla/sord/pull/3] +--- + wscript | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index fd8578e..d71d78c 100644 +--- a/wscript ++++ b/wscript +@@ -35,6 +35,7 @@ def options(ctx): + {'no-utils': 'do not build command line utilities', + 'static': 'build static library', + 'no-shared': 'do not build shared library', ++ 'no-threads': 'disable threads', + 'static-progs': 'build programs as static binaries'}) + + opt.add_option('--dump', type='string', default='', dest='dump', +@@ -55,6 +56,7 @@ def configure(conf): + + conf.env.BUILD_UTILS = not Options.options.no_utils + conf.env.BUILD_SHARED = not Options.options.no_shared ++ conf.env.ENABLE_THREADS = not Options.options.no_threads + conf.env.STATIC_PROGS = Options.options.static_progs + conf.env.BUILD_STATIC = (Options.options.static or + Options.options.static_progs) +@@ -124,7 +126,7 @@ def configure(conf): + conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') + conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) + +- if conf.env.HAVE_PCRE: ++ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: + if conf.check(cflags=['-pthread'], mandatory=False): + conf.env.PTHREAD_CFLAGS = ['-pthread'] + if conf.env.CC_NAME != 'clang': +@@ -160,6 +162,7 @@ def configure(conf): + conf, + {'Static library': bool(conf.env.BUILD_STATIC), + 'Shared library': bool(conf.env.BUILD_SHARED), ++ 'Threads': bool(conf.env.ENABLE_THREADS), + 'Utilities': bool(conf.env.BUILD_UTILS), + 'Unit tests': bool(conf.env.BUILD_TESTS), + 'Debug dumping': dump}) +-- +2.34.1 + diff --git a/package/sord/sord.mk b/package/sord/sord.mk index f805805e9d..c06ef9c55c 100644 --- a/package/sord/sord.mk +++ b/package/sord/sord.mk @@ -22,4 +22,8 @@ ifeq ($(BR2_STATIC_LIBS),y) SORD_CONF_OPTS += --static --no-shared --static-progs endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +SORD_CONF_OPTS += --no-threads +endif + $(eval $(waf-package)) From arnout at mind.be Mon Mar 7 22:07:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:07:41 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5webkit: needs OpenSSL Message-ID: <20220307220127.19CE182941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f5be21db989acbb41b0f432d0f72bc7cc458b24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master W/o OpenSSL QT5Webkit fails to build that way: -------------------------------->8----------------------------- .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp: In static member function ???static bool WebCore::ResourceRequest::alpnIsSupported()???: .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:68:12: error: ???QSslSocket??? has not been declared 68 | return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && | ^~~~~~~~~~ .../build/qt5webkit-5.212.0-alpha4/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp:69:9: error: ???QSslSocket??? has not been declared 69 | QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); | ^~~~~~~~~~ -------------------------------->8----------------------------- Signed-off-by: Alexey Brodkin Cc: Fabrice Fontaine Cc: James Hilliard Cc: Peter Seiderer Cc: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/Config.in | 1 + package/qt5/qt5webkit/qt5webkit.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index ed87efca95..26c3897d1d 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_JPEG select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 9012a588d4..6912359674 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,7 @@ QT5WEBKIT_SOURCE = qtwebkit-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python3 host-ruby gstreamer1 \ gst1-plugins-base icu leveldb jpeg libpng libxml2 libxslt qt5location \ - qt5sensors qt5webchannel sqlite webp woff2 + openssl qt5sensors qt5webchannel sqlite webp woff2 QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 From arnout at mind.be Mon Mar 7 21:57:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 22:57:18 +0100 Subject: [Buildroot] [git commit] package/python-pycli: drop package Message-ID: <20220307220126.F000182941@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e9565f831da2377622c79bfd6e5be37f7baaa7c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Even with the two upstream patches added in commit b2e6e376a2d7551ccf146855ec4e99a65c35bd16, python-pycli still raises the following build failure since bump of python3 to version 3.10.1 in commit 25b1fc2898d68ddf2674b14c738045875fc5a2dc due to the new "Multiple Exception types without parentheses" exception (https://docs.python.org/3/whatsnew/3.10.html): error: File "/usr/lib/python3.10/site-packages/cli/test.py", line 142 except raises, e: ^^^^^^^^^ SyntaxError: multiple exception types must be parenthesized So drop the package as the last release was made 10 years ago. Fixes: - http://autobuild.buildroot.org/results/6112e1830ce608abcea4a26b659c10e5ff09a66a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 7 ++++ DEVELOPERS | 1 - package/Config.in | 1 - ...-re-raise-exceptions-in-wrapped-functions.patch | 26 -------------- ...-except-statement-changed-slightly-in-2-6.patch | 41 ---------------------- package/python-pycli/Config.in | 7 ---- package/python-pycli/python-pycli.hash | 5 --- package/python-pycli/python-pycli.mk | 14 -------- 8 files changed, 7 insertions(+), 95 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b90b9dbcbc..3b066bbf72 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -158,6 +158,13 @@ config BR2_PACKAGE_WESTON_FBDEV help fbdev compositor was deprecated in weston 10.0.0. +config BR2_PACKAGE_PYTHON_PYCLI + bool "python-pycli removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with python + 3.10 and is not maintained anymore (no release since 2012). + config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL bool "bpftool was moved" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index b7a7c8771c..b5183711b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1061,7 +1061,6 @@ N: Geoff Levand F: package/flannel/ N: Geoffrey Ragot -F: package/python-pycli/ F: package/python-pyyaml/ N: Gerome Burlats diff --git a/package/Config.in b/package/Config.in index 8d2d550a64..517e66cce7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1144,7 +1144,6 @@ menu "External python modules" source "package/python-pybind/Config.in" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" - source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" diff --git a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch b/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch deleted file mode 100644 index 7ac9d7af9f..0000000000 --- a/package/python-pycli/0001-Fix-problem-with-re-raise-exceptions-in-wrapped-functions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Tue, 9 Jun 2020 11:50:41 -0500 -Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions. - -[Retrieved from: -https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index 7b6db52..f487ab4 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -240,6 +240,9 @@ def run(self): - try: - returned = self.main(*args) - except Exception, e: -+ elif isinstance(e, self.reraise): -+ # raising the last exception preserves traceback -+ raise - returned = e - - return self.post_run(returned) diff --git a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch b/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch deleted file mode 100644 index 75869d6d23..0000000000 --- a/package/python-pycli/0002-except-statement-changed-slightly-in-2-6.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001 -From: mmbutter -Date: Thu, 11 Jun 2020 15:50:03 -0500 -Subject: [PATCH] except statement changed slightly in 2.6. This could cause - problems in newer versions. Updated to the new format. - -[Retrieved from: -https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e] -Signed-off-by: Fabrice Fontaine ---- - lib/cli/app.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/cli/app.py b/lib/cli/app.py -index f487ab4..45256b8 100644 ---- a/lib/cli/app.py -+++ b/lib/cli/app.py -@@ -239,10 +239,10 @@ def run(self): - args = () - try: - returned = self.main(*args) -- except Exception, e: -- elif isinstance(e, self.reraise): -- # raising the last exception preserves traceback -- raise -+ except self.reraise: -+ # raising the last exception preserves traceback -+ raise -+ except Exception as e: - returned = e - - return self.post_run(returned) -@@ -420,7 +420,7 @@ def pre_run(self): - """ - try: - ns = self.argparser.parse_args() -- except SystemExit, e: -+ except SystemExit as e: - if self.exit_after_main: - raise - else: diff --git a/package/python-pycli/Config.in b/package/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package/python-pycli/python-pycli.hash b/package/python-pycli/python-pycli.hash deleted file mode 100644 index f0890e83a9..0000000000 --- a/package/python-pycli/python-pycli.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pycli/json -md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -# Locally computed -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz -sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/package/python-pycli/python-pycli.mk b/package/python-pycli/python-pycli.mk deleted file mode 100644 index 7aff1c6200..0000000000 --- a/package/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = 2.0.3 -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1 -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) From arnout at mind.be Mon Mar 7 22:25:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:25:38 +0100 Subject: [Buildroot] [PATCH v3, 1/1] package/ghostscript: disable tesseract without threads In-Reply-To: <20220223202648.3398307-1-fontaine.fabrice@gmail.com> References: <20220223202648.3398307-1-fontaine.fabrice@gmail.com> Message-ID: <9622b23e-22d8-c3c2-7255-d49feb46f552@mind.be> On 23/02/2022 21:26, Fabrice Fontaine wrote: > ghostscript embeds a local copy of tesseract-ocr which is enabled by > default since version 9.53.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef > > Since version 9.55.0 and > https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, > ghostscript expects that tesseract is disabled if threads are not > available resulting in the following build failure since commit > 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: > > configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build > > So disable tesseract if threads are not available. It should be noted > that there is no way to tell ghostscript to use a system provided > tesseract-ocr package. > > Fixes: > - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > Changes v2 -> v3 (after review of Arnout Vandecappelle): > - Only disable tesseract without threads > > Changes v1 -> v2: > - Unconditionally disable tesseract > > package/ghostscript/ghostscript.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk > index 24a0c489a8..02cb35fcfc 100644 > --- a/package/ghostscript/ghostscript.mk > +++ b/package/ghostscript/ghostscript.mk > @@ -83,4 +83,8 @@ else > GHOSTSCRIPT_CONF_OPTS += --without-x > endif > > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > +GHOSTSCRIPT_CONF_OPTS += --without-tesseract > +endif > + > $(eval $(autotools-package)) From arnout at mind.be Mon Mar 7 22:27:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:27:00 +0100 Subject: [Buildroot] [PATCH 1/1] utils/checkpackagelib/lib_mk.py: check CONF_OPTS In-Reply-To: <20220223203631.3398950-1-fontaine.fabrice@gmail.com> References: <20220223203631.3398950-1-fontaine.fabrice@gmail.com> Message-ID: On 23/02/2022 21:36, Fabrice Fontaine wrote: > As already done for {FOO}_DEPENDENCIES in commit > 4910a175b3f1f4b55ff257a75945d8ffb14a4ceb, check that {FOO}_CONF_OPTS are > never overridden in a conditional > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. upmpdcli.mk failed this check, so I also pushed a fix. ?Regards, ?Arnout > --- > utils/checkpackagelib/lib_mk.py | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py > index 153754b6f1..b50a19ac62 100644 > --- a/utils/checkpackagelib/lib_mk.py > +++ b/utils/checkpackagelib/lib_mk.py > @@ -90,6 +90,7 @@ class OverriddenVariable(_CheckFunction): > r"_SOURCE\s*=\s*", > r"_VERSION\s*=\s*"]))) > FORBIDDEN_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ > + r"_CONF_OPTS\s*=\s*", > r"_DEPENDENCIES\s*=\s*"]))) > > def before(self): From arnout at mind.be Mon Mar 7 22:27:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:27:28 +0100 Subject: [Buildroot] [PATCH 1/2] linux: bump CIP kernel to version 5.10.100-cip2 In-Reply-To: <20220224113735.4088631-1-angelo@amarulasolutions.com> References: <20220224113735.4088631-1-angelo@amarulasolutions.com> Message-ID: On 24/02/2022 12:37, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci ?Both applied to master, thanks. ?Regards, ?Arnout > --- > linux/Config.in | 4 ++-- > linux/linux.hash | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in > index 13d99bd09d..c454a89fba 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION > bool "Latest version (5.15)" > > config BR2_LINUX_KERNEL_LATEST_CIP_VERSION > - bool "Latest CIP SLTS version (5.10.83-cip1)" > + bool "Latest CIP SLTS version (5.10.100-cip2)" > help > CIP launched in the spring of 2016 to address the needs of > organizations in industries such as power generation and > @@ -126,7 +126,7 @@ endif > config BR2_LINUX_KERNEL_VERSION > string > default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION > - default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION > + default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION > default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION > default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ > if BR2_LINUX_KERNEL_CUSTOM_VERSION > diff --git a/linux/linux.hash b/linux/linux.hash > index d0813e5db4..8b689f122b 100644 > --- a/linux/linux.hash > +++ b/linux/linux.hash > @@ -9,7 +9,7 @@ sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux- > sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz > sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz > # Locally computed > -sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz > +sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz > sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz > > # Licenses hashes From arnout at mind.be Mon Mar 7 22:15:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:15:46 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib/lib_mk.py: check CONF_OPTS Message-ID: <20220307221917.114A882DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dc48e8b9d832889edbeeed28c2dcf0a7bf01718 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As already done for {FOO}_DEPENDENCIES in commit 4910a175b3f1f4b55ff257a75945d8ffb14a4ceb, check that {FOO}_CONF_OPTS are never overridden in a conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 153754b6f1..b50a19ac62 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -90,6 +90,7 @@ class OverriddenVariable(_CheckFunction): r"_SOURCE\s*=\s*", r"_VERSION\s*=\s*"]))) FORBIDDEN_OVERRIDDEN = re.compile(r"^[A-Z0-9_]+({})".format("|".join([ + r"_CONF_OPTS\s*=\s*", r"_DEPENDENCIES\s*=\s*"]))) def before(self): From arnout at mind.be Mon Mar 7 22:15:14 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:15:14 +0100 Subject: [Buildroot] [git commit] package/ghostscript: disable tesseract without threads Message-ID: <20220307221917.0892581375@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4adbfaf2e6153ad0e811b4debcf945ff5788c76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ghostscript embeds a local copy of tesseract-ocr which is enabled by default since version 9.53.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=7322ef87546c55b29056c1d96d8bdbb7f3ba53ef Since version 9.55.0 and https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=5459f7aca1ded3b7cf96c339a2419f418aa406c7, ghostscript expects that tesseract is disabled if threads are not available resulting in the following build failure since commit 7a4944569ce83b0b7b0cabd6e8aa184b8cb72a22: configure: error: Threading disabled or not available. Tesseract OCR relies on threading. Rerun configure with "--without-tesseract" to exclude OCR from the build So disable tesseract if threads are not available. It should be noted that there is no way to tell ghostscript to use a system provided tesseract-ocr package. Fixes: - http://autobuild.buildroot.org/results/fd35a47b2a77cf57c243ec1c88802b53ddca8f52 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ghostscript/ghostscript.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 24a0c489a8..02cb35fcfc 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -83,4 +83,8 @@ else GHOSTSCRIPT_CONF_OPTS += --without-x endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +GHOSTSCRIPT_CONF_OPTS += --without-tesseract +endif + $(eval $(autotools-package)) From arnout at mind.be Mon Mar 7 22:22:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:22:20 +0100 Subject: [Buildroot] [git commit] linux: bump CIP RT kernel to version 5.10.100-cip2-rt2 Message-ID: <20220307221917.2E22082DD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c44600c104f04d2d191f6e0e6320b4d5ff8b967 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 68355f1c48..36744c5337 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.83-cip1-rt1)" + bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 4dcd515d9a..758fdbf856 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz -sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz +sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From arnout at mind.be Mon Mar 7 22:21:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:21:56 +0100 Subject: [Buildroot] [git commit] linux: bump CIP kernel to version 5.10.100-cip2 Message-ID: <20220307221917.2424D81375@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af2278c42a862654a18d5692fba96efaf4cb3979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index df5261e5ff..68355f1c48 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.83-cip1)" + bool "Latest CIP SLTS version (5.10.100-cip2)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.83-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.83-cip1-rt1" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 01325348ef..4dcd515d9a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 5738dcf020ff75fb6e43d6d1a8b572d2f1fe58c08b31f822eb42fb91d6bdc98f linux-cip-5.10.83-cip1.tar.gz +sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz sha256 2395443c5f960e5c6343f70480209d2530da27aa6f0299412e0f4b7128fccb7c linux-cip-5.10.83-cip1-rt1.tar.gz # Licenses hashes From arnout at mind.be Mon Mar 7 22:17:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 7 Mar 2022 23:17:23 +0100 Subject: [Buildroot] [git commit] package/upmpdcli: append to _CONF_OPTS Message-ID: <20220307221917.1AC5083235@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f64e13a6a6e861ae8a03dc8e93fe079f09c443aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master check-package now gives a warning about this. It's not a problem at the moment, but it's a risk if an unconditional setting of _CONF_OPTS is done earlier in the file. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/upmpdcli/upmpdcli.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index d1c0aef912..2f001c51ee 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -12,7 +12,7 @@ UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp # Disable spotify plugin which requires dlfcn.h ifeq ($(BR2_STATIC_LIBS),y) -UPMPDCLI_CONF_OPTS = --disable-spotify +UPMPDCLI_CONF_OPTS += --disable-spotify endif # Upmpdcli only runs if user upmpdcli exists From arnout at mind.be Mon Mar 7 22:33:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:33:10 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> Message-ID: <813a014c-8aae-990e-cd76-f961a9be9bf7@mind.be> On 07/03/2022 22:49, Romain Naour wrote: > Hello Peter, > > Le 07/03/2022 ? 20:54, Peter Korsgaard a ?crit?: >>>>>>> "Romain" == Romain Naour writes: >> >> > To use time_t 64-bit for glibc >= 2.34 toolchains we have to set both >> > _FILE_OFFSET_BITS=64 and _TIME_BITS=64 for glibc toolchains. Buildroot >> > already define _FILE_OFFSET_BITS=64 since 2008 [1] before the first >> > release tag 2009.02. >> >> > _TIME_BITS is not needed for musl libc since it already year2038 >> > ready [2]. >> >> > The uclibc-ng libc only support time_t 32-bit (long int) so it will be >> > affected by the year2038 issue [3]. >> >> > Fixes (in French, chapter Buildroot 2022 and GlibC): >> > https://www.blaess.fr/christophe/2038 >> >> > Runtime tested with qemu_arm_vexpress_defconfig and the Bootlin glibc >> > bleeding-edge 2021.11-1 toolchain. >> >> > Before: >> > # date >> > Tue Jan 19 03:14:07 UTC 2038 >> > # date >> > Thu Jan 1 00:00:00 UTC 1970 >> >> > After: >> > # date >> > Tue Jan 19 03:14:07 UTC 2038 >> > # date >> > Tue Jan 19 03:14:08 UTC 2038 >> > # date >> > Tue Jan 19 03:14:09 UTC 2038 >> >> Ahh, good catch. Maybe something to add a runtime test for? >> >> Committed, thanks. > > Sorry but I guess this patch needs more testing. > >> >> > [1] 60b5eee76edfa153ef118d2788c74ac8da1497a0 >> > [2] https://git.musl-libc.org/cgit/musl/tree/include/alltypes.h.in?h=v1.2.2#n3 >> > [3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/include/time.h?h=v1.0.40#n75 >> > https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libc/sysdeps/linux/common/bits/types.h?h=v1.0.40#n106 >> >> > Signed-off-by: Romain Naour >> > Cc: Christophe Blaess >> > --- >> > package/Makefile.in | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> >> > diff --git a/package/Makefile.in b/package/Makefile.in >> > index 508ea7c366..cde050ca82 100644 >> > --- a/package/Makefile.in >> > +++ b/package/Makefile.in >> > @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) >> > TARGET_HARDENED += -D_FORTIFY_SOURCE=2 >> > endif >> >> > -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 >> > +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > > I noticed that glibc 2.34 stop the build if _TIME_BITS is set without > _FILE_OFFSET_BITS. > What if something (build system) unset _FILE_OFFSET_BITS ? Then there's something wrong with that package and it needs to be fixed. > There is something weird with libzlib package. gzguts.h has this: #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 # endif # ifdef _FILE_OFFSET_BITS # undef _FILE_OFFSET_BITS # endif #endif Why, I have no idea... Regards, Arnout > > I suggest to apply for next first and backport it latter to the stable branch. > > Best regards, > Romain > > >> > TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) >> > TARGET_CXXFLAGS = $(TARGET_CFLAGS) >> > TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) >> > -- >> >> > 2.35.1 >> >> > _______________________________________________ >> > buildroot mailing list >> > buildroot at buildroot.org >> > https://lists.buildroot.org/mailman/listinfo/buildroot >> >> > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Mon Mar 7 22:33:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 7 Mar 2022 23:33:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/oprofile: drop custom install rules Message-ID: <20220307223355.945328-1-fontaine.fabrice@gmail.com> Drop custom install rules which have added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine --- package/oprofile/oprofile.mk | 41 ------------------------------------ 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) -- 2.34.1 From arnout at mind.be Mon Mar 7 22:36:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 7 Mar 2022 23:36:17 +0100 Subject: [Buildroot] cannot make the device_table In-Reply-To: References: Message-ID: <6aaa39df-836f-055e-6f40-a077f690b669@mind.be> On 06/03/2022 13:46, Jacques Samoun wrote: > Hello, > despite all my tries, i just cannot make the "device_table" feature work as > described in the manual. > Basically, i am trying to set 666 rights to /dev/tty + add a dialout group, so i > created the following file (device_table.txt" > > /dev/tty c 666 root dialout 5 0 - - - > > and have set the correct variable in menuconfig. I know for sure that the build > has handled this file ... but looking at the /dev/tty, it is clear that nothing > has happened, the permissions are still 600 and the dialout group has not been set. When you say "looking at /dev/tty", do you mean looking at the contents of the tarball (or rootfs), or do you mean what appears after boot? Unless you have a very specific configuration (i.e. device managemnt: Static using device table), /dev will be a devtmpfs and the kernel will override anything you have set in device_table. So in that case you need dynamic handling using udev or mdev. Regards, Arnout > > Am I missing something ? > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Mon Mar 7 22:36:32 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 07 Mar 2022 22:36:32 +0000 Subject: [Buildroot] [Bug 14641] oprofile can not find the events files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 --- Comment #1 from Fabrice Fontaine --- Hi, Thanks for your bug report. Can you confirm that the following patch fixes your issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220307223355.945328-1-fontaine.fabrice at gmail.com/ ? Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Mon Mar 7 22:39:12 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 7 Mar 2022 23:39:12 +0100 Subject: [Buildroot] [PATCH] configs/microchip_sam9x60ek_mmc_dev_defconfig: fix build failure due to previous wrong commit In-Reply-To: <67313303-db84-93cd-d96b-56db0c73976b@mind.be> References: <20220218110914.3098061-1-giulio.benetti@benettiengineering.com> <67313303-db84-93cd-d96b-56db0c73976b@mind.be> Message-ID: <5226fc1a-8e39-26ea-8ef8-ad435bc317f8@benettiengineering.com> On 07/03/22 22:46, Arnout Vandecappelle wrote: > > > On 18/02/2022 12:09, Giulio Benetti wrote: >> Commit 616ba9c90b014637dc9925fa442a0af4a11f04b8 extended rootfs size, but >> the option was listed in the wrong place. Options must be set in the order > > Order doesn't matter in kconfig. The problem was the lack of quotes. Oh, maybe I was told only because of style some time ago. I didn't see the quotes.. probably I was/am cooked. > Updated the commit message and applied to master, thanks. Thank you! -- Giulio Benetti Benetti Engineering sas > Regards, > Arnout > >> they are specified by Config.in files. So let's move >> BR2_TARGET_ROOTFS_EXT2_SIZE="120M" right after BR2_TARGET_ROOTFS_EXT2_4=y >> as it should be. >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784289 >> >> Signed-off-by: Giulio Benetti >> --- >> configs/microchip_sam9x60ek_mmc_dev_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig >> index 00ccd784b5..06e03967c4 100644 >> --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig >> +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig >> @@ -7,7 +7,6 @@ BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" >> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" >> -BR2_TARGET_ROOTFS_EXT2_SIZE=120M >> BR2_LINUX_KERNEL=y >> BR2_LINUX_KERNEL_CUSTOM_TARBALL=y >> BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" >> @@ -67,6 +66,7 @@ BR2_PACKAGE_HTOP=y >> BR2_PACKAGE_VIM=y >> BR2_TARGET_ROOTFS_EXT2=y >> BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" >> BR2_TARGET_AT91BOOTSTRAP3=y >> BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y >> BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap-v4.0.1.tar.gz" > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From christian at paral.in Mon Mar 7 22:42:26 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 14:42:26 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build Message-ID: <20220307224226.1375696-1-christian@paral.in> Tested on Pi4 Model B (aarch64). Note: rpi-userland and upstream rpi os now support arm64. Signed-off-by: Christian Stewart --- package/rpi-userland/Config.in | 4 ++-- package/rpi-userland/rpi-userland.mk | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 342faf26e3..81f3588822 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_RPI_USERLAND bool "rpi-userland" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO endif comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..8a05bf2b51 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,10 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_aarch64),y) +RPI_USERLAND_CONF_OPTS += -DARM64=ON +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON -- 2.35.1 From ps.report at gmx.net Mon Mar 7 22:54:17 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 7 Mar 2022 23:54:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: <20220307224226.1375696-1-christian@paral.in> References: <20220307224226.1375696-1-christian@paral.in> Message-ID: <20220307235417.279e7751@gmx.net> Hello Christian, On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: > Tested on Pi4 Model B (aarch64). > > Note: rpi-userland and upstream rpi os now support arm64. All issues/questions solved since discussion [1], [2] about missing libraries/features? As far as I know rpi os graphic support is based on mesa3d v3d/vc4 instead of rpi-userland libraries? Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587538.html [2] http://lists.busybox.net/pipermail/buildroot/2021-October/626080.html > > Signed-off-by: Christian Stewart > --- > package/rpi-userland/Config.in | 4 ++-- > package/rpi-userland/rpi-userland.mk | 4 ++++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in > index 342faf26e3..81f3588822 100644 > --- a/package/rpi-userland/Config.in > +++ b/package/rpi-userland/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_RPI_USERLAND > bool "rpi-userland" > - depends on BR2_arm > + depends on BR2_arm || BR2_aarch64 > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO > endif > > comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" > - depends on BR2_arm > + depends on BR2_arm || BR2_aarch64 > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ > BR2_STATIC_LIBS > diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk > index 84050b6df3..8a05bf2b51 100644 > --- a/package/rpi-userland/rpi-userland.mk > +++ b/package/rpi-userland/rpi-userland.mk > @@ -13,6 +13,10 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr > > RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg > > +ifeq ($(BR2_aarch64),y) > +RPI_USERLAND_CONF_OPTS += -DARM64=ON > +endif > + > ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) > > RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From peter at korsgaard.com Mon Mar 7 23:00:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 00:00:00 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: <813a014c-8aae-990e-cd76-f961a9be9bf7@mind.be> (Arnout Vandecappelle's message of "Mon, 7 Mar 2022 23:33:10 +0100") References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> <813a014c-8aae-990e-cd76-f961a9be9bf7@mind.be> Message-ID: <871qzd4bdb.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: Hi, >> What if something (build system) unset _FILE_OFFSET_BITS ? > Then there's something wrong with that package and it needs to be fixed. >> There is something weird with libzlib package. > gzguts.h has this: > #ifdef _LARGEFILE64_SOURCE > # ifndef _LARGEFILE_SOURCE > # define _LARGEFILE_SOURCE 1 > # endif > # ifdef _FILE_OFFSET_BITS > # undef _FILE_OFFSET_BITS > # endif > #endif > Why, I have no idea... Me neither. It seems to have been added when the file was added to zlib 10 years ago, but given that there is no real public VCS for zlib it is hard to know why: https://github.com/madler/zlib/commit/d004b047838a7e803818b4973a2e39e0ff8c1fa2 We're not the only ones running into the issue: https://unix.stackexchange.com/questions/692377/relationship-between-flags-d-file-offset-bits-and-d-largefile64-source I agree that it simply looks like a bug in zlib, but maybe the best bet is indeed to revert for (the overdue) 2022.02 release? I hesitated when applying it given how late it is, but it indeed fixes a real bug. -- Bye, Peter Korsgaard From christian at paral.in Mon Mar 7 23:03:25 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 7 Mar 2022 15:03:25 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: <20220307235417.279e7751@gmx.net> References: <20220307224226.1375696-1-christian@paral.in> <20220307235417.279e7751@gmx.net> Message-ID: Hi Peter, You're probably right about that: On Mon, Mar 7, 2022 at 2:54 PM Peter Seiderer wrote: > On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: > > > Tested on Pi4 Model B (aarch64). > > > > Note: rpi-userland and upstream rpi os now support arm64. > > All issues/questions solved since discussion [1], [2] about > missing libraries/features? > > As far as I know rpi os graphic support is based on mesa3d v3d/vc4 > instead of rpi-userland libraries? I use this package on arm64 for vcgencmd (videocore) and other commands, however I have not verified that graphics work correctly, and you're most likely correct, the arm64 stack probably is using mesa3d vc4. I boot the pi4 64 bit with: arm_64bit=1 dtoverlay=vc4-fkms-v3d So this is using vc4, as you've mentioned here. I suppose to fix this patch, it needs something like: ifeq ($(BR2_aarch64),y) RPI_USERLAND_CONF_OPTS += -DARM64=ON else RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg endif Is this correct? Thanks & best, Christian Stewart > Regards, > Peter > > [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587538.html > [2] http://lists.busybox.net/pipermail/buildroot/2021-October/626080.html PS: I've noticed that my e-mail / name is wrong again: Christian Stewart via buildroot is this on your end or mine? From charles at steinkuehler.net Mon Mar 7 23:52:33 2022 From: charles at steinkuehler.net (Charles Steinkuehler) Date: Mon, 7 Mar 2022 17:52:33 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: References: <20220307224226.1375696-1-christian@paral.in> <20220307235417.279e7751@gmx.net> Message-ID: <9e71b104-9955-4d41-e05a-02e0b1e40802@steinkuehler.net> On 3/7/2022 5:03 PM, Christian Stewart via buildroot wrote: > Hi Peter, > > You're probably right about that: > > On Mon, Mar 7, 2022 at 2:54 PM Peter Seiderer wrote: >> On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: >> >>> Tested on Pi4 Model B (aarch64). >>> >>> Note: rpi-userland and upstream rpi os now support arm64. >> >> All issues/questions solved since discussion [1], [2] about >> missing libraries/features? >> >> As far as I know rpi os graphic support is based on mesa3d v3d/vc4 >> instead of rpi-userland libraries? > > I use this package on arm64 for vcgencmd (videocore) and other commands, > > however I have not verified that graphics work correctly, and you're > most likely correct, > > the arm64 stack probably is using mesa3d vc4. I boot the pi4 64 bit with: > > arm_64bit=1 > dtoverlay=vc4-fkms-v3d I am using the RPi 4 / CM4 and accelerated graphics are working using the open source stack (vc4-kms-v3d) as tested with the kmscube app and Buildroot 2022.02-rc3. -- Charles Steinkuehler charles at steinkuehler.net From mmayer at broadcom.com Tue Mar 8 00:58:37 2022 From: mmayer at broadcom.com (Markus Mayer) Date: Mon, 7 Mar 2022 16:58:37 -0800 Subject: [Buildroot] [PATCH 1/1] linux: limit YYLTYPE kernel modification In-Reply-To: <20220305091849.GB228549@scaer> References: <20220305000052.491721-1-mmayer@broadcom.com> <20220305002209.493816-1-mmayer@broadcom.com> <20220305091849.GB228549@scaer> Message-ID: On Sat, 5 Mar 2022 at 01:18, Yann E. MORIN wrote: > > Markus, All, > > On 2022-03-04 16:22 -0800, Markus Mayer spake thusly: > > Commit 9b41b54be07711c10ad13ce157be272ed1cf402e addresses a build issue > > regarding re-defined YACC symbols. Unfortunately, this can break the > > build for older toolchains. > > > > To prevent unintentional breakage, make the source code modification > > conditional on BR2_TOOLCHAIN_GCC_AT_LEAST_10. Also inform the user about > > the modification when it is performed, so it becomes more obvious what > > is happening in case of unforseen problems. [...] > > diff --git a/linux/linux.mk b/linux/linux.mk > > index 940dc2849f..382a3f679e 100644 > > --- a/linux/linux.mk > > +++ b/linux/linux.mk > > @@ -293,12 +293,15 @@ endef > > > > LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES > > > > +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) > > That is wrong, because this is built with the _host_ compiler, not the > target compiler, and BR2_TOOLCHAIN_GCC_AT_LEAST_XX is about the target > compiler. Very good point. I convoluted host and target compilers. The issue was seen on a Ubuntu 20 build host, which means it was using GCC 9.3.0 as the host compiler. > So, if we wanted to make that conditional, that would have to be > conditional on BR2_HOST_GCC_AT_LEAST_10 (we only have up to gcc-9 for > the host for now, so we'd need to add it for gcc-10 and 11; hint: search > for BR2_HOST_GCC_AT_LEAST_9, HOST_GCC_VERSION, HOSTCC_VERSION, and > HOSTCC_MAX_VERSION). > > Furthermore, that is still wrong in your case: if you switch to a > distribution that has gcc 10 (so, as host compler!), then this fixup > will be applied again, and your build will break again, because your > kernel is (probably) missing the following commits (of the 29 that > touch scripts/dtc/ between 4.1 and e33a814e772c): Yes. Unfortunately, this is true. Using GCC 10, the build stumbles over yylloc again. I installed gcc-10 and gave it another spin: [...] /usr/bin/gcc-10 -O2 -I/local/users/mmayer/buildroot/output/arm64/host/include -DNDEBUG -L/local/users/mmayer/buildroot/output/arm64/host/lib -Wl,-rpath,/local/users/mmayer/buildroot/output/arm64/host/lib -Wp,-MD,scripts/dtc/.dtc-lexer.lex.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 -Iscripts/dtc -Iscripts/dtc/libfdt -c -o scripts/dtc/dtc-lexer.lex.o scripts/dtc/dtc-lexer.lex.c dtc-lexer.lex.c: In function ?yylex?: dtc-lexer.l:46:18: error: ?yylloc? undeclared (first use in this function); did you mean ?yyalloc?? dtc-lexer.lex.c:845:2: note: in expansion of macro ?YY_USER_ACTION? dtc-lexer.lex.c:939:1: note: in expansion of macro ?YY_RULE_SETUP? dtc-lexer.l:46:18: note: each undeclared identifier is reported only once for each function it appears in dtc-lexer.lex.c:845:2: note: in expansion of macro ?YY_USER_ACTION? dtc-lexer.lex.c:939:1: note: in expansion of macro ?YY_RULE_SETUP? make[4]: *** [scripts/Makefile.host:108: scripts/dtc/dtc-lexer.lex.o] Error 1 make[3]: *** [scripts/Makefile.build:476: scripts/dtc] Error 2 make[2]: *** [Makefile:555: scripts] Error 2 make[1]: *** [package/pkg-generic.mk:292: /local/users/mmayer/buildroot/output/arm64/build/linux-stb-4.1/.stamp_built] Error 2 make: *** [Makefile:27: _all] Error 2 > $ git slog -G'YYLTYPE yylloc;' v4.1..e33a814e772cdc36436c8c188d8c42d019fda639 -- scripts/dtc/ > e33a814e772cd scripts/dtc: Remove redundant YYLOC global declaration > e039139be8c25 scripts/dtc: generate lexer and parser during build instead of shipping > 4760597116e34 scripts/dtc: Update to upstream version 9d3649bd3be245c9 Correct. We don't have those. However, it might be possible for us to pull some of them in. Not sure yet. I'd have to take a closer look. > However, you still have a point: this is breaking older kernels that do > not have a recent-enough bundled dtc, whether they be built with a host > gcc 10+ or not... Agreed. We might be able to overcome the issue by looking at the aforementioned kernel patches, but others might still run into it. > Maybe we need to find a better heuristic to detect the case when we need > to apply the fix, but then I am afraid this is going to be a nightmare > of so many corner cases with vendor-specific franken-kernels. > > I am not sure where to go from here, though... Let me mull this one over for a bit, as well. I am guessing you'll have thought of most approaches already, but one never knows what one might stumble upon. > > # Older versions break on gcc 10+ because of redefined symbols > > define LINUX_DROP_YYLLOC > > + @echo "Removing 'YYLTYPE yylloc;' from kernel sources..." > > There are so many fixes and tweaks we do without informing the user. If > we were to, the build would be even more verbose than it currently is. > Finding a reference to yylloc in the build log would just mean grepping > for it, so you would achieve about the same by running: > > $ make V=1 > > as that would print the fixup line. True and I see your point regarding super-verbose output, however, the problem I was facing here was that I didn't *know* to run "make V=1" on buildroot as a whole -- and that I would have to do so *before* it patched the kernel. It won't go through that stage again if you just reconfigure or rebuild Linux. I was thinking that the Linux build system itself was somehow messing with the files. So, I was looking in the completely wrong place for a while. I am not saying a message not relying on "V=1" in the buildroot build log would have actually helped me find this issue much more quickly, but it could have served as a pointer to look at the Buildroot patch stage more closely and not the kernel build system. And that definitely wouldn't have hurt. Regards, -Markus From bugzilla at busybox.net Tue Mar 8 08:18:24 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 08:18:24 +0000 Subject: [Buildroot] [Bug 14641] oprofile can not find the events files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 --- Comment #2 from Sergey --- Hi Fabrice, Built and tested right now, it works. I think yours patch is easy solution. All events files take 2.8M. For some applications it could be a wasted space, but it is working solution, if someone wanna save the flash space (for example me), he can write own OPROFILE_INSTALL_TARGET_CMDS Thanks, Best Regards, Sergey -- You are receiving this mail because: You are on the CC list for the bug. From mail at dbrgn.ch Tue Mar 8 08:57:53 2022 From: mail at dbrgn.ch (Danilo) Date: Tue, 08 Mar 2022 09:57:53 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL Message-ID: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> Hello I'm trying to set up an Nginx module package (nginx-rtmp-module) in a Buildroot project that uses BR2_EXTERNAL. I added the new external package, that works. However, Nginx modules need to be compiled along with Nginx, which means that I need to patch the Buildroot nginx.mk file, right? What I need to inject into the makefile, is the following: NGINX_DEPENDENCIES += nginx-rtmp-module NGINX_CONF_OPTS += --add-module=$(NGINX_RTMP_MODULE_DIR) Is there a mechanism to do this from outside the Buildroot source? It seems that BR2_GLOBAL_PATCH_DIR only works for packet sources, but not for Buildroot makefiles, correct? I tried adding the assignments above into the package makefile (nginx-rtmp-module.mk), but that doesn't seem to work. Any help would be appreciated! Danilo From dopsi at dopsi.ch Tue Mar 8 10:19:21 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Tue, 08 Mar 2022 11:19:21 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> Message-ID: Hi, On Tue, 2022-03-08 at 09:57 +0100, Danilo wrote: > [ snip ] > > What I need to inject into the makefile, is the following: > > NGINX_DEPENDENCIES += nginx-rtmp-module > NGINX_CONF_OPTS += --add-module=$(NGINX_RTMP_MODULE_DIR) > > Is there a mechanism to do this from outside the Buildroot source? It > seems > that BR2_GLOBAL_PATCH_DIR only works for packet sources, but not for > Buildroot > makefiles, correct? > > I tried adding the assignments above into the package makefile > (nginx-rtmp-module.mk), but that doesn't seem to work. I hit a similar issue last month (see [1]): I needed to add a dependency (host-stm32wrapper4dbg) to the arm-trusted-firmware from an external tree but I failed (a temporary workaround for me is to manually trigger the build of the host-stm32wrapper4dbg dependency then build the whole system). I did expect that adding the dependency as you did would work but it failed: they show up when running `make arm- trusted-firmware-show-depends` but not in `make arm-trusted- firmware-show-build-order`. Does the same happen for you? I confirmed that adding a post-build hook from an external makefile works fully, only the dependency has issues. I did start to investigate the issue, but it is currently low on my priority list since I have an easy workaround for it. I suspect it is somewhere in the package/pkg-generic.mk file, but I'm not entirely sure where the issue is. As far as I know, there is no way to patch the buildroot source, only downloaded sources can be patched in the build process. [1]: https://lists.buildroot.org/pipermail/buildroot/2022-February/637237.html Best regards, Simon Doppler From peter at korsgaard.com Tue Mar 8 11:49:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 12:49:05 +0100 Subject: [Buildroot] [PATCH] package/Makefile.in: year2038 makes time_t 64-bit for glibc toolchains In-Reply-To: (Johannes Agricola's message of "Tue, 08 Mar 2022 11:37:13 +0000") References: <20220225171148.701977-1-romain.naour@gmail.com> <87zgm15yir.fsf@dell.be.48ers.dk> Message-ID: <87v8wo3bri.fsf@dell.be.48ers.dk> >>>>> "Johannes" == Johannes Agricola writes: > Good Day! > This seems to break the build of gcc-10.3 w/ glibc > 2.34-110. `libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp` > contains: >> #if SANITIZER_LINUX || SANITIZER_MAC >> // Tests in this file assume that off_t-dependent data structures match the >> // libc ABI. For example, struct dirent here is what readdir() function (as >> // exported from libc) returns, and not the user-facing "dirent", which >> // depends on _FILE_OFFSET_BITS setting. >> // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. >> #ifdef _FILE_OFFSET_BITS >> #undef _FILE_OFFSET_BITS >> #endif Yes, we'll revert it for now and get it sorted out for 2022.05 instead. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 11:49:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 12:49:49 +0100 Subject: [Buildroot] [git commit] Revert "package/Makefile.in: Use 64-bit time_t with glibc toolchains for > year 2038 support" Message-ID: <20220308114603.EE65382578@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd170f0cbad729dba4193b2b20e3de0a7010d485 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 6e33e5908086a511294296f317f6e6f86fa84b1d. This unfortunately breaks a number of packages, as glibc errors out if 64bit time_t is used without 64bit file offsets, and some packages undefine _FILE_OFFSET_BITS leading to build breakage: # if ! defined (_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64 # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" .. So revert it for 2022.02. Signed-off-by: Peter Korsgaard --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index cde050ca82..508ea7c366 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -167,7 +167,7 @@ else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) From rsassen at comecer.com Tue Mar 8 12:39:51 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Tue, 8 Mar 2022 12:39:51 +0000 Subject: [Buildroot] [PATCH 0/1] package/rpi-firmware: fix missing files in overlays Message-ID: First of all, this is my first patch I submit for buildroot, or for any git project for that matter, so please forgive me if it is not in the expected format. This patch fixes some files not being copied from the rpi-firmware boot/overlays directory. I suspect it could also be backported to older still supported branches, but from the documentation I'm not quite sure how to specify this in the patch submission, since the package has been bumped to newer versions in the mean time. Also, git stripped the leading TAB character from the changed line in the diff. I'm hesitant to manually edit this, since I'm not sure if this is intended behavior. Rutger Sassen (1): package/rpi-firmware: fix missing files in overlays package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From rsassen at comecer.com Tue Mar 8 12:40:14 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Tue, 8 Mar 2022 12:40:14 +0000 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: Not all files in boot/overlays are copied to the image, which may result in overlays not being loaded at all, or a wrong overlay being loaded. When using os_prefix and/or overlay_prefix in the raspberry pi config.txt, it checks for the existence of README in the overlays directory. If it is missing, overlays will not be loaded. The overlay_map.dtb file contains rules for overlays that require special handling depending on the specific type of raspberry pi hardware. When this file is missing, the wrong overlay may be loaded. Fixed by copying all files from boot/overlays, instead of only *.dtbo Signed-off-by: Rutger Sassen --- package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..4b9a442bb6 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -45,7 +45,7 @@ endif ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ +$(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) endef -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Mar 8 12:46:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 13:46:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/oprofile: drop custom install rules In-Reply-To: <20220307223355.945328-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Mar 2022 23:33:55 +0100") References: <20220307223355.945328-1-fontaine.fabrice@gmail.com> Message-ID: <87r17c393p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop custom install rules which have added since commit > 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a > broken installation. Especially, they are trying to "guess" what must > be installed based on BR2_ARCH but oprofile has its own logic. For > example, goldmont microarchitecture files must be installed in i386 > directory even if this architecture is 64 bits: > https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a > This will result in the following runtime failure: > oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks > Unable to find info for event cpu_clk_unhalted > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14641 > Signed-off-by: Fabrice Fontaine This might install a bit "too much", but Ok - Better than too less. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 12:44:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 13:44:38 +0100 Subject: [Buildroot] [git commit] package/oprofile: drop custom install rules Message-ID: <20220308123934.F1FE482AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5259807318699646a7bb9cbc24fb137983bc5270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop custom install rules which were added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) From bugzilla at busybox.net Tue Mar 8 12:50:33 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 12:50:33 +0000 Subject: [Buildroot] [Bug 14641] oprofile can not find the events files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14641 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Peter Korsgaard --- Fixed in git: https://git.buildroot.org/buildroot/commit/?id=5259807318699646a7bb9cbc24fb137983bc5270 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 8 15:54:14 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 15:54:14 +0000 Subject: [Buildroot] [Bug 14646] New: OpenSSH 8.9p1 error under mipsel Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14646 Bug ID: 14646 Summary: OpenSSH 8.9p1 error under mipsel Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: lancethepants at gmail.com CC: buildroot at uclibc.org Target Milestone: --- 8-March-2022 from git master mips32 softfloat gcc-11.2 kernel 5.16 mipsel throws the following compiler error while compiling openssh 8.9p1. make[2]: Entering directory '/home/tomato/tomatoware/src/openssh/openssh/openbsd-compat' mipsel-linux-cc -O2 -pipe -mips32 -mtune=mips32 -pipe -Wno-error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleading-indentation -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fPIC -I. -I.. -I. -I./.. -I/home/tomato/tomatoware/mmc/include -I/home/tomato/tomatoware/mmc/include -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DHAVE_CONFIG_H -c arc4random.c during RTL pass: final In file included from arc4random.c:52: chacha_private.h: In function ?chacha_encrypt_bytes.constprop?: chacha_private.h:222:1: internal compiler error: in mips_output_move, at config/mips/mips.c:5321 222 | } | ^ 0x12c020e diagnostic_impl(rich_location*, diagnostic_metadata const*, int, char const*, __va_list_tag (*) [1], diagnostic_t) ???:0 0x12c0e26 internal_error(char const*, ...) ???:0 0x5a1fc1 fancy_abort(char const*, int, char const*) ???:0 0xdcc6e9 mips_output_move(rtx_def*, rtx_def*) ???:0 0x7e705f final_scan_insn_1(rtx_insn*, _IO_FILE*, int, int, int*) [clone .isra.84] ???:0 0x7e745b final_scan_insn(rtx_insn*, _IO_FILE*, int, int, int*) ???:0 0x7e6e91 final_scan_insn_1(rtx_insn*, _IO_FILE*, int, int, int*) [clone .isra.84] ???:0 0x7e745b final_scan_insn(rtx_insn*, _IO_FILE*, int, int, int*) ???:0 0x7e771c final_1(rtx_insn*, _IO_FILE*, int, int) ???:0 0x7e7ee3 (anonymous namespace)::pass_final::execute(function*) ???:0 Please submit a full bug report, with preprocessed source if appropriate. Please include the complete backtrace with any bug report. See for instructions. {standard input}: Assembler messages: {standard input}: Warning: missing .end at end of assembly make[2]: *** [Makefile:104: arc4random.o] Error 1 make[2]: Leaving directory '/home/tomato/tomatoware/src/openssh/openssh/openbsd-compat' make[1]: *** [Makefile:204: openbsd-compat/libopenbsd-compat.a] Error 2 make[1]: Leaving directory '/home/tomato/tomatoware/src/openssh/openssh' make: *** [Makefile:5: tomatoware] Error 2 tomato at e2a84530afa9:~/tomatoware$ -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 8 15:54:28 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 08 Mar 2022 15:54:28 +0000 Subject: [Buildroot] [Bug 14646] OpenSSH 8.9p1 compiler error under mipsel In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14646 Lance Fredrickson changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|OpenSSH 8.9p1 error under |OpenSSH 8.9p1 compiler |mipsel |error under mipsel -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Tue Mar 8 16:40:34 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 8 Mar 2022 17:40:34 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-hdhomerun: bump version to 19.1.0-Matrix Message-ID: <20220308164034.85212-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 4c866b59d8..f177eabd53 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a5e5135b176d9aeba35e16fb6ce48ce7323c53960457597e25c2962b126cca2 kodi-pvr-hdhomerun-19.0.2-Matrix.tar.gz +sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 5c6829cee3..a4a448c51e 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 19.0.2-Matrix +KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md -- 2.30.2 From yann.morin at orange.com Tue Mar 8 16:53:10 2022 From: yann.morin at orange.com (yann.morin at orange.com) Date: Tue, 8 Mar 2022 17:53:10 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: default to rawname to install binaries Message-ID: <19532_1646758392_622789F8_19532_102_1_b2db850ee51822a3272be0f6984d2e53d73e790c.1646758134.git.yann.morin@orange.com> From: "Yann E. MORIN" The default currently is to rely on the package name to decide what to build and install if not specified by tje caller. This works nice for target packages, where a 'foo' package will by default build and install a 'foo' executable. However, for host packages, that will build and install a 'host-foo' exzcutable, which is not really, even really not, what would be expected. We fix that by using the package raw name, i.e. the package name with the host- prefix yanked away. It is very improbable that there already have many host-golang packages in the wild (in br2-external trees), but if there are, they would forcibly define those variables to a sane value. This change is not incompatible, as the values provided by packages take precendence; it's just that those packages now carry superfluous, if innocuous, variable assignments. Signed-off-by: Yann E. MORIN --- package/pkg-golang.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 0cb2ed73cc..0b3dc3d32f 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -59,10 +59,10 @@ $(2)_BUILD_TARGETS ?= . # been specified, we assume that the binaries to be produced are named # after each build target building them (below in _BUILD_CMDS). ifeq ($$($(2)_BUILD_TARGETS),.) -$(2)_BIN_NAME ?= $(1) +$(2)_BIN_NAME ?= $$($(2)_RAWNAME) endif -$(2)_INSTALL_BINS ?= $(1) +$(2)_INSTALL_BINS ?= $$($(2)_RAWNAME) # Source files in Go usually use an import path resolved around # domain/vendor/software. We infer domain/vendor/software from the upstream URL -- 2.25.1 _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From fontaine.fabrice at gmail.com Tue Mar 8 17:47:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 18:47:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix armv7 and sparc builds Message-ID: <20220308174737.1413882-1-fontaine.fabrice@gmail.com> Fix the following build failure on armv7 and sparc raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: In file included from perf_memcpy32_s.c:7: perf_private.h: In function 'rdtsc': perf_private.h:72:3: error: 'asm' undeclared (first use in this function) 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); | ^~~ Fixes: - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 Signed-off-by: Fabrice Fontaine --- ...01-fix-armv7-asm-inline-error-GH-115.patch | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch diff --git a/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch new file mode 100644 index 0000000000..3cb37b96f5 --- /dev/null +++ b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch @@ -0,0 +1,156 @@ +From 9c739800a8915d5f2a73c840190920e95ffa1c5c Mon Sep 17 00:00:00 2001 +From: Reini Urban +Date: Fri, 18 Feb 2022 09:46:45 +0100 +Subject: [PATCH] fix armv7 asm inline error GH #115 + +some armv7 buildroot variants fail on asm. +we already probe for that, so use it. +Fixes GH #115 + +[Retrieved from: +https://github.com/rurban/safeclib/commit/9c739800a8915d5f2a73c840190920e95ffa1c5c] +Signed-off-by: Fabrice Fontaine +--- + tests/perf_private.h | 49 +++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/tests/perf_private.h b/tests/perf_private.h +index 3296cb3d..843674d3 100644 +--- a/tests/perf_private.h ++++ b/tests/perf_private.h +@@ -1,9 +1,9 @@ + /*------------------------------------------------------------------ + * perf_private.h - Internal benchmarking tools + * +- * 2020 Reini Urban ++ * 2020,2022 Reini Urban + * +- * Copyright (c) 2017, 2020 Reini Urban ++ * Copyright (c) 2017, 2020, 2022 Reini Urban + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person +@@ -55,13 +55,16 @@ static inline uint64_t timer_start(); + static inline uint64_t timer_end(); + + static inline clock_t rdtsc() { +-#ifdef __x86_64__ ++#ifndef ASM_INLINE ++#define NO_CYCLE_COUNTER ++ return clock(); ++#elif defined __x86_64__ + uint64_t a, d; +- __asm__ volatile("rdtsc" : "=a"(a), "=d"(d)); ++ ASM_INLINE volatile("rdtsc" : "=a"(a), "=d"(d)); + return (clock_t)(a | (d << 32)); + #elif defined(__i386__) + clock_t x; +- __asm__ volatile("rdtsc" : "=A"(x)); ++ ASM_INLINE volatile("rdtsc" : "=A"(x)); + return x; + #elif defined(__ARM_ARCH) && (__ARM_ARCH >= 7) && (SIZEOF_SIZE_T == 4) + // V7 is the earliest arch that has a standard cyclecount (some say 6) +@@ -69,11 +72,11 @@ static inline clock_t rdtsc() { + uint32_t pmuseren; + uint32_t pmcntenset; + // Read the user mode perf monitor counter access permissions. +- asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); + if (pmcntenset & 0x80000000ul) { // Is it counting? +- asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); + // The counter is set up to count every 64th cycle + return (int64_t)(pmccntr) * 64; // Should optimize to << 6 + } +@@ -83,22 +86,22 @@ static inline clock_t rdtsc() { + uint64_t pmccntr; + uint64_t pmuseren = 1UL; + // Read the user mode perf monitor counter access permissions. +- //asm volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); ++ //ASM_INLINE volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); ++ ASM_INLINE volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); + return (uint64_t)(pmccntr) * 64; // Should optimize to << 6 + } + return (uint64_t)rdtsc(); + #elif defined(__powerpc64__) || defined(__ppc64__) + uint64_t tb; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "mfspr %0, 268" + : "=r" (tb)); + return tb; + #elif defined(__powerpc__) || defined(__ppc__) + // This returns a time-base, which is not always precisely a cycle-count. + uint32_t tbu, tbl, tmp; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "0:\n" + "mftbu %0\n" + "mftbl %1\n" +@@ -109,12 +112,12 @@ static inline clock_t rdtsc() { + return (((uint64_t) tbu << 32) | tbl); + #elif defined(__sparc__) + uint64_t tick; +- asm(".byte 0x83, 0x41, 0x00, 0x00"); +- asm("mov %%g1, %0" : "=r" (tick)); ++ ASM_INLINE(".byte 0x83, 0x41, 0x00, 0x00"); ++ ASM_INLINE("mov %%g1, %0" : "=r" (tick)); + return tick; + #elif defined(__ia64__) + uint64_t itc; +- asm("mov %0 = ar.itc" : "=r" (itc)); ++ ASM_INLINE("mov %0 = ar.itc" : "=r" (itc)); + return itc; + #else + #define NO_CYCLE_COUNTER +@@ -126,9 +129,11 @@ static inline clock_t rdtsc() { + // 3.2.1 The Improved Benchmarking Method + static inline uint64_t timer_start() + { +-#if defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -137,7 +142,7 @@ static inline uint64_t timer_start() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -151,9 +156,11 @@ static inline uint64_t timer_start() + + static inline uint64_t timer_end() + { +-#if defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" +@@ -162,7 +169,7 @@ static inline uint64_t timer_end() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 17:48:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 18:48:32 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/oprofile: add s390x support Message-ID: <20220308174832.1414005-1-fontaine.fabrice@gmail.com> s390x is supported since at least 2003 (see ChangeLog-2003) Signed-off-by: Fabrice Fontaine --- package/oprofile/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in index cce2cfdab8..eca43d7ac3 100644 --- a/package/oprofile/Config.in +++ b/package/oprofile/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on BR2_arceb || BR2_arcle || BR2_arm || BR2_armeb || \ BR2_aarch64 || BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_s390x || BR2_sh || \ BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 18:00:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 19:00:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 Message-ID: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> This is a patch release for version 2 & 2.4, fixing a regression introduced in 2.4.1. https://github.com/cisco/libsrtp/releases/tag/v2.4.2 Signed-off-by: Fabrice Fontaine --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 3de0130f4c..8e51e68ac2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 885f05a33c..f2ba600dd6 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.1 +LIBSRTP_VERSION = 2.4.2 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 18:01:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 19:01:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.6.1 Message-ID: <20220308180152.1558214-1-fontaine.fabrice@gmail.com> https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 Signed-off-by: Fabrice Fontaine --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 780061bdbb..28e733aa2f 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 -sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.1.tar.gz.sha256 +sha256 e4b3b93d102bc03164f592d26d7a06d6de648bf78b1e3dcbd8d62941431c1f28 freerdp-2.6.1.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c8978db6ce..a1791b27f0 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.6.0 +FREERDP_VERSION = 2.6.1 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 8 18:28:45 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 19:28:45 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libaacs: bump to version 0.11.1 Message-ID: <20220308182845.1832681-1-fontaine.fabrice@gmail.com> Drop patch (not needed since https://code.videolan.org/videolan/libaacs/-/commit/a2ef3313bae4550f54ba842fa342d5b9b5f97145) https://code.videolan.org/videolan/libaacs/-/blob/0.11.1/ChangeLog Signed-off-by: Fabrice Fontaine --- ...0001-read_file.h-include-sys-types.h.patch | 36 ------------------- package/libaacs/libaacs.hash | 4 +-- package/libaacs/libaacs.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/libaacs/0001-read_file.h-include-sys-types.h.patch diff --git a/package/libaacs/0001-read_file.h-include-sys-types.h.patch b/package/libaacs/0001-read_file.h-include-sys-types.h.patch deleted file mode 100644 index 9bb1e04539..0000000000 --- a/package/libaacs/0001-read_file.h-include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1fb08a352afada589f0b93af7a07c6fcd6da9bb8 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 21 Sep 2020 20:19:38 +0200 -Subject: [PATCH] read_file.h: include sys/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-8.3.0: - -In file included from src/devtools/uk_dump.c:28: -src/devtools/read_file.h:24:44: error: unknown type name ?off_t? - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) - -Upstream status: pending - -Signed-off-by: Bernd Kuhls ---- - src/devtools/read_file.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devtools/read_file.h b/src/devtools/read_file.h -index 953b2ef..a5d185c 100644 ---- a/src/devtools/read_file.h -+++ b/src/devtools/read_file.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) --- -2.27.0 - diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 62e389f2f9..d4977727b0 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 -sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.1/libaacs-0.11.1.tar.bz2.sha512 +sha512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42 libaacs-0.11.1.tar.bz2 # Hash for license file: sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 3e0df18010..d4e90be26c 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.11.0 +LIBAACS_VERSION = 0.11.1 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ -- 2.34.1 From zajec5 at gmail.com Tue Mar 8 18:35:27 2022 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Tue, 8 Mar 2022 19:35:27 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package Message-ID: <20220308183527.17639-1-zajec5@gmail.com> From: Rafa? Mi?ecki This new package provides "lzma_alone" host binary based on the original LZMA SDK. It provides few extra options when compared to the LZMA Utils / XZ Utils project "lzma" binary (already packaged as the "lzma"). This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows Debian's solution. Please note that Debian also uses LZMA SDK for the base "lzma" tool which may be considered for Buildroot too - as an independent change. Similar packaging is also used by Ubuntu & Arch. lzma_alone is a requirement for preparing firmware images for some Broadcom based home routers with a picky CFE bootloader. It has limited LZMA support and building compatible images requires specifying dictionary size and lc/lp/pb LZMA values manually. Version 9.22 is used as it's the last release using .tar.bz2 format. The same version is used by Debian. Signed-off-by: Rafa? Mi?ecki --- Hi, this is V2 of my following old attempt: [PATCH] package/lzma-alone: new package https://patchwork.ozlabs.org/project/buildroot/patch/20201026213433.4309-1-zajec5 at gmail.com/ It doesn't seem like I'm going to get V1 properly reviewed / commented so let me try with V2 with changes I think were expected. --- package/Config.in.host | 1 + package/lzma-alone/Config.in.host | 18 ++++++++++++++++++ package/lzma-alone/lzma-alone.hash | 1 + package/lzma-alone/lzma-alone.mk | 22 ++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 package/lzma-alone/Config.in.host create mode 100644 package/lzma-alone/lzma-alone.hash create mode 100644 package/lzma-alone/lzma-alone.mk diff --git a/package/Config.in.host b/package/Config.in.host index e5fbb07fc2..cd1c34b5a3 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -50,6 +50,7 @@ menu "Host utilities" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/lzma-alone/Config.in.host" source "package/mender-artifact/Config.in.host" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" diff --git a/package/lzma-alone/Config.in.host b/package/lzma-alone/Config.in.host new file mode 100644 index 0000000000..053b869635 --- /dev/null +++ b/package/lzma-alone/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_LZMA_ALONE + bool "host lzma-alone" + help + LZMA has two well-known command-line tools: + 1. lzma from LZMA SDK + 2. lzma from XZ Utils (previously LZMA Utils) + + This package provides the former one which: + 1. Gives more control over compression parameters + 2. Gets named lzma_alone to allow coexistence + + This tool may be used to prepare firmwares for bootloaders + with limited LZMA support. + E.g. Broadcom's CFE bootloader for MIPS BCM47xx devices is + known to fail to boot images using LZMA compression with + dictionary. + + https://www.7-zip.org/sdk.html diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash new file mode 100644 index 0000000000..39759c4e3b --- /dev/null +++ b/package/lzma-alone/lzma-alone.hash @@ -0,0 +1 @@ +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk new file mode 100644 index 0000000000..6258bb4a95 --- /dev/null +++ b/package/lzma-alone/lzma-alone.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# lzma-alone +# +################################################################################ + +LZMA_ALONE_VERSION = 9.22 +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK +LZMA_ALONE_SOURCE = lzma922.tar.bz2 +LZMA_ALONE_STRIP_COMPONENTS = 0 +LZMA_ALONE_LICENSE = LGPL-2.1-or-later, BSD-3-Clause + +define HOST_LZMA_ALONE_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/C/Util/Lzma -f makefile.gcc + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc +endef + +define HOST_LZMA_ALONE_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/CPP/7zip/Bundles/LzmaCon/lzma $(HOST_DIR)/bin/lzma_alone +endef + +$(eval $(host-generic-package)) -- 2.34.1 From peter at korsgaard.com Tue Mar 8 20:13:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:13:14 +0100 Subject: [Buildroot] [PATCH] package/pkg-golang: default to rawname to install binaries In-Reply-To: <19532_1646758392_622789F8_19532_102_1_b2db850ee51822a3272be0f6984d2e53d73e790c.1646758134.git.yann.morin@orange.com> (yann morin's message of "Tue, 8 Mar 2022 17:53:10 +0100") References: <19532_1646758392_622789F8_19532_102_1_b2db850ee51822a3272be0f6984d2e53d73e790c.1646758134.git.yann.morin@orange.com> Message-ID: <87mti02of9.fsf@dell.be.48ers.dk> >>>>> writes: > From: "Yann E. MORIN" > The default currently is to rely on the package name to decide what to > build and install if not specified by tje caller. This works nice for > target packages, where a 'foo' package will by default build and > install a 'foo' executable. > However, for host packages, that will build and install a 'host-foo' > exzcutable, which is not really, even really not, what would be > expected. > We fix that by using the package raw name, i.e. the package name with > the host- prefix yanked away. > It is very improbable that there already have many host-golang packages > in the wild (in br2-external trees), but if there are, they would > forcibly define those variables to a sane value. This change is not > incompatible, as the values provided by packages take precendence; it's > just that those packages now carry superfluous, if innocuous, variable > assignments. > Signed-off-by: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:15:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:15:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 In-Reply-To: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:00:56 +0100") References: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> Message-ID: <87ilso2oc3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This is a patch release for version 2 & 2.4, fixing a regression > introduced in 2.4.1. > https://github.com/cisco/libsrtp/releases/tag/v2.4.2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:15:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:15:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: bump to version 2.6.1 In-Reply-To: <20220308180152.1558214-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:01:52 +0100") References: <20220308180152.1558214-1-fontaine.fabrice@gmail.com> Message-ID: <87ee3c2obd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:11:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:11:50 +0100 Subject: [Buildroot] [git commit] package/pkg-golang: default to rawname to install binaries Message-ID: <20220308200742.B598F837E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8539378771f7201bf29f207b3d4d6c9e943f3952 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The default currently is to rely on the package name to decide what to build and install if not specified by the caller. This works nice for target packages, where a 'foo' package will by default build and install a 'foo' executable. However, for host packages, that will build and install a 'host-foo' exzcutable, which is not really, even really not, what would be expected. We fix that by using the package raw name, i.e. the package name with the host- prefix yanked away. It is very improbable that there already are many host-golang packages in the wild (in br2-external trees), but if there are, they would forcibly define those variables to a sane value. This change is not incompatible, as the values provided by packages take precedence; it's just that those packages now carry superfluous, if innocuous, variable assignments. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 0cb2ed73cc..0b3dc3d32f 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -59,10 +59,10 @@ $(2)_BUILD_TARGETS ?= . # been specified, we assume that the binaries to be produced are named # after each build target building them (below in _BUILD_CMDS). ifeq ($$($(2)_BUILD_TARGETS),.) -$(2)_BIN_NAME ?= $(1) +$(2)_BIN_NAME ?= $$($(2)_RAWNAME) endif -$(2)_INSTALL_BINS ?= $(1) +$(2)_INSTALL_BINS ?= $$($(2)_RAWNAME) # Source files in Go usually use an import path resolved around # domain/vendor/software. We infer domain/vendor/software from the upstream URL From peter at korsgaard.com Tue Mar 8 20:14:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:14:29 +0100 Subject: [Buildroot] [git commit] package/freerdp: bump to version 2.6.1 Message-ID: <20220308200742.C5A708380C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=888d4aa36768b4d6932d39d25935cf6636a2af83 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/FreeRDP/FreeRDP/releases/tag/2.6.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 780061bdbb..28e733aa2f 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.6.0.tar.gz.sha256 -sha256 a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe freerdp-2.6.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.6.1.tar.gz.sha256 +sha256 e4b3b93d102bc03164f592d26d7a06d6de648bf78b1e3dcbd8d62941431c1f28 freerdp-2.6.1.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index c8978db6ce..a1791b27f0 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.6.0 +FREERDP_VERSION = 2.6.1 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Tue Mar 8 20:14:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:14:17 +0100 Subject: [Buildroot] [git commit] package/libsrtp: bump to version 2.4.2 Message-ID: <20220308200742.BDA87837ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=232868ffd3ef76f060711adf5ea1e5001e21ef9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This is a patch release for version 2 & 2.4, fixing a regression introduced in 2.4.1. https://github.com/cisco/libsrtp/releases/tag/v2.4.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 3de0130f4c..8e51e68ac2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 885f05a33c..f2ba600dd6 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.1 +LIBSRTP_VERSION = 2.4.2 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause From ps.report at gmx.net Tue Mar 8 20:26:41 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Mar 2022 21:26:41 +0100 Subject: [Buildroot] [PATCH 0/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220308212641.15b03b75@gmx.net> Hello Rutger, On Tue, 8 Mar 2022 12:39:51 +0000, "Sassen, Rutger" wrote: > First of all, this is my first patch I submit for buildroot, or for > any git project for that matter, so please forgive me if it is not in > the expected format. No problem, every patch (or hint about bugs/missing features) welcome... > > This patch fixes some files not being copied from the rpi-firmware > boot/overlays directory. I suspect it could also be backported to older > still supported branches, but from the documentation I'm not quite sure > how to specify this in the patch submission, since the package has been > bumped to newer versions in the mean time. Should be no problem as the mentioned overlay_map.dtb file should be already available in the older rpi-firmware releases (since April 2020)... > > Also, git stripped the leading TAB character from the changed line in > the diff. I'm hesitant to manually edit this, since I'm not sure if this > is intended behavior. This should not happen, are you sure the tab is committed? > > Rutger Sassen (1): > package/rpi-firmware: fix missing files in overlays > > package/rpi-firmware/rpi-firmware.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -- > 2.20.1 > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone > the message or any information contained in the message and I ask that you please notify me by return email and delete this > communication immediately. Thank you. According to the email footer I could not look further at your provided patch ;-) Please try to re-send without it.... More comments in replay to your patch... Regards, Peter From ps.report at gmx.net Tue Mar 8 20:41:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Mar 2022 21:41:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220308214133.5b494e1c@gmx.net> Hello Rutger, On Tue, 8 Mar 2022 12:40:14 +0000, "Sassen, Rutger" wrote: > Not all files in boot/overlays are copied to the image, which may result > in overlays not being loaded at all, or a wrong overlay being loaded. > > When using os_prefix and/or overlay_prefix in the raspberry pi > config.txt, it checks for the existence of README in the overlays > directory. If it is missing, overlays will not be loaded. Any prove for this behavior (could not find anything about it in the docs)? > > The overlay_map.dtb file contains rules for overlays that require > special handling depending on the specific type of raspberry pi > hardware. When this file is missing, the wrong overlay may be loaded. Only if you use this feature, see [1], [2] (building multiple rpi targeting sdcard) instead of determining the right overlay (exactly targeting one rpi flavour sdcard, as the buildroot rpi example config files do)... > > Fixed by copying all files from boot/overlays, instead of only *.dtbo > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/rpi-firmware.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..4b9a442bb6 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -45,7 +45,7 @@ endif > > ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) > define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > - $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ > +$(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*), \ > $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) > ) > endef Would prefer to only/explicitly add the overlay_map.dtb file: $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo) $(@D)/boot/overlays/overlay_map.dtb, \ or $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo $(@D)/boot/overlays/*.dtb), \ or as it is a (maybe unwanted target feature) add a new buildroot rpi-firmware configure option for adding the overlay_map.dtb file... Regards, Peter [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc [2] https://github.com/raspberrypi/documentation/commit/67f5d3b4ff8b2e52239a5415c4b0272a85a910fc Please avoid your footer message... > -- > 2.20.1 > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone > the message or any information contained in the message and I ask that you please notify me by return email and delete this > communication immediately. Thank you. From peter at korsgaard.com Tue Mar 8 20:43:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 08 Mar 2022 21:43:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/safeclib: fix armv7 and sparc builds In-Reply-To: <20220308174737.1413882-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 18:47:37 +0100") References: <20220308174737.1413882-1-fontaine.fabrice@gmail.com> Message-ID: <87a6e02n0w.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure on armv7 and sparc raised since bump to > version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and > https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: > In file included from perf_memcpy32_s.c:7: > perf_private.h: In function 'rdtsc': > perf_private.h:72:3: error: 'asm' undeclared (first use in this function) > 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); > | ^~~ > Fixes: > - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 8 20:42:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 21:42:03 +0100 Subject: [Buildroot] [git commit] package/safeclib: fix armv7 and sparc builds Message-ID: <20220308203520.899D983831@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d8c29e7ac8ff2558656340bb88a7d044279d302 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on armv7 and sparc raised since bump to version 3.7.1 in commit cc27267ae41bf44276c63b1e86042c4fae4adf50 and https://github.com/rurban/safeclib/commit/b90c52b1691fe82ce0a0681a503e1d45584f0162: In file included from perf_memcpy32_s.c:7: perf_private.h: In function 'rdtsc': perf_private.h:72:3: error: 'asm' undeclared (first use in this function) 72 | asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); | ^~~ Fixes: - http://autobuild.buildroot.org/results/ceb13c071b1461eb6d73f5940d6b010095127f41 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-fix-armv7-asm-inline-error-GH-115.patch | 156 +++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch new file mode 100644 index 0000000000..3cb37b96f5 --- /dev/null +++ b/package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch @@ -0,0 +1,156 @@ +From 9c739800a8915d5f2a73c840190920e95ffa1c5c Mon Sep 17 00:00:00 2001 +From: Reini Urban +Date: Fri, 18 Feb 2022 09:46:45 +0100 +Subject: [PATCH] fix armv7 asm inline error GH #115 + +some armv7 buildroot variants fail on asm. +we already probe for that, so use it. +Fixes GH #115 + +[Retrieved from: +https://github.com/rurban/safeclib/commit/9c739800a8915d5f2a73c840190920e95ffa1c5c] +Signed-off-by: Fabrice Fontaine +--- + tests/perf_private.h | 49 +++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) + +diff --git a/tests/perf_private.h b/tests/perf_private.h +index 3296cb3d..843674d3 100644 +--- a/tests/perf_private.h ++++ b/tests/perf_private.h +@@ -1,9 +1,9 @@ + /*------------------------------------------------------------------ + * perf_private.h - Internal benchmarking tools + * +- * 2020 Reini Urban ++ * 2020,2022 Reini Urban + * +- * Copyright (c) 2017, 2020 Reini Urban ++ * Copyright (c) 2017, 2020, 2022 Reini Urban + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person +@@ -55,13 +55,16 @@ static inline uint64_t timer_start(); + static inline uint64_t timer_end(); + + static inline clock_t rdtsc() { +-#ifdef __x86_64__ ++#ifndef ASM_INLINE ++#define NO_CYCLE_COUNTER ++ return clock(); ++#elif defined __x86_64__ + uint64_t a, d; +- __asm__ volatile("rdtsc" : "=a"(a), "=d"(d)); ++ ASM_INLINE volatile("rdtsc" : "=a"(a), "=d"(d)); + return (clock_t)(a | (d << 32)); + #elif defined(__i386__) + clock_t x; +- __asm__ volatile("rdtsc" : "=A"(x)); ++ ASM_INLINE volatile("rdtsc" : "=A"(x)); + return x; + #elif defined(__ARM_ARCH) && (__ARM_ARCH >= 7) && (SIZEOF_SIZE_T == 4) + // V7 is the earliest arch that has a standard cyclecount (some say 6) +@@ -69,11 +72,11 @@ static inline clock_t rdtsc() { + uint32_t pmuseren; + uint32_t pmcntenset; + // Read the user mode perf monitor counter access permissions. +- asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); + if (pmcntenset & 0x80000000ul) { // Is it counting? +- asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); ++ ASM_INLINE volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); + // The counter is set up to count every 64th cycle + return (int64_t)(pmccntr) * 64; // Should optimize to << 6 + } +@@ -83,22 +86,22 @@ static inline clock_t rdtsc() { + uint64_t pmccntr; + uint64_t pmuseren = 1UL; + // Read the user mode perf monitor counter access permissions. +- //asm volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); ++ //ASM_INLINE volatile("mrs cntv_ctl_el0, %0" : "=r" (pmuseren)); + if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. +- asm volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); ++ ASM_INLINE volatile("mrs %0, cntvct_el0" : "=r" (pmccntr)); + return (uint64_t)(pmccntr) * 64; // Should optimize to << 6 + } + return (uint64_t)rdtsc(); + #elif defined(__powerpc64__) || defined(__ppc64__) + uint64_t tb; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "mfspr %0, 268" + : "=r" (tb)); + return tb; + #elif defined(__powerpc__) || defined(__ppc__) + // This returns a time-base, which is not always precisely a cycle-count. + uint32_t tbu, tbl, tmp; +- __asm__ volatile (\ ++ ASM_INLINE volatile (\ + "0:\n" + "mftbu %0\n" + "mftbl %1\n" +@@ -109,12 +112,12 @@ static inline clock_t rdtsc() { + return (((uint64_t) tbu << 32) | tbl); + #elif defined(__sparc__) + uint64_t tick; +- asm(".byte 0x83, 0x41, 0x00, 0x00"); +- asm("mov %%g1, %0" : "=r" (tick)); ++ ASM_INLINE(".byte 0x83, 0x41, 0x00, 0x00"); ++ ASM_INLINE("mov %%g1, %0" : "=r" (tick)); + return tick; + #elif defined(__ia64__) + uint64_t itc; +- asm("mov %0 = ar.itc" : "=r" (itc)); ++ ASM_INLINE("mov %0 = ar.itc" : "=r" (itc)); + return itc; + #else + #define NO_CYCLE_COUNTER +@@ -126,9 +129,11 @@ static inline clock_t rdtsc() { + // 3.2.1 The Improved Benchmarking Method + static inline uint64_t timer_start() + { +-#if defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && SIZEOF_SIZE_T == 4) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -137,7 +142,7 @@ static inline uint64_t timer_start() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("cpuid\n\t" + "rdtsc\n\t" + "mov %%edx, %0\n\t" +@@ -151,9 +156,11 @@ static inline uint64_t timer_start() + + static inline uint64_t timer_end() + { +-#if defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) ++#ifndef ASM_INLINE ++ return (uint64_t)rdtsc(); ++#elif defined (__i386__) || (defined(__x86_64__) && defined (HAVE_BIT32)) + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" +@@ -162,7 +169,7 @@ static inline uint64_t timer_end() + return ((uint64_t)cycles_high << 32) | cycles_low; + #elif defined __x86_64__ + uint32_t cycles_high, cycles_low; +- __asm__ volatile ++ ASM_INLINE volatile + ("rdtscp\n\t" + "mov %%edx, %0\n\t" + "mov %%eax, %1\n\t" From ps.report at gmx.net Tue Mar 8 20:59:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 8 Mar 2022 21:59:47 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-userland: add support for aarch64 build In-Reply-To: References: <20220307224226.1375696-1-christian@paral.in> <20220307235417.279e7751@gmx.net> Message-ID: <20220308215947.665d0fac@gmx.net> Hello Christian, On Mon, 7 Mar 2022 15:03:25 -0800, Christian Stewart via buildroot wrote: > Hi Peter, > > You're probably right about that: > > On Mon, Mar 7, 2022 at 2:54 PM Peter Seiderer wrote: > > On Mon, 7 Mar 2022 14:42:26 -0800, Christian Stewart via buildroot wrote: > > > > > Tested on Pi4 Model B (aarch64). > > > > > > Note: rpi-userland and upstream rpi os now support arm64. > > > > All issues/questions solved since discussion [1], [2] about > > missing libraries/features? > > > > As far as I know rpi os graphic support is based on mesa3d v3d/vc4 > > instead of rpi-userland libraries? > > I use this package on arm64 for vcgencmd (videocore) and other commands, > > however I have not verified that graphics work correctly, and you're > most likely correct, > > the arm64 stack probably is using mesa3d vc4. I boot the pi4 64 bit with: > > arm_64bit=1 > dtoverlay=vc4-fkms-v3d > > So this is using vc4, as you've mentioned here. > > I suppose to fix this patch, it needs something like: > > ifeq ($(BR2_aarch64),y) > RPI_USERLAND_CONF_OPTS += -DARM64=ON > else > RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg > endif > > Is this correct? Did not (yet/lately) check if really all the above libs are disabled with the ARM64 feature, but at least a starting point for the aarch64 use case.... But needs a corresponding aarch64 handling in package/rpi-userland/Config.in too (select BR2_PACKAGE_HAS_LIBEGL, select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_LIBOPENVG, select BR2_PACKAGE_HAS_LIBOPENMAX, ...) and maybe the help text needs to be adjusted... > > Thanks & best, > Christian Stewart > > > Regards, > > Peter > > > > [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587538.html > > [2] http://lists.busybox.net/pipermail/buildroot/2021-October/626080.html > > PS: I've noticed that my e-mail / name is wrong again: > > Christian Stewart via buildroot > > is this on your end or mine? Maybe both, I got your original email with From: Christian Stewart via buildroot CC: Christian Stewart , ... Reply-To: Christian Stewart My email client (Claws Mail) seems to ignore the Reply-To field leading to To: Christian Stewart via buildroot CC: Christian Stewart CC: ... But the copy from the mailing list I receive is missing the CC: Christian Stewart but keeps the other CC recipients... Regards, Peter > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Tue Mar 8 21:12:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 22:12:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/boinc: disable fcgi Message-ID: <20220308211205.3682-1-fontaine.fabrice@gmail.com> libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot -- 2.34.1 From peter at korsgaard.com Tue Mar 8 22:08:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 8 Mar 2022 23:08:11 +0100 Subject: [Buildroot] [git commit] Update for 2022.02 Message-ID: <20220308220031.EAA1883874@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08967921c4a91eb7d966c31f755a0720914e8bff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 21 +++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 68 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 8e8ecd1a72..59ae8f15ce 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,36 @@ +2022.02, released March 8th, 2022 + + Various fixes. + + Fixes to cargo and golang packaging infrastructure. + + Defconfigs: OrangePi RK3399: Fix genimage format + + Updated/fixed packages: azure-iot-sdk-c, bpftool, cog, + directfb, directfb-examples, dnsmasq, docker-engine, expat, + freerdp, frr, gdb, ghostscript, glib-networking, go, haproxy, + hostapd, kf5-extra-cmake-modules, kf5-kcoreaddons, + kf5-modemmanager-qt, kf5-networkmanager-qt, libcamera-apps, + libgee, libglfw, librstp, libtorrent, libvirt, libxslt, linux, + mariadb, oprofile, osm2pgsql, pulseview, python-cryptography, + python-gnupg, python-treq, qt5base, qt5webkit, rauc, re2, + rygel, safeclib, sconeserver, seatd, sord, upmpdcli, + util-linux, weston, wpa_supplicant, xdriver_xf86-video-mach64, + xdriver_xf86-video-nouveau, xdriver_xf86-video-qxl, + xscreensaver, zabbix + + New packages: gdk-pixbuf-xlib + + Removed packages: python-pycli + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14611: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_.. + #14631: host-go-bootstrap: go not being built for package in .. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2022.02-rc3, released February 28th, 2022 Fixes all over the tree. diff --git a/Makefile b/Makefile index 4f693d40a9..71f8096b71 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02-rc3 +export BR2_VERSION := 2022.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646083800 +BR2_VERSION_EPOCH = 1646777000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 891221e155..18a9254cbf 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
        Download
        -

        Latest long term support release: 2021.02.10

        +

        Latest stable / long term support release: 2022.02

        - +
        - +
        -

        buildroot-2021.02.10.tar.gz

        -

        PGP signature

        +

        buildroot-2022.02.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2021.02.10.tar.bz2

        -

        PGP signature

        +

        buildroot-2022.02.tar.xz

        +

        PGP signature

        - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
        diff --git a/docs/website/news.html b/docs/website/news.html index 88885a058f..de80a5f23d 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2022.02 released

          +

          8 March 2022

          +
          +
          +

          The stable 2022.02 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2022.02 release.

          + +

          Notice that this is a long term support release which will be + supported with security and other important fixes until March 2023.

          +
          +
          +
          • +
        • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 37981d7932..a5a0e3f41a 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.2' +RELEASE='2022.02' ### Change here for more memory/cores ### VM_MEMORY=2048 From fontaine.fabrice at gmail.com Tue Mar 8 22:08:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 8 Mar 2022 23:08:12 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/riemann-c-client: bump to version 1.10.5 Message-ID: <20220308220812.35726-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/algernon/riemann-c-client/releases/tag/riemann-c-client-1.10.5 Signed-off-by: Fabrice Fontaine --- package/riemann-c-client/riemann-c-client.hash | 4 ++-- package/riemann-c-client/riemann-c-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/riemann-c-client/riemann-c-client.hash b/package/riemann-c-client/riemann-c-client.hash index 6d4d634d75..43d4cd45c4 100644 --- a/package/riemann-c-client/riemann-c-client.hash +++ b/package/riemann-c-client/riemann-c-client.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 334874f0b9a507a8abbc7138df719cba4f28f12c02c39d5e55090b8edb86f9d2 riemann-c-client-1.10.4.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE +sha256 568416d854d1c1e5eac743c9f56db6fa0d6a8144daa74a799d0556bb6b50e679 riemann-c-client-1.10.5.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 6fbb3caf5c..f942d560c8 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -RIEMANN_C_CLIENT_VERSION = 1.10.4 +RIEMANN_C_CLIENT_VERSION = 1.10.5 RIEMANN_C_CLIENT_SITE = \ $(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)) RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+ -- 2.34.1 From mail at dbrgn.ch Tue Mar 8 22:58:47 2022 From: mail at dbrgn.ch (Danilo) Date: Tue, 08 Mar 2022 23:58:47 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> Message-ID: <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> Hi Simon > I did expect that adding the dependency as you did would work but it > failed: they show up when running `make arm- > trusted-firmware-show-depends` but not in `make arm-trusted- > firmware-show-build-order`. Does the same happen for you? Yes, same issue for me. "make nginx-show-depends" includes "nginx-rtmp-module", but "make nginx-show-build-order" does not. Manually building the module before building nginx does work, but it would be nice if there were a clean fix. Danilo From fontaine.fabrice at gmail.com Tue Mar 8 23:17:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 00:17:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix dnssec static build Message-ID: <20220308231733.176991-1-fontaine.fabrice@gmail.com> Drop -DHAVE_DNSSEC_STATIC which has been added by commit e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises the following static build failure because dnsmasq will wrongly append "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' Strangely enough, this is the first time this build failure is raised by the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 Fixes: - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e Signed-off-by: Fabrice Fontaine --- package/dnsmasq/dnsmasq.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4..230e4a8116 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -26,9 +26,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Mar 9 07:43:30 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 09 Mar 2022 07:43:30 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-08 Message-ID: <20220309074335.AF1FB4089C@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-03-08 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 16 | 4 | 0 | 20 | 2021.11.x | 4 | 0 | 0 | 4 | master | 34 | 12 | 0 | 46 | Classification of failures by reason for master ----------------------------------------------- bluez5_utils-5.63 | 1 dnsmasq-2.86 | 1 efl-1.26.1 | 1 file-5.41 | 1 frr-8.1 | 1 gstd-0.13.0 | 1 host-libselinux-3.3 | 1 librtlsdr-ed0317e6a58c09887... | 1 safeclib-3.7.1 | 1 target-finalize | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/32ba5bde054ceee823af0a27e2cb849031c226cb | x86_64 | dnsmasq-2.86 | NOK | http://autobuild.buildroot.net/results/99b419ddb5a3be561d39e715833510a59519213e | powerpc | efl-1.26.1 | NOK | http://autobuild.buildroot.net/results/0a462c2de955d145a43aae657adf1ecc5ffba4f9 | arm | file-5.41 | NOK | http://autobuild.buildroot.net/results/2c8f26162e5c0e8202b58930930c08cf529bdb0f | ORPH arc | frr-8.1 | NOK | http://autobuild.buildroot.net/results/43fd833d5d6562b54988641cf8ad37e327d4fc8c | arm | gstd-0.13.0 | NOK | http://autobuild.buildroot.net/results/cd485ea788be73a3dc52aa89f6c8993928f9734c | ORPH xtensa | host-libselinux-3.3 | NOK | http://autobuild.buildroot.net/results/08c6207fd5f86e4cf786408d36bdda2797b60dd9 | x86_64 | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/ba76e152edad04134708f3d00ce78a194a18327c | sparc64 | safeclib-3.7.1 | NOK | http://autobuild.buildroot.net/results/024103bf9b624f25026cc9c9f60cdc3087379410 | arc | target-finalize | NOK | http://autobuild.buildroot.net/results/b7092e72d59aa1b55b494f7718cab3e8287d117e | arm | unknown | NOK | http://autobuild.buildroot.net/results/5b00e08bd10723985eb666d87544ea2ee6ff980a | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/f7f8969613ee6f2710cbf3d02fed1c3f22b7b029 | Classification of failures by reason for 2021.02.x -------------------------------------------------- gstreamer1-mm-1.10.0 | 1 ndisc6-1.0.4 | 1 unknown | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | gstreamer1-mm-1.10.0 | NOK | http://autobuild.buildroot.net/results/fc67af8a06c3a6d583be2a4211439d9fc3556846 | ORPH arm | ndisc6-1.0.4 | NOK | http://autobuild.buildroot.net/results/3d6e0a40b64ddf37429cf2b6870e0002a9d53810 | ORPH arm | unknown | NOK | http://autobuild.buildroot.net/results/b5bd8c5dc46eb98a7958fc88e02bb9ae122fb6a6 | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/78b0bd1d3f5eab2c2b41d156c42b7da11e178424 | -- http://autobuild.buildroot.net From bugzilla at busybox.net Wed Mar 9 09:58:14 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 09:58:14 +0000 Subject: [Buildroot] [Bug 14651] New: OpenSSH 8.9p1 compiler error under ARM Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 Bug ID: 14651 Summary: OpenSSH 8.9p1 compiler error under ARM Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: major Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: mf at go-sys.de CC: buildroot at uclibc.org Target Milestone: --- 9-March-2022 from git master ARM little endian gcc-11.2 kernel aspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64 compiling error openssh 8.9.p1 -fzero-call-used-regs is not supported on this target ssherr.c: In Funktion ?ssh_err?: ssherr.c:151:1: nicht implementiert: ?-fzero-call-used-regs? wird auf diesem Ziel nicht unterst?tzt 151 | } | ^ -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 9 10:05:51 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:05:51 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 Frank Rogall changed: What |Removed |Added ---------------------------------------------------------------------------- Version|2021.11.1 |2022.02 Severity|major |blocker --- Comment #6 from Frank Rogall --- This Bug is still in 2022.02 LD_LIBRARY_PATH=/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/lib.host:/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../tools/v8_gypfiles; mkdir -p /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/obj/gen/generate-bytecode-output-root/builtins-generated; python ../../deps/v8/tools/run.py "/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/v8-qemu-wrapper" "/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator" "/home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/obj/gen/generate-bytecode-output-root/builtins-generated/bytecodes-builtins-list.h" /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator) /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator) /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/bytecode_builtins_list_generator) make[3]: *** [tools/v8_gypfiles/generate_bytecode_builtins_list.target.mk:13: /home/fr/work/egate/x/egate/build/nodejs-14.18.3/out/Release/obj/gen/generate-bytecode-output-root/builtins-generated/bytecodes-builtins-list.h] Error 1 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 9 10:19:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:19:59 +0000 Subject: [Buildroot] [Bug 14366] Nodejs fails with "version `GLIBC_2.34' not found" on Ubuntu 20.04 In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14366 --- Comment #7 from Jens Maus --- (In reply to Frank Rogall from comment #6) I could verify that this issue still exists in 2022.02. However, my mentioned workaround (cf. https://bugs.busybox.net/show_bug.cgi?id=14366#c4) still works. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 9 10:22:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:22:59 +0000 Subject: [Buildroot] [Bug 14656] New: Adding dependencies from an external tree does not work Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14656 Bug ID: 14656 Summary: Adding dependencies from an external tree does not work Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dopsi at dopsi.ch CC: buildroot at uclibc.org Target Milestone: --- When a dependency is added by a Makefile in an external tree to a package present in the Buildroot tree, the dependency does not get built before the package. Detailled description: When having the following in an external tree: FOO_DEPENDENCIES += bar FOO_FINAL_ALL_DEPENDENCIES gets updated and will contain bar (as shown by running make foo-show-depends) but this will not be reflected in the build order (as shown in make foo-show-build-order). In the package/pkg-generic.mk file [1] there is a call to patsubst that will compute the prerequisites for foo-show-build-order. When printing the output of pathsubst with echo $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES)) the value is properly written out and will contain bar. However, the prerequisite is not present when printing them out with echo $$^ [1] https://git.buildroot.org/buildroot/tree/package/pkg-generic.mk#n996 Links: - first mailing list post: https://lists.buildroot.org/pipermail/buildroot/2022-February/637237.html - second mailing list post: https://lists.buildroot.org/pipermail/buildroot/2022-March/638117.html - minimal example: https://gitlab.com/dopsi/mve-br2-external-dep -- You are receiving this mail because: You are on the CC list for the bug. From rsassen at comecer.com Wed Mar 9 10:24:56 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 9 Mar 2022 10:24:56 +0000 Subject: [Buildroot] [PATCH 0/1] package/rpi-firmware: fix missing files in overlays Message-ID: Hi Peter, > > Also, git stripped the leading TAB character from the changed line in > > the diff. I'm hesitant to manually edit this, since I'm not sure if > > this is intended behavior. > > This should not happen, are you sure the tab is committed? I think it must have been a mistake on my side. I cannot reproduce it. I will fix it in a next revision for the patch. > > This email communication is CONFIDENTIAL. If you are not the intended > > recipient, you may not use, copy or disclose to anyone the message or > > any information contained in the message and I ask that you please notify > me by return email and delete this communication immediately. Thank you. > > According to the email footer I could not look further at your provided patch > ;-) > > Please try to re-send without it.... Unfortunately I have no control over this. It is added automatically by our company email gateway. I have submitted a support ticket for it, but I won't hold my breath... Thanks for the suggestions, Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 9 10:25:19 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 10:25:19 +0000 Subject: [Buildroot] [Bug 14656] Adding dependencies from an external tree does not work In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14656 --- Comment #1 from Simon Doppler --- Workaround: It is possible to build bar first and then building the entire system. -- You are receiving this mail because: You are on the CC list for the bug. From rsassen at comecer.com Wed Mar 9 10:25:24 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 9 Mar 2022 10:25:24 +0000 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: Hi Peter, > > Not all files in boot/overlays are copied to the image, which may result > > in overlays not being loaded at all, or a wrong overlay being loaded. > > > > When using os_prefix and/or overlay_prefix in the raspberry pi > > config.txt, it checks for the existence of README in the overlays > > directory. If it is missing, overlays will not be loaded. > Any prove for this behavior (could not find anything about it in > the docs)? Yes, it is documented in the raspberry pi docs for config.txt [3], 2nd paragraph: I've also tested it myself and can confirm that e.g. when using os_prefix=custom/ , and /custom/overlays/README does not exist, that overlays will be loaded from the root /overlays instead, or when /overlays does not exist, no overlays will be loaded at all. > > The overlay_map.dtb file contains rules for overlays that require > > special handling depending on the specific type of raspberry pi > > hardware. When this file is missing, the wrong overlay may be loaded. > > Only if you use this feature, see [1], [2] (building multiple rpi targeting sdcard) > instead of determining the right overlay (exactly targeting one rpi flavour sdcard, > as the buildroot rpi example config files do)... That is correct. You have to be careful however when e.g. switching to a new rpi target. When no overlay map is present, you'll have to manually change config.txt to use the correct overlays for your platform instead of relying on the overlay map. > Would prefer to only/explicitly add the overlay_map.dtb file: > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo) $(@D)/boot/overlays/overlay_map.dtb, \ > > or > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo $(@D)/boot/overlays/*.dtb), \ > > or as it is a (maybe unwanted target feature) add a new buildroot rpi-firmware > configure option for adding the overlay_map.dtb file... I had also considered adding only the README and overlay_map.dtb. But I figured if the raspberry pi firmware adds extra files, they would probably be important. Not copying them might introduce unexpected behavior. When not copying all files, each time when bumping rpi-firmware to a new version one should check if files were added, and if they are worth copying. I could add a configure option to also copy overlay_map.dtb and README like you suggested (probably two separate options then; default on?). E.g. BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_README How about instead adding a configure option for specifying a list of files to be copied instead of all files? That way you could also specify exactly which dtbo files should be copied, instead of copying all of them. Currently there are a lot of overlays copied that we don't use for our system configuration. And if in the future new files are added to the rpi-firmware overlays, we don't have to introduce yet another configure option for it. E.g. BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_FILES Thanks for the feedback, regards, Rutger [3] https://www.raspberrypi.com/documentation/computers/config_txt.html#os_prefix This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Wed Mar 9 11:20:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 12:20:02 +0100 Subject: [Buildroot] Buildroot 2022.02 released Message-ID: <87y21j1ifx.fsf@dell.be.48ers.dk> Hi, Buildroot 2022.02 is released - Go download it at: http://buildroot.net/downloads/buildroot-2022.02.tar.gz or http://buildroot.net/downloads/buildroot-2022.02.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Please give it a spin and report any problems to the mailing list or bug tracker. Again a very active development cycle with almost 2000 changes and contributions from 148 unique contributors! Of noteworthy new features/changes we have: - Toolchain: - glibc: Optional support for compatibility shims for running on older kernels than what glibc has been built against - uClibc: Use uClibc-ng 1.0.40 - External toolchains: Update Bootlin toolchains to 2021.11-1 version - Python 2.7 and python 2.x specific packages removed as python 2.x is EOL since April 2020. Likewise a number of python3 specific host packages has been renamed (host-python-foo instead of host-python3-foo) now host-python is always python 3.x. - Cargo (Rust) package infrastructure added. Vendoring support added to golang package infrastructure. - New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2, QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike Riscv64, Xilinx zcu102 - New packages: ace, alchemy, alfred, bat, bento4, bmx7, bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper, davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi, gdk-pixbuf-xlib gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools, libcamera-apps, libest, libexecinfo, libfutils, libglvnd, libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv, lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver, moby-buildkit, modsecurity2, networkd-dispatcher, pahole, php-apcu, php-lua, php-pam, python-argon2-cffi-bindings, python-cssselect2, python-distro, python-fonttools, python-gnupg, python-installer, python-memory-profiler, python-mpd2, python-pep517, python-pydyf, python-pypa-build, python-pyphen, python-tinycss2, python-tomli, python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware, riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp, sentry-cli, serd, simple-mail, sord, sratom, sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog, vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02 Upgrading from 2021.02.x: In addition to these changes, for people upgrading from 2021.02.x the most noteworthy changes since that release are: - FORTIFY_SOURCE, PIC/PIE, RELRO and SSP security hardening options are now enabled by default. - The minimal host cmake version has been bumped to 3.16 - support/download: Fix tarball generation (from git/svn repos) including symlinks pointing to ./. Fix svn download for <1.9 clients or repos using CVS-style keywords. - Infrastructure: Expose CONFIG_DIR to post-build/post-image scripts, so they can call the Buildroot Makefile in the correct directory for both in-tree / out-of-tree builds. - support/scripts/gen-missing-cpe: A script to query the list of CPE IDs for the packages enabled in the current configuration and: - for CPE IDs that do not have any matching entry in the CPE database, it emits a warning - for CPE IDs that do have a matching entry, but not with the same version, it generates a snippet of XML that can be used to propose an updated version to NIST. - support/scripts/cve.py: Use the (significantly) faster yajl2 ijson backend for older (< 2.5) ijson versions rather than the slow python default, speeding up pkg-stats by ~2x. - CPE meta data has been added for a large number of packages - Toolchain: Add support for gcc 11.x, gcc 10.x is now the default, removed gcc 8.x support except for PowerPC SPE. Support for gdb 11.x added, gdb 10.x now the default. Add support for binutils 2.37, binutils 2.36.x is now the default, binutils 2.34 removed. Glibc updated to 2.34 - Bootloaders/firmware: support for building the EDK II UEFI firmware, support for building AT91Bootstrap 4.x. - New BR2_ENABLE_RUNTIME_DEBUG option, that controls whether packages should be compiled with runtime debugging information (which is different than debugging symbols). - Many features of the bluez5_utils package have been made optional, and default to disabled. Users of bluez5_utils are encouraged to review their configuration. - Many packages (over 70) updated to enable the appropriate SELinux refpolicy module when SELinux support is enabled. - Many packages updated to select the appropriate OpenSSL features after many OpenSSL ciphers/features have been made optional. - Filesystems: - new OCI filesystem type, to build container images compatible with the Open Container Initiative standard - support for hybrid ISO9660 images added, which work on legacy and EFI BIOS machines Future: This release will be become our new long term support releases, which means it will be supported with security and other important fixes until 2023.02 is out. The previous 2021.02.x LTS release will see atleast one more update before it becomes EOL in April, so start migration to 2022.02 soon. The next release will be 2022.05. Expect the first release candidate in early May and the final release at the end of the month. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 12:56:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 13:56:12 +0100 Subject: [Buildroot] [git commit] Kickoff 2022.05 cycle Message-ID: <20220309124906.1EAE88386E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=722dffca13a8f129a8fb2938a02def5f454991fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 71f8096b71..6756945819 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02 +export BR2_VERSION := 2022.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1646777000 From peter at korsgaard.com Wed Mar 9 12:55:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 13:55:32 +0100 Subject: [Buildroot] [git commit] docs/website/news.html: add 2022.02 announcement link Message-ID: <20220309124906.150C683903@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=501263241ce6b38f3c45e737c7928a1ae1c66927 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index de80a5f23d..3b7234b307 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

          The stable 2022.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2022.02 release.

          From Alexey.Brodkin at synopsys.com Wed Mar 9 13:28:35 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 9 Mar 2022 16:28:35 +0300 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC Message-ID: <20220309132835.7251-1-abrodkin@synopsys.com> This patch adds support of ARC architecture in Qt's JS core and Webkit. The change itself is quite straight-forward: 1. Enable JS core for ARC 2. Make sure so-called "large memory model" is used, i.e. relocations with long jumps are being generated for global symbols, as otherwise insanely huge libqt5webkit.so fails to link because some symbols might be more than 32 MiB away from each other. 3. Make the original WebKit build system aware of yet another CPU architecture with explicitly disabled JIT in JS core for ARC. Obviously, this one depends on [1]. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer --- package/qt5/Config.in | 2 +- package/qt5/qt5base/qt5base.mk | 13 +++ .../0005-Add-support-for-ARC-processors.patch | 93 +++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch diff --git a/package/qt5/Config.in b/package/qt5/Config.in index f2b1ff4a19..cbb2e06a21 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE bool default y # Javascript engine is only available on certain architectures - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..b25e0f44b6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -201,6 +201,19 @@ endif QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) +ifeq ($(BR2_arc),y) +# In case of -Os (which is default in BR) gcc will use millicode implementation +# from libgcc. That along with performance degradation may lead to issues during +# linkage stage. In case of QtWebkit exactly that happens - millicode functions +# get put way too far from caller functions and so linker fails. +# To solve that problem we explicitly disable millicode call generation for Qt. +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) +# it's good to firce compiler to not assume short or even medium-length calls +# could be used. I.e. always use long jump instaructions. +# Otherwise there's a high risk of hitting link-time failures. +QT5BASE_CFLAGS += -mno-millicode -mlong-calls +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch new file mode 100644 index 0000000000..92f023eab6 --- /dev/null +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch @@ -0,0 +1,93 @@ +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 21 Feb 2022 18:28:00 +0300 +Subject: [PATCH] Add support for ARC processors + +Signed-off-by: Alexey Brodkin +--- + CMakeLists.txt | 4 +++- + Source/JavaScriptCore/CMakeLists.txt | 3 ++- + Source/WTF/wtf/Platform.h | 8 ++++++++ + Source/WTF/wtf/dtoa/utils.h | 2 +- + Source/cmake/OptionsQt.cmake | 4 ++++ + 5 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31a2ea1fd..f0dfbda5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) + else () + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) + endif () +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") ++ set(WTF_CPU_ARC 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 937b3ed00..205dde288 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) + endif () + +-if (WTF_CPU_ARM) ++if (WTF_CPU_ARC) ++elseif (WTF_CPU_ARM) + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5717f3ea1..b327ed693 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -349,6 +349,14 @@ + + #endif /* ARM */ + ++/* CPU(ARC) - ARC */ ++#if defined(__arc__) ++#define WTF_CPU_ARC 1 ++#if defined(__BIG_ENDIAN__) ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++#endif ++ + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 889642cee..8f1e9933e 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +index ec6081de0..e1a5efc1e 100644 +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) + endif () + ++if (WTF_CPU_ARC) ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) ++endif () ++ + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) +-- +2.25.1 + -- 2.25.1 From arnout at mind.be Wed Mar 9 13:30:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:24 -0000 Subject: [Buildroot] [git commit] package/libxkbcommon: bump version to 1.4.0 Message-ID: <20220309132156.0ADB883916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=948050c0f9096953555ed7f84835c5297a415a6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) From arnout at mind.be Wed Mar 9 13:30:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:24 -0000 Subject: [Buildroot] [git commit] package/python-setuptools: bump to version 60.8.2 Message-ID: <20220309132156.4917283917@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=795c473cfdedc71b6dcf5b691cec729d2845da0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Mar 9 13:30:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:25 -0000 Subject: [Buildroot] [git commit] package/xmrig: bump version to 6.16.4 Message-ID: <20220309132156.3CBF583916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b969c8c8cd30a97a47f7197c114e37c9d12d80b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 9 13:30:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:25 -0000 Subject: [Buildroot] [git commit] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Message-ID: <20220309132156.320BD83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80f480381b3b307079c761f14508458782772111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From peter at korsgaard.com Wed Mar 9 13:23:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 14:23:07 +0100 Subject: [Buildroot] [git commit] Merge branch 'next' Message-ID: <20220309132156.ED25D83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0064df6bd29492b3472542b0d52dd5d1ca983dc Patch is too large, so refusing to show it Patch is too large, so refusing to show it From arnout at mind.be Wed Mar 9 13:30:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:25 -0000 Subject: [Buildroot] [git commit] package/liquid-dsp: bump version to 1.4.0 Message-ID: <20220309132155.F12CA83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f7f8f381394207bfb029ec395f5ced5695a0a2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Wed Mar 9 13:30:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:26 -0000 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Message-ID: <20220309132156.546AB83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6aca97d6e51a006187bcd3319cb7ff1a92380c66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 871cf2f495..c8573fafad 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.5 +MESA3D_HEADERS_VERSION = 21.3.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e36d798e21..d64b833100 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.5 +MESA3D_VERSION = 21.3.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Wed Mar 9 13:30:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:26 -0000 Subject: [Buildroot] [git commit] package/unbound: bump version to 1.15.0 Message-ID: <20220309132156.6B5AE83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fad0f7a096ce29b3626e4ac41e5dbea0ff3e7ae0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From arnout at mind.be Wed Mar 9 13:30:27 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:27 -0000 Subject: [Buildroot] [git commit] boot/barebox: bump version to 2022.01.0 Message-ID: <20220309132156.613B483916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a2beaf778d3649ab395c2a931a3935f69191585 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bartosz Bilas Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From arnout at mind.be Wed Mar 9 13:30:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:28 -0000 Subject: [Buildroot] [git commit] package/mutt: bump to version 2.2.0 Message-ID: <20220309132156.8FDA183915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1ca33e81230eaa5fe41c4945075c62821128a8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif From arnout at mind.be Wed Mar 9 13:30:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:29 -0000 Subject: [Buildroot] [git commit] package/opentracing-cpp: bump to version 1.6.0 Message-ID: <20220309132156.84EE083915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5a8485963dc0112c0201e712d599d31f0081035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 9 13:30:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:30 -0000 Subject: [Buildroot] [git commit] package/pkg-python.mk: refactor build/install opts Message-ID: <20220309132156.9D7BF83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3810c131761922ae8c046840c78430c4125f16e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python package infrastructure defines a number of helper variables that are used to construct the build and install commands. However, there are still a few parts (setup.py and its argument) that are set explicitly in _BUILD_CMDS and _INSTALL_CMDS. This creates problems if we want to add another setup type that does not use setup.py. Therefore, move the setup.py part into the helper variables as well. Since this means that the variable becomes a full command rather than just options, rename them to _BUILD_CMD and _INSTALL_CMD. While we're at it, also clean up the whitespace in the definition of these variables. They were aligned on = at some point, but that alignment was already broken. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 02df061a19..61f0dd6ec2 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -130,27 +130,27 @@ endif # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") @@ -186,8 +186,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif @@ -200,8 +200,9 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) endef endif @@ -213,8 +214,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -227,8 +228,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif From arnout at mind.be Wed Mar 9 13:30:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:31 -0000 Subject: [Buildroot] [git commit] package/ola: reintroduce package at version 0.10.8 Message-ID: <20220309132156.792E983916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ff948444c3978d63f483344a3d92d994c64312 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Wed Mar 9 13:30:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:33 -0000 Subject: [Buildroot] [git commit] package/python-flit-core: new package/infrastructure Message-ID: <20220309132156.AA74283916@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29a12eb86aee706082f344a25d2e563984b9aa1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This adds pep517(needed for flit-core to build itself) and flit python package types. We need to add an installer script and pass it appropriate options for installing pep517 wheels generated by python-pypa-build during the build stage. Unfortunately it seems pep517 does not support builds without using the wheel format. We also need to add a patch fixing the version parser in flit-core. Signed-off-by: James Hilliard [Arnout: - fix indentation in pkg-python.mk (tabs, not spaces); - use the new _CMD variables instead of duplicating the entire _CMDS definitions; - no need to filter dependencies (they're not self-referencing); - _NEEDS_HOST_PYTHON no longer exists; - host-python-pypa-build gets added to DEPENDENCIES automatically. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 59 +++++++++++++++- ...t-version-parser-for-multiple-assignments.patch | 80 ++++++++++++++++++++++ package/python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 13 ++++ support/scripts/pyinstaller.py | 69 +++++++++++++++++++ 5 files changed, 223 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 61f0dd6ec2..0c5577362f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -103,6 +103,47 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PATH=$(BR_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ + PYTHONPATH="$(PYTHON3_PATH)" \ + PYTHONNOUSERSITE=1 \ + _python_sysroot=$(STAGING_DIR) \ + _python_prefix=/usr \ + _python_exec_prefix=/usr + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/usr/bin \ + --data=$(HOST_DIR)/usr + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -152,8 +193,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +ifeq ($(4),target) +$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for @@ -172,6 +224,11 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += host-python-flit-core +endif endif # SETUP_TYPE # Python interpreter to use for building the package. diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch new file mode 100644 index 0000000000..5a94e1dcab --- /dev/null +++ b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch @@ -0,0 +1,80 @@ +From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 27 Nov 2021 02:36:15 -0700 +Subject: [PATCH] Fix ast version parser for multiple assignments + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/takluyver/flit/pull/474] +--- + flit_core/common.py | 21 +++++++++++-------- + .../tests/samples/moduleunimportabledouble.py | 8 +++++++ + flit_core/tests/test_common.py | 5 +++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py + +diff --git a/flit_core/common.py b/flit_core/common.py +index f1f378f..86bcf4b 100644 +--- a/flit_core/common.py ++++ b/flit_core/common.py +@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): + for child in node.body: + # Only use the version from the given module if it's a simple + # string assignment to __version__ +- is_version_str = ( +- isinstance(child, ast.Assign) +- and len(child.targets) == 1 +- and isinstance(child.targets[0], ast.Name) +- and child.targets[0].id == "__version__" +- and isinstance(child.value, ast.Str) +- ) +- if is_version_str: +- version = child.value.s ++ if isinstance(child, ast.Assign): ++ for target in child.targets: ++ is_version_str = ( ++ isinstance(target, ast.Name) ++ and target.id == "__version__" ++ and isinstance(child.value, ast.Str) ++ ) ++ if is_version_str: ++ version = child.value.s ++ break ++ else: ++ continue + break + else: + version = None +diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py +new file mode 100644 +index 0000000..42d51f3 +--- /dev/null ++++ b/flit_core/tests/samples/moduleunimportabledouble.py +@@ -0,0 +1,8 @@ ++ ++""" ++A sample unimportable module with double assignment ++""" ++ ++raise ImportError() ++ ++VERSION = __version__ = "0.1" +diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py +index 02cfab7..42e230b 100644 +--- a/flit_core/tests/test_common.py ++++ b/flit_core/tests/test_common.py +@@ -70,6 +70,11 @@ class ModuleTests(TestCase): + 'version': '0.1'} + ) + ++ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) ++ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', ++ 'version': '0.1'} ++ ) ++ + info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) + self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', + 'version': '1.2.3'} +-- +2.33.1 + diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash new file mode 100644 index 0000000000..bd47fd4f6b --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz +sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 0000000000..8971223d1f --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 + +$(eval $(host-python-package)) diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py new file mode 100755 index 0000000000..6dd9242327 --- /dev/null +++ b/support/scripts/pyinstaller.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import argparse +import glob + +from installer import install +from installer.destinations import SchemeDictionaryDestination +from installer.sources import WheelFile + + +def main(): + """Entry point for CLI.""" + ap = argparse.ArgumentParser("python pyinstaller.py") + ap.add_argument("wheel_file", help="Path to a .whl file to install") + + ap.add_argument( + "--interpreter", required=True, help="Interpreter path to be used in scripts" + ) + ap.add_argument( + "--script-kind", + required=True, + choices=["posix", "win-ia32", "win-amd64", "win-arm", "win-arm64"], + help="Kind of launcher to create for each script", + ) + + dest_args = ap.add_argument_group("Destination directories") + dest_args.add_argument( + "--purelib", + required=True, + help="Directory for platform-independent Python modules", + ) + dest_args.add_argument( + "--platlib", + help="Directory for platform-dependent Python modules (same as purelib " + "if not specified)", + ) + dest_args.add_argument( + "--headers", required=True, help="Directory for C header files" + ) + dest_args.add_argument( + "--scripts", required=True, help="Directory for executable scripts" + ) + dest_args.add_argument( + "--data", required=True, help="Directory for external data files" + ) + args = ap.parse_args() + + destination = SchemeDictionaryDestination( + { + "purelib": args.purelib, + "platlib": args.platlib if args.platlib is not None else args.purelib, + "headers": args.headers, + "scripts": args.scripts, + "data": args.data, + }, + interpreter=args.interpreter, + script_kind=args.script_kind, + ) + + with WheelFile.open(glob.glob(args.wheel_file)[0]) as source: + install( + source=source, + destination=destination, + additional_metadata={}, + ) + + +if __name__ == "__main__": + main() From arnout at mind.be Wed Mar 9 13:30:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:33 -0000 Subject: [Buildroot] [git commit] package/python-tinycss2: bump to version 1.1.1 Message-ID: <20220309132156.B4D8283917@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc60c732a19548cfbd3543d3521324ef5faaa116 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-tinycss2/Config.in | 2 ++ package/python-tinycss2/python-tinycss2.hash | 4 ++-- package/python-tinycss2/python-tinycss2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index a34717e002..4d6dcca663 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -3,3 +3,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb3754752..e8e1d93f83 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 60272f58f8d5834b2e09ffbc9bd5de53 tinycss2-1.1.1.tar.gz +sha256 b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf tinycss2-1.1.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b97766..e4fc5dc9c5 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.1.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/1e/5a/576828164b5486f319c4323915b915a8af3fa4a654bbb6f8fc8e87b5cb17 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Mar 9 13:30:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 09 Mar 2022 13:30:34 -0000 Subject: [Buildroot] [git commit] package/cryptsetup: openssl is the default crypto backend Message-ID: <20220309132156.BFA3A83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ce909afa98223bbd6bb1b2c65dec6cc8982ad31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bad31cec8a 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -20,15 +20,15 @@ CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif From arnout at mind.be Wed Mar 9 13:30:35 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:35 -0000 Subject: [Buildroot] [git commit] package/poke: bump to version 2.1 Message-ID: <20220309132156.1799D83915@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc614345f1b8389df46b8f2d64cb3ae5a209b6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...c-HELP2MAN-replace-by-true-when-cross-com.patch | 6 ++--- ...-getrandom.c-fix-build-with-uclibc-1.0.35.patch | 28 +++++++++++----------- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index c169516153..85a76e068e 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From b35dadae6371c3727cac46ae5bd348b66aa411fc Mon Sep 17 00:00:00 2001 +From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -17,10 +17,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2c6f1aef..9c4c9be2 100644 +index a1943b57..c633f719 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index 757dc3f760..bd20b5d2c6 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -15,7 +15,7 @@ In file included from ./sys/random.h:40, /tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 7 | #include +++ |+#include - 8 | + 8 | This patch is not upstreamable as it is only a workaround for uclibc < 1.0.35, upstream uclibc has been patched with @@ -26,15 +26,15 @@ Fixes: Signed-off-by: Fabrice Fontaine --- - jitter/gnulib-local/getrandom.c | 1 + - gl/getrandom.c | 1 + gl-libpoke/getrandom.c | 1 + + gl/getrandom.c | 1 + + jitter/gnulib-local/getrandom.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/jitter/gnulib-local/getrandom.c -+++ b/jitter/gnulib-local/getrandom.c +diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c +index e146873..3948d8d 100644 +--- a/gl-libpoke/getrandom.c ++++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ #include @@ -44,7 +44,7 @@ index 41212fb32..0ad3f9648 100644 #include diff --git a/gl/getrandom.c b/gl/getrandom.c -index 41212fb32..0ad3f9648 100644 +index e146873..3948d8d 100644 --- a/gl/getrandom.c +++ b/gl/getrandom.c @@ -19,6 +19,7 @@ @@ -55,10 +55,10 @@ index 41212fb32..0ad3f9648 100644 #include #include -diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/gl-libpoke/getrandom.c -+++ b/gl-libpoke/getrandom.c +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index e146873..3948d8d 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c @@ -19,6 +19,7 @@ #include @@ -68,5 +68,5 @@ index 41212fb32..0ad3f9648 100644 #include -- -2.30.2 +2.31.1 diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 1367262f54..c30713b91c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24 poke-1.4.tar.gz +sha256 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) From arnout at mind.be Wed Mar 9 13:30:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 09 Mar 2022 13:30:36 -0000 Subject: [Buildroot] [git commit] package/rng-tools: bump to version 6.15 Message-ID: <20220309132156.2415F83917@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91cc129d72cf972c906829b1085c96797e41efd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-detect-non-posix-extensions-for-pthreads.patch | 43 ------------------- ...se-of-either-pthread-affinity-set-methods.patch | 49 ---------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) diff --git a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:43:01 -0400 -Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads - -Theres a desire to build rngd with musl, which doesn't have all the gnu -extensions (but it has some). So test for those. Note, this requires -the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0fe06fc..de7dca3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD - AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS([rng-tools-config.h]) - AC_CONFIG_MACRO_DIRS([m4]) -+AC_USE_SYSTEM_EXTENSIONS - - dnl Parse options - -@@ -100,6 +101,12 @@ AS_IF( - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) - -+AC_CHECK_DECL(pthread_attr_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], -+ [ AC_CHECK_DECL(pthread_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include ]]) -+ ], [[#include ]]) -+ - AS_IF( - [ test "x$with_nistbeacon" != "xno"], - [ diff --git a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:48:10 -0400 -Subject: [PATCH] Allow for use of either pthread affinity set methods - -musl has support for pthread_setaffinity_np, but not -pthread_attr_setaffinity_np. so check for hte existence of either -function in configure, and use the appropriate one. - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893] -Signed-off-by: Fabrice Fontaine ---- - rngd_jitter.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index ea29436..5c7e09e 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, - for(i=i-1;i>=0;i--) { - CPU_SET(i,cpus); - } -- pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); - -+ /* -+ * Note that only one of: -+ * HAVE_PTHREAD_ATTR_SETAFFINITY -+ * and -+ * HAVE_PTHREAD_SETAFFINITY -+ * Will ever be set, as per the configure.ac logic -+ */ -+#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY -+ pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); -+#endif - ret = -pthread_create(&thread_ctx->notime_thread_id, - &thread_ctx->notime_pthread_attr, - start_routine, arg); - -+#ifdef HAVE_PTHREAD_SETAFFINITY -+ pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); -+#endif -+ - CPU_FREE(cpus); - return ret; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING From nolange79 at gmail.com Wed Mar 9 13:52:23 2022 From: nolange79 at gmail.com (Norbert Lange) Date: Wed, 9 Mar 2022 14:52:23 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: support mismatched merged usr In-Reply-To: <2086ffec-82b8-ec71-41f0-55253c3cd8eb@mind.be> References: <20220215124619.563502-1-nolange79@gmail.com> <2086ffec-82b8-ec71-41f0-55253c3cd8eb@mind.be> Message-ID: Am Sa., 5. M?rz 2022 um 16:09 Uhr schrieb Arnout Vandecappelle : > > > > On 15/02/2022 13:46, Norbert Lange wrote: > > Look at the case where the source toolchain has non-merged usr, > > yet the target will have merged usr. > > > > sysroot/lib/ld-musl-x86_64.so.1 -> ../usr/lib/libc.so > > sysroot/usr/lib/libc.so > > Where do you get an external toolchain with such a weird layout? Normally libc > is in sysroot/lib and ld-musl*.so.1 is a symlink to either /lib/libc.so or > ../lib/libc.so. > > > Regards, > Arnout > the toolchain is built with crosstool-ng > > > > What happens is that buildroot copies the ld-*so* symlink > > into usr/lib, at which point it becomes broken. > > > > We now detect these broken symlinks, then try to find the target > > binary in the library directories and fix the link. > > > > Fix the case where the lib directory is a symlink, and no ld-*so* > > is installed by adding -H to find. > > > > Also use `cp -t` instead of some rarely used xargs tricks. > > > > Signed-off-by: Norbert Lange > > --- > > toolchain/helpers.mk | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > > index ef8e9a5f64..aaf2aecd80 100644 > > --- a/toolchain/helpers.mk > > +++ b/toolchain/helpers.mk > > @@ -135,8 +135,17 @@ copy_toolchain_sysroot = \ > > $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ > > done ; \ > > fi ; \ > > - if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > > - find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ > > + for i in $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -xtype l); do \ > > + LINKTARGET=`readlink $$i`; \ > > + rm $$i; \ > > + NEWLINKTARGET=$$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/lib $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/lib -name "`basename $${LINKTARGET}`" -print -quit); \ > > + if [ -n "$${NEWLINKTARGET}" -a -e "$${NEWLINKTARGET}" ]; then \ > > + ln -sr $${NEWLINKTARGET} $$i; \ > > + echo "Symlinking $$i -> `readlink $$i`" ; \ > > + fi; \ > > + done; \ > > + if [[ ! $$(find -H $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ > > + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 cp -t $(STAGING_DIR)/lib/; \ > > fi ; \ > > if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ > > if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ From foss+buildroot at 0leil.net Wed Mar 9 14:29:13 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Wed, 9 Mar 2022 15:29:13 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 Message-ID: <20220309142913.2102898-1-foss+buildroot@0leil.net> From: Quentin Schulz This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. The patch fails to apply because of a conflict in copyright year so it needed some additional handling after downloading. The patch file was added by running the following command: wget https://download.qt.io/archive/qt/5.15/CVE-2022-25255-qprocess5-15.diff -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch [1] https://nvd.nist.gov/vuln/detail/CVE-2022-25255 Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 2 + 2 files changed, 58 insertions(+) create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch new file mode 100644 index 0000000000..dfab92a9ef --- /dev/null +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch @@ -0,0 +1,56 @@ +--- a/src/corelib/io/qprocess_unix.cpp ++++ b/src/corelib/io/qprocess_unix.cpp +@@ -1,7 +1,7 @@ + /**************************************************************************** + ** + ** Copyright (C) 2016 The Qt Company Ltd. +-** Copyright (C) 2016 Intel Corporation. ++** Copyright (C) 2022 Intel Corporation. + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtCore module of the Qt Toolkit. +@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess() + // Add the program name to the argument list. + argv[0] = nullptr; + if (!program.contains(QLatin1Char('/'))) { ++ // findExecutable() returns its argument if it's an absolute path, ++ // otherwise it searches $PATH; returns empty if not found (we handle ++ // that case much later) + const QString &exeFilePath = QStandardPaths::findExecutable(program); +- if (!exeFilePath.isEmpty()) { +- const QByteArray &tmp = QFile::encodeName(exeFilePath); +- argv[0] = ::strdup(tmp.constData()); +- } +- } +- if (!argv[0]) ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); ++ argv[0] = ::strdup(tmp.constData()); ++ } else { + argv[0] = ::strdup(encodedProgramName.constData()); ++ } + + // Add every argument to the list + for (int i = 0; i < arguments.count(); ++i) +@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid) + envp = _q_dupEnvironment(environment.d.constData()->vars, &envc); + } + +- QByteArray tmp; + if (!program.contains(QLatin1Char('/'))) { ++ // findExecutable() returns its argument if it's an absolute path, ++ // otherwise it searches $PATH; returns empty if not found (we handle ++ // that case much later) + const QString &exeFilePath = QStandardPaths::findExecutable(program); +- if (!exeFilePath.isEmpty()) +- tmp = QFile::encodeName(exeFilePath); ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); ++ argv[0] = ::strdup(tmp.constData()); ++ } else { ++ argv[0] = ::strdup(QFile::encodeName(program)); + } +- if (tmp.isEmpty()) +- tmp = QFile::encodeName(program); +- argv[0] = tmp.data(); + + if (envp) + qt_safe_execve(argv[0], argv, envp); diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..ac0781c430 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -15,6 +15,8 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# 0008-CVE-2022-25255-qprocess5-15.diff.patch +QT5BASE_IGNORE_CVES += CVE-2022-25255 # A few comments: # * -no-pch to workaround the issue described at -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:35:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:35:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads Message-ID: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine --- ...cks-define-lock-functions-as-a-macro.patch | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:37:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:37:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/pppd: fix CPE ID Message-ID: <20220309173710.527496-1-fontaine.fabrice@gmail.com> samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce..d9d6244f10 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:58:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:58:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola! drop autoreconf Message-ID: <20220309175826.538666-1-fontaine.fabrice@gmail.com> OLA_AUTORECONF has been set since re-introduction of package in commit 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no patches are touching Makefile.am or ola.m4 anymore Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..1874350784 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 17:59:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 18:59:31 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/ola: drop autoreconf Message-ID: <20220309175931.538771-1-fontaine.fabrice@gmail.com> OLA_AUTORECONF has been set since re-introduction of package in commit 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no patches are touching Makefile.am or ola.m4 anymore Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo in title package/ola/ola.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..1874350784 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola -- 2.34.1 From bugzilla at busybox.net Wed Mar 9 18:18:35 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 18:18:35 +0000 Subject: [Buildroot] [Bug 14661] New: Fakeroot script relies on bash-isms, does not work with dash Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 Bug ID: 14661 Summary: Fakeroot script relies on bash-isms, does not work with dash Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: gsmecher at threespeedlogic.com CC: buildroot at uclibc.org Target Milestone: --- On a Debian (bookworm) release, I get the following error message when building up the release tarball: >>> Generating filesystem image rootfs.tar mkdir -p /home/gsmecher/winterland/buildroot-mkids/output/images rm -rf /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar mkdir -p /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar rsync -auH --exclude=/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM /home/gsmecher/winterland/buildroot-mkids/output/target/ /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target echo '#!/bin/sh' > /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "set -e" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "chown -h -R 0:0 /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot PATH="/home/gsmecher/winterland/buildroot-mkids/output/host/bin:/home/gsmecher/winterland/buildroot-mkids/output/host/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" /home/gsmecher/winterland/buildroot-mkids/support/scripts/mkusers /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/full_users_table.txt /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "/home/gsmecher/winterland/buildroot-mkids/output/host/bin/makedevs -d /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/full_devices_table.txt /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot echo "rm -rf /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/run/* /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/run/.[^.]* /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/tmp/* /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/tmp/.[^.]*" >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot printf ' \n' >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot printf ' \n' >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot printf ' (cd /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target; find -print0 | LC_ALL=C sort -z | tar --pax-option=exthdr.name=%%d/PaxHeaders/%%f,atime:=0,ctime:=0 -cf /home/gsmecher/winterland/buildroot-mkids/output/images/rootfs.tar --null --xattrs-include='\''*'\'' --no-recursion -T - --numeric-owner)\n' >> /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot chmod a+x /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot PATH="/home/gsmecher/winterland/buildroot-mkids/output/host/bin:/home/gsmecher/winterland/buildroot-mkids/output/host/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" FAKEROOTDONTTRYCHOWN=1 /home/gsmecher/winterland/buildroot-mkids/output/host/bin/fakeroot -- /home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/fakeroot rootdir=/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target table='/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/full_devices_table.txt' rm: refusing to remove '.' or '..' directory: skipping '/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/home/gsmecher/winterland/buildroot-mkids/output/build/buildroot-fs/tar/target/tmp/..' make: *** [fs/tar/tar.mk:37: /home/gsmecher/winterland/buildroot-mkids/output/images/rootfs.tar] Error 1 My /bin/sh is symlinked to /bin/dash: $ ls -ls /bin/sh 0 lrwxrwxrwx 1 root root 4 Mar 7 16:32 /bin/sh -> dash When I change fs/common.mk to produce a shebang line using /bin/bash instead, the build completes as expected. This is most likely a bash-ism in the fakeroot script - it is conceivably also possibly a dash limitation. In any case, the most plausible fixes are either - for me to insist on /bin/bash for /bin/sh, which fixes the problem here and does not require buildroot alterations, or - for buildroot to use /bin/bash instead of /bin/sh, which fixes the problem for anyone else who bumps into it. I am happy with either but thought a bug report was polite. thanks, Graeme -- You are receiving this mail because: You are on the CC list for the bug. From dopsi at dopsi.ch Wed Mar 9 10:30:14 2022 From: dopsi at dopsi.ch (Simon Doppler) Date: Wed, 09 Mar 2022 11:30:14 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> Message-ID: <3677050fbcbf7d7e31d8c6c12924f648d0e37d2a.camel@dopsi.ch> Hi Danilo, > > I did expect that adding the dependency as you did would work but > > it > > failed: they show up when running `make arm- > > trusted-firmware-show-depends` but not in `make arm-trusted- > > firmware-show-build-order`. Does the same happen for you? > > Yes, same issue for me. "make nginx-show-depends" includes "nginx- > rtmp-module", > but "make nginx-show-build-order" does not. > > Manually building the module before building nginx does work, but it > would be > nice if there were a clean fix. I submitted a bug report [1], with some extra info I found by digging around today. I will continue to dig around in the coming weeks but it will still not be high on my priorities. Simon From bugzilla at busybox.net Wed Mar 9 19:12:40 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 19:12:40 +0000 Subject: [Buildroot] [Bug 14661] Fakeroot script relies on bash-isms, does not work with dash In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 clayton.shotwell at rockwellcollins.com changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |2022.02 -- You are receiving this mail because: You are on the CC list for the bug. From ps.report at gmx.net Wed Mar 9 19:39:44 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 9 Mar 2022 20:39:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220309203944.17591179@gmx.net> Hello Rutger, On Wed, 9 Mar 2022 10:25:24 +0000, "Sassen, Rutger" wrote: > Hi Peter, > > > > Not all files in boot/overlays are copied to the image, which may result > > > in overlays not being loaded at all, or a wrong overlay being loaded. > > > > > > When using os_prefix and/or overlay_prefix in the raspberry pi > > > config.txt, it checks for the existence of README in the overlays > > > directory. If it is missing, overlays will not be loaded. > > > Any prove for this behavior (could not find anything about it in > > the docs)? > > Yes, it is documented in the raspberry pi docs for config.txt [3], 2nd paragraph: > Thanks for the link, but as I read it (and I am pretty sure the given overlays are loaded from the default location without the README file) the README file is only needed in case os_prefix is is (overlays stored in a non default location)? > I've also tested it myself and can confirm that e.g. when using os_prefix=custom/ , and /custom/overlays/README does not exist, that overlays will be loaded from the root /overlays instead, or when /overlays does not exist, no overlays will be loaded at all. > Seems to validate the above..., a README file in the default boot partition overlays directory is not needed (the default buildroot/rpi-firmware/genimage-configs location)..., and the special cases (os_prefix use cases) are not supported by buildroot out-of-the-box, so I would omit the README case... > > > > The overlay_map.dtb file contains rules for overlays that require > > > special handling depending on the specific type of raspberry pi > > > hardware. When this file is missing, the wrong overlay may be loaded. > > > > Only if you use this feature, see [1], [2] (building multiple rpi targeting sdcard) > > instead of determining the right overlay (exactly targeting one rpi flavour sdcard, > > as the buildroot rpi example config files do)... > > That is correct. You have to be careful however when e.g. switching to a new rpi target. When no overlay map is present, you'll have to manually change config.txt to use the correct overlays for your platform instead of relying on the overlay map. As the buildroot default configs are per raspberry pi model this is no use-case/problem...., but optional support for multiple targeting sdcards is welcome ;-) > > > Would prefer to only/explicitly add the overlay_map.dtb file: > > > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo) $(@D)/boot/overlays/overlay_map.dtb, \ > > > > or > > > > $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo $(@D)/boot/overlays/*.dtb), \ > > > > or as it is a (maybe unwanted target feature) add a new buildroot rpi-firmware > > configure option for adding the overlay_map.dtb file... > > I had also considered adding only the README and overlay_map.dtb. But I figured if the raspberry pi firmware adds extra files, they would probably be important. Not copying them might introduce unexpected behavior. When not copying all files, each time when bumping rpi-firmware to a new version one should check if files were added, and if they are worth copying. > > I could add a configure option to also copy overlay_map.dtb and README like you suggested (probably two separate options then; default on?). E.g. > > BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP Yes (default off)..., as it is a easy/simple option to enable one implementation of basic multi-target sd-cards (the other option would be the use of 'Model Filters' ([4]) in config.txt). > BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_README Omit (see above)... > > How about instead adding a configure option for specifying a list of files to be copied instead of all files? That way you could also specify exactly which dtbo files should be copied, instead of copying all of them. Currently there are a lot of overlays copied that we don't use for our system configuration. And if in the future new files are added to the rpi-firmware overlays, we don't have to introduce yet another configure option for it. E.g. > > BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_FILES Matter of taste (as with many options available in buildroot)...., I believe the _FILES option is overkill/too-complex for 1.1M overlays files (and will not fix/enable all possibles use-cases, see os_prefix above..., very special cases needs special hand-crafted solutions/scripts/genimage-configs, etc.)... Regards, Peter [4] https://www.raspberrypi.com/documentation/computers/config_txt.html#model-filters > > Thanks for the feedback, regards, > > Rutger > > [3] https://www.raspberrypi.com/documentation/computers/config_txt.html#os_prefix > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. From yann.morin.1998 at free.fr Wed Mar 9 20:10:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:10:30 +0100 Subject: [Buildroot] Patching buildroot package makefiles with BR2_EXTERNAL In-Reply-To: <3677050fbcbf7d7e31d8c6c12924f648d0e37d2a.camel@dopsi.ch> References: <0e6293a1-fa3e-4399-b963-14634d3578ad@www.fastmail.com> <94327194-ed5b-42c2-8ece-45c0368c9622@www.fastmail.com> <3677050fbcbf7d7e31d8c6c12924f648d0e37d2a.camel@dopsi.ch> Message-ID: <20220309201030.GA23050@scaer> Simon, Danillo, All, On 2022-03-09 11:30 +0100, Simon Doppler spake thusly: > > > I did expect that adding the dependency as you did would work but > > > it > > > failed: they show up when running `make arm- > > > trusted-firmware-show-depends` but not in `make arm-trusted- > > > firmware-show-build-order`. Does the same happen for you? > > > > Yes, same issue for me. "make nginx-show-depends" includes "nginx- > > rtmp-module", > > but "make nginx-show-build-order" does not. > > > > Manually building the module before building nginx does work, but it > > would be > > nice if there were a clean fix. > > I submitted a bug report [1], with some extra info I found by digging > around today. > > I will continue to dig around in the coming weeks but it will still not > be high on my priorities. The value of FOO_DEPENDENCIES are used to generate Makefile-level dependencies, and that is done at the time a package infra is called. I.e. when your foo.mk has: FOO_DPEENDENCIES = bar $(eval $(generic-pakcage)) This is turned into Makefile code like: foo: bar Which means that, modifying FOO_DEPENDENCIES later on will have no impact in the actual dependency chain. br2-external trees are meant to add new packages, and it is not possible to modify existing packages. In the current state, you have no way but to modify nginx.mk in the Buildroot tree. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Wed Mar 9 20:14:16 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 20:14:16 +0000 Subject: [Buildroot] [Bug 14656] Adding dependencies from an external tree does not work In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14656 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |yann.morin.1998 at free.fr Resolution|--- |WONTFIX --- Comment #2 from Yann E. MORIN --- Simon, All, As I explained on the list [0], it is not possible to use a br2-external tree to modify the dependencies of a package. [0] https://lore.kernel.org/buildroot/20220309201030.GA23050 at scaer/T/#m4bacf3a6047b2da82554d088f2afd805bef5a312 There is for now no way to achieve what you need without directly modifying the original package's .mk file. (note: there have been a few ideas floated around in the past, but they are far from trivial to apply, if at all.) Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Wed Mar 9 20:25:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:25:53 +0100 Subject: [Buildroot] [PATCH] package/at: bump version to 3.2.5 In-Reply-To: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> (Giulio Benetti's message of "Mon, 28 Feb 2022 13:02:43 +0100") References: <20220228120243.3361127-1-giulio.benetti@benettiengineering.com> Message-ID: <87tuc627qm.fsf@dell.be.48ers.dk> >>>>> "Giulio" == Giulio Benetti writes: > Signed-off-by: Giulio Benetti Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:26:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:26:29 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/jpeg-turbo: bump to version 2.1.3 In-Reply-To: <20220304193210.4025746-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 20:32:10 +0100") References: <20220304193210.4025746-1-fontaine.fabrice@gmail.com> Message-ID: <87pmmu27pm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update hash of license file (date updated with > https://github.com/libjpeg-turbo/libjpeg-turbo/commit/172972394a51352d0b67c30f20041e69a98d78b7) > https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:25:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:25:39 +0100 Subject: [Buildroot] [git commit] package/at: bump version to 3.2.5 Message-ID: <20220309201939.4163F83946@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1f3dacf4568dc1b995ca89ed04b44d2cf2416a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/at/at.hash | 2 +- package/at/at.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at/at.hash b/package/at/at.hash index d4ad9aa436..be3e82f9f0 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz +sha256 bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8 at_3.2.5.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index 26c44f5287..ed38def337 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.4 +AT_VERSION = 3.2.5 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex From peter at korsgaard.com Wed Mar 9 20:26:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:26:41 +0100 Subject: [Buildroot] [git commit] package/faketime: bump to version 0.9.10 Message-ID: <20220309201939.54A078394B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b335ba17be6139a1fa2f6e58c3d87f89d98c0ed8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/wolfcw/libfaketime/releases/tag/v0.9.10 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/faketime/faketime.hash | 2 +- package/faketime/faketime.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index 0628ff9ae6..a7d8d62dba 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 729ad33b9c750a50d9c68e97b90499680a74afd1568d859c574c0fe56fe7947f faketime-0.9.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 355477ba3b..6fc684f852 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.9 +FAKETIME_VERSION = 0.9.10 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 9 20:26:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:26:11 +0100 Subject: [Buildroot] [git commit] package/jpeg-turbo: bump to version 2.1.3 Message-ID: <20220309201939.4BF5783949@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f73e257cdf859c67ed2c3769f9ef15dc8f9b4878 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of license file (date updated with https://github.com/libjpeg-turbo/libjpeg-turbo/commit/172972394a51352d0b67c30f20041e69a98d78b7) https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jpeg-turbo/jpeg-turbo.hash | 10 +++++----- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index de82199659..a892fd3eaa 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/ -sha1 65c51c543b1fbba6db9ff5bee474ccb0b52a929f libjpeg-turbo-2.1.2.tar.gz -md5 e181bd78884dd5392a869209bfa41d4a libjpeg-turbo-2.1.2.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.3/ +sha1 6dec48193bb27e1c07abae8230031ce9ecb1cfec libjpeg-turbo-2.1.3.tar.gz +md5 85244dedeaf06f636a9e7ddea6d236d8 libjpeg-turbo-2.1.3.tar.gz # Locally computed -sha256 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 libjpeg-turbo-2.1.2.tar.gz -sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 LICENSE.md +sha256 467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0 libjpeg-turbo-2.1.3.tar.gz +sha256 ee1eaf194d5924b6360af8a6ba6a4e1554037091f7505943300cdeec65f1aebb LICENSE.md sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index ddae019839..475eb5fa84 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.1.2 +JPEG_TURBO_VERSION = 2.1.3 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) From peter at korsgaard.com Wed Mar 9 20:29:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:29:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack2: bump to version 1.9.20 In-Reply-To: (Jan Havran's message of "Mon, 7 Mar 2022 10:35:00 +0100") References: Message-ID: <87lexi27la.fsf@dell.be.48ers.dk> >>>>> "Jan" == Jan Havran writes: > - Fix URL for 'JACK DBus packaging' GitHub Wiki page. > https://github.com/jackaudio/jack2/releases/tag/v1.9.18 > https://github.com/jackaudio/jack2/releases/tag/v1.9.19 > https://github.com/jackaudio/jack2/releases/tag/v1.9.20 > Signed-off-by: Jan Havran Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:29:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:29:27 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-hdhomerun: bump version to 19.1.0-Matrix In-Reply-To: <20220308164034.85212-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 8 Mar 2022 17:40:34 +0100") References: <20220308164034.85212-1-bernd.kuhls@t-online.de> Message-ID: <87h78627ko.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:29:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:29:46 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/oprofile: add s390x support In-Reply-To: <20220308174832.1414005-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 18:48:32 +0100") References: <20220308174832.1414005-1-fontaine.fabrice@gmail.com> Message-ID: <87cziu27k5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > s390x is supported since at least 2003 (see ChangeLog-2003) > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:30:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:30:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libaacs: bump to version 0.11.1 In-Reply-To: <20220308182845.1832681-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:28:45 +0100") References: <20220308182845.1832681-1-fontaine.fabrice@gmail.com> Message-ID: <878rti27jb.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop patch (not needed since > https://code.videolan.org/videolan/libaacs/-/commit/a2ef3313bae4550f54ba842fa342d5b9b5f97145) > https://code.videolan.org/videolan/libaacs/-/blob/0.11.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 20:28:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:28:45 +0100 Subject: [Buildroot] [git commit] package/jack2: bump to version 1.9.20 Message-ID: <20220309202204.C676F83976@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26ca7fec041836c31f29c5566365fe40eb552bca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix URL for 'JACK DBus packaging' GitHub Wiki page. https://github.com/jackaudio/jack2/releases/tag/v1.9.18 https://github.com/jackaudio/jack2/releases/tag/v1.9.19 https://github.com/jackaudio/jack2/releases/tag/v1.9.20 Signed-off-by: Jan Havran Signed-off-by: Peter Korsgaard --- package/jack2/Config.in | 4 ++-- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d5..8abdda6376 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca5..6361473cf7 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..2e55169984 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.20 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 9 20:29:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:29:43 +0100 Subject: [Buildroot] [git commit] package/oprofile: add s390x support Message-ID: <20220309202204.E2A0983979@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6f3de83940ed4ff2bc2a5fec0cd2add93ebf635 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x is supported since at least 2003 (see ChangeLog-2003) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/oprofile/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in index cce2cfdab8..eca43d7ac3 100644 --- a/package/oprofile/Config.in +++ b/package/oprofile/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on BR2_arceb || BR2_arcle || BR2_arm || BR2_armeb || \ BR2_aarch64 || BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_s390x || BR2_sh || \ BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 From peter at korsgaard.com Wed Mar 9 20:29:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:29:59 +0100 Subject: [Buildroot] [git commit] package/libaacs: bump to version 0.11.1 Message-ID: <20220309202205.0298483976@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=57eb983832a848dd406bf6c6403d01394bc5fc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed since https://code.videolan.org/videolan/libaacs/-/commit/a2ef3313bae4550f54ba842fa342d5b9b5f97145) https://code.videolan.org/videolan/libaacs/-/blob/0.11.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-read_file.h-include-sys-types.h.patch | 36 ---------------------- package/libaacs/libaacs.hash | 4 +-- package/libaacs/libaacs.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/package/libaacs/0001-read_file.h-include-sys-types.h.patch b/package/libaacs/0001-read_file.h-include-sys-types.h.patch deleted file mode 100644 index 9bb1e04539..0000000000 --- a/package/libaacs/0001-read_file.h-include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1fb08a352afada589f0b93af7a07c6fcd6da9bb8 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 21 Sep 2020 20:19:38 +0200 -Subject: [PATCH] read_file.h: include sys/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-8.3.0: - -In file included from src/devtools/uk_dump.c:28: -src/devtools/read_file.h:24:44: error: unknown type name ???off_t??? - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) - -Upstream status: pending - -Signed-off-by: Bernd Kuhls ---- - src/devtools/read_file.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devtools/read_file.h b/src/devtools/read_file.h -index 953b2ef..a5d185c 100644 ---- a/src/devtools/read_file.h -+++ b/src/devtools/read_file.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) --- -2.27.0 - diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 62e389f2f9..d4977727b0 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 -sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.1/libaacs-0.11.1.tar.bz2.sha512 +sha512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42 libaacs-0.11.1.tar.bz2 # Hash for license file: sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 3e0df18010..d4e90be26c 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.11.0 +LIBAACS_VERSION = 0.11.1 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Mar 9 20:29:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 21:29:23 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-hdhomerun: bump version to 19.1.0-Matrix Message-ID: <20220309202204.D631383978@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97f3c1fee2165cc0c1c17cb9c0ef03027ef40f82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 2 +- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 4c866b59d8..f177eabd53 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6a5e5135b176d9aeba35e16fb6ce48ce7323c53960457597e25c2962b126cca2 kodi-pvr-hdhomerun-19.0.2-Matrix.tar.gz +sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 5c6829cee3..a4a448c51e 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 19.0.2-Matrix +KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Wed Mar 9 20:34:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 21:34:08 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/riemann-c-client: bump to version 1.10.5 In-Reply-To: <20220308220812.35726-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 23:08:12 +0100") References: <20220308220812.35726-1-fontaine.fabrice@gmail.com> Message-ID: <874k4627cv.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > https://github.com/algernon/riemann-c-client/releases/tag/riemann-c-client-1.10.5 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Mar 9 20:45:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:45:56 +0100 Subject: [Buildroot] [PATCH 1/1] fix links to Technologic Systems web resources In-Reply-To: <20220307211455.9630-1-kris@embeddedTS.com> References: <20220307211455.9630-1-kris@embeddedTS.com> Message-ID: <20220309204556.GB23050@scaer> Kris, All, On 2022-03-07 13:14 -0800, Kris Bahnsen via buildroot spake thusly: > Technologic Systems has rebranded as embeddedTS with the current > domain eventually going offline. Update web/doc URLs to correct > resource locations. > > Signed-off-by: Kris Bahnsen Applied to master, thanks. Regards, Yann E. MORIN. > --- > RESEND: > - Was not subscribed to Buildroot list with this email > > board/technologic/ts4900/readme.txt | 4 ++-- > board/technologic/ts5500/readme.txt | 4 ++-- > board/technologic/ts7680/readme.txt | 4 ++-- > configs/ts7680_defconfig | 2 +- > package/ts4900-fpga/Config.in | 2 +- > package/ts4900-fpga/ts4900-fpga.hash | 2 +- > package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- > 7 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt > index 679454fdeb..121e639749 100644 > --- a/board/technologic/ts4900/readme.txt > +++ b/board/technologic/ts4900/readme.txt > @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at > 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express > Bus, high speed USB host and device (OTG), and microSD card. > More details on the board here: > - http://wiki.embeddedarm.com/wiki/TS-4900 > + https://docs.embeddedTS.com/TS-4900 > > The TS-4900 is not currently supported by mainline Linux, so a > Technologic Systems Linux is used based on Linux 4.1. > @@ -48,5 +48,5 @@ connector etc. > The bootloader comes pre-flashed on the board on an SPI flash. Since > updating the bootloader is risky and not trivial, it is not included > in the Buildroot defconfig. Refer to > -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which > +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which > U-Boot config to use and how to flash it. > diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt > index 1e73ab3ea1..1fe384faae 100644 > --- a/board/technologic/ts5500/readme.txt > +++ b/board/technologic/ts5500/readme.txt > @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the > Technologic Systems TS-5x00 serie of x86-based Single Board Computers. > > TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more > -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD > +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD > > The kernel configuration works for any AMD Elan520-based SBCs, but the support > is enhanced for the TS-5500 and TS-5400 models (on-board devices registration > @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by > choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS > Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') > flag on partition 1. For details about the CMOS setup, please see: > -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens > +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens > > Connect a terminal program to the rs232 connector marked "COM2" > with baudrate set to 115200, insert the Compact Flash card into the socket, > diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt > index 43d5d135e8..3f703330bf 100644 > --- a/board/technologic/ts7680/readme.txt > +++ b/board/technologic/ts7680/readme.txt > @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S > running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, > Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, > relays and ADC/DAC. More details on the board here: > -https://wiki.embeddedarm.com/wiki/TS-7680 > +https://docs.embeddedTS.com/TS-7680 > > The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. > > @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. > The bootloader comes pre-flashed on the board on an SPI flash. Since > updating the bootloader is risky and not trivial, it is not included > in the Buildroot defconfig. Refer to > -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on > +https://docs.embeddedts.com/TS-7680#U-Boot for details on > which U-Boot config to use and how to flash it. > diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig > index 7eb57ab1c5..e4f5c1aabd 100644 > --- a/configs/ts7680_defconfig > +++ b/configs/ts7680_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" > diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in > index 7aa94e26f2..9f704fbc8c 100644 > --- a/package/ts4900-fpga/Config.in > +++ b/package/ts4900-fpga/Config.in > @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA > It is loaded by U-Boot during the boot sequence, the default > U-boot script expects to find it in the /boot folder. > > - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog > + https://docs.embeddedts.com/TS-4900#FPGA_Changelog > diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash > index 2147aeb3c2..ed2941079a 100644 > --- a/package/ts4900-fpga/ts4900-fpga.hash > +++ b/package/ts4900-fpga/ts4900-fpga.hash > @@ -1,4 +1,4 @@ > -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 > +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 > md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin > > # Locally calculated > diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk > index 7bb62a3984..a3e42c0812 100644 > --- a/package/ts4900-fpga/ts4900-fpga.mk > +++ b/package/ts4900-fpga/ts4900-fpga.mk > @@ -6,9 +6,9 @@ > > TS4900_FPGA_VERSION = 20150930 > TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin > -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga > +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga > # No license file provided, Yocto recipe from the vendor claims MIT. > -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 > +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 > > define TS4900_FPGA_EXTRACT_CMDS > cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) > -- > 2.11.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 9 20:47:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:47:48 +0100 Subject: [Buildroot] [git commit] package/ola: drop autoreconf Message-ID: <20220309203930.D366A839C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66d348ae18c6e73d6ff9d935a241e55a65948be6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master OLA_AUTORECONF has been set since re-introduction of package in commit 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no patches are touching Makefile.am or ola.m4 anymore Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ola/ola.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..1874350784 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola From yann.morin.1998 at free.fr Wed Mar 9 20:47:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:47:48 +0100 Subject: [Buildroot] [git commit] package/pppd: fix CPE ID Message-ID: <20220309203930.C8DFF83972@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9051a6322187129ba65249b5ee2228e045a4fa8c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce..d9d6244f10 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y From yann.morin.1998 at free.fr Wed Mar 9 20:47:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:47:48 +0100 Subject: [Buildroot] [git commit] fix links to Technologic Systems web resources Message-ID: <20220309203930.C06FA839AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b058e15f5334dac93f42b92ea31525afdc2c27c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From yann.morin.1998 at free.fr Wed Mar 9 20:48:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:48:34 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/ola: drop autoreconf In-Reply-To: <20220309175931.538771-1-fontaine.fabrice@gmail.com> References: <20220309175931.538771-1-fontaine.fabrice@gmail.com> Message-ID: <20220309204834.GC23050@scaer> Fabrice, All, On 2022-03-09 18:59 +0100, Fabrice Fontaine spake thusly: > OLA_AUTORECONF has been set since re-introduction of package in commit > 16ff948444c3978d63f483344a3d92d994c64312 but it is not needed as no > patches are touching Makefile.am or ola.m4 anymore > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - Fix typo in title > > package/ola/ola.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 5090076175..1874350784 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -9,7 +9,6 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE > OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) > OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE > OLA_INSTALL_STAGING = YES > -OLA_AUTORECONF = YES > > # util-linux provides uuid lib > OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 9 20:49:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 21:49:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/pppd: fix CPE ID In-Reply-To: <20220309173710.527496-1-fontaine.fabrice@gmail.com> References: <20220309173710.527496-1-fontaine.fabrice@gmail.com> Message-ID: <20220309204905.GD23050@scaer> Fabrice, All, On 2022-03-09 18:37 +0100, Fabrice Fontaine spake thusly: > samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has > been deprecated in February 2020: > > > > > cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the > correct CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pppd/pppd.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk > index 19b6f3ccce..d9d6244f10 100644 > --- a/package/pppd/pppd.mk > +++ b/package/pppd/pppd.mk > @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ > PPPD_LICENSE_FILES = \ > pppd/tdb.c pppd/plugins/pppoatm/COPYING \ > pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c > -PPPD_CPE_ID_VENDOR = samba > -PPPD_CPE_ID_PRODUCT = ppp > +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project > +PPPD_CPE_ID_PRODUCT = point-to-point_protocol > PPPD_SELINUX_MODULES = ppp > > PPPD_MAKE_OPTS = HAVE_INET6=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Mar 9 21:04:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 22:04:26 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/xdotool: bump to version 3.20211022.1 In-Reply-To: <20220302214404.2476680-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 22:44:04 +0100") References: <20220302214404.2476680-1-fontaine.fabrice@gmail.com> Message-ID: <87zglyzvl1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Retrieve official tarball > - Update indentation in hash file (two spaces) > https://github.com/jordansissel/xdotool/blob/v3.20211022.1/CHANGELIST > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 21:04:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 22:04:35 +0100 Subject: [Buildroot] [git commit] package/xdotool: bump to version 3.20211022.1 Message-ID: <20220309205614.281CF83A43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e8714f54fab704be63a8b7dc1d82afaf1e785a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Retrieve official tarball - Update indentation in hash file (two spaces) https://github.com/jordansissel/xdotool/blob/v3.20211022.1/CHANGELIST Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xdotool/xdotool.hash | 4 ++-- package/xdotool/xdotool.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/xdotool/xdotool.hash b/package/xdotool/xdotool.hash index b0d5a7582a..549e807ccc 100644 --- a/package/xdotool/xdotool.hash +++ b/package/xdotool/xdotool.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a xdotool-3.20160805.1.tar.gz -sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT +sha256 96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada xdotool-3.20211022.1.tar.gz +sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT diff --git a/package/xdotool/xdotool.mk b/package/xdotool/xdotool.mk index 5c5603bd62..c430a49d06 100644 --- a/package/xdotool/xdotool.mk +++ b/package/xdotool/xdotool.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDOTOOL_VERSION = 3.20160805.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,v$(XDOTOOL_VERSION)) +XDOTOOL_VERSION = 3.20211022.1 +XDOTOOL_SITE = https://github.com/jordansissel/xdotool/releases/download/v$(XDOTOOL_VERSION) XDOTOOL_LICENSE = BSD-3-Clause XDOTOOL_LICENSE_FILES = COPYRIGHT XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 From peter at korsgaard.com Wed Mar 9 21:04:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 22:04:35 +0100 Subject: [Buildroot] [git commit] package/riemann-c-client: bump to version 1.10.5 Message-ID: <20220309205614.1DFE083A34@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59ab0dff71c0da0dfa58369d81c41e9d2f3e470f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/algernon/riemann-c-client/releases/tag/riemann-c-client-1.10.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/riemann-c-client/riemann-c-client.hash | 4 ++-- package/riemann-c-client/riemann-c-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/riemann-c-client/riemann-c-client.hash b/package/riemann-c-client/riemann-c-client.hash index 6d4d634d75..43d4cd45c4 100644 --- a/package/riemann-c-client/riemann-c-client.hash +++ b/package/riemann-c-client/riemann-c-client.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 334874f0b9a507a8abbc7138df719cba4f28f12c02c39d5e55090b8edb86f9d2 riemann-c-client-1.10.4.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE +sha256 568416d854d1c1e5eac743c9f56db6fa0d6a8144daa74a799d0556bb6b50e679 riemann-c-client-1.10.5.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 6fbb3caf5c..f942d560c8 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -RIEMANN_C_CLIENT_VERSION = 1.10.4 +RIEMANN_C_CLIENT_VERSION = 1.10.5 RIEMANN_C_CLIENT_SITE = \ $(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)) RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+ From fontaine.fabrice at gmail.com Wed Mar 9 21:09:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:09:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: bump to version 6.03 Message-ID: <20220309210953.540376-1-fontaine.fabrice@gmail.com> xlib_libXft and xlib_libXi are now mandatory https://www.jwz.org/xscreensaver/changelog.html Signed-off-by: Fabrice Fontaine --- package/xscreensaver/Config.in | 2 ++ package/xscreensaver/xscreensaver.hash | 2 +- package/xscreensaver/xscreensaver.mk | 18 +++--------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 10b2b7012c..48eefdfa70 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXT help XScreenSaver is the standard screen saver collection shipped diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 26ecd8bbbf..27ef7d8f00 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 46dedc3211..0a91d22d14 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.45 +XSCREENSAVER_VERSION = 6.03 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ libgtk2 \ libxml2 \ xlib_libX11 \ + xlib_libXft \ + xlib_libXi \ xlib_libXt \ $(TARGET_NLS_DEPENDENCIES) \ host-intltool @@ -51,20 +53,6 @@ else XSCREENSAVER_CONF_OPTS += --with-systemd=no endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XSCREENSAVER_CONF_OPTS += --with-xft=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXft -else -XSCREENSAVER_CONF_OPTS += --with-xft=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXi -else -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes XSCREENSAVER_DEPENDENCIES += xlib_libXinerama -- 2.34.1 From yann.morin.1998 at free.fr Wed Mar 9 21:25:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 22:25:37 +0100 Subject: [Buildroot] [git commit] package/gnutls: fix build without threads Message-ID: <20220309211728.20D8683A4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f4f57b62b371252425bde4440cedcac45fcaebd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From yann.morin.1998 at free.fr Wed Mar 9 21:26:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 22:26:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads In-Reply-To: <20220309173503.527227-1-fontaine.fabrice@gmail.com> References: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Message-ID: <20220309212618.GE23050@scaer> Fabrice, All, On 2022-03-09 18:35 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure without threads raised since bump to > version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: > > kx.c: In function '_gnutls_nss_keylog_write': > kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? > 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { > | ^~~~~~~~~~~~ > | keylog_once > > Fixes: > - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...cks-define-lock-functions-as-a-macro.patch | 179 ++++++++++++++++++ > 1 file changed, 179 insertions(+) > create mode 100644 package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch > > diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch > new file mode 100644 > index 0000000000..52965c051d > --- /dev/null > +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch > @@ -0,0 +1,179 @@ > +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 > +From: Daiki Ueno > +Date: Wed, 9 Mar 2022 08:07:58 +0100 > +Subject: [PATCH] locks: define lock functions as a macro > + > +When threads are not supported, glthread_* functions are defined as > +no-op and thus dereferencing lock variables in inline functions will > +cause compilation error. This change fixes it by redefining our lock > +functions as a macro so it will also be compiled out. > + > +Reported by Fabrice Fontaine in: > +https://gitlab.com/gnutls/gnutls/-/issues/1330 > + > +Signed-off-by: Daiki Ueno > + > +[Retrieved from: > +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] > +Signed-off-by: Fabrice Fontaine > +--- > + lib/locks.c | 54 ----------------------------------------------- > + lib/locks.h | 28 ++++++++++++++++++------ > + lib/pkcs11.c | 2 +- > + lib/priority.c | 2 +- > + lib/verify-tofu.c | 2 +- > + 5 files changed, 25 insertions(+), 63 deletions(-) > + > +diff --git a/lib/locks.c b/lib/locks.c > +index d61504e077..8888ed6b12 100644 > +--- a/lib/locks.c > ++++ b/lib/locks.c > +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, > + gnutls_mutex_lock = lock; > + gnutls_mutex_unlock = unlock; > + } > +- > +-int > +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) > +-{ > +- if (unlikely(glthread_lock_lock(lock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) > +-{ > +- if (unlikely(glthread_lock_unlock(lock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) > +-{ > +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) > +-{ > +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) > +-{ > +- if (unlikely(glthread_rwlock_unlock(rwlock))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +- > +-int > +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) > +-{ > +- if (unlikely(glthread_once(once, init_func))) { > +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); > +- } > +- return 0; > +-} > +diff --git a/lib/locks.h b/lib/locks.h > +index a1ff0fa9d7..907adfc134 100644 > +--- a/lib/locks.h > ++++ b/lib/locks.h > +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; > + */ > + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) > + typedef gl_lock_t *gnutls_static_mutex_t; > +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); > +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); > ++ > ++#define gnutls_static_mutex_lock(LOCK) \ > ++ (unlikely(glthread_lock_lock(LOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > ++ > ++#define gnutls_static_mutex_unlock(LOCK) \ > ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > + > + /* Unlike static mutexes, static rwlocks can be locked/unlocked with > + * the functions defined below, because there is no way to replace > +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); > + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) > + typedef gl_rwlock_t *gnutls_rwlock_t; > + > +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); > +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); > +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); > ++#define gnutls_rwlock_rdlock(RWLOCK) \ > ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > ++ > ++#define gnutls_rwlock_wrlock(RWLOCK) \ > ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > ++ > ++#define gnutls_rwlock_unlock(RWLOCK) \ > ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > + > + #define GNUTLS_ONCE(once) gl_once_define(static, once) > + typedef gl_once_t *gnutls_once_t; > + > +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); > ++#define gnutls_once(ONCE, INIT_FUNC) \ > ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ > ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) > + > + #endif /* GNUTLS_LIB_LOCKS_H */ > +diff --git a/lib/pkcs11.c b/lib/pkcs11.c > +index 8dda0f07c9..ba8ac0c375 100644 > +--- a/lib/pkcs11.c > ++++ b/lib/pkcs11.c > +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ > + ret = sret; > + > + cleanup: > +- gnutls_static_mutex_unlock(&pkcs11_mutex); > ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); > + > + return ret; > + } > +diff --git a/lib/priority.c b/lib/priority.c > +index d17a923318..55ae185c1f 100644 > +--- a/lib/priority.c > ++++ b/lib/priority.c > +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) > + } > + > + out: > +- gnutls_rwlock_unlock(&system_wide_config_rwlock); > ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); > + return ret; > + } > + > +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c > +index 40b7acdc8a..97f47385e6 100644 > +--- a/lib/verify-tofu.c > ++++ b/lib/verify-tofu.c > +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, > + if (fp != NULL) > + fclose(fp); > + > +- gnutls_static_mutex_unlock(&file_mutex); > ++ (void)gnutls_static_mutex_unlock(&file_mutex); > + gnutls_free(b64key.data); > + > + return ret; > +-- > +GitLab > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Wed Mar 9 21:34:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:34:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220309213459.677932-1-fontaine.fabrice@gmail.com> cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 8df8aedeb3..54a4031056 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 21:41:56 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:41:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 Message-ID: <20220309214156.776849-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/gerbera/gerbera/releases/tag/v1.10.0 Signed-off-by: Fabrice Fontaine --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------------- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md -- 2.34.1 From bugzilla at busybox.net Wed Mar 9 21:44:20 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 09 Mar 2022 21:44:20 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #1 from Peter Seiderer --- (In reply to mf from comment #0) - from build/openssh-8.9p1/ChangeLog: 2692 commit 39f2111b1d5f00206446257377dcce58cc72369f 2693 Author: Darren Tucker 2694 Date: Wed Sep 29 10:53:55 2021 +1000 2695 2696 Add new compiler hardening flags. 2697 2698 Add -fzero-call-used-regs and -ftrivial-auto-var-init to the list of 2699 compiler hardening flags that configure checks for. These are support ed 2700 by clang and gcc, and make ROP gadgets less useful and mitigate 2701 stack-based infoleaks respectively. ok djm@ - from openssh-8.9p1/configure.ac: 195 OSSH_CHECK_CFLAG_COMPILE([-fzero-call-used-regs=all]) - from build/openssh-8.9p1/config.log: 716 configure:6832: checking if .../host/bin/arm-buildroot-linux-gnueabihf-gcc supports compile flag -fzero-call-used-regs=all 717 configure:6865: .../hos t/bin/arm-buildroot-linux-gnueabihf-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFIL E64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pipe -Wno- error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsi gn-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleadi ng-indentation -fno-strict-aliasing -ftrapv -Werror -fzero-call-used-regs= all -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conft est.c >&5 718 arm-buildroot-linux-gnueabihf-gcc.br_real: error: unrecognized command-lin e option '-fzero-call-used-regs=all' [...] 766 configure:6878: result: no So 'zero-call-used-regs' not supported (gcc-10.3, raspberrypi0w_defconfig) is detected correctly here... Same test with gcc-11.2, from build/openssh-8.9p1/config.log: configure:6832: checking if .../host/bin/arm-buildroot-linux-gnueabihf-gcc supports compile flag -fzero-call-used-regs=all configure:6865: .../host/bin/arm-buildroot-linux-gnueabihf-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pipe -Wno-error=format-truncation -Wall -Wextra -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-parameter -Wno-unused-result -Wimplicit-fallthrough -Wmisleading-indentation -fno-strict-aliasing -ftrapv -Werror -fzero-call-used-regs=all -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 configure:6865: $? = 0 configure:6873: result: yes Which compiler do you use? For which target do you compile? Can you provide a failing .config/defconfig file? -- You are receiving this mail because: You are on the CC list for the bug. From yannick.brosseau at gmail.com Wed Mar 9 21:55:31 2022 From: yannick.brosseau at gmail.com (Yannick Brosseau) Date: Wed, 9 Mar 2022 16:55:31 -0500 Subject: [Buildroot] [PATCH] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220309215531.638593-1-yannick.brosseau@gmail.com> In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 9 21:56:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 22:56:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: bump to version 2022-03-08 Message-ID: <20220309215639.786189-1-fontaine.fabrice@gmail.com> - Switch site: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 - Update first and second patches - Drop third and fourth patches (already in version) - This bump will fix the following build failure with powerpc and gcc 11 thanks to https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian Fixes: - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be Signed-off-by: Fabrice Fontaine --- ...emove-Werror-to-avoid-build-failures.patch | 17 +++--- ...vm-unit-tests-test-for-rdseed-rdrand.patch | 24 ++++---- ...3-Makefile-fix-stack-protector-tests.patch | 36 ----------- ...issue-with-the-linker-from-Fedora-32.patch | 61 ------------------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- 6 files changed, 27 insertions(+), 119 deletions(-) delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch index cbfa3a87e6..d07b9b6912 100644 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures Signed-off-by: Thomas Petazzoni [Matthew: Refactoring of Thomas Petazzoni's original.] Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 1 - 1 file changed, 1 deletion(-) @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- +- 2.14.2 diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch index 1a1a90ce99..80549fd32a 100644 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch @@ -13,6 +13,8 @@ Upstream: https://marc.info/?l=kvm&m=151580743523259&w=2 Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 2 +- configure | 18 ++++++++++++++++++ @@ -27,11 +29,11 @@ index d9ad42b..799e9b5 100644 cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer +-COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common ++COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common $(EXTRA_CFLAGS) + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized + COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + diff --git a/configure b/configure index dd9d361..21c0219 100755 --- a/configure @@ -63,7 +65,7 @@ index dd9d361..21c0219 100755 @@ -181,6 +198,7 @@ ARCH_NAME=$arch_name PROCESSOR=$processor CC=$cross_prefix$cc - CXX=$cross_prefix$cxx + CFLAGS=$cflags +EXTRA_CFLAGS=$extra_cflags LD=$cross_prefix$ld OBJCOPY=$cross_prefix$objcopy @@ -84,12 +86,12 @@ index 4a3e94b..2cbe3eb 100644 extern void insn_hlt(); extern void insn_invlpg(); @@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); + extern void insn_str(void); + extern void insn_cpuid(void); + extern void insn_invd(void); +#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); + extern void insn_rdrand(void); + extern void insn_rdseed(void); +#endif u32 cur_insn; diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c6..0000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm at vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7..0000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth at redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2..42c3b4a241 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb9..d610442e03 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,9 +4,9 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:00:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:00:16 +0100 Subject: [Buildroot] [PATCH v2,1/3] package/cmake: bump to version 3.18.6 Message-ID: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Update hash of Copyright.txt (year updated and Qt Company Ltd. added: https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50 https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716) Signed-off-by: Fabrice Fontaine --- package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 97e83a274c..da514a6d6b 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz # Locally calculated -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index b1b214982e..4177b119ab 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.16 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 3.18 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:00:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:00:17 +0100 Subject: [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 In-Reply-To: <20220309220018.786891-1-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Message-ID: <20220309220018.786891-2-fontaine.fabrice@gmail.com> gerbera requires cmake 3.18 since version 1.10.0 and https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559 Signed-off-by: Fabrice Fontaine --- support/dependencies/check-host-cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index dfc252e919..5760e4ded1 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,9 @@ -# Set this to either 3.16 or higher, depending on the highest minimum +# Set this to either 3.18 or higher, depending on the highest minimum # version required by any of the packages bundled in Buildroot. If a # package is bumped or a new one added, and it requires a higher # version, our cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.16 +BR2_CMAKE_VERSION_MIN = 3.18 BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:00:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:00:18 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 In-Reply-To: <20220309220018.786891-1-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Message-ID: <20220309220018.786891-3-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/gerbera/gerbera/releases/tag/v1.10.0 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add cmake patches to the serie package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------------- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:02:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:02:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: bump to version LTS_01_2022_Ref01 Message-ID: <20220309220219.787315-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_01_2022_Ref01 Signed-off-by: Fabrice Fontaine --- ...c-fix-mismatching-function-prototype.patch | 35 ------------------- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch deleted file mode 100644 index 0c262e6c46..0000000000 --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 -From: Francesco Giancane <30423178+fgiancane8 at users.noreply.github.com> -Date: Fri, 2 Jul 2021 20:47:38 +0200 -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) - -The reported function raises a warning when compilers assert the flag -`-Warray-parameter=`, signaling that an array-type argument was promoted -to a pointer-type argument. - -While in practice in most C implementations this is correct, fixing the -warning (and, in this case, indicating the maximum size for the array) -would represent a best-practice for finding out-of-bound accesses or -identifying wrongly-sized arrays passed in the function. - -Signed-off-by: Francesco Giancane -[Retrieved from: -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] -Signed-off-by: Fabrice Fontaine ---- - src/hmac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hmac.c b/src/hmac.c -index 53f2411f8..160af9d2f 100644 ---- a/c-utility/src/hmac.c -+++ b/c-utility/src/hmac.c -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, - * sha Error Code. - * - */ --int hmacResult(HMACContext *ctx, uint8_t *digest) -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) - { - if (!ctx) return shaNull; - diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index 72fa99c44d..5dbb530954 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz +sha256 082e41f7cdf06fec036b8cfa1793f03e81ba527b55ea13c66be0e4cf9f20ff7b azure-iot-sdk-c-LTS_01_2022_Ref01-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e6de8c851b..874646c445 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 +AZURE_IOT_SDK_C_VERSION = LTS_01_2022_Ref01 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES -- 2.34.1 From fontaine.fabrice at gmail.com Wed Mar 9 22:03:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 9 Mar 2022 23:03:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/nbd: bump to version 3.24 Message-ID: <20220309220320.787799-1-fontaine.fabrice@gmail.com> https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -- 2.34.1 From yann.morin.1998 at free.fr Wed Mar 9 22:06:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 23:06:08 +0100 Subject: [Buildroot] [git commit] package/lzma-alone: new package Message-ID: <20220309215932.52B9583A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4accbb4655d3816fd230f9820e6aac4ee9b1d8fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This new package provides "lzma_alone" host binary based on the original LZMA SDK. It provides few extra options when compared to the LZMA Utils / XZ Utils project "lzma" binary (already packaged as the "lzma"). This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows Debian's solution. Please note that Debian also uses LZMA SDK for the base "lzma" tool which may be considered for Buildroot too - as an independent change. Similar packaging is also used by Ubuntu & Arch. lzma_alone is a requirement for preparing firmware images for some Broadcom based home routers with a picky CFE bootloader. It has limited LZMA support and building compatible images requires specifying dictionary size and lc/lp/pb LZMA values manually. Version 9.22 is used as it's the last release using .tar.bz2 format. The same version is used by Debian. Signed-off-by: Rafa?? Mi??ecki [yann.morin.1998 at free.fr: - add the upstream sha1, add comments - fix license - add license file and its sha256 - fix coding styles ] Signed-off-by: Yann E. MORIN --- package/Config.in.host | 1 + package/lzma-alone/Config.in.host | 18 ++++++++++++++++++ package/lzma-alone/lzma-alone.hash | 5 +++++ package/lzma-alone/lzma-alone.mk | 27 +++++++++++++++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/package/Config.in.host b/package/Config.in.host index e5fbb07fc2..cd1c34b5a3 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -50,6 +50,7 @@ menu "Host utilities" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/lzma-alone/Config.in.host" source "package/mender-artifact/Config.in.host" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" diff --git a/package/lzma-alone/Config.in.host b/package/lzma-alone/Config.in.host new file mode 100644 index 0000000000..053b869635 --- /dev/null +++ b/package/lzma-alone/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_LZMA_ALONE + bool "host lzma-alone" + help + LZMA has two well-known command-line tools: + 1. lzma from LZMA SDK + 2. lzma from XZ Utils (previously LZMA Utils) + + This package provides the former one which: + 1. Gives more control over compression parameters + 2. Gets named lzma_alone to allow coexistence + + This tool may be used to prepare firmwares for bootloaders + with limited LZMA support. + E.g. Broadcom's CFE bootloader for MIPS BCM47xx devices is + known to fail to boot images using LZMA compression with + dictionary. + + https://www.7-zip.org/sdk.html diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash new file mode 100644 index 0000000000..33901d1620 --- /dev/null +++ b/package/lzma-alone/lzma-alone.hash @@ -0,0 +1,5 @@ +# From https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/ +sha1 fbe4d6c02202d65fae75c2db0e3cdc542ca41e6d lzma922.tar.bz2 +# Locally computed +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 +sha256 65cd2f7b76266889cbdcec55ab8ce6e845beabb5f450d58287439b25666e3b6a lzma.txt diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk new file mode 100644 index 0000000000..2ed6c2c772 --- /dev/null +++ b/package/lzma-alone/lzma-alone.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# lzma-alone +# +################################################################################ + +LZMA_ALONE_VERSION = 9.22 +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK +LZMA_ALONE_SOURCE = lzma922.tar.bz2 +LZMA_ALONE_STRIP_COMPONENTS = 0 +LZMA_ALONE_LICENSE = Public Domain +LZMA_ALONE_LICENSE_FILES = lzma.txt + +define HOST_LZMA_ALONE_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/C/Util/Lzma -f makefile.gcc + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc +endef + +define HOST_LZMA_ALONE_INSTALL_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/CPP/7zip/Bundles/LzmaCon/lzma \ + $(HOST_DIR)/bin/lzma_alone +endef + +$(eval $(host-generic-package)) From yann.morin.1998 at free.fr Wed Mar 9 22:08:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 9 Mar 2022 23:08:00 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package In-Reply-To: <20220308183527.17639-1-zajec5@gmail.com> References: <20220308183527.17639-1-zajec5@gmail.com> Message-ID: <20220309220800.GF23050@scaer> Rafa?, All, On 2022-03-08 19:35 +0100, Rafa? Mi?ecki spake thusly: > From: Rafa? Mi?ecki > > This new package provides "lzma_alone" host binary based on the original > LZMA SDK. It provides few extra options when compared to the LZMA Utils > / XZ Utils project "lzma" binary (already packaged as the "lzma"). > > This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows > Debian's solution. Please note that Debian also uses LZMA SDK for the > base "lzma" tool which may be considered for Buildroot too - as an > independent change. Similar packaging is also used by Ubuntu & Arch. > > lzma_alone is a requirement for preparing firmware images for some > Broadcom based home routers with a picky CFE bootloader. It has limited > LZMA support and building compatible images requires specifying > dictionary size and lc/lp/pb LZMA values manually. > > Version 9.22 is used as it's the last release using .tar.bz2 format. We could introduce a host variant of p7zip, so that we could automatically add that to FOO_EXTRACT_DEPENDENCIES if the host does not already have 7za (or 7zr), like we do for lzip archives for example. > The > same version is used by Debian. > > Signed-off-by: Rafa? Mi?ecki > --- [--SNIP--] > diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash > new file mode 100644 > index 0000000000..39759c4e3b > --- /dev/null > +++ b/package/lzma-alone/lzma-alone.hash > @@ -0,0 +1 @@ > +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 Fields must be separated by two spaces; fixed. I also added the sha1 that is provided int he SF page, and approipriate comments. > diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk > new file mode 100644 > index 0000000000..6258bb4a95 > --- /dev/null > +++ b/package/lzma-alone/lzma-alone.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# lzma-alone > +# > +################################################################################ > + > +LZMA_ALONE_VERSION = 9.22 > +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK > +LZMA_ALONE_SOURCE = lzma922.tar.bz2 > +LZMA_ALONE_STRIP_COMPONENTS = 0 > +LZMA_ALONE_LICENSE = LGPL-2.1-or-later, BSD-3-Clause The license stated in lzma.txt (at the root of the source tree) states the "LZMA SDK is written and placed in the public domain by Igor Pavlov." The 'GPL' term only appears in that file, and BSD appears nowhere. Also, the usual words in the BSD or GPL licenses do not appear in the source at all: 'redistribution', 'provided', 'disclaimer'. WikiPedia seems to agree that it is Public Domain since 2008 and version 4.62: https://en.wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Markov_chain_algorithm#7-Zip_reference_implementation Fixed. > +define HOST_LZMA_ALONE_BUILD_CMDS > + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/C/Util/Lzma -f makefile.gcc > + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc Lines too long, I've split them. > +endef > + > +define HOST_LZMA_ALONE_INSTALL_CMDS > + $(INSTALL) -D -m 0755 $(@D)/CPP/7zip/Bundles/LzmaCon/lzma $(HOST_DIR)/bin/lzma_alone Ditto. Applied to master, thanks. Could you see at using a more recent version, with the p7zip host variant I suggested above, please? Regards, Yann E. MORIN. > +endef > + > +$(eval $(host-generic-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Mar 9 22:37:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 23:37:16 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tree: bump to version 2.0.2 In-Reply-To: <20220302215131.2479736-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 22:51:31 +0100") References: <20220302215131.2479736-1-fontaine.fabrice@gmail.com> Message-ID: <87v8wmzrab.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update indentation in hash file (two spaces) > http://mama.indstate.edu/users/ice/tree/changes.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 22:37:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 09 Mar 2022 23:37:40 +0100 Subject: [Buildroot] [PATCH] package/pdbg: bump version to v3.5 In-Reply-To: <20220307052858.1245393-1-joel@jms.id.au> (Joel Stanley's message of "Mon, 7 Mar 2022 15:58:57 +1030") References: <20220307052858.1245393-1-joel@jms.id.au> Message-ID: <87r17azr9n.fsf@dell.be.48ers.dk> >>>>> "Joel" == Joel Stanley writes: > Signed-off-by: Joel Stanley Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 9 22:39:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 23:39:50 +0100 Subject: [Buildroot] [git commit] package/pdbg: bump version to v3.5 Message-ID: <20220309223137.41A2783A8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5030d7f4ea5004b24025eb93d421ddadb0f8ee06 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Joel Stanley Signed-off-by: Peter Korsgaard --- package/pdbg/pdbg.hash | 4 ++-- package/pdbg/pdbg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index df7ba314bf..f859930dd6 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5b721fd5551591cd5626ccf72c8d9096d902de4da10324097a37b4763815f0d7 pdbg-3.4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +sha256 7bdbab4e14b8cf50dbf6242955e46e58882c37b1a52671d9e6f3073885629dfa pdbg-3.5.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 5a5cfbc62d..871bf953f2 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 3.4 +PDBG_VERSION = 3.5 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 9 22:36:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 9 Mar 2022 23:36:44 +0100 Subject: [Buildroot] [git commit] package/tree: bump to version 2.0.2 Message-ID: <20220309223137.39C6683A8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11a3989dbf7ac2535fac04b24ab3d959da3686b3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) http://mama.indstate.edu/users/ice/tree/changes.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tree/tree.hash | 4 ++-- package/tree/tree.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 6bffaa5ec0..298153c89c 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 tree-1.8.0.tgz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf tree-2.0.2.tgz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index b6c63c0244..7c111b47d2 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 1.8.0 +TREE_VERSION = 2.0.2 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://mama.indstate.edu/users/ice/tree/src TREE_LICENSE = GPL-2.0+ From clayton.shotwell at rockwellcollins.com Wed Mar 9 23:07:45 2022 From: clayton.shotwell at rockwellcollins.com (clayton.shotwell at rockwellcollins.com) Date: Wed, 9 Mar 2022 17:07:45 -0600 Subject: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash Message-ID: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> From: Clayton Shotwell The addition of the removal of the /run and /tmp contents using a non-POSIX pattern causes the file system creation to fail on systems where /bin/sh does not default to bash. Switching the fakeroot script to a bash shell addresses the problem. Fixes: https://bugs.buildroot.org/show_bug.cgi?id=14661 Signed-off-by: Clayton Shotwell --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..09edf41c21 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -172,7 +172,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(BASE_TARGET_DIR)/ \ $$(TARGET_DIR) - echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) + echo '#!/bin/bash' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) -- 2.29.0 From David.Laight at ACULAB.COM Thu Mar 10 07:40:50 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 07:40:50 +0000 Subject: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash In-Reply-To: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> References: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> Message-ID: <28b7bbc57970469eae07f1e439fdf1cd@AcuMS.aculab.com> From: clayton.shotwell > Sent: 09 March 2022 23:08 > > The addition of the removal of the /run and /tmp contents using a > non-POSIX pattern causes the file system creation to fail on systems > where /bin/sh does not default to bash. Switching the fakeroot script > to a bash shell addresses the problem. I'm not sure you can rely on /bin/bash existing. Better to fix the script to not need bashisms. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From clement.leger at bootlin.com Thu Mar 10 08:07:44 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:44 +0100 Subject: [Buildroot] [PATCH 2/3] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310080745.16903-3-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..f8426f9ab2 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE version below 3.16 used python-pycryptodomex package + in python scripts. Newer version uses python-cryptography. + Select this option if optee-os needs python-cryptography to + be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..57f9a17bb6 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,12 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 08:07:43 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:43 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-cryptography: enable host package In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310080745.16903-2-clement.leger@bootlin.com> Enable host package and add needed dependencies. Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..4ff61c7f86 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 08:07:42 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:42 +0100 Subject: [Buildroot] [PATCH 0/3] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220310080745.16903-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Cl?ment L?ger (3): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 3 +-- boot/optee-os/optee-os.mk | 7 ++++++- package/python-cryptography/python-cryptography.mk | 7 +++++++ 4 files changed, 25 insertions(+), 5 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 08:07:45 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 09:07:45 +0100 Subject: [Buildroot] [PATCH 3/3] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310080745.16903-4-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index f8426f9ab2..6fe2ae95ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography. @@ -58,7 +59,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b3276d702a 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,3 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz # Locally computed +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From kamel.bouhara at bootlin.com Thu Mar 10 08:51:46 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 09:51:46 +0100 Subject: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant In-Reply-To: <20220226113538.6def80d0@windsurf> References: <20220225113400.802049-1-kamel.bouhara@bootlin.com> <20220225113400.802049-5-kamel.bouhara@bootlin.com> <20220226113538.6def80d0@windsurf> Message-ID: On Sat, Feb 26, 2022 at 11:35:38AM +0100, Thomas Petazzoni wrote: > On Fri, 25 Feb 2022 12:34:00 +0100 > Kamel Bouhara via buildroot wrote: > > > Add host variant of libodb-boost required by host-odb package. > > This is a bit short, and I think just like PATCH 3/4, it needs a more > extensive explanation that the ODB compiler needs the libodb-boost > headers at compile time, and therefore installed in $(HOST_DIR). > Ack. > > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > > index bac5f1e78f..7f2ad1fe72 100644 > > --- a/package/libodb-boost/libodb-boost.mk > > +++ b/package/libodb-boost/libodb-boost.mk > > @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE > > LIBODB_BOOST_INSTALL_STAGING = YES > > LIBODB_BOOST_LICENSE = GPL-2.0 > > LIBODB_BOOST_LICENSE_FILES = LICENSE > > -LIBODB_BOOST_DEPENDENCIES = boost libodb > > +LIBODB_BOOST_DEPENDENCIES = boost libodb \ > > + host-boost \ > > + host-libodb > > This seems wrong. Why is libodb-boost depending on host-libodb-boost. > At least, this makes the dependencies added in your PATCH 2/4 a bit > irrelevant. > Actually, that is the host variant that is depending on it. Your following comments are completely right. Thanks ! > I guess what you need to do instead is: > > HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb > > And rely on the logic in odb.mk to pull in host-libodb-boost when > BR2_PACKAGE_LIBODB_BOOST=y. > > Could you fix your patch series, and send a new iteration? > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com -- Kamel Bouhara, Bootlin Embedded Linux and kernel engineering https://bootlin.com From bugzilla at busybox.net Thu Mar 10 09:19:21 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Mar 2022 09:19:21 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #2 from mf at go-sys.de --- Created attachment 9236 --> https://bugs.busybox.net/attachment.cgi?id=9236&action=edit Buildroot config file Sample buildroot config file. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Thu Mar 10 09:22:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Mar 2022 09:22:04 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #3 from mf at go-sys.de --- Created attachment 9241 --> https://bugs.busybox.net/attachment.cgi?id=9241&action=edit openssh-8.9p1 config.log -- You are receiving this mail because: You are on the CC list for the bug. From kamel.bouhara at bootlin.com Thu Mar 10 09:55:58 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:55:58 +0100 Subject: [Buildroot] [PATCH v2 0/4] Add odb host variant and fix gcc-11 build Message-ID: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Hello, Here is a short patch series that fix odb build issue with gcc-11 and add a host variant of the libodb package required by the host-odb compiler. The host-libodb-boost variant is only required when boost package is enabled. Changes v1 -> v2: - Fix patch order issue. - Add a more extensive commit description for the libodb-boost. - Use HOST_*_DEPENDENCIES when appropriate. - Use BR2_PACKAGE_LIBODB_BOOST in odb.mk to check for optional dependencies. Kamel Bouhara (1): package/libodb-boost: add host variant Thomas Petazzoni (3): package/odb: backport more upstream commits to fix build with gcc 11.x package/libodb: add host variant package/odb: add dependency on host-libodb package/libodb-boost/libodb-boost.mk | 2 + package/libodb/libodb.mk | 2 + .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ package/odb/odb.mk | 8 ++- 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:55:59 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:55:59 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-2-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara --- Note: the above autobuilder issue has stopped appearing after September 29, 2021, which initially sounded odd. However, on October 3, we started rejecting build results from Xogium's autobuilder (for other reasons), and all those issues were coming from Xogium's autobuilder. And this is pretty logical: Xogium's autobuilder was known to be running a very recent Arch Linux, and therefore was the only autobuild machine running gcc 11.x as the host compiler. --- .../0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++ ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:56:00 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:56:00 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/libodb: add host variant In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-3-kamel.bouhara@bootlin.com> From: Thomas Petazzoni Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:56:01 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:56:01 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-4-kamel.bouhara@bootlin.com> Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara --- package/libodb-boost/libodb-boost.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..39c9f91030 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,8 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) -- 2.25.1 From kamel.bouhara at bootlin.com Thu Mar 10 09:56:02 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Thu, 10 Mar 2022 10:56:02 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/odb: add dependency on host-libodb In-Reply-To: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> Message-ID: <20220310095602.2435745-5-kamel.bouhara@bootlin.com> From: Thomas Petazzoni host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts -- 2.25.1 From mat at parad0x.org Thu Mar 10 10:18:26 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 11:18:26 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns Message-ID: <20220310101826.GA2353@parad0x.org> Different shells can have different behaviours when it comes to globbing patterns. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that results in this new behaviour: Using bash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.[^.]* Using dash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.. The current FAKEROOT script uses this shell glob pattern which now fails on recent Debian testing systems: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' It seems safer to use `find | xargs rm` here instead of relying on shell globbing patterns. Signed-off-by: Mathieu Mirmont --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..37eafac4f7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) -- 2.34.1 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From David.Laight at ACULAB.COM Thu Mar 10 10:45:41 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 10:45:41 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> References: <20220310101826.GA2353@parad0x.org> Message-ID: <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> From: Mathieu Mirmont > Sent: 10 March 2022 10:18 > > Different shells can have different behaviours when it comes to > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > to a different fnmatch/glob implementation that results in this new > behaviour: > > Using bash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.[^.]* > > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. That is just broken. Does the [^x] pattern work at all? Raise a bug on 'Debian testing' hopefully they'll fix it before it actually gets released anywhere. For this script I'd just ignore errors from rm. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From bonet at grenoble.cnrs.fr Thu Mar 10 11:22:16 2022 From: bonet at grenoble.cnrs.fr (Edgar Bonet) Date: Thu, 10 Mar 2022 12:22:16 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> References: <20220310101826.GA2353@parad0x.org> Message-ID: <455a9499-b6a6-adbd-1e20-0b4f1ceb66f7@grenoble.cnrs.fr> Mathieu Mirmont wrote: > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. There is an error in this glob pattern. Fixing it would be simpler than invoking find/xargs. Within a regexp, character classes are complemented with "^": [^.] means "any character other that a dot". Within a glob pattern, character classes are complemented with "!", and the same class would be written [!.] C.f. glob(7). Regards, Edgar. From David.Laight at ACULAB.COM Thu Mar 10 11:31:21 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 11:31:21 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <455a9499-b6a6-adbd-1e20-0b4f1ceb66f7@grenoble.cnrs.fr> References: <20220310101826.GA2353@parad0x.org> <455a9499-b6a6-adbd-1e20-0b4f1ceb66f7@grenoble.cnrs.fr> Message-ID: From: Of Edgar Bonet > Sent: 10 March 2022 11:22 > > Mathieu Mirmont wrote: > > Using dash: > > $ mkdir /tmp/foo > > $ echo /tmp/foo/.[^.]* > > /tmp/foo/.. > > There is an error in this glob pattern. Fixing it would be simpler than > invoking find/xargs. > > Within a regexp, character classes are complemented with "^": [^.] means > "any character other that a dot". Within a glob pattern, character > classes are complemented with "!", and the same class would be written > [!.] I should know that :-) David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From mat at parad0x.org Thu Mar 10 11:33:11 2022 From: mat at parad0x.org (Mat) Date: Thu, 10 Mar 2022 12:33:11 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> Message-ID: <20220310113310.GA9122@parad0x.org> On Thu, Mar 10, 2022 at 10:45:41AM +0000, David Laight wrote: > From: Mathieu Mirmont > > Sent: 10 March 2022 10:18 > > > > Different shells can have different behaviours when it comes to > > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > > to a different fnmatch/glob implementation that results in this new > > behaviour: > > > > Using bash: > > $ mkdir /tmp/foo > > $ echo /tmp/foo/.[^.]* > > /tmp/foo/.[^.]* > > > > Using dash: > > $ mkdir /tmp/foo > > $ echo /tmp/foo/.[^.]* > > /tmp/foo/.. > > That is just broken. > Does the [^x] pattern work at all? > > Raise a bug on 'Debian testing' hopefully they'll > fix it before it actually gets released anywhere. The new behaviour of dash is very strange indeed, but also according to POSIX the wildcard pattern [^x] is undefined so we should not rely on it. -- Mat -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From fperrad at gmail.com Thu Mar 10 11:40:47 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:40:47 +0100 Subject: [Buildroot] [PATCH] package/libgcrypt: bump to version 1.10.0 Message-ID: <20220310114047.919725-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- .../0001-configure.ac-add-an-option-to-disable-tests.patch | 2 +- package/libgcrypt/libgcrypt.hash | 6 ++---- package/libgcrypt/libgcrypt.mk | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index 4ef02fba6..e32f93863 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 23562d0ed..2ea4d74c2 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,5 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 +sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index e5fdfcfc8..c6c88f607 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.9.4 +LIBGCRYPT_VERSION = 1.10.0 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:41:22 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:41:22 +0100 Subject: [Buildroot] [PATCH] package/libglib2: bump to version 2.70.4 Message-ID: <20220310114122.919781-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- ...03-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- ...son.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f9522893..b5603c92f 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', + version : '2.70.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2339,7 +2324,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982..e21239301 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd3..db77a7320 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08..f0f0cb55a 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8b..18f5b329c 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:41:41 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:41:41 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.33 Message-ID: <20220310114141.919836-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb51..23ce1f42b 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade..cd0a75eb2 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:41:53 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:41:53 +0100 Subject: [Buildroot] [PATCH] package/moarvm: bump to version 2022.02 Message-ID: <20220310114153.919891-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 01e3ee4ae..58e3ce8ac 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz +sha256 4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 MoarVM-2022.02.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 99e26c73c..db336bfe4 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2021.10 +MOARVM_VERSION = 2022.02 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:42:01 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:42:01 +0100 Subject: [Buildroot] [PATCH] package/nano: bump to version 6.2 Message-ID: <20220310114201.919946-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 80529437d..69ebc27b7 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v6/nano-6.0.tar.xz.asc +# https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz +sha256 2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 nano-6.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 30db3249e..e3ecbab56 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:42:11 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:42:11 +0100 Subject: [Buildroot] [PATCH] package/pango: bump to version 1.50.5 Message-ID: <20220310114211.920001-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c..319d9778c 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228..69ec5bb49 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES -- 2.32.0 From fperrad at gmail.com Thu Mar 10 11:42:20 2022 From: fperrad at gmail.com (Francois Perrad) Date: Thu, 10 Mar 2022 12:42:20 +0100 Subject: [Buildroot] [PATCH] package/webp: bump to version 1.2.2 Message-ID: <20220310114220.920056-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index cf7b1dc9d..a95086e81 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz +sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index f23e1c92e..670a7b801 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.1 +WEBP_VERSION = 1.2.2 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause -- 2.32.0 From David.Laight at ACULAB.COM Thu Mar 10 11:52:08 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 11:52:08 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310113310.GA9122@parad0x.org> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> Message-ID: <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> From: Mat > Sent: 10 March 2022 11:33 > > On Thu, Mar 10, 2022 at 10:45:41AM +0000, David Laight wrote: > > From: Mathieu Mirmont > > > Sent: 10 March 2022 10:18 > > > > > > Different shells can have different behaviours when it comes to > > > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > > > to a different fnmatch/glob implementation that results in this new > > > behaviour: > > > > > > Using bash: > > > $ mkdir /tmp/foo > > > $ echo /tmp/foo/.[^.]* > > > /tmp/foo/.[^.]* > > > > > > Using dash: > > > $ mkdir /tmp/foo > > > $ echo /tmp/foo/.[^.]* > > > /tmp/foo/.. > > > > That is just broken. > > Does the [^x] pattern work at all? > > > > Raise a bug on 'Debian testing' hopefully they'll > > fix it before it actually gets released anywhere. > > The new behaviour of dash is very strange indeed, but also according > to POSIX the wildcard pattern [^x] is undefined so we should not rely > on it. Well [^x] originally meant '^' or 'x' (the same as [x^] but then shells started treating [^x] the same as [!x]. So I guess POSIX has allowed such shells to be conformant by making [^x] undefined. I'm not sure how many shells treat [^x] the same as [!x] but enough do that people (including me) have forgotten the difference. ash from a recent buildroot treats [^x] as [!x} but a cygwin ash I've got doesn't. A quick search failed to find dash. ISTR dash is badly broken in other places, try: $ x=aaab234; echo ${x##${x%%b*}} b234 It is worth checking whether Debian have changed the behaviour of dash or whether they've just changed the default root shell to dash. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From mat at parad0x.org Thu Mar 10 12:02:56 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 13:02:56 +0100 Subject: [Buildroot] [PATCH v2] fs/common.mk: fix the globing pattern In-Reply-To: <20220310101826.GA2353@parad0x.org> Message-ID: <20220310120256.GA11974@parad0x.org> The FAKEROOT script uses [^x] wildcard patterns which, while supported by many shells and interpreted like a regex, are undefined according to POSIX. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that does not support [^x]. Instead it treats [^x] as either "^" or "x", and as a result buildroot fails to build on this distro: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' The correct form should be [!x] rather than [^x]. Signed-off-by: Mathieu Mirmont --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..64a94d9ad8 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) -- 2.35.1 Changes v1 -> v2: - Fix the regex rather than use find|xargs (suggested by Edgar Bonet & David Laight) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From mat at parad0x.org Thu Mar 10 12:11:05 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 13:11:05 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> Message-ID: <20220310121105.GB11974@parad0x.org> On Thu, Mar 10, 2022 at 11:52:08AM +0000, David Laight wrote: > It is worth checking whether Debian have changed the behaviour of dash > or whether they've just changed the default root shell to dash. They've switched to the internal fnmatch implementation of dash [1] in this commit [1]. Before that they were using fnmatch(3) from the glibc. [1] https://salsa.debian.org/debian/dash/-/commit/d7b1269eeeb5749ccc577f6e01dfccc2916b0130 -- Mathieu Mirmont -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From zajec5 at gmail.com Thu Mar 10 12:12:29 2022 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Thu, 10 Mar 2022 13:12:29 +0100 Subject: [Buildroot] [PATCH V2] board/broadcom: add support for Northstar platform devices Message-ID: <20220310121229.18284-1-zajec5@gmail.com> From: Rafa? Mi?ecki Broadcom Northstar family of SoCs is most commonly used for home routers. It's an ARM platform with Cortex-A9 CPU(s). All known Northstar devices come with CFE bootloader which almost always expects a TRX firmware format (with exception for D-Link). Some vendors (like Luxul and Netgear) wrap TRX in their own containers. This board code provides: 1. Minimal kernel with support for on-SoC blocks It enables Linux drivers for SoC, watchdog, Ethernet, switch, USB, PCIe, LEDs). 2. Post image script building firmware images In uses Buildroot packages tools (lzma_alone, otrx, lxlfw) to build bootloader-compatible images that can be flashed. Signed-off-by: Rafa? Mi?ecki --- Previous attempt: [PATCH] board/broadcom: add support for Northstar platform devices https://patchwork.ozlabs.org/project/buildroot/patch/20210810131236.18022-1-zajec5 at gmail.com/ V2: Update DEVELOPERS Reduce kernel config Add readme.txt Use UBI with ubifs for rootfs (instead of initramfs) --- DEVELOPERS | 2 + board/broadcom/ns/linux.config | 70 +++++++++++++++++++++++++++++++++ board/broadcom/ns/post-image.sh | 40 +++++++++++++++++++ board/broadcom/ns/readme.txt | 38 ++++++++++++++++++ configs/broadcom_ns_defconfig | 14 +++++++ 5 files changed, 164 insertions(+) create mode 100644 board/broadcom/ns/linux.config create mode 100755 board/broadcom/ns/post-image.sh create mode 100644 board/broadcom/ns/readme.txt create mode 100644 configs/broadcom_ns_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 3bc9819382..4d17194af3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2382,6 +2382,8 @@ F: board/avnet/s6lx9_microboard/ F: configs/s6lx9_microboard_defconfig N: Rafa? Mi?ecki +F: board/broadcom/ns/ +F: configs/broadcom_ns_defconfig F: package/firmware-utils/ N: Rahul Bedarkar diff --git a/board/broadcom/ns/linux.config b/board/broadcom/ns/linux.config new file mode 100644 index 0000000000..47e6990032 --- /dev/null +++ b/board/broadcom/ns/linux.config @@ -0,0 +1,70 @@ +CONFIG_EMBEDDED=y +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_5301X=y +CONFIG_ARCH_BCM_53573=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_HIGHMEM=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_CMDLINE="ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs" +CONFIG_CMDLINE_FORCE=y +# CONFIG_SUSPEND is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=y +CONFIG_VLAN_8021Q=y +CONFIG_PCI=y +CONFIG_BCM47XX_NVRAM=y +CONFIG_BCM47XX_SPROM=y +CONFIG_MTD=y +CONFIG_MTD_BCM47XX_PARTS=y +CONFIG_MTD_PARSER_TRX=y +CONFIG_MTD_BCM47XXSFLASH=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_BRCMNAND=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_NETDEVICES=y +CONFIG_VXLAN=y +CONFIG_VETH=y +CONFIG_B53=y +CONFIG_BGMAC_BCMA=y +CONFIG_BROADCOM_PHY=y +CONFIG_MDIO_BUS_MUX_MMIOREG=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SPI=y +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_BCM47XX_WDT=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +CONFIG_USB=y +CONFIG_USB_LEDS_TRIGGER_USBPORT=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_PCI is not set +CONFIG_USB_HCD_BCMA=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_PHY_BCM_NS_USB2=y +CONFIG_PHY_BCM_NS_USB3=y +CONFIG_UBIFS_FS=y +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_UNCOMPRESS=y +CONFIG_EARLY_PRINTK=y diff --git a/board/broadcom/ns/post-image.sh b/board/broadcom/ns/post-image.sh new file mode 100755 index 0000000000..b6150fc539 --- /dev/null +++ b/board/broadcom/ns/post-image.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +# $1: images directory path +# $2: device dts filename +# $3: board id +build_lxl() { + local images="$1" + local device="$2" + local board="$3" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma + $HOST_DIR/bin/lxlfw create $images/$device.lxl -i $images/$device.trx -b "$board" +} + +# $1: images directory path +# $2: device dts filename +build_trx() { + local images="$1" + local device="$2" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma +} + +devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" +for device in $devices; do + case "$device" in + "bcm4708-smartrg-sr400ac") + build_trx "$1" "$device" + ;; + "bcm47094-luxul-xwr-3150-v1") + build_lxl "$1" "$device" "XWR-3150" + ;; + esac +done diff --git a/board/broadcom/ns/readme.txt b/board/broadcom/ns/readme.txt new file mode 100644 index 0000000000..18c9b03c13 --- /dev/null +++ b/board/broadcom/ns/readme.txt @@ -0,0 +1,38 @@ +Broadcom Northstar + +Intro +===== + +This readme covers Northstar family of Broadcom SoCs. It includes: + - BCM4708 (2 x 800 MHz) + - BCM47081 (1 x 800 MHz) + - BCM4709 (2 x 1 GHz) + - BCM47094 (2 x 1 GHz) (AKA BCM4709C0) + +Northstar platform is used in some home routers by multiple vendors. There are +over 100 market devices based on it and they can all be supported with 1 kernel. + +There is no point in having separated board for each model. This board code is +meant for all supported Northstar devices. + +All Northstar devices come with CFE bootloader by default. It's basically closed +source as sources are available for some old releases only. There is no U-Boot (or +any other) drop-in replacement or second stage loader with Northstar support. + +CFE supports flashing firmware images over TFTP and HTTP (depending on vendor / +device setup). + +How to build it +=============== + + $ make broadcom_ns_defconfig + + $ make + +How to flash over HTTP +====================== + +Power on device and press (and hold) CTRL+C in serial console terminal. When CFE +gets into prompt mode it'll automatically start built-in HTTP server. Navigate +to http://192.168.1.1/ (unless IP was changed - verify with "ifconfig") and +upload new firmware using a web browser. diff --git a/configs/broadcom_ns_defconfig b/configs/broadcom_ns_defconfig new file mode 100644 index 0000000000..bba7011aac --- /dev/null +++ b/configs/broadcom_ns_defconfig @@ -0,0 +1,14 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/broadcom/ns/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/ns/linux.config" +BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm4708-smartrg-sr400ac bcm47094-luxul-xwr-3150-v1" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_PACKAGE_HOST_FIRMWARE_UTILS=y +BR2_PACKAGE_HOST_LZMA_ALONE=y -- 2.34.1 From nicolas.carrier at orolia.com Thu Mar 10 12:41:06 2022 From: nicolas.carrier at orolia.com (Nicolas Carrier) Date: Thu, 10 Mar 2022 13:41:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: fix compilation with linaro 7.3 / 7.5 toolchains Message-ID: <20220310124106.2916278-1-nicolas.carrier@orolia.com> An unitialized field in a structure, causes the following error: platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar initializer for type ?gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}? This commit applies a patch to qt5webkit to fix the compilation issue. Signed-off-by: Nicolas Carrier --- ...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch diff --git a/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch new file mode 100644 index 0000000000..dc2dcdafb7 --- /dev/null +++ b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch @@ -0,0 +1,17 @@ +AudioFileReaderGStreamer.cpp: fix error: braces around scalar initializer + +Compilation error, with linaro toolchains Linaro ARM 2018.05 and Linaro ARM +2019.12. + +Signed-off-by: Nicolas Carrier + +--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2022-03-09 16:44:12.597494891 +0100 ++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2020-03-04 18:16:37.000000000 +0100 +@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterle + [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { + return static_cast(userData)->handleSample(sink); + }, ++ nullptr, // new_event + { nullptr } + }; + gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0); -- 2.30.2 From nicolas.carrier at orolia.com Thu Mar 10 12:42:40 2022 From: nicolas.carrier at orolia.com (Nicolas Carrier) Date: Thu, 10 Mar 2022 13:42:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5webkit: fix compilation with linaro 7.3 / 7.5 toolchains In-Reply-To: <20220310124106.2916278-1-nicolas.carrier@orolia.com> References: <20220310124106.2916278-1-nicolas.carrier@orolia.com> Message-ID: <8794da8eac039997d08572a1508077ff878cce7c.camel@orolia.com> I forgot to add, that I had this bug when testing the latest LTS version 2022.02, so if accepted, it could be applied to it too, it would be great :) On Thu, 2022-03-10 at 13:41 +0100, Nicolas Carrier wrote: > An unitialized field in a structure, causes the following error: > ??? platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar > initializer for type ?gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}? > > This commit applies a patch to qt5webkit to fix the compilation issue. > > Signed-off-by: Nicolas Carrier > --- > ?...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++ > ?1 file changed, 17 insertions(+) > ?create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > > diff --git a/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > new file mode 100644 > index 0000000000..dc2dcdafb7 > --- /dev/null > +++ b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch > @@ -0,0 +1,17 @@ > +AudioFileReaderGStreamer.cpp: fix error: braces around scalar initializer > + > +Compilation error, with linaro toolchains Linaro ARM 2018.05 and Linaro ARM > +2019.12. > + > +Signed-off-by: Nicolas Carrier > + > +--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp?????2022-03-09 > 16:44:12.597494891 +0100 > ++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp?????2020-03-04 > 18:16:37.000000000 +0100 > +@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterle > +???????? [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { > +???????????? return static_cast(userData)->handleSample(sink); > +???????? }, > ++??????? nullptr, // new_event > +???????? { nullptr } > +???? }; > +???? gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0); From clement.leger at bootlin.com Thu Mar 10 13:28:36 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Thu, 10 Mar 2022 14:28:36 +0100 Subject: [Buildroot] [PATCH 0/3] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220310080745.16903-1-clement.leger@bootlin.com> References: <20220310080745.16903-1-clement.leger@bootlin.com> Message-ID: <20220310142836.2c8e1787@fixe.home> Le Thu, 10 Mar 2022 09:07:42 +0100, Cl?ment L?ger a ?crit : > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. > > Cl?ment L?ger (3): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > > boot/optee-os/Config.in | 13 +++++++++++-- > boot/optee-os/optee-os.hash | 3 +-- > boot/optee-os/optee-os.mk | 7 ++++++- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 4 files changed, 25 insertions(+), 5 deletions(-) > Actually, all optee packages needs to be updated to 3.16.0. Please ignore this version. I'll send a V2 updating other packages. Thanks, -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From David.Laight at ACULAB.COM Thu Mar 10 13:47:24 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 10 Mar 2022 13:47:24 +0000 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310121105.GB11974@parad0x.org> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> <20220310121105.GB11974@parad0x.org> Message-ID: <2c3fb2b6d5c54261a4e0a8538ec6ea3c@AcuMS.aculab.com> From: Mathieu Mirmont > Sent: 10 March 2022 12:11 > > On Thu, Mar 10, 2022 at 11:52:08AM +0000, David Laight wrote: > > It is worth checking whether Debian have changed the behaviour of dash > > or whether they've just changed the default root shell to dash. > > They've switched to the internal fnmatch implementation of dash [1] in > this commit [1]. Before that they were using fnmatch(3) from the > glibc. > > [1] https://salsa.debian.org/debian/dash/-/commit/d7b1269eeeb5749ccc577f6e01dfccc2916b0130 Hmmm: External implementations change in subtle ways, leading to hard to diagnose bugs. It?s better to rely on the built-in implementation instead. As does randomly changing the implementation! Anyone signed up to the debian lists to comment? David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From john at metanate.com Thu Mar 10 14:03:50 2022 From: john at metanate.com (John Keeping) Date: Thu, 10 Mar 2022 14:03:50 +0000 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit Message-ID: <20220310140350.1955655-1-john@metanate.com> sshd is broken on 32-bit systems because ppoll_time64 is used by the application although it is not allowed by the seccomp filter. Apply the upstream patch to fix this. Signed-off-by: John Keeping --- ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch new file mode 100644 index 0000000000..34b309bd9a --- /dev/null +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch @@ -0,0 +1,31 @@ +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Sat, 26 Feb 2022 14:06:14 +1100 +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. + +Should fix sandbox violations on (some? at least i386 and armhf) 32bit +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at +debian.org via bz#3396. + +Signed-off-by: John Keeping +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif +-- +2.35.1 + -- 2.35.1 From zajec5 at gmail.com Thu Mar 10 14:12:53 2022 From: zajec5 at gmail.com (=?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?=) Date: Thu, 10 Mar 2022 15:12:53 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package In-Reply-To: <20220309220800.GF23050@scaer> References: <20220308183527.17639-1-zajec5@gmail.com> <20220309220800.GF23050@scaer> Message-ID: <95291ce8-0b8d-9bfc-8a5c-db6d640d2255@gmail.com> On 9.03.2022 23:08, Yann E. MORIN wrote: > On 2022-03-08 19:35 +0100, Rafa? Mi?ecki spake thusly: >> From: Rafa? Mi?ecki >> >> This new package provides "lzma_alone" host binary based on the original >> LZMA SDK. It provides few extra options when compared to the LZMA Utils >> / XZ Utils project "lzma" binary (already packaged as the "lzma"). >> >> This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows >> Debian's solution. Please note that Debian also uses LZMA SDK for the >> base "lzma" tool which may be considered for Buildroot too - as an >> independent change. Similar packaging is also used by Ubuntu & Arch. >> >> lzma_alone is a requirement for preparing firmware images for some >> Broadcom based home routers with a picky CFE bootloader. It has limited >> LZMA support and building compatible images requires specifying >> dictionary size and lc/lp/pb LZMA values manually. >> >> Version 9.22 is used as it's the last release using .tar.bz2 format. > > We could introduce a host variant of p7zip, so that we could > automatically add that to FOO_EXTRACT_DEPENDENCIES if the host does not > already have 7za (or 7zr), like we do for lzip archives for example. I can see 7z format support is no less messy than LZMA tools. It seems that 7-Zip project didn't provide command-line tool initially and that resulted in developing p7zip. It seems it has changed though. So we have two projects: 1. p7zip * Provides "7z" and "7za" * Last updated in 2016 * Suffers from security issues * Requires patching (11 Debian patches, 2 for CVEs) 2. 7-Zip * Provides "7zr" (documented as "7za") * Last updated in 2021 * Messy source * Doesn't even compile on some systems: ../../../C/Util/7z/7zMain.c:363:5: error: initializer element is not constant (const UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - kFileTimeStartYear)); ^ Which one of above we should try to package? > Applied to master, thanks. Huge thanks for your help. From theo.lebrun at bootlin.com Thu Mar 10 15:20:46 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 10 Mar 2022 16:20:46 +0100 Subject: [Buildroot] [PATCH 1/3] package/ragel: new package Message-ID: <20220310152048.633340-1-theo.lebrun@bootlin.com> This is an host-only package that does preprocessing to .rl files to turn them into .c or .cpp files. Initially added to support package/roc. See https://www.colm.net/open-source/ragel/ for the project's home page: Ragel compiles executable finite state machines from regular languages. Ragel targets C, C++ and ASM. Ragel state machines can not only recognize byte sequences as regular expression machines do, but can also execute code at arbitrary points in the recognition of a regular language. Code embedding is done using inline operators that do not disrupt the regular language syntax. Signed-off-by: Th?o Lebrun --- package/ragel/ragel.hash | 3 +++ package/ragel/ragel.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/ragel/ragel.hash create mode 100644 package/ragel/ragel.mk diff --git a/package/ragel/ragel.hash b/package/ragel/ragel.hash new file mode 100644 index 0000000000..332f587432 --- /dev/null +++ b/package/ragel/ragel.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f ragel-6.10.tar.gz +sha256 05a87975accb539399d0c8a4f4402ac27a6762fb1e4f31d04d455a8bee3e3693 COPYING diff --git a/package/ragel/ragel.mk b/package/ragel/ragel.mk new file mode 100644 index 0000000000..476aff5da4 --- /dev/null +++ b/package/ragel/ragel.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# ragel +# +################################################################################ + +RAGEL_VERSION = 6.10 +RAGEL_SITE = https://www.colm.net/files/ragel/ +RAGEL_LICENSE = GPL-2.0 +RAGEL_LICENSE_FILES = COPYING +RAGEL_CONF_OPTS = \ + --disable-silent-rules \ + --disable-manual \ + --disable-dependency-tracking +RAGEL_DEPENDENCIES = +HOST_RAGEL_DEPENDENCIES = + +$(eval $(host-autotools-package)) -- 2.35.1 From theo.lebrun at bootlin.com Thu Mar 10 15:20:48 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 10 Mar 2022 16:20:48 +0100 Subject: [Buildroot] [PATCH 3/3] package/pipewire: add optional roc In-Reply-To: <20220310152048.633340-1-theo.lebrun@bootlin.com> References: <20220310152048.633340-1-theo.lebrun@bootlin.com> Message-ID: <20220310152048.633340-3-theo.lebrun@bootlin.com> Roc is a toolkit for real-time audio streaming over the network, that can be used as a PipeWire module. Successful if libpipewire-module-roc-{sink,source}.so get built. Signed-off-by: Th?o Lebrun --- package/pipewire/pipewire.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..de27bce10c 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -189,6 +189,13 @@ else PIPEWIRE_CONF_OPTS += -Draop=disabled endif +ifeq ($(BR2_PACKAGE_ROC),y) +PIPEWIRE_CONF_OPTS += -Droc=enabled +PIPEWIRE_DEPENDENCIES += roc +else +PIPEWIRE_CONF_OPTS += -Droc=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef -- 2.35.1 From theo.lebrun at bootlin.com Thu Mar 10 15:20:47 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 10 Mar 2022 16:20:47 +0100 Subject: [Buildroot] [PATCH 2/3] package/roc: new package In-Reply-To: <20220310152048.633340-1-theo.lebrun@bootlin.com> References: <20220310152048.633340-1-theo.lebrun@bootlin.com> Message-ID: <20220310152048.633340-2-theo.lebrun@bootlin.com> Roc is a toolkit for real-time audio streaming over the network. https://roc-streaming.org/ Goal: optional dependency to PipeWire. Requires host-ragel to build. Signed-off-by: Th?o Lebrun --- package/Config.in | 1 + ...uild-that-used-removed-functionality.patch | 28 +++++++ package/roc/Config.in | 28 +++++++ package/roc/roc.hash | 3 + package/roc/roc.mk | 75 +++++++++++++++++++ 5 files changed, 135 insertions(+) create mode 100644 package/roc/0001-fix-build-that-used-removed-functionality.patch create mode 100644 package/roc/Config.in create mode 100644 package/roc/roc.hash create mode 100644 package/roc/roc.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..7ed075ae19 100644 --- a/package/Config.in +++ b/package/Config.in @@ -48,6 +48,7 @@ menu "Audio and video applications" source "package/on2-8170-libs/Config.in" source "package/opus-tools/Config.in" source "package/pulseaudio/Config.in" + source "package/roc/Config.in" source "package/sox/Config.in" source "package/squeezelite/Config.in" source "package/tovid/Config.in" diff --git a/package/roc/0001-fix-build-that-used-removed-functionality.patch b/package/roc/0001-fix-build-that-used-removed-functionality.patch new file mode 100644 index 0000000000..50147905c8 --- /dev/null +++ b/package/roc/0001-fix-build-that-used-removed-functionality.patch @@ -0,0 +1,28 @@ +build: fix build that used removed functionality + +The SConstruct file used the "SourceCode()" method that was removed in +SCons 4.0.0, after being deprecated in 2.0.0. + +This was fixed upstream but is not in the latest release yet. +https://github.com/roc-streaming/roc-toolkit/commit/abdfbb94df98fe88be4dd92ca587500126558411 + +Signed-off-by: Th?o Lebrun +--- + SConstruct | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index c724854..91fd469 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[ + # performance tuning + env.Decider('MD5-timestamp') + env.SetOption('implicit_cache', 1) +-env.SourceCode('.', None) + + # provide absolute path to force single sconsign file + # per-directory sconsign files seems to be buggy with generated sources +-- +2.35.1 + diff --git a/package/roc/Config.in b/package/roc/Config.in new file mode 100644 index 0000000000..3fd74cab3f --- /dev/null +++ b/package/roc/Config.in @@ -0,0 +1,28 @@ +comment "ROC needs a toolchain w/ shared libraries, C++, NPTL" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + +config BR2_PACKAGE_ROC + bool "roc" + # depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_1 + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_USE_MMU # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON3_SSL + select BR2_PACKAGE_LIBUV + help + Roc is a toolkit for real-time audio streaming over the + network. + + https://roc-streaming.org/ + +if BR2_PACKAGE_ROC +config BR2_PACKAGE_ROC_TOOLS + bool "build roc-{conv,recv,send} tools" + default y +endif diff --git a/package/roc/roc.hash b/package/roc/roc.hash new file mode 100644 index 0000000000..92bd8ce022 --- /dev/null +++ b/package/roc/roc.hash @@ -0,0 +1,3 @@ +# Computed locally: +sha256 b5f6eda94e5f989226bc6e61dcd0e307e711f00e3b27da49b552133862117353 roc-v0.1.5.tar.gz +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d LICENSE diff --git a/package/roc/roc.mk b/package/roc/roc.mk new file mode 100644 index 0000000000..90d226ffbd --- /dev/null +++ b/package/roc/roc.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# roc +# +################################################################################ + +ROC_VERSION = v0.1.5 +ROC_SITE = $(call github,roc-streaming,roc-toolkit,$(ROC_VERSION)) +ROC_LICENSE = MPL-2.0 +ROC_LICENSE_FILES = LICENSE +ROC_INSTALL_STAGING = YES +ROC_DEPENDENCIES = \ + host-gengetopt \ + host-pkgconf \ + host-ragel \ + host-scons \ + libuv + +ROC_SCONS_OPTS = \ + --disable-tests \ + --disable-examples \ + --disable-doc \ + --disable-libunwind \ + --build-3rdparty=openfec +# We are not building OpenFEC ourselves as they are using a forked version. See +# the following note in the documentation: +# https://github.com/roc-streaming/roc-toolkit/blob/c89687330bfce6f4dce79826f7a235b581f2b49d/docs/sphinx/building/dependencies.rst + +# The shared library is enabled by default. --enable-lib does not exist. +ifneq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +ROC_SCONS_OPTS += --disable-lib +endif + +ifeq ($(BR2_PACKAGE_ROC_TOOLS),y) + +# Tools are enabled by default. --enable-tools does not exist. + +# SoX and Pulseaudio support is only used for tools or examples, which is why +# their support is inside the TOOLS condition. + +ifeq ($(BR2_PACKAGE_SOX),y) +ROC_DEPENDENCIES += sox +else +ROC_SCONS_OPTS += --disable-sox +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +ROC_DEPENDENCIES += pulseaudio +else +ROC_SCONS_OPTS += --disable-pulseaudio +endif + +else +ROC_SCONS_OPTS += --disable-tools +endif + +define ROC_BUILD_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(SCONS) $(ROC_SCONS_OPTS)) +endef + +define ROC_INSTALL_STAGING_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(SCONS) $(ROC_SCONS_OPTS) --prefix="$(STAGING_DIR)/usr" install) +endef + +define ROC_INSTALL_TARGET_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(SCONS) $(ROC_SCONS_OPTS) --prefix="$(TARGET_DIR)/usr" install) +endef + +$(eval $(generic-package)) -- 2.35.1 From mat at parad0x.org Thu Mar 10 15:42:09 2022 From: mat at parad0x.org (Mathieu Mirmont) Date: Thu, 10 Mar 2022 16:42:09 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <2c3fb2b6d5c54261a4e0a8538ec6ea3c@AcuMS.aculab.com> References: <20220310101826.GA2353@parad0x.org> <34cb1e87c9ff49b897ae79c543278d03@AcuMS.aculab.com> <20220310113310.GA9122@parad0x.org> <35a9243ae72142ac8380675e9caa0fcf@AcuMS.aculab.com> <20220310121105.GB11974@parad0x.org> <2c3fb2b6d5c54261a4e0a8538ec6ea3c@AcuMS.aculab.com> Message-ID: <20220310154209.GA32108@parad0x.org> On Thu, Mar 10, 2022 at 01:47:24PM +0000, David Laight wrote: > From: Mathieu Mirmont > > Sent: 10 March 2022 12:11 > > > > On Thu, Mar 10, 2022 at 11:52:08AM +0000, David Laight wrote: > > > It is worth checking whether Debian have changed the behaviour of dash > > > or whether they've just changed the default root shell to dash. > > > > They've switched to the internal fnmatch implementation of dash [1] in > > this commit [1]. Before that they were using fnmatch(3) from the > > glibc. > > > > [1] https://salsa.debian.org/debian/dash/-/commit/d7b1269eeeb5749ccc577f6e01dfccc2916b0130 > > Hmmm: > > External implementations change in subtle ways, leading to hard to > diagnose bugs. It?s better to rely on the built-in implementation > instead. > > As does randomly changing the implementation! True, however [^x] is not part of POSIX so it can't be expected to work with /bin/sh. -- Mathieu Mirmont -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: From Clayton.Shotwell at collins.com Thu Mar 10 15:06:28 2022 From: Clayton.Shotwell at collins.com (Shotwell, Clayton L Collins) Date: Thu, 10 Mar 2022 15:06:28 +0000 Subject: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash In-Reply-To: <28b7bbc57970469eae07f1e439fdf1cd@AcuMS.aculab.com> References: <20220309230745.143885-1-clayton.shotwell@rockwellcollins.com> <28b7bbc57970469eae07f1e439fdf1cd@AcuMS.aculab.com> Message-ID: David, > -----Original Message----- > From: David Laight > Sent: Thursday, March 10, 2022 1:41 AM > To: Shotwell, Clayton L Collins ; buildroot at buildroot.org > Cc: Shotwell, Clayton L Collins ; Weber, Matthew L Collins > Subject: [External] RE: [Buildroot] [PATCH 1/1] fs: Change default fakeroot shell to bash > > From: clayton.shotwell > > Sent: 09 March 2022 23:08 > > > > The addition of the removal of the /run and /tmp contents using a > > non-POSIX pattern causes the file system creation to fail on systems > > where /bin/sh does not default to bash. Switching the fakeroot script > > to a bash shell addresses the problem. > > I'm not sure you can rely on /bin/bash existing. > > Better to fix the script to not need bashisms. Bash is a required tool of Buildroot (according to the manual anyway) but I agree fixing the bashism would be the better option. I see others have already pushed a fix so I will mark this patch as Rejected. https://patchwork.ozlabs.org/project/buildroot/patch/20220310120256.GA11974 at parad0x.org/ Thanks, Clayton From etienne.carriere at linaro.org Thu Mar 10 16:00:26 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Thu, 10 Mar 2022 17:00:26 +0100 Subject: [Buildroot] [PATCH 0/3] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220310142836.2c8e1787@fixe.home> References: <20220310080745.16903-1-clement.leger@bootlin.com> <20220310142836.2c8e1787@fixe.home> Message-ID: Hello Cl?ment, Thanks for upgrading optee. Regards, Etienne On Thu, 10 Mar 2022 at 14:30, Cl?ment L?ger wrote: > > Le Thu, 10 Mar 2022 09:07:42 +0100, > Cl?ment L?ger a ?crit : > > > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > > of python-pycryptodomex to build. This series adds support to build > > host-python-cryptography and uses it in optee-os package to build the > > 3.16.0 version. > > > > Cl?ment L?ger (3): > > package/python-cryptography: enable host package > > boot/optee-os: add support to build with python-cryptography > > boot/optee-os: bump to version 3.16.0 > > > > boot/optee-os/Config.in | 13 +++++++++++-- > > boot/optee-os/optee-os.hash | 3 +-- > > boot/optee-os/optee-os.mk | 7 ++++++- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 4 files changed, 25 insertions(+), 5 deletions(-) > > > > Actually, all optee packages needs to be updated to 3.16.0. Please > ignore this version. I'll send a V2 updating other packages. > > Thanks, > > -- > Cl?ment L?ger, > Embedded Linux and Kernel engineer at Bootlin > https://bootlin.com From hrsourabh011 at gmail.com Thu Mar 10 16:43:27 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 10 Mar 2022 17:43:27 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: Hello All, I am trying to connect my Raspberry Pi CM4 to Wifi automatically after start-up. I am using Buildroot based Linux distribution. I have worked with Yocto before and it provides systemd-networkd and wpa_supplicant feature to connect to wifi on boot. I am lloking something similar in Buildroot but couldn't find any notes online. So far, I think I have enabled the necessary config/driver using "make menuconfig" : [image: wpa_supplicant.png] [image: firmware.png] But now, how can I set-up wpa_supplicant.conf? Any link to notes or suggestion would be helpful. Can anyone please let me know how to proceed further with it? Your help will be much appreciated. Thanks in advance. P.S: I am using Buildroot 2022.02 release and also using systemd feature and let me know if any info is missing here. Regards, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: firmware.png Type: image/png Size: 11900 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: wpa_supplicant.png Type: image/png Size: 11434 bytes Desc: not available URL: From clement.leger at bootlin.com Thu Mar 10 16:57:29 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:29 +0100 Subject: [Buildroot] [PATCH v2 1/7] package/python-cryptography: enable host package In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-2-clement.leger@bootlin.com> Enable host package and add needed dependencies. Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..4ff61c7f86 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:31 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:31 +0100 Subject: [Buildroot] [PATCH v2 3/7] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-4-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index f8426f9ab2..6fe2ae95ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography. @@ -58,7 +59,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..d05309e0db 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ # From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:32 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:32 +0100 Subject: [Buildroot] [PATCH v2 4/7] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-5-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:33 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:33 +0100 Subject: [Buildroot] [PATCH v2 5/7] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-6-clement.leger@bootlin.com> From: Etienne Carriere Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:30 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:30 +0100 Subject: [Buildroot] [PATCH v2 2/7] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-3-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..f8426f9ab2 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE version below 3.16 used python-pycryptodomex package + in python scripts. Newer version uses python-cryptography. + Select this option if optee-os needs python-cryptography to + be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..57f9a17bb6 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,12 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:35 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:35 +0100 Subject: [Buildroot] [PATCH v2 7/7] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-8-clement.leger@bootlin.com> From: Etienne Carriere Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:34 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:34 +0100 Subject: [Buildroot] [PATCH v2 6/7] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220310165735.1102802-7-clement.leger@bootlin.com> From: Etienne Carriere Bump OP-TEE Client package version to OP-TEE release 3.16.0. Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Thu Mar 10 16:57:28 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Thu, 10 Mar 2022 17:57:28 +0100 Subject: [Buildroot] [PATCH v2 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220310165735.1102802-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which neess to be aligned with optee-os version. ---- Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (4): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 Etienne Carriere (3): package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 2 +- boot/optee-os/optee-os.mk | 7 ++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 37 insertions(+), 16 deletions(-) -- 2.34.1 From havran.jan at email.cz Thu Mar 10 18:03:32 2022 From: havran.jan at email.cz (Jan Havran) Date: Thu, 10 Mar 2022 19:03:32 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: Hi Sourabh, after enabling RPi firmware you must load the Wifi driver - since you are using systemd, it should by handled by udev on start I think. So you probably just need to configure /etc/network/interfaces to start wpa_supplicant on wlan0 with /etc/wpa_supplicant.conf file, where you can put your credentials. Or at least that is what I have done, but I am not using systemd. I did something similar some time ago, you can check it here: https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 (note that to make "my" credentials public in that commit was an intention). P.S.: if you want to have any modifications to be part of your image with filesystem, you can do it by using rootfs overlays for example: https://buildroot.org/downloads/manual/manual.html#rootfs-custom Regards, Jan Havran V?Thu, Mar 10, 2022 at 05:43:27PM +0100,?Sourabh Hegde napsal(a): > Hello All, > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > start-up. I am using Buildroot based Linux distribution. I have worked with > Yocto before and it provides systemd-networkd and wpa_supplicant feature to > connect to wifi on boot. I am lloking something similar in Buildroot but > couldn't find any notes online. > > So far, I think I have enabled the necessary config/driver using "make > menuconfig" : > [image: wpa_supplicant.png] > [image: firmware.png] > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > suggestion would be helpful. > > Can anyone please let me know how to proceed further with it? > > Your help will be much appreciated. > > Thanks in advance. > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > and let me know if any info is missing here. > > Regards, > > Sourabh > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kris at embeddedTS.com Thu Mar 10 18:59:21 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 10 Mar 2022 10:59:21 -0800 Subject: [Buildroot] [PATCH 1/1] package/ts4900-fpga: bump version to 20170510 Message-ID: <20220310185921.8852-1-kris@embeddedTS.com> Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte transmits. Signed-off-by: Kris Bahnsen --- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 9ffff643af..1d3c62bfd1 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index a3e42c0812..73e7a28e31 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,7 +4,7 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -- 2.11.0 From peter at korsgaard.com Thu Mar 10 19:38:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:38:26 +0100 Subject: [Buildroot] [PATCH 2/2] package/expat: security bump to version 2.4.5 In-Reply-To: <20220219122831.2961097-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 19 Feb 2022 13:28:31 +0100") References: <20220219122831.2961097-1-fontaine.fabrice@gmail.com> <20220219122831.2961097-2-fontaine.fabrice@gmail.com> Message-ID: <87mthxzjgt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security fixes: > #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 > sequences (e.g. from start tag names) to the XML > processing application on top of Expat can cause > arbitrary damage (e.g. code execution) depending > on how invalid UTF-8 is handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #561 CVE-2022-25236 -- Passing (one or more) namespace separator > characters in "xmlns[:prefix]" attribute values > made Expat send malformed tag names to the XML > processor on top of Expat which can cause > arbitrary damage (e.g. code execution) depending > on such unexpectable cases are handled inside the XML > processor; validation was not their job but Expat's. > Exploits with code execution are known to exist. > #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing > that could be triggered by e.g. a 2 megabytes > file with a large number of opening braces. > Expected impact is denial of service or potentially > arbitrary code execution. > #560 CVE-2022-25314 -- Fix integer overflow in function copyString; > only affects the encoding name parameter at parser creation > time which is often hardcoded (rather than user input), > takes a value in the gigabytes to trigger, and a 64-bit > machine. Expected impact is denial of service. > #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; > needs input in the gigabytes and a 64-bit machine. > Expected impact is denial of service or potentially > arbitrary code execution. > https://blog.hartwork.org/posts/expat-2-4-5-released/ > https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Thu Mar 10 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <20220309142913.2102898-1-foss+buildroot@0leil.net> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> Message-ID: Hi Quentin, On 09/03/2022 15:29, Quentin Schulz wrote: > From: Quentin Schulz > > This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. > > The patch fails to apply because of a conflict in copyright year so it > needed some additional handling after downloading. > > The patch file was added by running the following command: > wget https://download.qt.io/archive/qt/5.15/CVE-2022-25255-qprocess5-15.diff -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch > > [1] https://nvd.nist.gov/vuln/detail/CVE-2022-25255 > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz > --- > ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ > package/qt5/qt5base/qt5base.mk | 2 + > 2 files changed, 58 insertions(+) > create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > new file mode 100644 > index 0000000000..dfab92a9ef > --- /dev/null > +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch Please make the patch something that approaches git-formatted. At the very least, the patch itself must have a description of what it does (i.e. a commit message) and a Signed-off-by from you. Ideally, though, you look for the appropriate commit in the upstream repository [1] and use that instead of a random diff. In that case, add something like this at the end of the description part: [Quentin: backport from upstream commit ab6915f0efb12cfe48d1f126f4a828212f853ce5 in 6.2 branch] Signed-off-by: ... Regards, Arnout [1] https://invent.kde.org/qt/qt/qtbase/-/commit/ab6915f0efb12cfe48d1f126f4a828212f853ce5.patch > @@ -0,0 +1,56 @@ > +--- a/src/corelib/io/qprocess_unix.cpp > ++++ b/src/corelib/io/qprocess_unix.cpp > +@@ -1,7 +1,7 @@ > + /**************************************************************************** > + ** > + ** Copyright (C) 2016 The Qt Company Ltd. > +-** Copyright (C) 2016 Intel Corporation. > ++** Copyright (C) 2022 Intel Corporation. > + ** Contact: https://www.qt.io/licensing/ > + ** > + ** This file is part of the QtCore module of the Qt Toolkit. > +@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess() > + // Add the program name to the argument list. > + argv[0] = nullptr; > + if (!program.contains(QLatin1Char('/'))) { > ++ // findExecutable() returns its argument if it's an absolute path, > ++ // otherwise it searches $PATH; returns empty if not found (we handle > ++ // that case much later) > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > +- if (!exeFilePath.isEmpty()) { > +- const QByteArray &tmp = QFile::encodeName(exeFilePath); > +- argv[0] = ::strdup(tmp.constData()); > +- } > +- } > +- if (!argv[0]) > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > ++ argv[0] = ::strdup(tmp.constData()); > ++ } else { > + argv[0] = ::strdup(encodedProgramName.constData()); > ++ } > + > + // Add every argument to the list > + for (int i = 0; i < arguments.count(); ++i) > +@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid) > + envp = _q_dupEnvironment(environment.d.constData()->vars, &envc); > + } > + > +- QByteArray tmp; > + if (!program.contains(QLatin1Char('/'))) { > ++ // findExecutable() returns its argument if it's an absolute path, > ++ // otherwise it searches $PATH; returns empty if not found (we handle > ++ // that case much later) > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > +- if (!exeFilePath.isEmpty()) > +- tmp = QFile::encodeName(exeFilePath); > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > ++ argv[0] = ::strdup(tmp.constData()); > ++ } else { > ++ argv[0] = ::strdup(QFile::encodeName(program)); > + } > +- if (tmp.isEmpty()) > +- tmp = QFile::encodeName(program); > +- argv[0] = tmp.data(); > + > + if (envp) > + qt_safe_execve(argv[0], argv, envp); > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef38d03253..ac0781c430 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -15,6 +15,8 @@ QT5BASE_SYNC_QT_HEADERS = YES > # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > +# 0008-CVE-2022-25255-qprocess5-15.diff.patch > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > > # A few comments: > # * -no-pch to workaround the issue described at From huth at tuxfamily.org Thu Mar 10 20:15:32 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Thu, 10 Mar 2022 21:15:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: bump to version 2022-03-08 In-Reply-To: <20220309215639.786189-1-fontaine.fabrice@gmail.com> References: <20220309215639.786189-1-fontaine.fabrice@gmail.com> Message-ID: <20220310211532.51f8d789@tuxfamily.org> Am Wed, 9 Mar 2022 22:56:39 +0100 schrieb Fabrice Fontaine : > - Switch site: > https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 > - Update first and second patches > - Drop third and fourth patches (already in version) > - This bump will fix the following build failure with powerpc and gcc 11 > thanks to > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 > > /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian > > Fixes: > - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be > > Signed-off-by: Fabrice Fontaine > --- > ...emove-Werror-to-avoid-build-failures.patch | 17 +++--- > ...vm-unit-tests-test-for-rdseed-rdrand.patch | 24 ++++---- > ...3-Makefile-fix-stack-protector-tests.patch | 36 ----------- > ...issue-with-the-linker-from-Fedora-32.patch | 61 ------------------- > package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- > package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- > 6 files changed, 27 insertions(+), 119 deletions(-) > delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > > diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > index cbfa3a87e6..d07b9b6912 100644 > --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures > Signed-off-by: Thomas Petazzoni > [Matthew: Refactoring of Thomas Petazzoni's original.] > Signed-off-by: Matthew Weber > +[Fabrice: updated for 2022-03-08] > +Signed-off-by: Fabrice Fontaine > --- > Makefile | 1 - > 1 file changed, 1 deletion(-) > @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile > index 7231334..d9ad42b 100644 > --- a/Makefile > +++ b/Makefile > -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > - COMMON_CFLAGS += -g $(autodepend-flags) > - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized > - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter > --COMMON_CFLAGS += -Werror > +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > + > + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common > + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized > +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces > ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces > + > frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") > - fnostack_protector := $(call cc-option, -fno-stack-protector, "") > --- > +- > 2.14.2 > > diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > index 1a1a90ce99..80549fd32a 100644 > --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > +++ b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > @@ -13,6 +13,8 @@ Upstream: > https://marc.info/?l=kvm&m=151580743523259&w=2 If I've get that old patch description right, this patch 0002 was only there for supporting old binutils versions < 2.23 ... but buildroot does not support those versions anymore, so I think you could simply drop the 0002 patch completely instead? Apart from that, your patch looks fine to me. Thomas From ps.report at gmx.net Thu Mar 10 20:21:26 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Mar 2022 21:21:26 +0100 Subject: [Buildroot] [PATCH v1] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220310202126.8379-1-ps.report@gmx.net> - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ?reserve?: bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer --- ...n-of-fzero-call-used-regs-all-suppor.patch | 38 +++++++++++++++++++ package/openssh/openssh.mk | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch diff --git a/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ -- 2.35.1 From bugzilla at busybox.net Thu Mar 10 20:23:52 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 10 Mar 2022 20:23:52 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 --- Comment #4 from Peter Seiderer --- Suggested buildroot patch [1] should fix the problem, thanks for reporting the problem and providing the config file! [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220310202126.8379-1-ps.report at gmx.net/ -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Thu Mar 10 20:29:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 21:29:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: security bump version to 8.0.16 In-Reply-To: <20220218190233.473109-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Fri, 18 Feb 2022 20:02:33 +0100") References: <20220218190233.473109-1-bernd.kuhls@t-online.de> Message-ID: <87ilslzh3b.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 > Fixes CVE-2021-21708. > Signed-off-by: Bernd Kuhls Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 7.4.28 which contains the same fix. -- Bye, Peter Korsgaard From arnout at mind.be Thu Mar 10 20:29:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:29:48 +0100 Subject: [Buildroot] [PATCH V2] package/lzma-alone: new package In-Reply-To: <95291ce8-0b8d-9bfc-8a5c-db6d640d2255@gmail.com> References: <20220308183527.17639-1-zajec5@gmail.com> <20220309220800.GF23050@scaer> <95291ce8-0b8d-9bfc-8a5c-db6d640d2255@gmail.com> Message-ID: <2a7d0213-14a4-e930-aabf-0d79ecd2b075@mind.be> On 10/03/2022 15:12, Rafa? Mi?ecki wrote: > On 9.03.2022 23:08, Yann E. MORIN wrote: >> On 2022-03-08 19:35 +0100, Rafa? Mi?ecki spake thusly: >>> From: Rafa? Mi?ecki >>> >>> This new package provides "lzma_alone" host binary based on the original >>> LZMA SDK. It provides few extra options when compared to the LZMA Utils >>> / XZ Utils project "lzma" binary (already packaged as the "lzma"). >>> >>> This packaging schema (LZMA SDK with lzma -> lzma_alone rename) follows >>> Debian's solution. Please note that Debian also uses LZMA SDK for the >>> base "lzma" tool which may be considered for Buildroot too - as an >>> independent change. Similar packaging is also used by Ubuntu & Arch. >>> >>> lzma_alone is a requirement for preparing firmware images for some >>> Broadcom based home routers with a picky CFE bootloader. It has limited >>> LZMA support and building compatible images requires specifying >>> dictionary size and lc/lp/pb LZMA values manually. >>> >>> Version 9.22 is used as it's the last release using .tar.bz2 format. >> >> We could introduce a host variant of p7zip, so that we could >> automatically add that to FOO_EXTRACT_DEPENDENCIES if the host does not >> already have 7za (or 7zr), like we do for lzip archives for example. > > I can see 7z format support is no less messy than LZMA tools. > > It seems that 7-Zip project didn't provide command-line tool initially > and that resulted in developing p7zip. It seems it has changed though. > > So we have two projects: > > 1. p7zip > * Provides "7z" and "7za" > * Last updated in 2016 > * Suffers from security issues > * Requires patching (11 Debian patches, 2 for CVEs) Last commit in the fork that we use in package/p7zip [1] is from December '21, so not that bad I think. Regards, Arnout [1] https://github.com/jinfeihan57/p7zip > > 2. 7-Zip > * Provides "7zr" (documented as "7za") > * Last updated in 2021 > * Messy source > * Doesn't even compile on some systems: > ../../../C/Util/7z/7zMain.c:363:5: error: initializer element is not constant > ???? (const UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - > kFileTimeStartYear)); > ???? ^ > > Which one of above we should try to package? > > >> Applied to master, thanks. > > Huge thanks for your help. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Thu Mar 10 20:38:40 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Mar 2022 21:38:40 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220310140350.1955655-1-john@metanate.com> References: <20220310140350.1955655-1-john@metanate.com> Message-ID: <20220310213840.32655ec7@gmx.net> Hello John, thanks for the patch, some minor nitpicks... Better patch subject would be: package/openssh: add upstream patch to add seccomp ppoll_time64 support On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: > sshd is broken on 32-bit systems because ppoll_time64 is used by the > application although it is not allowed by the seccomp filter. > > Apply the upstream patch to fix this. Better: -add upstream patch ([1] to add seccomp ppoll_time64 support [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch > > Signed-off-by: John Keeping > --- > ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ > 1 file changed, 31 insertions(+) > create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > > diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > new file mode 100644 > index 0000000000..34b309bd9a > --- /dev/null > +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > @@ -0,0 +1,31 @@ > +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 > +From: Darren Tucker > +Date: Sat, 26 Feb 2022 14:06:14 +1100 > +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. > + > +Should fix sandbox violations on (some? at least i386 and armhf) 32bit > +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at > +debian.org via bz#3396. > + Missing: [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] > +Signed-off-by: John Keeping > +--- > + sandbox-seccomp-filter.c | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c > +index 2e065ba3..4ce80cb2 100644 > +--- a/sandbox-seccomp-filter.c > ++++ b/sandbox-seccomp-filter.c > +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { > + #ifdef __NR_ppoll > + SC_ALLOW(__NR_ppoll), > + #endif > ++#ifdef __NR_ppoll_time64 > ++ SC_ALLOW(__NR_ppoll_time64), > ++#endif > + #ifdef __NR_poll > + SC_ALLOW(__NR_poll), > + #endif > +-- > +2.35.1 > + With this fixed you can add my Reviewed-by: Peter Seiderer Regards, Peter From arnout at mind.be Thu Mar 10 20:43:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:43:28 +0100 Subject: [Buildroot] [PATCH v2] configs/orangepi_pc_defconfig: switch to extlinux In-Reply-To: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> References: <20220218035141.6914-1-kuzminov.sergey81@gmail.com> Message-ID: <90f76172-fd06-bd9f-f88c-dff188ef4a7d@mind.be> On 18/02/2022 04:51, Sergey Kuzminov wrote: > Changes: > * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch SD image from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > > Signed-off-by: Sergey Kuzminov Applied to master, thanks. Regards, Arnout > --- > V1->V2: > * improved commit log > --- > board/orangepi/orangepi-pc/boot.cmd | 8 ------ > board/orangepi/orangepi-pc/genimage.cfg | 37 ------------------------- > configs/orangepi_pc_defconfig | 9 ++---- > 3 files changed, 3 insertions(+), 51 deletions(-) > delete mode 100644 board/orangepi/orangepi-pc/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc/genimage.cfg > > diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd > deleted file mode 100644 > index 9da625c803..0000000000 > --- a/board/orangepi/orangepi-pc/boot.cmd > +++ /dev/null > @@ -1,8 +0,0 @@ > -setenv fdt_high ffffffff > - > -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg > deleted file mode 100644 > index 14e326cc56..0000000000 > --- a/board/orangepi/orangepi-pc/genimage.cfg > +++ /dev/null > @@ -1,37 +0,0 @@ > -# Minimal SD card image for the OrangePi PC > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h3-orangepi-pc.dtb", > - "boot.scr" > - } > - } > - > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig > index 44ea9b95c4..fd0f64e0e6 100644 > --- a/configs/orangepi_pc_defconfig > +++ b/configs/orangepi_pc_defconfig > @@ -5,8 +5,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" > BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" > BR2_SYSTEM_DHCP="eth0" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" > @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Thu Mar 10 20:44:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:44:38 +0100 Subject: [Buildroot] [PATCH v2 0/6] orangepi/linksprite: convert more allwinner boards to extlinux In-Reply-To: <20220225072622.3584480-1-geomatsi@gmail.com> References: <20220225072622.3584480-1-geomatsi@gmail.com> Message-ID: <777b2ce3-bf0a-3b3e-896a-00bc9525b65a@mind.be> On 25/02/2022 08:26, Sergey Matyukevich wrote: > Hi all, > > Recently extlinux infrastructure has been added for orangepi boards by > Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig: > switch to extlinux"). This patch series converts to extlinux some of the > boards that I have at my disposal: > - orangepi-zero-plus2 > - orangepi-pc-plus > - orangepi-one > - linksprite-pcduino > > All these changes have been build- and boot- tested. Also I added > orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye > on its build failures. > > Regards, > Sergey Series applied to master, thanks. Regards, Arnout > > v1 -> v2 > - add linksprite-pcduino changes > - update commit messages according to Giulio Benetti comments > > > Sergey Matyukevich (6): > board/orangepi/orangepi-zero-plus2: switch to extlinux > board/orangepi/orangepi-pc-plus: switch to extlinux > board/orangepi/orangepi-one: switch to extlinux > board/linksprite/pcduino: switch to extlinux > configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions > DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 > > DEVELOPERS | 2 + > board/linksprite/pcduino/boot.cmd | 8 ---- > board/linksprite/pcduino/genimage.cfg | 43 ------------------- > board/linksprite/pcduino/post-build.sh | 11 ----- > board/linksprite/pcduino/post-image.sh | 16 ------- > board/orangepi/orangepi-one/boot.cmd | 8 ---- > board/orangepi/orangepi-one/genimage.cfg | 37 ---------------- > board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- > board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ------------------- > board/orangepi/orangepi-zero-plus2/boot.cmd | 6 --- > .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------ > configs/linksprite_pcduino_defconfig | 18 ++++---- > configs/orangepi_one_defconfig | 9 ++-- > configs/orangepi_pc_plus_defconfig | 9 ++-- > configs/orangepi_zero_plus2_defconfig | 14 +++--- > 15 files changed, 24 insertions(+), 249 deletions(-) > delete mode 100644 board/linksprite/pcduino/boot.cmd > delete mode 100644 board/linksprite/pcduino/genimage.cfg > delete mode 100755 board/linksprite/pcduino/post-build.sh > delete mode 100755 board/linksprite/pcduino/post-image.sh > delete mode 100644 board/orangepi/orangepi-one/boot.cmd > delete mode 100644 board/orangepi/orangepi-one/genimage.cfg > delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd > delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg > delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg > From arnout at mind.be Thu Mar 10 20:45:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:45:06 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-treq: bump to version 22.2.0 In-Reply-To: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> References: <20220221230815.2203955-1-fontaine.fabrice@gmail.com> Message-ID: On 22/02/2022 00:08, Fabrice Fontaine wrote: > - hyperlink is a dependency since version 20.4.0 and > https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed > - six is not a dependency since version 21.5.0 and > https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-treq/Config.in | 2 +- > package/python-treq/python-treq.hash | 4 ++-- > package/python-treq/python-treq.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in > index 7c02a35638..5d76a5cdd6 100644 > --- a/package/python-treq/Config.in > +++ b/package/python-treq/Config.in > @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ > # twisted TLS -> python-{pyopenssl,service-identity} > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > select BR2_PACKAGE_PYTHON_ATTRS # runtime > + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime > select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime > select BR2_PACKAGE_PYTHON_REQUESTS # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > select BR2_PACKAGE_PYTHON_TWISTED # runtime > select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime > help > diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash > index 288279cbd8..aecf71aad8 100644 > --- a/package/python-treq/python-treq.hash > +++ b/package/python-treq/python-treq.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/treq/json > -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz > -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz > +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz > +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz > # Locally computed sha256 checksums > sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE > diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk > index 320f57b6f2..57dc50ee74 100644 > --- a/package/python-treq/python-treq.mk > +++ b/package/python-treq/python-treq.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TREQ_VERSION = 20.3.0 > +PYTHON_TREQ_VERSION = 22.2.0 > PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz > -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 > +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 > PYTHON_TREQ_LICENSE = MIT > PYTHON_TREQ_LICENSE_FILES = LICENSE > PYTHON_TREQ_SETUP_TYPE = setuptools From arnout at mind.be Thu Mar 10 20:45:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:45:25 +0100 Subject: [Buildroot] [PATCH v5] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version In-Reply-To: <20220222153741.15815-1-mdurrant@arcturusnetworks.com> References: <20220222153741.15815-1-mdurrant@arcturusnetworks.com> Message-ID: <06ac030e-ecab-f78b-5137-08d1237337d8@mind.be> On 22/02/2022 16:37, Michael Durrant wrote: > - Bump Linux to version 5.4.137 > - Bump U-Boot to add new targets, version remains the same > - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was > only used by PFE and now PFE is loaded directly by the kernel > - Use Image.gz instead of Image to have a compressed kernel > - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and > post-image.sh use different name. This fixes the bug that didn't > allow the creation of the part0-000000.itb file. > > Signed-off-by: Oleksandr Zhadan > Signed-off-by: Michael Durrant > Reviewed-by: Giulio Benetti > Tested-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. > - Remove the /etc/init.d/S09modload script to load the pfe firmware > module because now the pfe firmware module is loaded by the kernel > - New compressed Image.gz is used > V2->V3: > - Moved SoB to top of patch > - The use of Image.gz replace Image to force use of compression. > - Our scripts use br2-ucls1012a.its in error ucls1012a.its was used > in original readme. > - Removing extra newline > - The NXP Packet Forward Engine (PFE) firmware loader was the only > file used in the overlay. As the PFE is now loaded directly by > the kernel the BR2_ROOTFS_OVERLAY script has been removed. > V3->V4: > - Improved commit log by listing all the changed as suggested by Giulio. > - Updated header version comment in defconfig to reflect 5.4 series. > V4->V5: > - Adding Reviewed-by & Tested-by by Giulio. > - Wrapping commit log. > --- > board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - > board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- > .../rootfs_overlay/etc/init.d/S09modload | 14 -------------- > configs/arcturus_ucls1012a_defconfig | 10 +++++----- > 4 files changed, 7 insertions(+), 22 deletions(-) > delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > > diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh > index f8ba78095f..372df59c61 100755 > --- a/board/arcturus/aarch64-ucls1012a/post-build.sh > +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh > @@ -1,5 +1,4 @@ > #!/bin/sh > > mkdir -p ${TARGET_DIR}/lib/firmware > -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ > cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ > diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt > index 483d5e9aef..b486ecebc7 100644 > --- a/board/arcturus/aarch64-ucls1012a/readme.txt > +++ b/board/arcturus/aarch64-ucls1012a/readme.txt > @@ -24,13 +24,13 @@ After building, you should obtain this tree: > > output/images/ > +-- arc-ucls1012a.dtb > - +-- Image > + +-- Image.gz > +-- part0-000000.itb > +-- rootfs.cpio > +-- rootfs.cpio.gz > +-- rootfs.tar > +-- u-boot.bin > - +-- ucls1012a.its > + +-- br2-ucls1012a.its > > Flashing > -------- > diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > deleted file mode 100755 > index c87ffda14f..0000000000 > --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/bin/sh > -# > -case "$1" in > - start) > - modprobe pfe > - ;; > - stop) > - ;; > - restart|reload) > - ;; > - *) > - echo "Usage: $0 {start|stop|restart}" > - exit 1 > -esac > diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig > index fd33ebf1f6..124cc3ff94 100644 > --- a/configs/arcturus_ucls1012a_defconfig > +++ b/configs/arcturus_ucls1012a_defconfig > @@ -1,22 +1,22 @@ > # Architecture > BR2_aarch64=y > > -# Linux headers same as kernel, a 4.14 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y > +# Linux headers same as kernel, a 5.4 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y > > # System settings > BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" > BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" > > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" > +BR2_LINUX_KERNEL_IMAGEGZ=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" > > @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" > > # Tools From arnout at mind.be Thu Mar 10 20:34:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:34:29 +0100 Subject: [Buildroot] [git commit] configs/orangepi_pc_defconfig: switch to extlinux Message-ID: <20220310203713.DCCAE83B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=866ffbe0e63aff5788f29007b8fabc3fa49cd5ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changes: * Switch to common orangepi scenario for multiple boards (board/orangepi/common) to create an SD image. * Exclude FAT partition, it is no longer needed for U-Boot. * Switch SD image from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. Signed-off-by: Sergey Kuzminov Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-pc/boot.cmd | 8 ------- board/orangepi/orangepi-pc/genimage.cfg | 37 --------------------------------- configs/orangepi_pc_defconfig | 9 +++----- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c803..0000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56..0000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c4..fd0f64e0e6 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Thu Mar 10 20:35:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:35:20 +0100 Subject: [Buildroot] [git commit] package/python-treq: bump to version 22.2.0 Message-ID: <20220310203713.E644A83A8A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=933447c27c41ebcdb5eb9fa2a374456699ae33f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - hyperlink is a dependency since version 20.4.0 and https://github.com/twisted/treq/commit/5475def96f3ec93075ff95709fec4acd154e6fed - six is not a dependency since version 21.5.0 and https://github.com/twisted/treq/commit/22bdb399a03b0eebaa93023b80d348f584f567d5 Signed-off-by: Fabrice Fontaine Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-treq/Config.in | 2 +- package/python-treq/python-treq.hash | 4 ++-- package/python-treq/python-treq.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 7c02a35638..5d76a5cdd6 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index 288279cbd8..aecf71aad8 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 320f57b6f2..57dc50ee74 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 20.3.0 +PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools From arnout at mind.be Thu Mar 10 20:39:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:54 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2 Message-ID: <20220310203714.343B283B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4616a195ea396e2113dcbb5dad373306036c1a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergey Matyukevich Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3bc9819382..6f213e054f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2546,10 +2546,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ From arnout at mind.be Thu Mar 10 20:39:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:40 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-one: switch to extlinux Message-ID: <20220310203714.17E7783B7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbca462131f7d8e40dcef47d12c57d741dc21648 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-one/boot.cmd | 8 ------- board/orangepi/orangepi-one/genimage.cfg | 37 -------------------------------- configs/orangepi_one_defconfig | 9 +++----- 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9..0000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec2..0000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307..ba128424a0 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From arnout at mind.be Thu Mar 10 20:39:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:50 +0100 Subject: [Buildroot] [git commit] configs/linksprite_pcduino_defconfig: update Linux/U-Boot versions Message-ID: <20220310203714.2A31B83B78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3c6c1d9793db45000dfd9cf5df6ff7404ccf097 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump Linux kernel to 5.16.1 and U-Boot to 2022.01. Select option BR2_TARGET_UBOOT_NEEDS_OPENSSL since U-Boot requires openssl. Drop redundant U-Boot options. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- configs/linksprite_pcduino_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 05b25aede4..806c4f0697 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -19,12 +19,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -40,13 +40,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" -BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" From arnout at mind.be Thu Mar 10 20:39:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:07 +0100 Subject: [Buildroot] [git commit] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Message-ID: <20220310203713.F0E8B83B7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b72db519e69491e3c37074e2c526310f12d0faa9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Bump Linux to version 5.4.137 - Bump U-Boot to add new targets, version remains the same - Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel - Use Image.gz instead of Image to have a compressed kernel - Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file. Signed-off-by: Oleksandr Zhadan Signed-off-by: Michael Durrant Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/arcturus/aarch64-ucls1012a/post-build.sh | 1 - board/arcturus/aarch64-ucls1012a/readme.txt | 4 ++-- .../aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload | 14 -------------- configs/arcturus_ucls1012a_defconfig | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..372df59c61 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..b486ecebc7 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..124cc3ff94 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools From arnout at mind.be Thu Mar 10 20:39:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:37 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-pc-plus: switch to extlinux Message-ID: <20220310203714.0EFC683B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8497e2a3ce8632ef57d0af5c7a482ba6978e6e9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ------ board/orangepi/orangepi-pc-plus/genimage.cfg | 43 ---------------------------- configs/orangepi_pc_plus_defconfig | 9 ++---- 3 files changed, 3 insertions(+), 57 deletions(-) diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y From arnout at mind.be Thu Mar 10 20:39:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:45 +0100 Subject: [Buildroot] [git commit] board/linksprite/pcduino: switch to extlinux Message-ID: <20220310203714.20CAA83B75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5bfc4002ed598189a92db1eb7797928e136a9883 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/linksprite/pcduino/boot.cmd | 8 ------- board/linksprite/pcduino/genimage.cfg | 43 ---------------------------------- board/linksprite/pcduino/post-build.sh | 11 --------- board/linksprite/pcduino/post-image.sh | 16 ------------- configs/linksprite_pcduino_defconfig | 9 ++++--- 5 files changed, 4 insertions(+), 83 deletions(-) diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd deleted file mode 100644 index 0db8363599..0000000000 --- a/board/linksprite/pcduino/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg deleted file mode 100644 index db33322118..0000000000 --- a/board/linksprite/pcduino/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# -# Minimal SD card image for the pcDuino -# - -image boot.vfat { - vfat { - files = { - "zImage", - "sun4i-a10-pcduino.dtb", - "boot.scr" - } - } - - size = 16M -} - -# -# Note: u-boot environment is stored between u-boot and boot partitions -# - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 1M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh deleted file mode 100755 index e1e1877671..0000000000 --- a/board/linksprite/pcduino/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for pcDuino taken from OrangePi post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh deleted file mode 100755 index c82b189f9c..0000000000 --- a/board/linksprite/pcduino/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index b58f970493..05b25aede4 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -11,8 +11,9 @@ BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # SD image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -29,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -49,10 +51,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Target packages: wireless support for pcduino-lite-wifi BR2_PACKAGE_IW=y From arnout at mind.be Thu Mar 10 20:39:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:39:25 +0100 Subject: [Buildroot] [git commit] board/orangepi/orangepi-zero-plus2: switch to extlinux Message-ID: <20220310203714.0669483B78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce73d0a1d2b5abec972cd2bf9a5945b0853eb035 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. To help extlinux to find DTB without U-Boot environment changes, do not strip arm64 board specific directory from DTB name when installing it in /boot directory. For this purpose use BR2_KERNEL_DTB_KEEP_DIRNAME config option. Finally, tidy up configuration file adding section names. Signed-off-by: Sergey Matyukevich Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-zero-plus2/boot.cmd | 6 ---- board/orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------------- configs/orangepi_zero_plus2_defconfig | 14 +++++---- 3 files changed, 8 insertions(+), 53 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004b..0000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707a..0000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac9..ef171c3ad3 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From arnout at mind.be Thu Mar 10 20:57:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:57:36 +0100 Subject: [Buildroot] [PATCH v5 0/3] Add andes ae350 support In-Reply-To: <20220225092509.16478-1-peterlin@andestech.com> References: <20220225092509.16478-1-peterlin@andestech.com> Message-ID: <2df4d52d-03db-3af9-8ef9-808236638379@mind.be> On 25/02/2022 10:25, Yu Chien Peter Lin wrote: > This patchset > - renames andes/ae3xx and its defconfig to ae300 for nds32 architecture. > - adds ae350 platform support and andes_ae350_45_defconfig. > > Yu Chien Peter Lin (3): > board/andes: rearrange andes folder structure > board/andes/ae350: add support for Andes AE350 > DEVELOPERS: add Yu-Chien Lin to board/andes Series applied to master, thanks. Regards, Arnout > > DEVELOPERS | 5 +- > .../ae3xx.fragment => ae300/ae300.fragment} | 0 > ...0001-nds32-Fix-boot-messages-garbled.patch | 0 > ...ve-redundant-YYLOC-global-declaratio.patch | 0 > board/andes/{ => ae300}/readme.txt | 10 +- > board/andes/ae350/ae350.dts | 274 ++++++++++++++++++ > board/andes/ae350/genimage_sdcard.cfg | 26 ++ > ...isable-PIC-explicitly-for-assembling.patch | 29 ++ > ...2-Enable-cache-for-opensbi-jump-mode.patch | 25 ++ > ...001-Fix-mmc-no-partition-table-error.patch | 27 ++ > ...2-Prevent-fw_dynamic-from-relocation.patch | 27 ++ > ...0003-Fix-u-boot-proper-booting-issue.patch | 26 ++ > ...04-Enable-printing-OpenSBI-boot-logo.patch | 25 ++ > board/andes/ae350/post-build.sh | 3 + > board/andes/ae350/readme.txt | 65 +++++ > .../boot/extlinux/extlinux.conf | 4 + > board/andes/ae350/uboot.config.fragment | 5 + > ..._ae3xx_defconfig => andes_ae300_defconfig} | 4 +- > configs/andes_ae350_45_defconfig | 43 +++ > .../toolchain-external-andes-nds32/Config.in | 2 +- > 20 files changed, 590 insertions(+), 10 deletions(-) > rename board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} (100%) > rename board/andes/{ => ae300}/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch (100%) > rename board/andes/{ => ae300}/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch (100%) > rename board/andes/{ => ae300}/readme.txt (71%) > create mode 100755 board/andes/ae350/ae350.dts > create mode 100644 board/andes/ae350/genimage_sdcard.cfg > create mode 100644 board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch > create mode 100644 board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch > create mode 100644 board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch > create mode 100644 board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch > create mode 100644 board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch > create mode 100644 board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch > create mode 100755 board/andes/ae350/post-build.sh > create mode 100644 board/andes/ae350/readme.txt > create mode 100644 board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf > create mode 100644 board/andes/ae350/uboot.config.fragment > rename configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} (69%) > create mode 100644 configs/andes_ae350_45_defconfig > From arnout at mind.be Thu Mar 10 20:57:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 21:57:55 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/balena-engine: bump to version 20.10.12 In-Reply-To: <20220226102418.943851-1-tianyuanhao3@163.com> References: <20220226102418.943851-1-tianyuanhao3@163.com> Message-ID: On 26/02/2022 11:24, TIAN Yuanhao wrote: > Also: > - drop unused dependencies > - drop invalid tags > - drop the autogen step > - simplify kconfigs just to run hello-world > > https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md > > Signed-off-by: TIAN Yuanhao Applied to master, thanks. Regards, Arnout > --- > package/balena-engine/Config.in | 1 - > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 42 +++++------------------- > 3 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in > index f48f361dc2..02f694515e 100644 > --- a/package/balena-engine/Config.in > +++ b/package/balena-engine/Config.in > @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE > depends on BR2_USE_MMU # util-linux > select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime > select BR2_PACKAGE_IPTABLES # runtime > - select BR2_PACKAGE_SQLITE # runtime > select BR2_PACKAGE_UTIL_LINUX # runtime > select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime > select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 3f632ef381..ef590881f5 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz > +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index b3eb2ca75b..0afcea3d7e 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,34 +4,33 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 19.03.14 > +BALENA_ENGINE_VERSION = 20.10.12 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 > BALENA_ENGINE_LICENSE_FILES = LICENSE > > -BALENA_ENGINE_DEPENDENCIES = host-pkgconf > BALENA_ENGINE_GOMOD = github.com/docker/docker > > BALENA_ENGINE_LDFLAGS = \ > - -X github.com/docker/cli/cli/version.Version=N/A \ > - -X github.com/docker/cli/cli/version.GitCommit= \ > - -X github.com/docker/cli/cli/version.BuildTime= \ > + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ > + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ > -X github.com/containerd/containerd/version.Version=N/A \ > + -X github.com/docker/cli/cli/version.BuildTime= \ > + -X github.com/docker/cli/cli/version.GitCommit= \ > + -X github.com/docker/cli/cli/version.Version=N/A \ > -X github.com/opencontainers/runc.version=N/A > > BALENA_ENGINE_TAGS = \ > cgo \ > - exclude_graphdriver_zfs \ > - autogen \ > - no_buildkit \ > no_btrfs \ > no_cri \ > no_devmapper \ > no_zfs \ > exclude_disk_quota \ > exclude_graphdriver_btrfs \ > - exclude_graphdriver_devicemapper > + exclude_graphdriver_devicemapper \ > + exclude_graphdriver_zfs > > BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine > > @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd > BALENA_ENGINE_TAGS += journald > endif > > -define BALENA_ENGINE_RUN_AUTOGEN > - cd $(@D) && \ > - VERSION=$(BALENA_ENGINE_VERSION) \ > - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ > - $(TARGET_MAKE_ENV) \ > - $(SHELL) hack/make/.go-autogen > -endef > - > -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN > - > define BALENA_ENGINE_INSTALL_INIT_SYSTEMD > $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ > $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service > @@ -64,35 +53,20 @@ endef > define BALENA_ENGINE_LINUX_CONFIG_FIXUPS > $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) > $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) > - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) > $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) > $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) > - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) > - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) > $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) > $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) > - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) > $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) > - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) > $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) > - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) > - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) > - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) > $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) > - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) > - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) > endef > > define BALENA_ENGINE_INSTALL_SYMLINK From arnout at mind.be Thu Mar 10 20:52:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:52:46 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: replace Nylon chen with Yu Chien Peter Lin for Andes Message-ID: <20220310204935.8759883BF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff6d4778c270d612e5338a9a5f93f84f7cf3e4f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Nylon is no longer at Andes. Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 26bcb508e5..70d71186ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2147,10 +2147,11 @@ N: Norbert Lange F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen +N: Yu Chien Peter Lin F: arch/Config.in.nds32 F: board/andes F: configs/andes_ae300_defconfig +F: configs/andes_ae350_45_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel From arnout at mind.be Thu Mar 10 20:47:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:47:55 +0100 Subject: [Buildroot] [git commit] board/andes: rearrange andes folder structure Message-ID: <20220310204935.727D383BF5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48bdd8374174494b5a1ae658edb32780e9f86052 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In order to add ae350 RISC-V platform, rename ae3xx to ae300 for NDS32 architecture. AE300 (NDS32): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae300/ AE350 (RISC-V): - http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 2 +- board/andes/{ae3xx/ae3xx.fragment => ae300/ae300.fragment} | 0 .../patches/linux/0001-nds32-Fix-boot-messages-garbled.patch | 0 ...-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch | 0 board/andes/{ => ae300}/readme.txt | 10 +++++----- configs/{andes_ae3xx_defconfig => andes_ae300_defconfig} | 4 ++-- .../toolchain-external-andes-nds32/Config.in | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6f213e054f..26bcb508e5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2150,7 +2150,7 @@ F: package/tcf-agent/ N: Nylon Chen F: arch/Config.in.nds32 F: board/andes -F: configs/andes_ae3xx_defconfig +F: configs/andes_ae300_defconfig F: toolchain/toolchain-external/toolchain-external-andes-nds32/ N: Olaf Rempel diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae300/ae300.fragment similarity index 100% rename from board/andes/ae3xx/ae3xx.fragment rename to board/andes/ae300/ae300.fragment diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch similarity index 100% rename from board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch rename to board/andes/ae300/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch similarity index 100% rename from board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch rename to board/andes/ae300/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch diff --git a/board/andes/readme.txt b/board/andes/ae300/readme.txt similarity index 71% rename from board/andes/readme.txt rename to board/andes/ae300/readme.txt index 0f95c65549..51c05c9235 100644 --- a/board/andes/readme.txt +++ b/board/andes/ae300/readme.txt @@ -1,10 +1,10 @@ Intro ===== -Andestech(nds32) AE3XX Platform +Andestech(nds32) AE300 Platform -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. +The AE300 prototype demonstrates the AE300 example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE300. How to build it =============== @@ -12,10 +12,10 @@ How to build it Configure Buildroot ------------------- -The andes_ae3xx_defconfig configuration is a sample configuration with +The andes_ae300_defconfig configuration is a sample configuration with all that is required to bring the FPGA Development Board: - $ make andes_ae3xx_defconfig + $ make andes_ae300_defconfig Build everything ---------------- diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae300_defconfig similarity index 69% rename from configs/andes_ae3xx_defconfig rename to configs/andes_ae300_defconfig index 52634caa50..ffcb4d7d38 100644 --- a/configs/andes_ae3xx_defconfig +++ b/configs/andes_ae300_defconfig @@ -1,10 +1,10 @@ BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_GLOBAL_PATCH_DIR="board/andes/ae300/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae300/ae300.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in index 9c937b8c44..ecd50cc805 100644 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -12,4 +12,4 @@ config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 help nds32 toolchain for the nds32 architecture. It uses GCC 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform + code that runs on ae300 platform From arnout at mind.be Thu Mar 10 20:48:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:48:16 +0100 Subject: [Buildroot] [git commit] board/andes/ae350: add support for Andes AE350 Message-ID: <20220310204935.7D48083BF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc22c3ce40d8be4a6fbb1bcf0f16bd1777b562ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch provides defconfig and basic support for Andes 45 series RISC-V architecture on AE350 platform. http://www.andestech.com/en/products-solutions/andeshape-platforms/ae350-axi-based-platform-pre-integrated-with-n25f-nx25f-a25-ax25/ Signed-off-by: Yu Chien Peter Lin Signed-off-by: Alan Kao Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/andes/ae350/ae350.dts | 274 +++++++++++++++++++++ board/andes/ae350/genimage_sdcard.cfg | 26 ++ ...001-Disable-PIC-explicitly-for-assembling.patch | 29 +++ .../0002-Enable-cache-for-opensbi-jump-mode.patch | 25 ++ .../0001-Fix-mmc-no-partition-table-error.patch | 27 ++ .../0002-Prevent-fw_dynamic-from-relocation.patch | 27 ++ .../0003-Fix-u-boot-proper-booting-issue.patch | 26 ++ .../0004-Enable-printing-OpenSBI-boot-logo.patch | 25 ++ board/andes/ae350/post-build.sh | 3 + board/andes/ae350/readme.txt | 65 +++++ .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 + board/andes/ae350/uboot.config.fragment | 5 + configs/andes_ae350_45_defconfig | 43 ++++ 13 files changed, 579 insertions(+) diff --git a/board/andes/ae350/ae350.dts b/board/andes/ae350/ae350.dts new file mode 100755 index 0000000000..5e5d70ab25 --- /dev/null +++ b/board/andes/ae350/ae350.dts @@ -0,0 +1,274 @@ +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,ae350"; + model = "andestech,ax45"; + aliases { + uart0 = &serial0; + spi0 = &spi; + }; + + chosen { + bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + cpus { + #address-cells = <1>; + #size-cells = <0>; + timebase-frequency = <60000000>; + CPU0: cpu at 0 { + device_type = "cpu"; + reg = <0>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU0_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU1: cpu at 1 { + device_type = "cpu"; + reg = <1>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU1_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU2: cpu at 2 { + device_type = "cpu"; + reg = <2>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU2_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + CPU3: cpu at 3 { + device_type = "cpu"; + reg = <3>; + status = "okay"; + compatible = "riscv"; + riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0"; + riscv,priv-major = <1>; + riscv,priv-minor = <10>; + mmu-type = "riscv,sv48"; + clock-frequency = <60000000>; + i-cache-size = <0x8000>; + i-cache-sets = <256>; + i-cache-block-size = <64>; + i-cache-line-size = <64>; + d-cache-size = <0x8000>; + d-cache-sets = <128>; + d-cache-block-size = <64>; + d-cache-line-size = <64>; + next-level-cache = <&L2>; + CPU3_intc: interrupt-controller { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "riscv,cpu-intc"; + }; + }; + }; + L2: l2-cache at e0500000 { + compatible = "cache"; + cache-level = <2>; + cache-size = <0x80000>; + reg = <0x00000000 0xe0500000 0x00000000 0x00001000>; + andes,inst-prefetch = <3>; + andes,data-prefetch = <3>; + // The value format is + andes,tag-ram-ctl = <0 0>; + andes,data-ram-ctl = <0 0>; + }; + memory at 0 { + reg = <0x00000000 0x00000000 0x00000000 0x80000000>; + device_type = "memory"; + }; + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "andestech,riscv-ae350-soc", "simple-bus"; + ranges; + plic0: interrupt-controller at e4000000 { + compatible = "riscv,plic0"; + reg = <0x00000000 0xe4000000 0x00000000 0x02000000>; + interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <71>; + }; + plic1: interrupt-controller at e6400000 { + compatible = "riscv,plic1"; + reg = <0x00000000 0xe6400000 0x00000000 0x00400000>; + interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>; + interrupt-controller; + #address-cells = <2>; + #interrupt-cells = <2>; + riscv,ndev = <4>; + }; + plmt0: plmt0 at e6000000 { + compatible = "riscv,plmt0"; + reg = <0x00000000 0xe6000000 0x00000000 0x00100000>; + interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>; + }; + spiclk: virt_100mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + timer0: timer at f0400000 { + compatible = "andestech,atcpit100"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + }; + pwm: pwm at f0400000 { + compatible = "andestech,atcpit100-pwm"; + reg = <0x00000000 0xf0400000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <60000000>; + pwm-cells = <2>; + }; + wdt: wdt at f0500000 { + compatible = "andestech,atcwdt200"; + reg = <0x00000000 0xf0500000 0x00000000 0x00001000>; + interrupts = <3 4>; + interrupt-parent = <&plic0>; + clock-frequency = <15000000>; + }; + serial0: serial at f0300000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x00000000 0xf0300000 0x00000000 0x00001000>; + interrupts = <9 4>; + interrupt-parent = <&plic0>; + clock-frequency = <19660800>; + reg-shift = <2>; + reg-offset = <32>; + no-loopback-test = <1>; + }; + rtc0: rtc at f0600000 { + compatible = "andestech,atcrtc100"; + reg = <0x00000000 0xf0600000 0x00000000 0x00001000>; + interrupts = <1 4 2 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + gpio: gpio at f0700000 { + compatible = "andestech,atcgpio100"; + reg = <0x00000000 0xf0700000 0x00000000 0x00001000>; + interrupts = <7 4>; + interrupt-parent = <&plic0>; + wakeup-source; + }; + mac0: mac at e0100000 { + compatible = "andestech,atmac100"; + reg = <0x00000000 0xe0100000 0x00000000 0x00001000>; + interrupts = <19 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + smu: smu at f0100000 { + compatible = "andestech,atcsmu"; + reg = <0x00000000 0xf0100000 0x00000000 0x00001000>; + }; + mmc0: mmc at f0e00000 { + compatible = "andestech,atfsdc010"; + reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>; + interrupts = <18 4>; + interrupt-parent = <&plic0>; + clock-freq-min-max = <400000 100000000>; + max-frequency = <100000000>; + fifo-depth = <16>; + cap-sd-highspeed; + dma-coherent; + }; + dma0: dma at f0c00000 { + compatible = "andestech,atcdmac300"; + reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>; + interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>; + interrupt-parent = <&plic0>; + dma-channels = <8>; + }; + lcd0: lcd at e0200000 { + compatible = "andestech,atflcdc100"; + reg = <0x00000000 0xe0200000 0x00000000 0x00001000>; + interrupts = <20 4>; + interrupt-parent = <&plic0>; + dma-coherent; + }; + pmu: pmu { + compatible = "riscv,andes-pmu"; + device_type = "pmu"; + }; + spi: spi at f0b00000 { + compatible = "andestech,atcspi200"; + reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>; + interrupts = <4 4>; + interrupt-parent = <&plic0>; + #address-cells = <1>; + #size-cells = <0>; + num-cs = <1>; + clocks = <&spiclk>; + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0x00000000>; + spi-max-frequency = <50000000>; + spi-cpol; + spi-cpha; + }; + }; + }; +}; diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 0000000000..b8b9fe6a62 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch new file mode 100644 index 0000000000..aeafed4c9f --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch @@ -0,0 +1,29 @@ +From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 29 Dec 2021 16:04:54 +0800 +Subject: [PATCH] Disable PIC explicitly for assembling + +This patch is necessary if the fw_dynamic load address +is not equal to link address. +However, they are equal currently, since we include an u-boot +patch for preventing fw_dynamic relocation. + +Signed-off-by: Yu Chien Peter Lin +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index d6f097d..441518d 100644 +--- a/Makefile ++++ b/Makefile +@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) + ASFLAGS += $(firmware-asflags-y) ++ASFLAGS += -fno-pic + + ARFLAGS = rcs + +-- +2.25.1 diff --git a/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch new file mode 100644 index 0000000000..ae48a760c8 --- /dev/null +++ b/board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch @@ -0,0 +1,25 @@ +From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 30 Dec 2021 08:47:34 +0800 +Subject: [PATCH] Enable cache for opensbi jump mode + +Signed-off-by: Yu Chien Peter Lin +--- + firmware/fw_base.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/firmware/fw_base.S b/firmware/fw_base.S +index ab33e11..155d230 100644 +--- a/firmware/fw_base.S ++++ b/firmware/fw_base.S +@@ -46,6 +46,8 @@ + .globl _start + .globl _start_warm + _start: ++ li t0, 0x80003 ++ csrw 0x7ca, t0 + /* Find preferred boot HART id */ + MOV_3R s0, a0, s1, a1, s2, a2 + call fw_boot_hart +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch new file mode 100644 index 0000000000..7aff3cebf6 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch @@ -0,0 +1,27 @@ +From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:00:59 +0800 +Subject: [PATCH] Fix mmc no partition table error + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf..3b1e0aa0 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev) + return ret; + #endif + +- if (dev_read_bool(dev, "cap-mmc-highspeed") || \ +- dev_read_bool(dev, "cap-sd-highspeed")) +- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz; +- + ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps, + priv->minmax[1] , priv->minmax[0]); + chip->mmc = &plat->mmc; +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch new file mode 100644 index 0000000000..c6e1896f1c --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch @@ -0,0 +1,27 @@ +From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 11:02:26 +0800 +Subject: [PATCH] Prevent fw_dynamic from relocation + +This patch prevents OpenSBI relocation, load fw_dynamic to link address + +Signed-off-by: Yu Chien Peter Lin +--- + board/AndesTech/ax25-ae350/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig +index e50f505a..385c4c11 100644 +--- a/board/AndesTech/ax25-ae350/Kconfig ++++ b/board/AndesTech/ax25-ae350/Kconfig +@@ -25,7 +25,7 @@ config SPL_TEXT_BASE + default 0x800000 + + config SPL_OPENSBI_LOAD_ADDR +- default 0x01000000 ++ default 0x0 + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch new file mode 100644 index 0000000000..20598fdba4 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch @@ -0,0 +1,26 @@ +From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Wed, 5 Jan 2022 18:17:39 +0800 +Subject: [PATCH] Fix u-boot proper booting issue + +Signed-off-by: Yu Chien Peter Lin +--- + arch/riscv/cpu/start.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S +index 76850ec9..2ccda4f5 100644 +--- a/arch/riscv/cpu/start.S ++++ b/arch/riscv/cpu/start.S +@@ -139,7 +139,9 @@ call_harts_early_init: + * accesses gd). + */ + mv gp, s0 ++#if !CONFIG_IS_ENABLED(RISCV_SMODE) + bnez tp, secondary_hart_loop ++#endif + #endif + + jal board_init_f_init_reserve +-- +2.25.1 diff --git a/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch new file mode 100644 index 0000000000..efd78ab26d --- /dev/null +++ b/board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch @@ -0,0 +1,25 @@ +From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001 +From: Yu Chien Peter Lin +Date: Thu, 6 Jan 2022 13:50:07 +0800 +Subject: [PATCH] Enable printing OpenSBI boot logo + +Signed-off-by: Yu Chien Peter Lin +--- + include/opensbi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/opensbi.h b/include/opensbi.h +index d812cc8c..91fb8fd9 100644 +--- a/include/opensbi.h ++++ b/include/opensbi.h +@@ -20,7 +20,7 @@ + + enum sbi_scratch_options { + /** Disable prints during boot */ +- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0), ++ SBI_SCRATCH_NO_BOOT_PRINTS = 0, + }; + + /** Representation dynamic info passed by previous booting stage */ +-- +2.25.1 diff --git a/board/andes/ae350/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 0000000000..0e6ce228f4 --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 0000000000..6825468d50 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,65 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make andes_ae350_45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- ae350.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- fw_jump.bin + |-- fw_jump.elf + |-- Image + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..549eb93abc --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 0000000000..4992d712a5 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,5 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_OF_BOARD is not set +CONFIG_OF_SEPARATE=y diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig new file mode 100644 index 0000000000..a35ddd06ba --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,43 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_OVERLAY="board/andes/ae350/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45" +BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="andes/ae350" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From arnout at mind.be Thu Mar 10 20:53:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 21:53:43 +0100 Subject: [Buildroot] [git commit] package/balena-engine: bump to version 20.10.12 Message-ID: <20220310204935.91DB083BF6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=046739df7ef1e704889a24a7e0886865dd32e0b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also: - drop unused dependencies - drop invalid tags - drop the autogen step - simplify kconfigs just to run hello-world https://github.com/balena-os/balena-engine/blob/v20.10.12/CHANGELOG.md Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/balena-engine/Config.in | 1 - package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 42 ++++++-------------------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2..02f694515e 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381..ef590881f5 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b..0afcea3d7e 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,34 +4,33 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.12 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +53,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK From ps.report at gmx.net Thu Mar 10 20:59:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 10 Mar 2022 21:59:14 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: References: <20220309142913.2102898-1-foss+buildroot@0leil.net> Message-ID: <20220310215914.3d26c317@gmx.net> Hello *, On Thu, 10 Mar 2022 21:10:36 +0100, Arnout Vandecappelle wrote: > Hi Quentin, > > On 09/03/2022 15:29, Quentin Schulz wrote: > > From: Quentin Schulz > > > > This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. > > > > The patch fails to apply because of a conflict in copyright year so it > > needed some additional handling after downloading. > > > > The patch file was added by running the following command: > > wget https://download.qt.io/archive/qt/5.15/CVE-2022-25255-qprocess5-15.diff -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch > > > > [1] https://nvd.nist.gov/vuln/detail/CVE-2022-25255 > > > > Cc: Quentin Schulz > > Signed-off-by: Quentin Schulz > > --- > > ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ > > package/qt5/qt5base/qt5base.mk | 2 + > > 2 files changed, 58 insertions(+) > > create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > > > diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > new file mode 100644 > > index 0000000000..dfab92a9ef > > --- /dev/null > > +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch > > Please make the patch something that approaches git-formatted. At the very > least, the patch itself must have a description of what it does (i.e. a commit > message) and a Signed-off-by from you. Ideally, though, you look for the > appropriate commit in the upstream repository [1] and use that instead of a > random diff. In that case, add something like this at the end of the description > part: > > [Quentin: backport from upstream commit ab6915f0efb12cfe48d1f126f4a828212f853ce5 > in 6.2 branch] > Signed-off-by: ... > ..or wait until [2] is merged and bump the qt5base version/kde-git-revision (but then only applicable for 2022.02.x/master and not for the older buildroot branches)... Regards Peter [2] https://invent.kde.org/qt/qt/qtbase/-/merge_requests/115 > > Regards, > Arnout > > [1] > https://invent.kde.org/qt/qt/qtbase/-/commit/ab6915f0efb12cfe48d1f126f4a828212f853ce5.patch > > > > @@ -0,0 +1,56 @@ > > +--- a/src/corelib/io/qprocess_unix.cpp > > ++++ b/src/corelib/io/qprocess_unix.cpp > > +@@ -1,7 +1,7 @@ > > + /**************************************************************************** > > + ** > > + ** Copyright (C) 2016 The Qt Company Ltd. > > +-** Copyright (C) 2016 Intel Corporation. > > ++** Copyright (C) 2022 Intel Corporation. > > + ** Contact: https://www.qt.io/licensing/ > > + ** > > + ** This file is part of the QtCore module of the Qt Toolkit. > > +@@ -422,14 +422,15 @@ void QProcessPrivate::startProcess() > > + // Add the program name to the argument list. > > + argv[0] = nullptr; > > + if (!program.contains(QLatin1Char('/'))) { > > ++ // findExecutable() returns its argument if it's an absolute path, > > ++ // otherwise it searches $PATH; returns empty if not found (we handle > > ++ // that case much later) > > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > > +- if (!exeFilePath.isEmpty()) { > > +- const QByteArray &tmp = QFile::encodeName(exeFilePath); > > +- argv[0] = ::strdup(tmp.constData()); > > +- } > > +- } > > +- if (!argv[0]) > > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > > ++ argv[0] = ::strdup(tmp.constData()); > > ++ } else { > > + argv[0] = ::strdup(encodedProgramName.constData()); > > ++ } > > + > > + // Add every argument to the list > > + for (int i = 0; i < arguments.count(); ++i) > > +@@ -983,15 +984,16 @@ bool QProcessPrivate::startDetached(qint64 *pid) > > + envp = _q_dupEnvironment(environment.d.constData()->vars, &envc); > > + } > > + > > +- QByteArray tmp; > > + if (!program.contains(QLatin1Char('/'))) { > > ++ // findExecutable() returns its argument if it's an absolute path, > > ++ // otherwise it searches $PATH; returns empty if not found (we handle > > ++ // that case much later) > > + const QString &exeFilePath = QStandardPaths::findExecutable(program); > > +- if (!exeFilePath.isEmpty()) > > +- tmp = QFile::encodeName(exeFilePath); > > ++ const QByteArray &tmp = QFile::encodeName(exeFilePath); > > ++ argv[0] = ::strdup(tmp.constData()); > > ++ } else { > > ++ argv[0] = ::strdup(QFile::encodeName(program)); > > + } > > +- if (tmp.isEmpty()) > > +- tmp = QFile::encodeName(program); > > +- argv[0] = tmp.data(); > > + > > + if (envp) > > + qt_safe_execve(argv[0], argv, envp); > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index ef38d03253..ac0781c430 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -15,6 +15,8 @@ QT5BASE_SYNC_QT_HEADERS = YES > > # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > > # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > > QT5BASE_IGNORE_CVES += CVE-2021-38593 > > +# 0008-CVE-2022-25255-qprocess5-15.diff.patch > > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > > > > # A few comments: > > # * -no-pch to workaround the issue described at > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Mar 10 21:03:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:03:23 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220310213840.32655ec7@gmx.net> References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> Message-ID: On 10/03/2022 21:38, Peter Seiderer wrote: > Hello John, > > thanks for the patch, some minor nitpicks... > > Better patch subject would be: > > package/openssh: add upstream patch to add seccomp ppoll_time64 support Applied to master with this changed. > > On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: > >> sshd is broken on 32-bit systems because ppoll_time64 is used by the >> application although it is not allowed by the seccomp filter. >> >> Apply the upstream patch to fix this. > > Better: > > -add upstream patch ([1] to add seccomp ppoll_time64 support Since the subject now already says that it adds seccomp ppoll_time64 support, this is redundant. Since I'm lazy :-), I didn't change this. > > [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch There's already a reference to the upstream commit in the patch itself, so this is not really needed. > >> >> Signed-off-by: John Keeping >> --- >> ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ >> 1 file changed, 31 insertions(+) >> create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >> >> diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >> new file mode 100644 >> index 0000000000..34b309bd9a >> --- /dev/null >> +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >> @@ -0,0 +1,31 @@ >> +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 >> +From: Darren Tucker >> +Date: Sat, 26 Feb 2022 14:06:14 +1100 >> +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. >> + >> +Should fix sandbox violations on (some? at least i386 and armhf) 32bit >> +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at >> +debian.org via bz#3396. >> + > > Missing: > > [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] Except for the signoff, the patch is literally the upstream patch, including the sha1 in the From line. So an upstream reference is not really needed. Still, it's useful so I overcame my laziness and added it. Regards, Arnout >> +Signed-off-by: John Keeping >> +--- >> + sandbox-seccomp-filter.c | 3 +++ >> + 1 file changed, 3 insertions(+) >> + >> +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c >> +index 2e065ba3..4ce80cb2 100644 >> +--- a/sandbox-seccomp-filter.c >> ++++ b/sandbox-seccomp-filter.c >> +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { >> + #ifdef __NR_ppoll >> + SC_ALLOW(__NR_ppoll), >> + #endif >> ++#ifdef __NR_ppoll_time64 >> ++ SC_ALLOW(__NR_ppoll_time64), >> ++#endif >> + #ifdef __NR_poll >> + SC_ALLOW(__NR_poll), >> + #endif >> +-- >> +2.35.1 >> + > > With this fixed you can add my > > Reviewed-by: Peter Seiderer > > Regards, > Peter > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Mar 10 21:02:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:02:58 +0100 Subject: [Buildroot] [git commit] package/openssh: add upstream patch to add seccomp ppoll_time64 support Message-ID: <20220310205500.005D183BFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=10c1d887d6082d8806b38b86097c212c4c3ec8f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master sshd is broken on 32-bit systems because ppoll_time64 is used by the application although it is not allowed by the seccomp filter. Apply the upstream patch to fix this. Signed-off-by: John Keeping Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...001-Allow-ppoll_time64-in-seccomp-sandbox.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch new file mode 100644 index 0000000000..16eb6eaba2 --- /dev/null +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch @@ -0,0 +1,32 @@ +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Sat, 26 Feb 2022 14:06:14 +1100 +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. + +Should fix sandbox violations on (some? at least i386 and armhf) 32bit +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at +debian.org via bz#3396. + +[Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] +Signed-off-by: John Keeping +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif +-- +2.35.1 + From arnout at mind.be Thu Mar 10 21:07:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:07:51 +0100 Subject: [Buildroot] [PATCH] package/mender: bump to version 3.2.1 In-Reply-To: <20220222105531.2498422-1-angelo@amarulasolutions.com> References: <20220222105531.2498422-1-angelo@amarulasolutions.com> Message-ID: On 22/02/2022 11:55, Angelo Compagnucci wrote: > Main LICENSE file hash is changed due to a copyright year update. > > Signed-off-by: Angelo Compagnucci Same comment as the earlier patch from Adam [1]: I'm sorry Adam, but that's not enough. When you say "update license hashes due to removals and additions" it sounds like there were clauses removed to or added to the license - which would mean the license has changed. Did you mean the following? Update license hashes due to year changes. Remove license files of vendored dependencies that are no longer used. Add license files for new vendored dependencies. Also, did you check if MENDER_LICENSE needs to be updated due to the added or removed vendored dependencies? Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/list/?series=284884 > --- > package/mender/mender.hash | 15 ++++++++------- > package/mender/mender.mk | 7 ++++--- > 2 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/package/mender/mender.hash b/package/mender/mender.hash > index 40d82f072f..3a7a675341 100644 > --- a/package/mender/mender.hash > +++ b/package/mender/mender.hash > @@ -1,12 +1,12 @@ > # Locally computed: > -sha256 716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763 3.1.0.tar.gz > +sha256 8dd04f963f1816350c5406312969f5b11d45c772274a8c32f7a9da8b2cc36561 3.2.1.tar.gz > > # Vendor licenses > # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 > > # Apache-2.0 license. > -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE > -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE > +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE > +sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a vendor/github.com/mendersoftware/mender-artifact/LICENSE > sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE > sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE > @@ -14,26 +14,27 @@ sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor > # BSD 2 Clause license. > sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE > sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE > +sha256 2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d vendor/github.com/gorilla/websocket/LICENSE > # > # BSD 3 Clause license. > -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE > +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE > sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE > -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE > sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE > sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md > sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE > +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/term/LICENSE > # > # ISC license. > sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE > # > # MIT license. > sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE > +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE > sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE > sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE > sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE > sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE > sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE > -sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE > sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE > sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE > # > @@ -41,4 +42,4 @@ sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor > sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md > > # sha256 of all the vendor licenses combined > -sha256 4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24 LIC_FILES_CHKSUM.sha256 > +sha256 e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f LIC_FILES_CHKSUM.sha256 > diff --git a/package/mender/mender.mk b/package/mender/mender.mk > index ddf3e43be2..33b4611a5f 100644 > --- a/package/mender/mender.mk > +++ b/package/mender/mender.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MENDER_VERSION = 3.1.0 > +MENDER_VERSION = 3.2.1 > MENDER_SITE = https://github.com/mendersoftware/mender/archive > MENDER_SOURCE = $(MENDER_VERSION).tar.gz > MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 > @@ -20,20 +20,21 @@ MENDER_LICENSE_FILES = \ > vendor/github.com/mendersoftware/progressbar/LICENSE \ > vendor/github.com/pkg/errors/LICENSE \ > vendor/github.com/godbus/dbus/LICENSE \ > + vendor/github.com/gorilla/websocket/LICENSE \ > vendor/github.com/klauspost/compress/LICENSE \ > vendor/github.com/pmezard/go-difflib/LICENSE \ > - vendor/golang.org/x/crypto/LICENSE \ > vendor/golang.org/x/sys/LICENSE \ > vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ > vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ > + vendor/golang.org/x/term/LICENSE \ > vendor/github.com/davecgh/go-spew/LICENSE \ > vendor/github.com/klauspost/pgzip/LICENSE \ > + vendor/github.com/klauspost/cpuid/v2/LICENSE \ > vendor/github.com/sirupsen/logrus/LICENSE \ > vendor/github.com/stretchr/testify/LICENSE \ > vendor/github.com/ungerik/go-sysfs/LICENSE \ > vendor/github.com/urfave/cli/v2/LICENSE \ > vendor/github.com/stretchr/objx/LICENSE \ > - vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ > vendor/gopkg.in/yaml.v3/LICENSE \ > vendor/github.com/mattn/go-isatty/LICENSE \ > vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md From arnout at mind.be Thu Mar 10 21:22:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:22:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe In-Reply-To: <20220206212028.1786742-1-james.hilliard1@gmail.com> References: <20220206212028.1786742-1-james.hilliard1@gmail.com> Message-ID: <60819f52-11e9-40e0-b3ec-b399c1c7b1fa@mind.be> On 06/02/2022 22:20, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 396f5044ff..1b9ff43ab2 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 > +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index d8a0bf1d16..37ad9c652c 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d > +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > From arnout at mind.be Thu Mar 10 21:22:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:22:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5declarative: bump to version 1d49a5b678957adde7e2db23a485a3f48157bc8f In-Reply-To: <20220206212405.1787998-1-james.hilliard1@gmail.com> References: <20220206212405.1787998-1-james.hilliard1@gmail.com> Message-ID: On 06/02/2022 22:24, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > index adda7e03ba..e5b016fc20 100644 > --- a/package/qt5/qt5declarative/qt5declarative.hash > +++ b/package/qt5/qt5declarative/qt5declarative.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 > +sha256 afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index e63a78021a..54aa3be1cb 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 > +QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f > QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > QT5DECLARATIVE_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 10 21:22:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:22:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5wayland: bump to version ce2caf493a1343fbd9f8e4c85baf6a61c057f242 In-Reply-To: <20220206212824.1790375-1-james.hilliard1@gmail.com> References: <20220206212824.1790375-1-james.hilliard1@gmail.com> Message-ID: <403e117c-e579-f96e-764f-7f69d6fdf8fe@mind.be> On 06/02/2022 22:28, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > index 1a7400de67..2acdd1643c 100644 > --- a/package/qt5/qt5wayland/qt5wayland.hash > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 > +sha256 f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0 qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > index bcc4915022..61182f611c 100644 > --- a/package/qt5/qt5wayland/qt5wayland.mk > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 > +QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242 > QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > QT5WAYLAND_DEPENDENCIES = wayland From arnout at mind.be Thu Mar 10 21:23:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:23:03 +0100 Subject: [Buildroot] [PATCH 1/2] support/scripts/gen-bootlin-toolchains: add s390x toolchain In-Reply-To: <20220208213514.7141-1-romain.naour@gmail.com> References: <20220208213514.7141-1-romain.naour@gmail.com> Message-ID: <7417e8c3-fb16-f276-33f3-65ee8b4f0b22@mind.be> On 08/02/2022 22:35, Romain Naour wrote: > s390x support has been added since toolchain-builder release > 2021.05 [1]. > > [1] https://github.com/bootlin/toolchains-builder/commit/4bbb52a6a30a340a30722bc170467aa6fa4adbe6 > > Signed-off-by: Romain Naour Both applied to master, thanks. Regards, Arnout > --- > support/scripts/gen-bootlin-toolchains | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains > index dc173fa949..f9dd9da9a8 100755 > --- a/support/scripts/gen-bootlin-toolchains > +++ b/support/scripts/gen-bootlin-toolchains > @@ -162,6 +162,10 @@ arches = { > 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], > 'prefix': 'riscv64', > }, > + 's390x-z13': { > + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], > + 'prefix': 's390x', > + }, > 'sh-sh4': { > 'conditions': ['BR2_sh', 'BR2_sh4'], > 'prefix': 'sh4', From arnout at mind.be Thu Mar 10 21:23:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:23:23 +0100 Subject: [Buildroot] [PATCH] package/erofs-utils: bump version to 1.4 In-Reply-To: <20220214152450.319583-1-hsiangkao@aol.com> References: <20220214152450.319583-1-hsiangkao.ref@aol.com> <20220214152450.319583-1-hsiangkao@aol.com> Message-ID: On 14/02/2022 16:24, Gao Xiang via buildroot wrote: > - new upstream version; > - add 0001-erofs-utils-dump-fix-de-nid-issues.patch [1]; > - add 0002-fsck-main.c-add-missing-include.patch [2]; > - add 0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch [3]; > - add 0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch [4]. > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 > [2] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=1ca453ee89894b1669ac78d7f216bda172783e8d > [3] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eb255afa101b52096bd3e5e48f990576190f03bd > [4] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 > > Signed-off-by: Gao Xiang Applied to master, thanks. Regards, Arnout [snip] From arnout at mind.be Thu Mar 10 21:23:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:23:55 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.48 In-Reply-To: <20220214211051.22421-1-ps.report@gmx.net> References: <20220214211051.22421-1-ps.report@gmx.net> Message-ID: <66a1b135-aeca-d245-f209-ce52a8e507c4@mind.be> On 14/02/2022 22:10, Peter Seiderer wrote: > - Changelog (since 0.47, from [1]): > > ver 0.48: > Fix issue with memory leaking from ICMPv6 RA. > > [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog > > Signed-off-by: Peter Seiderer Both applied to master, thanks. Regards, Arnout > --- > 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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz > +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 3ce64b6f2f..267b44e5f0 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.47 > +ELL_VERSION = 0.48 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 10 21:24:11 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:24:11 +0100 Subject: [Buildroot] [PATCH 1/2] syslog-ng: Bump version to 3.35.1 In-Reply-To: <20220214211927.3673441-1-judge.packham@gmail.com> References: <20220214211927.3673441-1-judge.packham@gmail.com> Message-ID: On 14/02/2022 22:19, Chris Packham wrote: > Signed-off-by: Chris Packham Applied to master, thanks. Regards, Arnout > --- > package/syslog-ng/syslog-ng.conf | 2 +- > package/syslog-ng/syslog-ng.hash | 2 +- > package/syslog-ng/syslog-ng.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf > index 55d01501cb..64ff980593 100644 > --- a/package/syslog-ng/syslog-ng.conf > +++ b/package/syslog-ng/syslog-ng.conf > @@ -1,4 +1,4 @@ > - at version: 3.34 > + at version: 3.35 > > source s_sys { > file("/proc/kmsg" program_override("kernel")); > diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash > index 99ed363eca..ab643627e8 100644 > --- a/package/syslog-ng/syslog-ng.hash > +++ b/package/syslog-ng/syslog-ng.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz > +sha256 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53 syslog-ng-3.35.1.tar.gz > sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING > sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt > diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk > index c05ec9785c..fc57a56820 100644 > --- a/package/syslog-ng/syslog-ng.mk > +++ b/package/syslog-ng/syslog-ng.mk > @@ -6,7 +6,7 @@ > > # When updating the version, please check at runtime if the version in > # syslog-ng.conf header needs to be updated > -SYSLOG_NG_VERSION = 3.34.1 > +SYSLOG_NG_VERSION = 3.35.1 > SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) > SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) > SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From arnout at mind.be Thu Mar 10 21:25:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:25:10 +0100 Subject: [Buildroot] [PATCH 1/2] package/perl-gd: bump to version 2.76 In-Reply-To: <20220215070739.2199760-1-francois.perrad@gadz.org> References: <20220215070739.2199760-1-francois.perrad@gadz.org> Message-ID: On 15/02/2022 08:07, Francois Perrad wrote: > remove upstreamed patch > > Signed-off-by: Francois Perrad Both applied to master, thanks. Regards, Arnout > --- > ...-fix-cross-compilation-with-gdlib.pc.patch | 34 ------------------- > package/perl-gd/perl-gd.hash | 4 +-- > package/perl-gd/perl-gd.mk | 2 +- > 3 files changed, 3 insertions(+), 37 deletions(-) > delete mode 100644 package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch > > diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch > deleted file mode 100644 > index af053c560..000000000 > --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 24 Jan 2021 10:59:31 +0100 > -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc > - > -Cross-compilation will fail if gdlib.pc does not contain any cflags. > -Indeed, if cflags is empty, Makefile.PL will use the default value for > -INC (i.e. -I/usr/include -I/usr/include/gd) > - > -It should be noted that gdlib-config has been dropped from gd since > -version 2.3.0 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: probably not upstreamable] > ---- > - Makefile.PL | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile.PL b/Makefile.PL > -index 25f2f93..7da3651 100644 > ---- a/Makefile.PL > -+++ b/Makefile.PL > -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - > - END > - } > - > -- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; > -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; > - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; > - @LIBS = qw(-lgd) unless @LIBS; > - > --- > -2.29.2 > - > diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash > index 780b1d1e2..97f1da821 100644 > --- a/package/perl-gd/perl-gd.hash > +++ b/package/perl-gd/perl-gd.hash > @@ -1,6 +1,6 @@ > # retrieved by scancpan from http://cpan.metacpan.org/ > -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz > -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz > +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz > +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz > > # computed by scancpan > sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE > diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk > index b402dfff4..9787cc12f 100644 > --- a/package/perl-gd/perl-gd.mk > +++ b/package/perl-gd/perl-gd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PERL_GD_VERSION = 2.73 > +PERL_GD_VERSION = 2.76 > PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz > PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN > PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd From arnout at mind.be Thu Mar 10 21:26:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:26:12 +0100 Subject: [Buildroot] [PATCH v1] package/assimp: bump version to 5.2.1 In-Reply-To: <20220215214125.20412-1-ps.report@gmx.net> References: <20220215214125.20412-1-ps.report@gmx.net> Message-ID: <8f96b3e5-bb85-e3e3-6047-f98127c08e21@mind.be> On 15/02/2022 22:41, Peter Seiderer wrote: > For details see [1]. > > [1] https://github.com/assimp/assimp/releases/tag/v5.2.1 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/assimp/assimp.hash | 2 +- > package/assimp/assimp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash > index 50f0b3e6d6..a778b79132 100644 > --- a/package/assimp/assimp.hash > +++ b/package/assimp/assimp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz > +sha256 c9cbbc8589639cd8c13f65e94a90422a70454e8fa150cf899b6038ba86e9ecff assimp-5.2.1.tar.gz > sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE > diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk > index 766b2c9b5a..42440f0fa9 100644 > --- a/package/assimp/assimp.mk > +++ b/package/assimp/assimp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ASSIMP_VERSION = 5.1.6 > +ASSIMP_VERSION = 5.2.1 > ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) > ASSIMP_LICENSE = BSD-3-Clause > ASSIMP_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 10 21:26:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:26:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbpf: bump to version 0.7.0 In-Reply-To: <20220215222422.1865613-1-james.hilliard1@gmail.com> References: <20220215222422.1865613-1-james.hilliard1@gmail.com> Message-ID: <4b15d59e-f5e9-f0f0-8047-0d4cbfb6b9c1@mind.be> On 15/02/2022 23:24, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/libbpf/libbpf.hash | 2 +- > package/libbpf/libbpf.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash > index 27e22be9e9..06adc09885 100644 > --- a/package/libbpf/libbpf.hash > +++ b/package/libbpf/libbpf.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz > +sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz > sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE > sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause > sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 > diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk > index 6750b063c0..ff018f5c24 100644 > --- a/package/libbpf/libbpf.mk > +++ b/package/libbpf/libbpf.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBPF_VERSION = 0.6.1 > +LIBBPF_VERSION = 0.7.0 > LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) > LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause > LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Thu Mar 10 21:26:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 10 Mar 2022 22:26:45 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libdrm: bump version to 2.4.110 In-Reply-To: <20220216180128.49268-1-bernd.kuhls@t-online.de> References: <20220216180128.49268-1-bernd.kuhls@t-online.de> Message-ID: <17e6ed80-9fe7-3b84-8d8b-2c7f68a2185d@mind.be> On 16/02/2022 19:01, Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libdrm/libdrm.hash | 6 +++--- > package/libdrm/libdrm.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash > index ca7332dd76..e0fac3a4d1 100644 > --- a/package/libdrm/libdrm.hash > +++ b/package/libdrm/libdrm.hash > @@ -1,6 +1,6 @@ > -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html > -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz > -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz > +# From https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html > +sha256 eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 libdrm-2.4.110.tar.xz > +sha512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3 libdrm-2.4.110.tar.xz > > # Hash for license file > sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build > diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk > index 9b614bf421..b64db06931 100644 > --- a/package/libdrm/libdrm.mk > +++ b/package/libdrm/libdrm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBDRM_VERSION = 2.4.109 > +LIBDRM_VERSION = 2.4.110 > LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz > LIBDRM_SITE = https://dri.freedesktop.org/libdrm > LIBDRM_LICENSE = MIT From peter at korsgaard.com Thu Mar 10 21:26:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:26:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/php: security bump version to 7.4.28 Message-ID: <20220310211823.9D2CF83C07@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51aa106ba3194ae49e119fb3c0bd91ddd81608fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog: https://www.php.net/ChangeLog-7.php#7.4.28 Fixes CVE-2021-21708. Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 76e4b4a8e5..33f56dc551 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e305b3aafdc85fa73a81c53d3ce30578bc94d1633ec376add193a1e85e0f0ef8 php-7.4.26.tar.xz +sha256 9cc3b6f6217b60582f78566b3814532c4b71d517876c25013ae51811e65d8fce php-7.4.28.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 2123cbc5e9..15f5540c5e 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.26 +PHP_VERSION = 7.4.28 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 19:37:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:37:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: security bump to version 2.4.5 Message-ID: <20220310211823.930EB83C06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73fd90816a23c925a33ad0c606df3e0992d873b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 21c07c0aaa7e43b8f676c564f173a510d345a77a) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 10e13206d0..cd2e8c7fb9 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 19:39:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:39:08 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/php: security bump version to 8.0.16 Message-ID: <20220310211836.01F9283C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfe590a9594b94debfcf2db0c5c6d887aeab9e7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.16 Fixes CVE-2021-21708. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 4c4d28922942deb0fc41d11d4057b7fedd25cab1) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index e78385cbe7..2753f9a0eb 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz +sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c9de8c2c76..5b29692d94 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.15 +PHP_VERSION = 8.0.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 19:37:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 20:37:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: security bump to version 2.4.5 Message-ID: <20220310211835.EC81C83C15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42ecaeb1ce83823552dbe73997f5e401f0a021df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Security fixes: #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8 sequences (e.g. from start tag names) to the XML processing application on top of Expat can cause arbitrary damage (e.g. code execution) depending on how invalid UTF-8 is handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #561 CVE-2022-25236 -- Passing (one or more) namespace separator characters in "xmlns[:prefix]" attribute values made Expat send malformed tag names to the XML processor on top of Expat which can cause arbitrary damage (e.g. code execution) depending on such unexpectable cases are handled inside the XML processor; validation was not their job but Expat's. Exploits with code execution are known to exist. #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing that could be triggered by e.g. a 2 megabytes file with a large number of opening braces. Expected impact is denial of service or potentially arbitrary code execution. #560 CVE-2022-25314 -- Fix integer overflow in function copyString; only affects the encoding name parameter at parser creation time which is often hardcoded (rather than user input), takes a value in the gigabytes to trigger, and a 64-bit machine. Expected impact is denial of service. #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames; needs input in the gigabytes and a 64-bit machine. Expected impact is denial of service or potentially arbitrary code execution. https://blog.hartwork.org/posts/expat-2-4-5-released/ https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 21c07c0aaa7e43b8f676c564f173a510d345a77a) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 10e13206d0..cd2e8c7fb9 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.4/ -md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz -sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ +md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz +sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz # Locally calculated -sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz +sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 250600c25e..7815d61027 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.4 +EXPAT_VERSION = 2.4.5 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 10 21:09:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:17 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5declarative: bump to version 1d49a5b678957adde7e2db23a485a3f48157bc8f Message-ID: <20220310211843.9370883C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27be79eeeb8e6d60c5ae01499b6d4eb2e063e3ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03ba..e5b016fc20 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index e63a78021a..54aa3be1cb 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 10 21:09:14 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:14 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe Message-ID: <20220310211843.8874783C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8d88189202e61653850fe1a6d9b4e4d90ebcb1cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff..1b9ff43ab2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..010df7ec75 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 From arnout at mind.be Thu Mar 10 21:09:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:33 +0100 Subject: [Buildroot] [git commit] package/ell: bump version to 0.48 Message-ID: <20220310211843.D028783C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c01a8397d9923c38b14a0d083ba1cf3ee3a3049a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Changelog (since 0.47, from [1]): ver 0.48: Fix issue with memory leaking from ICMPv6 RA. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f..267b44e5f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.48 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 10 21:09:19 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:19 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5wayland: bump to version ce2caf493a1343fbd9f8e4c85baf6a61c057f242 Message-ID: <20220310211843.9FC4E83C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec0fabf14527716c55f8d5496829667bfef8c6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 1a7400de67..2acdd1643c 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 +sha256 f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0 qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index bcc4915022..61182f611c 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland From arnout at mind.be Thu Mar 10 21:09:22 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:22 +0100 Subject: [Buildroot] [git commit] support/scripts/gen-bootlin-toolchains: add s390x toolchain Message-ID: <20220310211843.AC8FA83C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=249ce1c584815c42a52a3c4932a9546fd5b980a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x support has been added since toolchain-builder release 2021.05 [1]. [1] https://github.com/bootlin/toolchains-builder/commit/4bbb52a6a30a340a30722bc170467aa6fa4adbe6 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/gen-bootlin-toolchains | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index dc173fa949..f9dd9da9a8 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -162,6 +162,10 @@ arches = { 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], 'prefix': 'riscv64', }, + 's390x-z13': { + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], + 'prefix': 's390x', + }, 'sh-sh4': { 'conditions': ['BR2_sh', 'BR2_sh4'], 'prefix': 'sh4', From arnout at mind.be Thu Mar 10 21:25:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:25:55 +0100 Subject: [Buildroot] [git commit] package/micropython: Bump version to 1.18 Message-ID: <20220310211844.0103783C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4104e099fd10ca3fdd537ffa151146f86e6424f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master LICENSE hash is update due to change in copyright year. Signed-off-by: Chris Packham Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/micropython/micropython.hash | 4 ++-- package/micropython/micropython.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index d5045e8f27..6beea78bc7 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c21dbf8144237b3dbe3847c9ad5264cd0f3104eb078c810b3986004cce8fcd70 micropython-1.17.tar.gz -sha256 59b1f0947a87c90d0d29dbe2c8deb3d1f8263bbbd2fb5ebcc79a649cff6dfcba LICENSE +sha256 d804a422872c6fe283c6e4fd392698472035b34b5a683ac26adbd5c7582267f9 micropython-1.18.tar.gz +sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 55c00ba08a..d8ba5ac0c0 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.17 +MICROPYTHON_VERSION = 1.18 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, From arnout at mind.be Thu Mar 10 21:09:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:26 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-external/toolchain-external-bootlin: update with new s390x toolchain Message-ID: <20220310211843.BA1D183C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62451216135a86021278a24c8e8fc04c1a52f5b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../tests/toolchain/test_external_bootlin.py | 30 +++++++++++++ .../toolchain-external-bootlin/Config.in.options | 51 ++++++++++++++++++++++ .../toolchain-external-bootlin.hash | 4 ++ .../toolchain-external-bootlin.mk | 12 +++++ 4 files changed, 97 insertions(+) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index cf6174303e..94df9ac488 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2152,6 +2152,36 @@ class TestExternalToolchainBootlinRiscv64lp64dUclibcStable(TestExternalToolchain TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinS390xz13GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinS390xz13GlibcStable(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinShsh4GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_sh=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 4b4404620c..53034c4f5e 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -33,6 +33,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_powerpc64le && BR2_powerpc_power8 default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_32 && BR2_RISCV_ABI_ILP32D default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64D + default y if BR2_s390x && BR2_s390x_z13 default y if BR2_sh && BR2_sh4 default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 @@ -3455,6 +3456,56 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE + bool "s390x-z13 glibc bleeding-edge 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the s390x-z13 architecture, using the + glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE + bool "s390x-z13 glibc stable 2021.11-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the s390x-z13 architecture, using the + glibc C library. This is a stable version, which means it + is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE bool "sh-sh4 glibc bleeding-edge 2021.11-1" depends on BR2_sh diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index 6542694033..1f2aa1386c 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -278,6 +278,10 @@ sha256 42ca8024547e51e6126e3c9e711d80815aa4b2997900dfc8af4b9514105e8b78 riscv6 sha256 02dd9fe4a024f84c7f73b7155640066017c7d18dd90c4da6efe6f0e66d24f75c riscv64-lp64d--uclibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2021.11-1.sha256 sha256 01f061e1b3d106d25614ae5bd64df3a3588bc960caa3bbad14b50f718a558f41 riscv64-lp64d--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2021.11-1.sha256 +sha256 d8e657ba00929007e938c7fc398fb5aee8abeceea3ad1cd304c05e7f47d9ef30 s390x-z13--glibc--bleeding-edge-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2021.11-1.sha256 +sha256 04d8c28bc1af09a949cfe76991379fef4b0876448192625a22c028c7daf92e3f s390x-z13--glibc--stable-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2021.11-1.sha256 sha256 64c14617fb95b1eeb50564d1e0ccbf73fa73e5e58aea6b192549fc7127e4bd5c sh-sh4--glibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2021.11-1.sha256 diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index fb19ef2909..786967052f 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -840,6 +840,18 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EX TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 From arnout at mind.be Thu Mar 10 21:25:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:25:47 +0100 Subject: [Buildroot] [git commit] package/syslog-ng: Bump version to 3.35.1 Message-ID: <20220310211843.E8BC883C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dc5f4a4d9f965d3bc8f3b14f9371fcef19b193a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Chris Packham Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 55d01501cb..64ff980593 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ - at version: 3.34 + at version: 3.35 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 99ed363eca..ab643627e8 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz +sha256 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53 syslog-ng-3.35.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index c05ec9785c..fc57a56820 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.34.1 +SYSLOG_NG_VERSION = 3.35.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/libbpf: bump to version 0.7.0 Message-ID: <20220310211844.3858D83C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b1003855b02f6d9c77de634c9d0f636470e7388 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 27e22be9e9..06adc09885 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz +sha256 5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361 libbpf-0.7.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 06f3f3475a..d6914757d7 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 0.6.1 +LIBBPF_VERSION = 0.7.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From arnout at mind.be Thu Mar 10 21:09:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:36 +0100 Subject: [Buildroot] [git commit] package/iwd: bump version to 1.24 Message-ID: <20220310211843.DC0A183C1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92e0fe71de85d0d7647aefbcab843e66f9bcca99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - remove 001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch (upstream applied [1]) - Changelog (since 1.21, from [2]): ver 1.24: Fix issue with handshake and missing rekeying support. Fix issue with BSS ranking and zero signal strength. Fix issue with setting OWE IE length correctly. ver 1.23: Fix issue with handling handshake offloading. Fix issue with at_console and D-Bus policy. ver 1.22: Fix issue with handling periodic scanning. Fix issue with handling scanning completion. Fix issue with handling scanning for OWE auto-connect. Add support for additional DPP features. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...licit-declaration-of-function-explicit_bz.patch | 41 ---------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch deleted file mode 100644 index 3e808deb88..0000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero - warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add missing src/missing.h include for explicit_bzero, fixes uclibc - compile/linking - -Fixes: - - src/dpp.c:166:2: warning: implicit declaration of function ???explicit_bzero??? [-Wimplicit-function-declaration] - 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); - | ^~~~~~~~~~~~~~ - -[backport from upstream] -Signed-off-by: Peter Seiderer -[yann.morin.1998 at free.fr: actual backport now upstreamn applied] -Signed-off-by: Yann E. MORIN ---- - src/dpp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dpp.c b/src/dpp.c -index 84e89f6c..8091ded1 100644 ---- a/src/dpp.c -+++ b/src/dpp.c -@@ -30,6 +30,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/dbus.h" - #include "src/netdev.h" - #include "src/module.h" --- -2.34.1 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 8e34d2983f..1a58ec88e8 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc..548b508edb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 1.24 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/assimp: bump version to 5.2.1 Message-ID: <20220310211844.2360F83C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=629fc34cb6b1f0ca8982b7f7e145afc7c110e27d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/assimp/assimp/releases/tag/v5.2.1 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 50f0b3e6d6..a778b79132 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz +sha256 c9cbbc8589639cd8c13f65e94a90422a70454e8fa150cf899b6038ba86e9ecff assimp-5.2.1.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 766b2c9b5a..42440f0fa9 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.6 +ASSIMP_VERSION = 5.2.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/perl-gd: add webp support Message-ID: <20220310211844.18E5083C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b117664aca0e5b81236c0fc7ad5f0ccb4e0267a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl-gd/perl-gd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index 9787cc12fe..cd32c7fb8f 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -40,6 +40,12 @@ PERL_GD_OPTIONS += PNG PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_WEBP),y) +PERL_GD_DEPENDENCIES += webp +PERL_GD_OPTIONS += WEBP +PERL_GD_CONF_OPTS += -lib_webp_path=$(STAGING_DIR)/usr +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) PERL_GD_DEPENDENCIES += xlib_libXpm PERL_GD_OPTIONS += XPM From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/perl-gd: bump to version 2.76 Message-ID: <20220310211844.0C9D283C1A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c6d0b52698a032f181e97c6218c52abe4cabc0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master remove upstreamed patch Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...le.PL-fix-cross-compilation-with-gdlib.pc.patch | 34 ---------------------- package/perl-gd/perl-gd.hash | 4 +-- package/perl-gd/perl-gd.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch deleted file mode 100644 index af053c5605..0000000000 --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 24 Jan 2021 10:59:31 +0100 -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc - -Cross-compilation will fail if gdlib.pc does not contain any cflags. -Indeed, if cflags is empty, Makefile.PL will use the default value for -INC (i.e. -I/usr/include -I/usr/include/gd) - -It should be noted that gdlib-config has been dropped from gd since -version 2.3.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable] ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 25f2f93..7da3651 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - - END - } - -- at INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; - @LIBS = qw(-lgd) unless @LIBS; - --- -2.29.2 - diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 780b1d1e27..97f1da821a 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index b402dfff49..9787cc12fe 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.73 +PERL_GD_VERSION = 2.76 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd From arnout at mind.be Thu Mar 10 21:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:26:02 +0100 Subject: [Buildroot] [git commit] package/libdrm: bump version to 2.4.110 Message-ID: <20220310211844.4491F83BFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4dc0576b49bc67922b5c136b78ae4072726eeb71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libdrm/libdrm.hash | 6 +++--- package/libdrm/libdrm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index ca7332dd76..e0fac3a4d1 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2022-February/342405.html +sha256 eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 libdrm-2.4.110.tar.xz +sha512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3 libdrm-2.4.110.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 9b614bf421..b64db06931 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.109 +LIBDRM_VERSION = 2.4.110 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From arnout at mind.be Thu Mar 10 21:09:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 10 Mar 2022 22:09:30 +0100 Subject: [Buildroot] [git commit] package/erofs-utils: bump version to 1.4 Message-ID: <20220310211843.C530583C16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2e32e655802ad917eb240b8c2b7ac343ab55ec1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - new upstream version; - add 0001-erofs-utils-dump-fix-de-nid-issues.patch [1]; - add 0002-fsck-main.c-add-missing-include.patch [2]; - add 0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch [3]; - add 0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch [4]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 [2] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=1ca453ee89894b1669ac78d7f216bda172783e8d [3] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=eb255afa101b52096bd3e5e48f990576190f03bd [4] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Signed-off-by: Gao Xiang Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-erofs-utils-dump-fix-de-nid-issues.patch | 134 +++++++++++++++++++++ ...-manpage-only-install-erofsfuse.1-with-th.patch | 32 ----- .../0002-fsck-main.c-add-missing-include.patch | 31 +++++ ...-lib-fix-blobdev-without-Eforce-chunk-ind.patch | 40 ++++++ ...utils-fix-Makefile-for-fsck.erofs-manpage.patch | 29 +++++ package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 2 +- 7 files changed, 236 insertions(+), 34 deletions(-) diff --git a/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch new file mode 100644 index 0000000000..493ce59177 --- /dev/null +++ b/package/erofs-utils/0001-erofs-utils-dump-fix-de-nid-issues.patch @@ -0,0 +1,134 @@ +From 17eb5c417bd56be4b2f7627c2d6879fbad6a86d6 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:48:48 +0800 +Subject: [PATCH] erofs-utils: dump: fix de->nid issues + +As David Michael reported, " + In file included from main.c:11: + main.c: In function 'erofs_checkdirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:264:17: note: in expansion of macro 'erofs_err' + 264 | erofs_err("invalid file type %llu", de->nid); + | ^~~~~~~~~ + main.c: In function 'erofs_read_dirent': + ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] + 68 | " " PR_FMT_FUNC_LINE(fmt), \ + | ^~~~~~ + main.c:303:25: note: in expansion of macro 'erofs_err' + 303 | erofs_err("parse dir nid %llu error occurred\n", + | ^~~~~~~~~ + cc1: all warnings being treated as errors +" + +Also there are many de->nid lacking of endianness handling. +Should fix them together. + +Link: https://lore.kernel.org/r/20211121234848.12663-1-xiang at kernel.org +Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") +Cc: Wang Qi +Cc: Guo Xuenan +Reported-by: David Michael +Signed-off-by: Gao Xiang +--- + dump/main.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +diff --git a/dump/main.c b/dump/main.c +index b7560eca1080..f85903b059d2 100644 +--- a/dump/main.c ++++ b/dump/main.c +@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + { + int dname_len; + unsigned int nameoff = le16_to_cpu(de->nameoff); ++ erofs_nid_t nid = le64_to_cpu(de->nid); + + if (nameoff < sizeof(struct erofs_dirent) || + nameoff >= PAGE_SIZE) { + erofs_err("invalid de[0].nameoff %u @ nid %llu", +- nameoff, de->nid | 0ULL); ++ nameoff, nid | 0ULL); + return -EFSCORRUPTED; + } + +@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, + /* a corrupted entry is found */ + if (nameoff + dname_len > maxsize || + dname_len > EROFS_NAME_LEN) { +- erofs_err("bogus dirent @ nid %llu", +- le64_to_cpu(de->nid) | 0ULL); ++ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + if (de->file_type >= EROFS_FT_MAX) { +- erofs_err("invalid file type %llu", de->nid); ++ erofs_err("invalid file type %llu", nid | 0ULL); + return -EFSCORRUPTED; + } + return dname_len; +@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, + { + int err; + erofs_off_t occupied_size = 0; +- struct erofs_inode inode = { .nid = de->nid }; ++ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; + + stats.files++; + stats.file_category_stat[de->file_type]++; +@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, + update_file_size_statatics(occupied_size, inode.i_size); + } + +- if ((de->file_type == EROFS_FT_DIR) +- && de->nid != nid && de->nid != parent_nid) { +- err = erofs_read_dir(de->nid, nid); ++ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && ++ inode.nid != parent_nid) { ++ err = erofs_read_dir(inode.nid, nid); + if (err) { + erofs_err("parse dir nid %llu error occurred\n", +- de->nid); ++ inode.nid | 0ULL); + return err; + } + } +@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) + int ret; + + /* skip "." and ".." dentry */ +- if (de->nid == nid || de->nid == parent_nid) { ++ if (le64_to_cpu(de->nid) == nid || ++ le64_to_cpu(de->nid) == parent_nid) { + de++; + continue; + } +@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, + if (len < 0) + return len; + +- if (de->nid == target) { ++ if (le64_to_cpu(de->nid) == target) { + memcpy(path + pos, dname, len); + path[pos + len] = '\0'; + return 0; + } + + if (de->file_type == EROFS_FT_DIR && +- de->nid != parent_nid && +- de->nid != nid) { ++ le64_to_cpu(de->nid) != parent_nid && ++ le64_to_cpu(de->nid) != nid) { + memcpy(path + pos, dname, len); +- err = erofs_get_pathname(de->nid, nid, +- target, path, pos + len); ++ err = erofs_get_pathname(le64_to_cpu(de->nid), ++ nid, target, path, pos + len); + if (!err) + return 0; + memset(path + pos, 0, len); +-- +2.30.2 + diff --git a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch b/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch deleted file mode 100644 index 0aa99d5324..0000000000 --- a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ab34000c672adca90388a8fcb1f70a7d391d35c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Thu, 3 Jun 2021 16:18:57 -0400 -Subject: [PATCH] erofs-utils: manpage: only install erofsfuse.1 with the - command - -Link: https://lore.kernel.org/r/87lf7q3dn2.fsf at gmail.com -Reviewed-by: Gao Xiang -Signed-off-by: David Michael -Signed-off-by: Gao Xiang ---- - man/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index ffcf6f81c255..0df947b6fbf7 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,9 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Makefile.am - --dist_man_MANS = mkfs.erofs.1 erofsfuse.1 -+dist_man_MANS = mkfs.erofs.1 - -+EXTRA_DIST = erofsfuse.1 -+if ENABLE_FUSE -+man_MANS = erofsfuse.1 -+endif --- -2.20.1 - diff --git a/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch new file mode 100644 index 0000000000..c4fe71c9e6 --- /dev/null +++ b/package/erofs-utils/0002-fsck-main.c-add-missing-include.patch @@ -0,0 +1,31 @@ +From 1ca453ee89894b1669ac78d7f216bda172783e8d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 6 Dec 2021 20:14:03 +0100 +Subject: [PATCH] fsck/main.c: add missing include + +Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR +definitions. + +Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex at linutronix.de +Reviewed-by: Gao Xiang +Signed-off-by: Alexander Kanavin +Signed-off-by: Gao Xiang +--- + fsck/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsck/main.c b/fsck/main.c +index aefa881f740a..ad48e35f587b 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include "erofs/print.h" + #include "erofs/io.h" + #include "erofs/decompress.h" +-- +2.30.2 + diff --git a/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch new file mode 100644 index 0000000000..88979eb28f --- /dev/null +++ b/package/erofs-utils/0003-erofs-utils-lib-fix-blobdev-without-Eforce-chunk-ind.patch @@ -0,0 +1,40 @@ +From eb255afa101b52096bd3e5e48f990576190f03bd Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Thu, 23 Dec 2021 16:49:07 +0800 +Subject: [PATCH] erofs-utils: lib: fix --blobdev without -Eforce-chunk-indexes + +blockmap is used by default, chunk indexes should be switched +instead if --blobdev is specified. + +Link: https://lore.kernel.org/r/20211223084907.93020-1-hsiangkao at linux.alibaba.com +Fixes: 016bd812be1e ("erofs-utils: mkfs: enable block map chunk format") +Signed-off-by: Gao Xiang +--- + lib/blobchunk.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/blobchunk.c b/lib/blobchunk.c +index 5e9a88a30af3..a145be917b4a 100644 +--- a/lib/blobchunk.c ++++ b/lib/blobchunk.c +@@ -113,7 +113,7 @@ int erofs_blob_write_chunk_indexes(struct erofs_inode *inode, + + if (multidev) { + idx.device_id = 1; +- inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; ++ DBG_BUGON(!(inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES)); + } else { + base_blkaddr = remapped_base; + } +@@ -171,6 +171,8 @@ int erofs_blob_write_chunked_file(struct erofs_inode *inode) + int fd, ret; + + inode->u.chunkformat |= inode->u.chunkbits - LOG_BLOCK_SIZE; ++ if (multidev) ++ inode->u.chunkformat |= EROFS_CHUNK_FORMAT_INDEXES; + + if (inode->u.chunkformat & EROFS_CHUNK_FORMAT_INDEXES) + unit = sizeof(struct erofs_inode_chunk_index); +-- +2.30.2 + diff --git a/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch new file mode 100644 index 0000000000..27832d1e32 --- /dev/null +++ b/package/erofs-utils/0004-erofs-utils-fix-Makefile-for-fsck.erofs-manpage.patch @@ -0,0 +1,29 @@ +From 534eda7f8678e5b8fc8ca0f5cf0d9d7a932e0d48 Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Mon, 22 Nov 2021 07:58:40 +0800 +Subject: [PATCH] erofs-utils: fix Makefile for fsck.erofs manpage + +Add the missing dependency for fsck.erofs manpage. + +Link: https://lore.kernel.org/r/20211121235840.17600-1-xiang at kernel.org +Fixes: f44043561491 ("erofs-utils: introduce fsck.erofs") +Signed-off-by: Gao Xiang +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 769b5578a175..4628b85df2ef 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0+ + +-dist_man_MANS = mkfs.erofs.1 dump.erofs.1 ++dist_man_MANS = mkfs.erofs.1 dump.erofs.1 fsck.erofs.1 + + EXTRA_DIST = erofsfuse.1 + if ENABLE_FUSE +-- +2.30.2 + diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 8bbb088568..aca5677d17 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 132635740039bbe76d743aea72378bfae30dbf034e123929f5d794198d4c0b12 erofs-utils-1.3.tar.gz +sha256 67702b1fc5da05719d95ddb7c107e334b04365f5161a9717479d2831fca85a98 erofs-utils-1.4.tar.gz sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index e35470b02e..03df2be366 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.3 +EROFS_UTILS_VERSION = 1.4 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 10 21:44:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:44:51 +0100 Subject: [Buildroot] [PATCH v1] package/wireless-regdb: bump version to 2022.02.18 In-Reply-To: <20220219102451.25602-1-ps.report@gmx.net> (Peter Seiderer's message of "Sat, 19 Feb 2022 11:24:51 +0100") References: <20220219102451.25602-1-ps.report@gmx.net> Message-ID: <87ee39zdm4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > Changelog (since 2021.08.28, [1]): > e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US > 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz > 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) > acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz > ea83a82 wireless-regdb: add support for US S1G channels > 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain > 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz > e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" > 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) > e427ff2 wireless-regdb: Update regulatory rules for China (CN) > 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz > 4dac44b wireless-regdb: update regulatory database based on preceding changes > [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 21:44:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:44:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220310213635.5764983C36@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3fad951aaef52b86f93aef93efff69ea651fac28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 324f0552526d169c24cd75e9dadf67641f2beef0) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From peter at korsgaard.com Thu Mar 10 21:44:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:44:15 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireless-regdb: drop spurious space Message-ID: <20220310213635.4A37983C33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8368a375e2680399bc4cd04bf70ae2fceb899d58 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop spurious space added by commit 71dc107d41e5daf45e0955740b302367313aa23f Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 2210ab8385cfa4729ed117a7724c0d05478cf356) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 0db8c6f345..9e01283c01 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -12,7 +12,7 @@ WIRELESS_REGDB_LICENSE_FILES = LICENSE WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) -define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS +define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS $(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \ $(TARGET_DIR)/usr/lib/crda/regulatory.bin $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ From peter at korsgaard.com Thu Mar 10 21:43:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:43:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireless-regdb: bump version to 2022.02.18 Message-ID: <20220310213651.E090A83C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15d2938c2440b6d87616c9231aba3e497da8497f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog (since 2021.08.28, [1]): e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US 2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz 0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR) acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz ea83a82 wireless-regdb: add support for US S1G channels 4408149 wireless-regdb: add 802.11ah bands to world regulatory domain 5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)" 40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR) e427ff2 wireless-regdb: Update regulatory rules for China (CN) 0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz 4dac44b wireless-regdb: update regulatory database based on preceding changes [1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L at ubuntu-x1/ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 324f0552526d169c24cd75e9dadf67641f2beef0) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index abe8f6b000..91fcb320d2 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz +sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 9e01283c01..35a8c6686d 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.08.28 +WIRELESS_REGDB_VERSION = 2022.02.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From peter at korsgaard.com Thu Mar 10 21:47:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:47:09 +0100 Subject: [Buildroot] [PATCH] package/zsh: security bump to version 5.8.1 In-Reply-To: <871qzxbawi.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sun, 20 Feb 2022 20:22:53 +0100") References: <20220218133057.2426-1-peter@korsgaard.com> <871qzxbawi.fsf@dell.be.48ers.dk> Message-ID: <87a6dxzdia.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Korsgaard writes: >> Fixes the following security issue: >> - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code >> execution if they control a command output inside the prompt, as >> demonstrated by a %F argument. This occurs because of recursive >> PROMPT_SUBST expansion. >> The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. >> Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 21:46:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:46:57 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/zsh: security bump to version 5.8.1 Message-ID: <20220310213851.EDD2583C3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3d357990204241bc832a8543ad1007a5789d8f62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard (cherry picked from commit ca6c2ee3da7be5e4af478e779b49248b89e6514d) Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses From peter at korsgaard.com Thu Mar 10 21:46:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:46:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/zsh: security bump to version 5.8.1 Message-ID: <20220310213902.E5ECE83C42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f45f6bae0db3df1ee3666df52dc711e609890d0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fixes the following security issue: - CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code execution if they control a command output inside the prompt, as demonstrated by a %F argument. This occurs because of recursive PROMPT_SUBST expansion. The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash. Signed-off-by: Peter Korsgaard (cherry picked from commit ca6c2ee3da7be5e4af478e779b49248b89e6514d) Signed-off-by: Peter Korsgaard --- package/zsh/zsh.hash | 6 +----- package/zsh/zsh.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 2df409c946..5c661ded25 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,7 +1,3 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz -# Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc -sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated +sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 1a04833211..c5ab7c2fae 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8 +ZSH_VERSION = 5.8.1 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses From peter at korsgaard.com Thu Mar 10 21:50:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:50:17 +0100 Subject: [Buildroot] [PATCH v2, 1/2] package/gdk-pixbuf: enable relocatable option In-Reply-To: <20220220121637.200393-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 13:16:36 +0100") References: <20220220121637.200393-1-fontaine.fabrice@gmail.com> Message-ID: <875yolzdd2.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Enable relocatable option to fix the following PPD build failure of > adwaita-icon-theme: > Can't load file: Unrecognized image file format > This failure is raised because the SVG library is not found by > gtk-encode-symbolic-svg. To find the SVG library, > gtk-encode-symbolic-svg depends on libgtk_pixbuf library which reads the > loaders.cache file using: > - a hardcoded path (which points to host-gdk-pixbuf per-package > directory) if relocatable is disabled. The loaders.cache in this > directory doesn't declare SVG support because it has not yet been > updated by host-librsvg > - or a dynamic path corresponding to the binary location if relocatable > is enabled. > So obviously, we need to set relocatable to true. > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Drop relocatable from target > - Enhance commit message Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 21:49:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:49:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gdk-pixbuf: fix run with per-package directory Message-ID: <20220310214214.61D6B83C48@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9884d674d1788124194e0dc8757830ad832af320 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are provided either by the gdk-pixbuf package itself, or be installed by third-party packages, like librsvg. At runtime, those plugins get loaded by helper function in the gdk-pixbuf library. The location where to find those modules is currently hard-coded at build time, to the location where gdb-pixbuf is installed.. This means that host-packages that install image-conversion utilities will try to look in the path where gdk-pixbuf was installed. With per-package directories, this fails to find any module that was installed bu a third-party package. For example, the module for loading an SVG provided by librsvg, so it is not present in the PPD of gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another format, like adwaita-icon-theme does) will fail with: Can't load file: Unrecognized image file format However, gdk-pixbuf can be configured so as to look for the modules relative to where the program is run from, rather than hard-coding the location at build time. This is exactly what we need in the PPD case Additionally, even without PPD, this would fail in a similar manner in the SDK, as that can be relocated too. So we unconditionally enable the relocatable option, but only for the host variant (there is no reason to enable it for the target, as it is not going to be relocated). Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword the already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 75361a9aba042799040591fb84192802b137fc3a) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) From peter at korsgaard.com Thu Mar 10 21:48:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:48:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdk-pixbuf: fix run with per-package directory Message-ID: <20220310214220.F0F4983C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9395a06b18b8472ac139232d9779d65fcd4a713 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are provided either by the gdk-pixbuf package itself, or be installed by third-party packages, like librsvg. At runtime, those plugins get loaded by helper function in the gdk-pixbuf library. The location where to find those modules is currently hard-coded at build time, to the location where gdb-pixbuf is installed.. This means that host-packages that install image-conversion utilities will try to look in the path where gdk-pixbuf was installed. With per-package directories, this fails to find any module that was installed bu a third-party package. For example, the module for loading an SVG provided by librsvg, so it is not present in the PPD of gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another format, like adwaita-icon-theme does) will fail with: Can't load file: Unrecognized image file format However, gdk-pixbuf can be configured so as to look for the modules relative to where the program is run from, rather than hard-coding the location at build time. This is exactly what we need in the PPD case Additionally, even without PPD, this would fail in a similar manner in the SDK, as that can be relocated too. So we unconditionally enable the relocatable option, but only for the host variant (there is no reason to enable it for the target, as it is not going to be relocated). Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword the already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 75361a9aba042799040591fb84192802b137fc3a) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index cd30d450d5..b22e9568c9 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ + -Drelocatable=true \ -Dman=false ifeq ($(BR2_STATIC_LIBS),y) From fontaine.fabrice at gmail.com Thu Mar 10 22:19:08 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 10 Mar 2022 23:19:08 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/kvm-unit-tests: bump to version 2022-03-08 Message-ID: <20220310221908.30588-1-fontaine.fabrice@gmail.com> - Switch site: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 - Update first patch - Drop second patch (binutils < 2.23 is not supported by buildroot anymore) - Drop third and fourth patches (already in version) - This bump will fix the following build failure with powerpc and gcc 11 thanks to https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian Fixes: - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Huth): - Drop second patch ...emove-Werror-to-avoid-build-failures.patch | 17 +-- ...vm-unit-tests-test-for-rdseed-rdrand.patch | 110 ------------------ ...3-Makefile-fix-stack-protector-tests.patch | 36 ------ ...issue-with-the-linker-from-Fedora-32.patch | 61 ---------- package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- 6 files changed, 14 insertions(+), 218 deletions(-) delete mode 100644 package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch index cbfa3a87e6..d07b9b6912 100644 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures Signed-off-by: Thomas Petazzoni [Matthew: Refactoring of Thomas Petazzoni's original.] Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 1 - 1 file changed, 1 deletion(-) @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- +- 2.14.2 diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch deleted file mode 100644 index 1a1a90ce99..0000000000 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 12 Jan 2018 19:07:27 -0600 -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand - -The build fails when the host binutils isn't at least 2.23 -(2.22.x introduced RDSEED). - -Fixes: -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ - -Upstream: -https://marc.info/?l=kvm&m=151580743523259&w=2 - -Signed-off-by: Matthew Weber ---- - Makefile | 2 +- - configure | 18 ++++++++++++++++++ - x86/vmx_tests.c | 6 ++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d9ad42b..799e9b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer -diff --git a/configure b/configure -index dd9d361..21c0219 100755 ---- a/configure -+++ b/configure -@@ -171,6 +171,23 @@ mkdir -p lib - ln -sf "$asm" lib/asm - - -+cat > rd_test.c < -+int main() { -+ uint16_t seed=0; -+ unsigned char ok; -+ asm volatile ("rdseed %0; setc %1" -+ : "=r" (seed), "=qm" (ok)); -+ return ok; -+} -+EOF -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then -+ echo "Checking for rdseed/rdrand... Yes." -+else -+ echo "Checking for rdseed/rdrand... No." -+ extra_cflags="-DNO_RDSEEDRAND" -+fi -+ - # create the config - cat < config.mak - SRCDIR=$srcdir -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name - PROCESSOR=$processor - CC=$cross_prefix$cc - CXX=$cross_prefix$cxx -+EXTRA_CFLAGS=$extra_cflags - LD=$cross_prefix$ld - OBJCOPY=$cross_prefix$objcopy - OBJDUMP=$cross_prefix$objdump -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c -index 4a3e94b..2cbe3eb 100644 ---- a/x86/vmx_tests.c -+++ b/x86/vmx_tests.c -@@ -770,8 +770,10 @@ asm( - "insn_sldt: sldt %ax;ret\n\t" - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" - "insn_str: str %ax;ret\n\t" -+#ifndef NO_RDSEEDRAND - "insn_rdrand: rdrand %rax;ret\n\t" - "insn_rdseed: rdseed %rax;ret\n\t" -+#endif - ); - extern void insn_hlt(); - extern void insn_invlpg(); -@@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); -+#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); -+#endif - - u32 cur_insn; - u64 cr3; -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ -+#ifndef NO_RDSEEDRAND - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, -+#endif - // Instructions always trap - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, --- -1.9.1 - diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c6..0000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm at vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7..0000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth at redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2..42c3b4a241 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb9..d610442e03 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,9 +4,9 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -- 2.34.1 From peter at korsgaard.com Thu Mar 10 21:52:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:52:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220310222235.9F1BA83C59@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e12ce1a6b9a03eda75d888d236f664632585fd5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit af37e96f3d85a687503c85e7d2e37cfbd791dd18) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Mar 10 21:52:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 22:52:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220310222235.AB98883C4B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be2ef38faa9b0d843417bbc213917220a6e2dd3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit b43ba475cf3dbf2b3990144758d5b1d4b74862c0) Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 29536ecf9d..25145ee067 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. From peter at korsgaard.com Thu Mar 10 22:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:29:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: Needs python 3 Message-ID: <20220310222247.9188883C6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1db1922e460d4f5862be16ef2b3f0c84c3201ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x >From the twisted-21.2.0 release notes: Deprecations and Removals - Support for Python 2.7 has been removed. Twisted now supports only Python versions 3.5/3.6/3.7. https://github.com/twisted/twisted/releases/tag/twisted-21.2.0 Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + support/testing/tests/package/test_python_twisted.py | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 8a8717ff9c..5ad936f6c9 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TWISTED bool "python-twisted" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INCREMENTAL select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOMAT # runtime diff --git a/support/testing/tests/package/test_python_twisted.py b/support/testing/tests/package/test_python_twisted.py index a458ee45dd..e87312db13 100644 --- a/support/testing/tests/package/test_python_twisted.py +++ b/support/testing/tests/package/test_python_twisted.py @@ -21,15 +21,6 @@ class TestPythonTwisted(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Twisted(TestPythonTwisted): - __test__ = True - config = TestPythonTwisted.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TWISTED=y - """ - - class TestPythonPy3Twisted(TestPythonTwisted): __test__ = True config = TestPythonTwisted.config + \ From peter at korsgaard.com Thu Mar 10 22:02:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:02:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: add missing python typing extensions runtime dependency Message-ID: <20220310222247.85C7283C70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6f32a2440eb6fa417ba28c0237cd3e2b37126633 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x # python sample_python_txtorcon.py Traceback (most recent call last): File "/root/sample_python_txtorcon.py", line 1, in import txtorcon # noqa File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in ModuleNotFoundError: No module named 'typing_extensions' python typing_extensions is required since python-twisted 22.1.0 [1] Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit b43ba475cf3dbf2b3990144758d5b1d4b74862c0) Signed-off-by: Peter Korsgaard --- package/python-twisted/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 4e24a3f71a..8a8717ff9c 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Twisted is an event-driven networking engine written in Python. From peter at korsgaard.com Thu Mar 10 22:02:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:02:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: security bump to version 22.1.0 Message-ID: <20220310222247.7A2AA83C6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0879a8e26c3455f9c06f83266e2374c271a329fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-21712: twisted is an event-driven networking engine written in Python. In affected versions twisted exposes cookies and authorization headers when following cross-origin redirects. This issue is present in the `twited.web.RedirectAgent` and `twisted.web. BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There are no known workarounds. Update hash of license file (author added and update in year: https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit af37e96f3d85a687503c85e7d2e37cfbd791dd18) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c633112e9d..8f0935e4f0 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2 -sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2 +md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz +sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz # Locally computed sha256 -sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE +sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 49d97af097..8e867cfb58 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 20.3.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc +PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Mar 10 22:31:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:31:33 +0100 Subject: [Buildroot] [PATCH] package/python-twisted: add missing python typing extensions runtime dependency In-Reply-To: <20220221215702.8461-1-romain.naour@gmail.com> (Romain Naour's message of "Mon, 21 Feb 2022 22:57:02 +0100") References: <20220221215702.8461-1-romain.naour@gmail.com> Message-ID: <871qz9zbga.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > # python sample_python_txtorcon.py > Traceback (most recent call last): > File "/root/sample_python_txtorcon.py", line 1, in > import txtorcon # noqa > File "/usr/lib/python3.10/site-packages/txtorcon/__init__.py", line 11, in > File "/usr/lib/python3.10/site-packages/txtorcon/router.py", line 10, in > File "/usr/lib/python3.10/site-packages/txtorcon/util.py", line 17, in > File "/usr/lib/python3.10/site-packages/twisted/internet/defer.py", line 42, in > ModuleNotFoundError: No module named 'typing_extensions' > python typing_extensions is required since python-twisted 22.1.0 [1] > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202537 > [1] https://github.com/twisted/twisted/commit/6e768da0a10c8ab42a57a1c0fa505ebe2d8bfb30 > Signed-off-by: Romain Naour Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 22:31:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:31:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.1.0 In-Reply-To: <20220218105557.705926-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Feb 2022 11:55:57 +0100") References: <20220218105557.705926-1-fontaine.fabrice@gmail.com> Message-ID: <87wnh1xwvj.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21712: twisted is an event-driven networking engine written > in Python. In affected versions twisted exposes cookies and > authorization headers when following cross-origin redirects. This issue > is present in the `twited.web.RedirectAgent` and `twisted.web. > BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There > are no known workarounds. > Update hash of license file (author added and update in year: > https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f > https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd > https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8) > https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx > https://github.com/twisted/twisted/releases/tag/twisted-22.1.0 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 10 22:35:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:35:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: bump to version 2.4.6 Message-ID: <20220310222720.C91AF83C72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19214951bb25f215e26d3065204f3faf7527c0d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 46390b3a7c47420b7523b8f18276f3ccd49940c7) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index cd2e8c7fb9..0d9f60931f 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 22:35:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:35:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: bump to version 2.4.6 Message-ID: <20220310222728.42F2683C75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2ecadb5fca1cd987b05dc5c566a888c3a64b6863 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release fixes a regression introduced by one of the security fixes in 2.4.5. https://blog.hartwork.org/posts/expat-2-4-6-released https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 46390b3a7c47420b7523b8f18276f3ccd49940c7) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index cd2e8c7fb9..0d9f60931f 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.5/ -md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz -sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ +md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz +sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz # Locally calculated -sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz +sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 7815d61027..c481b5c225 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.5 +EXPAT_VERSION = 2.4.6 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 10 22:36:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 10 Mar 2022 23:36:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.6 In-Reply-To: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 21:47:22 +0100") References: <20220220204722.1737731-1-fontaine.fabrice@gmail.com> Message-ID: <87sfrpxwo7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release fixes a regression introduced by one of the security fixes > in 2.4.5. > https://blog.hartwork.org/posts/expat-2-4-6-released > https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From christian at paral.in Fri Mar 11 04:18:21 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:18:21 -0800 Subject: [Buildroot] [PATCH 1/1] package/moby-buildkit: bump to version 0.10.0 Message-ID: <20220311041821.3078930-1-christian@paral.in> https://github.com/moby/buildkit/releases/tag/v0.10.0 Signed-off-by: Christian Stewart --- package/moby-buildkit/moby-buildkit.hash | 4 ++-- package/moby-buildkit/moby-buildkit.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index 3015e479f6..e22e97cb3a 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef..d34ff96252 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_VERSION = 0.10.0 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE -- 2.35.1 From christian at paral.in Fri Mar 11 04:31:37 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:31:37 -0800 Subject: [Buildroot] [PATCH 1/1] package/balena-engine: bump to version 20.10.13 Message-ID: <20220311043137.3210407-1-christian@paral.in> https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md Signed-off-by: Christian Stewart --- package/balena-engine/Config.in | 1 - package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 42 +++++------------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2..02f694515e 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381..1054e22550 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 88254fe4a5bcb9801ba0094226de65696fc754eca8143f601c75ba2f95893d3b balena-engine-20.10.13.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b..402c586468 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,34 +4,33 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.13 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine @@ -40,16 +39,6 @@ BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +53,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK -- 2.35.1 From christian at paral.in Fri Mar 11 04:32:25 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:32:25 -0800 Subject: [Buildroot] [PATCH 1/1] package/balena-engine: bump to version 20.10.13 In-Reply-To: <20220311043137.3210407-1-christian@paral.in> References: <20220311043137.3210407-1-christian@paral.in> Message-ID: All, My mistake, seems this patch somehow got rebased incorrectly. Will fix. On Thu, Mar 10, 2022 at 8:31 PM Christian Stewart wrote: > > https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md > > Signed-off-by: Christian Stewart > --- > package/balena-engine/Config.in | 1 - > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 42 +++++------------------- > 3 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in > index f48f361dc2..02f694515e 100644 > --- a/package/balena-engine/Config.in > +++ b/package/balena-engine/Config.in > @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE > depends on BR2_USE_MMU # util-linux > select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime > select BR2_PACKAGE_IPTABLES # runtime > - select BR2_PACKAGE_SQLITE # runtime > select BR2_PACKAGE_UTIL_LINUX # runtime > select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime > select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index 3f632ef381..1054e22550 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed [SNIP] From christian at paral.in Fri Mar 11 04:41:17 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:41:17 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.13 Message-ID: <20220311044117.3213995-1-christian@paral.in> https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md Signed-off-by: Christian Stewart --- v2: - rebase: update commit against upstream/master Signed-off-by: Christian Stewart --- package/balena-engine/balena-engine.hash | 2 +- package/balena-engine/balena-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index ef590881f5..1054e22550 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz +sha256 88254fe4a5bcb9801ba0094226de65696fc754eca8143f601c75ba2f95893d3b balena-engine-20.10.13.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index 0afcea3d7e..402c586468 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 20.10.12 +BALENA_ENGINE_VERSION = 20.10.13 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 -- 2.35.1 From christian at paral.in Fri Mar 11 04:48:16 2022 From: christian at paral.in (Christian Stewart) Date: Thu, 10 Mar 2022 20:48:16 -0800 Subject: [Buildroot] [PATCH v3 1/1] package/nerdctl: new package Message-ID: <20220311044816.3222673-1-christian@paral.in> nerdctl is a CLI for containerd (package docker-containerd) which is drop-in compatible with the Docker Daemon CLI. This allows using the lighter weight containerd daemon directly, instead of via the additional docker daemon. It also implements rootless mode. https://github.com/containerd/nerdctl Signed-off-by: Christian Stewart --- v1: - pkg-golang does not support main.go at root of project - https://bugs.busybox.net/show_bug.cgi?id=13651 - override the build command instead v2: - bump to 0.8.0 - go now works fine with /. targets, remove command override - docker-containerd was renamed to containerd v3: - bump to version 0.17.1 from 0.8.0 - add correct build targets Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/nerdctl/Config.in | 24 ++++++++++++++++++++++++ package/nerdctl/nerdctl.hash | 3 +++ package/nerdctl/nerdctl.mk | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 package/nerdctl/Config.in create mode 100644 package/nerdctl/nerdctl.hash create mode 100644 package/nerdctl/nerdctl.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..8f68c464db 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2554,6 +2554,7 @@ menu "System tools" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" + source "package/nerdctl/Config.in" source "package/netifrc/Config.in" source "package/numactl/Config.in" source "package/nut/Config.in" diff --git a/package/nerdctl/Config.in b/package/nerdctl/Config.in new file mode 100644 index 0000000000..51a2919d9d --- /dev/null +++ b/package/nerdctl/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_NERDCTL + bool "nerdctl" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_CONTAINERD # containerd runtime dependency + select BR2_PACKAGE_RUNC # containerd runtime dependency + select BR2_PACKAGE_UTIL_LINUX # runtime dependency + select BR2_PACKAGE_UTIL_LINUX_BINARIES # containerd + select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT # containerd + select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT # containerd + select BR2_PACKAGE_UTIL_LINUX_MOUNT # containerd + help + Docker-compatible CLI for containerd, controlling runc. + + https://github.com/containerd/nerdctl + +comment "nerdctl needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash new file mode 100644 index 0000000000..a31b12b26d --- /dev/null +++ b/package/nerdctl/nerdctl.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 be41804ef139a3f92b774edc8439678e56b44033d7ab3fcf4389f0865c1fe069 nerdctl-0.17.1.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk new file mode 100644 index 0000000000..3f3c04aa11 --- /dev/null +++ b/package/nerdctl/nerdctl.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# nerdctl +# +################################################################################ + +NERDCTL_VERSION = 0.17.1 +NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) + +NERDCTL_LICENSE = Apache-2.0 +NERDCTL_LICENSE_FILES = LICENSE + +NERDCTL_GOMOD = github.com/containerd/nerdctl + +NERDCTL_LDFLAGS = \ + -X $(NERDCTL_GOMOD)/pkg/version.Version=$(NERDCTL_VERSION) + +NERDCTL_BUILD_TARGETS = cmd/nerdctl + +$(eval $(golang-package)) -- 2.35.1 From ps.report at gmx.net Fri Mar 11 06:50:42 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 07:50:42 +0100 Subject: [Buildroot] [PATCH v1] package/wget: bump version to 1.21.3 Message-ID: <20220311065042.8687-1-ps.report@gmx.net> - explicit set some default options (--without-metalink, --enable-opie, --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, --disable-assert) - add optional libpsl dependency - remove legacy --with-libidn option (see [1]), replace with new --enable-iri option in case libiconv and libidn2 are available - use explicit --with-libuuid option - add optional c-ares dependency For details see [2]. [1] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 [2] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html Signed-off-by: Peter Seiderer --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..026c6c375d 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -12,6 +12,22 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +WGET_CONF_OPTS = \ + --without-metalink \ + --enable-opie \ + --enable-digest \ + --enable-ntlm \ + --disable-debug \ + --disable-valgrind-tests \ + --disable-assert + +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls @@ -22,19 +38,18 @@ else WGET_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WGET_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn -WGET_DEPENDENCIES += libidn2 +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri +WGET_DEPENDENCIES += libiconv libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) @@ -44,6 +59,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 -- 2.35.1 From ps.report at gmx.net Fri Mar 11 06:55:11 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 07:55:11 +0100 Subject: [Buildroot] [PATCH v2] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220311065511.14015-1-ps.report@gmx.net> - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ?reserve?: bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - rebased and renumbered patch from 0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch to 0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch --- ...n-of-fzero-call-used-regs-all-suppor.patch | 38 +++++++++++++++++++ package/openssh/openssh.mk | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ -- 2.35.1 From ps.report at gmx.net Fri Mar 11 06:59:28 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 07:59:28 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.38 Message-ID: <20220311065928.14849-1-ps.report@gmx.net> For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html Signed-off-by: Peter Seiderer --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486f..a162bfdc95 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231..c875814bc7 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ -- 2.35.1 From mohd.faiz.rohani at gmail.com Fri Mar 11 07:10:46 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Fri, 11 Mar 2022 15:10:46 +0800 Subject: [Buildroot] User and Group Utility in Buildroot Message-ID: Hi Guys I need help here. I could not find the correct utils for the Linux user and group management (useradd groupadd etc. etc.) in the Buildroot packages. Can anyone show me which utils I need to select in order to activate this?. Fyi I'm using buildroot-2022.02-rc3. Thank you -------------- next part -------------- An HTML attachment was scrubbed... URL: From ps.report at gmx.net Fri Mar 11 07:24:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 08:24:13 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> Message-ID: <20220311082413.4bfe7465@gmx.net> Hello Arnout, On Thu, 10 Mar 2022 22:03:23 +0100, Arnout Vandecappelle wrote: > On 10/03/2022 21:38, Peter Seiderer wrote: > > Hello John, > > > > thanks for the patch, some minor nitpicks... > > > > Better patch subject would be: > > > > package/openssh: add upstream patch to add seccomp ppoll_time64 support > > Applied to master with this changed. > > > > > On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: > > > >> sshd is broken on 32-bit systems because ppoll_time64 is used by the > >> application although it is not allowed by the seccomp filter. > >> > >> Apply the upstream patch to fix this. > > > > Better: > > > > -add upstream patch ([1] to add seccomp ppoll_time64 support > > Since the subject now already says that it adds seccomp ppoll_time64 support, > this is redundant. Since I'm lazy :-), I didn't change this. > > > > > [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch > > There's already a reference to the upstream commit in the patch itself, so > this is not really needed. > > > > >> > >> Signed-off-by: John Keeping > >> --- > >> ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ > >> 1 file changed, 31 insertions(+) > >> create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > >> > >> diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > >> new file mode 100644 > >> index 0000000000..34b309bd9a > >> --- /dev/null > >> +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch > >> @@ -0,0 +1,31 @@ > >> +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 > >> +From: Darren Tucker > >> +Date: Sat, 26 Feb 2022 14:06:14 +1100 > >> +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. > >> + > >> +Should fix sandbox violations on (some? at least i386 and armhf) 32bit > >> +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at > >> +debian.org via bz#3396. > >> + > > > > Missing: > > > > [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] > > Except for the signoff, the patch is literally the upstream patch, including > the sha1 in the From line. So an upstream reference is not really needed. Still, > it's useful so I overcame my laziness and added it. But the sha1 alone does not tell to which git repo it belongs to, but the explicit upstream link does (and has the nice effect to gain a one-click link to the corresponding patch/merge-request etc.) and is a prominent remainder in case of package version bump where the patch comes from... Regards, Peter > > Regards, > Arnout > > > >> +Signed-off-by: John Keeping > >> +--- > >> + sandbox-seccomp-filter.c | 3 +++ > >> + 1 file changed, 3 insertions(+) > >> + > >> +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c > >> +index 2e065ba3..4ce80cb2 100644 > >> +--- a/sandbox-seccomp-filter.c > >> ++++ b/sandbox-seccomp-filter.c > >> +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { > >> + #ifdef __NR_ppoll > >> + SC_ALLOW(__NR_ppoll), > >> + #endif > >> ++#ifdef __NR_ppoll_time64 > >> ++ SC_ALLOW(__NR_ppoll_time64), > >> ++#endif > >> + #ifdef __NR_poll > >> + SC_ALLOW(__NR_poll), > >> + #endif > >> +-- > >> +2.35.1 > >> + > > > > With this fixed you can add my > > > > Reviewed-by: Peter Seiderer > > > > Regards, > > Peter > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Fri Mar 11 07:33:33 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 11 Mar 2022 08:33:33 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20220310 Message-ID: <20220311073333.29596-1-ps.report@gmx.net> - update hash of WHENCE file - update hash of LICENSE.amdgpu (copyright year update, see [1]) [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=34f9f8994a61192abfb597fc55810e3c27269ebf Signed-off-by: Peter Seiderer --- package/linux-firmware/linux-firmware.hash | 6 +++--- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 83275ec6d7..382e9cb2ba 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,9 +1,9 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz +sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE +sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c..5ccb7f10dd 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20211216 +LINUX_FIRMWARE_VERSION = 20220310 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -- 2.35.1 From clement.leger at bootlin.com Fri Mar 11 09:32:46 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Fri, 11 Mar 2022 10:32:46 +0100 Subject: [Buildroot] [PATCH v2 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220310165735.1102802-1-clement.leger@bootlin.com> References: <20220310165735.1102802-1-clement.leger@bootlin.com> Message-ID: <20220311103246.471185ee@fixe.home> Le Thu, 10 Mar 2022 17:57:28 +0100, Cl?ment L?ger a ?crit : > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > and optee-test which neess to be aligned with optee-os version. > > ---- > > Changes in v2: > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > Cl?ment L?ger (4): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > package/optee-test: bump to version 3.16.0 > > Etienne Carriere (3): > package/optee-examples: bump to version 3.16.0 > package/optee-client: bump to version 3.16.0 > package/optee-benchmark: bump to version 3.16.0 > > boot/optee-os/Config.in | 13 +++++++++++-- > boot/optee-os/optee-os.hash | 2 +- > boot/optee-os/optee-os.mk | 7 ++++++- > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > package/optee-benchmark/optee-benchmark.mk | 2 +- > package/optee-client/optee-client.hash | 4 ++-- > package/optee-client/optee-client.mk | 2 +- > package/optee-examples/optee-examples.hash | 4 ++-- > package/optee-examples/optee-examples.mk | 2 +- > package/optee-test/optee-test.hash | 4 ++-- > package/optee-test/optee-test.mk | 2 +- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 12 files changed, 37 insertions(+), 16 deletions(-) > Sadly, I used commits from Etienne Carriere as initial commits messages (using -c). I did not noticed it reused the original commit author. I will resend a V3 with authorship fixed properly. Sorry for the inconvenience. -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From quentin.schulz at theobroma-systems.com Fri Mar 11 10:09:40 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Fri, 11 Mar 2022 11:09:40 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <20220310215914.3d26c317@gmx.net> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> <20220310215914.3d26c317@gmx.net> Message-ID: <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> Hi all, On 3/10/22 21:59, Peter Seiderer wrote: > Hello *, > > On Thu, 10 Mar 2022 21:10:36 +0100, Arnout Vandecappelle wrote: > >> Hi Quentin, >> >> On 09/03/2022 15:29, Quentin Schulz wrote: >>> From: Quentin Schulz >>> >>> This fixes CVE-2022-25255[1] by using a patch provided by Qt for 5.15. >>> >>> The patch fails to apply because of a conflict in copyright year so it >>> needed some additional handling after downloading. >>> >>> The patch file was added by running the following command: >>> wget https://urldefense.proofpoint.com/v2/url?u=https-3A__download.qt.io_archive_qt_5.15_CVE-2D2022-2D25255-2Dqprocess5-2D15.diff&d=DwIFAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=BsFMymMtfNBibxvKyvdJPDHFdo422rhoYyW1yKTW6AhrH0dKs7xDb-efWy6vBNAT&s=-6cfccEeLqsLUibYZcNYVLGYEN_CxlShGyX6MzeFYX8&e= -q -O - | sed -e 's/Copyright (C) 2021 The Qt Company Ltd./Copyright (C) 2016 The Qt Company Ltd./' > 0008-CVE-2022-25255-qprocess5-15.diff.patch >>> >>> [1] https://urldefense.proofpoint.com/v2/url?u=https-3A__nvd.nist.gov_vuln_detail_CVE-2D2022-2D25255&d=DwIFAg&c=_sEr5x9kUWhuk4_nFwjJtA&r=LYjLexDn7rXIzVmkNPvw5ymA1XTSqHGq8yBP6m6qZZ4njZguQhZhkI_-172IIy1t&m=BsFMymMtfNBibxvKyvdJPDHFdo422rhoYyW1yKTW6AhrH0dKs7xDb-efWy6vBNAT&s=qywJU5cDeT4YRPIoWShq1zOH4t4wlihP8FgpBlCIvoE&e= >>> >>> Cc: Quentin Schulz >>> Signed-off-by: Quentin Schulz >>> --- >>> ...008-CVE-2022-25255-qprocess5-15.diff.patch | 56 +++++++++++++++++++ >>> package/qt5/qt5base/qt5base.mk | 2 + >>> 2 files changed, 58 insertions(+) >>> create mode 100644 package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch >>> >>> diff --git a/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch >>> new file mode 100644 >>> index 0000000000..dfab92a9ef >>> --- /dev/null >>> +++ b/package/qt5/qt5base/0008-CVE-2022-25255-qprocess5-15.diff.patch >> >> Please make the patch something that approaches git-formatted. At the very >> least, the patch itself must have a description of what it does (i.e. a commit >> message) and a Signed-off-by from you. Ideally, though, you look for the >> appropriate commit in the upstream repository [1] and use that instead of a >> random diff. In that case, add something like this at the end of the description Not technically a random diff. It's hosted on an official Qt website where the tarballs used to be fetched from. There's no commit log because well, there is no commit log. I cannot invent it :) The commit you point to is completely different from the diff in this patch, which makes me uncomfortable with stealing the commit log and apply it to this diff. Also, there is no commit available for 5.15 branch (at least publicly ?) yet. See the discussion for 5.12 LTS branch: https://codereview.qt-project.org/c/qt/qtbase/+/396020 Specifically: "5.15 has ended up needing even more path corrections for helpers. Will likely be needed here as well" "Yeah, I have, so far, just manually changed tests for 5.15. But there's quite a few and took a long time to get them all, and it will have to be repeated for other modules. I was thinking about this too, but then, changing the test-runner may break other things as well. But it's worth looking into" and finally, this patchset was abandoned. I quickly checked this person's other commits on Qt Gerrit but found nothing interesting. I could have done a better job at writing my commit log and give all this info in it to explain why such an unusual patch should/could be included. >> part: >> >> [Quentin: backport from upstream commit ab6915f0efb12cfe48d1f126f4a828212f853ce5 >> in 6.2 branch] >> Signed-off-by: ... >> > > ..or wait until [2] is merged and bump the qt5base version/kde-git-revision > (but then only applicable for 2022.02.x/master and not for the older buildroot > branches)... > I needed this fixed now and that is the only reasonable way to fix the CVE at the moment. If the Buildroot project prefers to wait for the KDE PR to be merged, that's another story and I completely understand :) No hard feelings if this patch isn't merged, I understand it's not really on-par with Buildroot policies/best practices as highlighted by Arnout. Regards, Quentin From etienne.carriere at linaro.org Fri Mar 11 10:14:23 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Fri, 11 Mar 2022 11:14:23 +0100 Subject: [Buildroot] [PATCH v2 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220311103246.471185ee@fixe.home> References: <20220310165735.1102802-1-clement.leger@bootlin.com> <20220311103246.471185ee@fixe.home> Message-ID: Hello Clement, On Fri, 11 Mar 2022 at 10:34, Cl?ment L?ger wrote: > > Le Thu, 10 Mar 2022 17:57:28 +0100, > Cl?ment L?ger a ?crit : > > > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > > of python-pycryptodomex to build. This series adds support to build > > host-python-cryptography and uses it in optee-os package to build the > > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > > and optee-test which neess to be aligned with optee-os version. > > > > ---- > > > > Changes in v2: > > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > > > Cl?ment L?ger (4): > > package/python-cryptography: enable host package > > boot/optee-os: add support to build with python-cryptography > > boot/optee-os: bump to version 3.16.0 > > package/optee-test: bump to version 3.16.0 > > > > Etienne Carriere (3): > > package/optee-examples: bump to version 3.16.0 > > package/optee-client: bump to version 3.16.0 > > package/optee-benchmark: bump to version 3.16.0 > > > > boot/optee-os/Config.in | 13 +++++++++++-- > > boot/optee-os/optee-os.hash | 2 +- > > boot/optee-os/optee-os.mk | 7 ++++++- > > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > > package/optee-benchmark/optee-benchmark.mk | 2 +- > > package/optee-client/optee-client.hash | 4 ++-- > > package/optee-client/optee-client.mk | 2 +- > > package/optee-examples/optee-examples.hash | 4 ++-- > > package/optee-examples/optee-examples.mk | 2 +- > > package/optee-test/optee-test.hash | 4 ++-- > > package/optee-test/optee-test.mk | 2 +- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 12 files changed, 37 insertions(+), 16 deletions(-) > > > > Sadly, I used commits from Etienne Carriere as initial commits messages > (using -c). I did not noticed it reused the original commit author. > I will resend a V3 with authorship fixed properly. Sorry for the > inconvenience. > Acked-by: Etienne Carriere for the whole series with only a comment on patch 3/7. You forgot to update the url in the inline comment of optee-os.hash for that package only. Regards, etienne > -- > Cl?ment L?ger, > Embedded Linux and Kernel engineer at Bootlin > https://bootlin.com From clement.leger at bootlin.com Fri Mar 11 12:36:29 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:29 +0100 Subject: [Buildroot] [PATCH v3 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220311123636.13415-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which needs to be aligned with optee-os version. ---- Changes in v3: - Fix authorship for commits that were copied from Etienne ones. - Fix package URL for optee-os - Added Acked-by Etienne Carriere Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (7): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 7 ++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 38 insertions(+), 17 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:31 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:31 +0100 Subject: [Buildroot] [PATCH v3 2/7] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-3-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..f8426f9ab2 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE version below 3.16 used python-pycryptodomex package + in python scripts. Newer version uses python-cryptography. + Select this option if optee-os needs python-cryptography to + be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..57f9a17bb6 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,12 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:33 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:33 +0100 Subject: [Buildroot] [PATCH v3 4/7] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-5-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:30 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:30 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-2-clement.leger@bootlin.com> Enable host package and add needed dependencies. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..4ff61c7f86 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:35 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:35 +0100 Subject: [Buildroot] [PATCH v3 6/7] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-7-clement.leger@bootlin.com> Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:36 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:36 +0100 Subject: [Buildroot] [PATCH v3 7/7] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-8-clement.leger@bootlin.com> Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:32 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:32 +0100 Subject: [Buildroot] [PATCH v3 3/7] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-4-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index f8426f9ab2..6fe2ae95ac 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography. @@ -58,7 +59,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b9b0e5b43f 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 11 12:36:34 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 11 Mar 2022 13:36:34 +0100 Subject: [Buildroot] [PATCH v3 5/7] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220311123636.13415-6-clement.leger@bootlin.com> Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From tianyuanhao3 at 163.com Fri Mar 11 12:47:15 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Fri, 11 Mar 2022 04:47:15 -0800 Subject: [Buildroot] User and Group Utility in Buildroot In-Reply-To: References: Message-ID: <8db51f93-0b22-57b3-5a99-a4199277ea91@163.com> These tools seem to come from _shadow_, which Buildroot doesn't have. Thanks, Yuanhao On 3/10/22 23:10, Mohd Faiz Rohani wrote: > Hi Guys > > I need help here. I could not find?the correct utils for the Linux > user and group management (useradd groupadd etc. etc.) in the > Buildroot packages. Can anyone show me which utils I need to select in > order to activate this?. Fyi I'm using buildroot-2022.02-rc3. > > Thank you > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From tianyuanhao3 at 163.com Fri Mar 11 12:37:17 2022 From: tianyuanhao3 at 163.com (TIAN Yuanhao) Date: Fri, 11 Mar 2022 04:37:17 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/balena-engine: bump to version 20.10.13 In-Reply-To: <20220311044117.3213995-1-christian@paral.in> References: <20220311044117.3213995-1-christian@paral.in> Message-ID: <6920ae4c-efdc-8236-4634-b07d188bd559@163.com> I suggest waiting for this [1] to be merged before updating balena-engine. [1]: https://github.com/balena-os/balena-engine/pull/286/files Thanks, Yuanhao On 3/10/22 20:41, Christian Stewart via buildroot wrote: > https://github.com/balena-os/balena-engine/blob/v20.10.13/CHANGELOG.md > > Signed-off-by: Christian Stewart > > --- > > v2: > > - rebase: update commit against upstream/master > > Signed-off-by: Christian Stewart > --- > package/balena-engine/balena-engine.hash | 2 +- > package/balena-engine/balena-engine.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash > index ef590881f5..1054e22550 100644 > --- a/package/balena-engine/balena-engine.hash > +++ b/package/balena-engine/balena-engine.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 43f4c985b855a4f731a5cdac214f1adf6c4cc2021cbad3f93856009df246d61c balena-engine-20.10.12.tar.gz > +sha256 88254fe4a5bcb9801ba0094226de65696fc754eca8143f601c75ba2f95893d3b balena-engine-20.10.13.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk > index 0afcea3d7e..402c586468 100644 > --- a/package/balena-engine/balena-engine.mk > +++ b/package/balena-engine/balena-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BALENA_ENGINE_VERSION = 20.10.12 > +BALENA_ENGINE_VERSION = 20.10.13 > BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) > > BALENA_ENGINE_LICENSE = Apache-2.0 From james.knight at collins.com Fri Mar 11 15:09:43 2022 From: james.knight at collins.com (James Knight) Date: Fri, 11 Mar 2022 10:09:43 -0500 Subject: [Buildroot] [PATCH 1/1] package/chrony: bump to version 4.2 Message-ID: <20220311150943.119252-1-james.knight@collins.com> https://git.tuxfamily.org/chrony/chrony.git/tree/NEWS?id=4.2 Signed-off-by: James Knight --- package/chrony/chrony.hash | 5 +++-- package/chrony/chrony.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index f8dd1438bc7d1f08dcbdccb7bff8e03cee3e2da8..7fa67bf040da0c00e23e3e4fb5ddd4a638cb91d0 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,4 +1,5 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz +# Locally calculated after checking pgp signature +# https://download.tuxfamily.org/chrony/chrony-4.2-tar-gz-asc.txt +sha256 273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a chrony-4.2.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 5a34f70e1e992f179784ad87b240967f5cf0a30f..15b200aeffe9bd70694bb1d490535ae8785dc3fc 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 4.1 +CHRONY_VERSION = 4.2 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING -- 2.30.0.windows.1 From ben at fluff.org Fri Mar 11 17:13:25 2022 From: ben at fluff.org (Ben Dooks) Date: Fri, 11 Mar 2022 17:13:25 +0000 Subject: [Buildroot] error during cpio build failing to rm Message-ID: <20220311171325.jwcww5qb7ao5vnpy@hetzy.fluff.org> I'm getting the following error with upstream buildroot: rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/tmp/..' make: *** [fs/cpio/cpio.mk:74: /home/ben/project/buildroot/output/images/rootfs.c I've temprarily fixed this with: diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..6bb993663f 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/tmp/*" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) It looks like this was introduced in 5e78e7e97d772124f0d31653aca33731abe5b4db Author: Norbert Lange Date: Sat Jun 6 00:48:57 2020 +0200 fs: clean the volatile /run and /tmp directories Any ideas on how to fix properly? -- Ben Dooks, ben at fluff.org, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear. From james.hilliard1 at gmail.com Fri Mar 11 19:17:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 12:17:17 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-weasyprint: bump to version 54.2 Message-ID: <20220311191717.3878852-1-james.hilliard1@gmail.com> Migrate from distutils to flit package infrastructure. Signed-off-by: James Hilliard --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 8d231c50ba..90ccc1d057 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 a90fd2d5a581a0e218943af3a8b64a31 weasyprint-53.4.tar.gz -sha256 10ccb17d55c73096bdf1edd3efe58cb855b07e4c307d9bad4ebc9a3f13ff4580 weasyprint-53.4.tar.gz +md5 3917447c277db6931b8370f1d725db49 weasyprint-54.2.tar.gz +sha256 d5e8aa82e3e2a2477a4543f0646d9fb14080c9ba34a0859751eb23757cc00466 weasyprint-54.2.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 0a944825bb..925de855bc 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 53.4 +PYTHON_WEASYPRINT_VERSION = 54.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 -PYTHON_WEASYPRINT_SETUP_TYPE = distutils +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 +PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 19:27:26 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 12:27:26 -0700 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: apply host platform and project base to pep517 env Message-ID: <20220311192726.3879992-1-james.hilliard1@gmail.com> The _PYTHON_HOST_PLATFORM and _PYTHON_PROJECT_BASE variables should also be set for pep517 builds as they are not setuptools/distutils specific. Signed-off-by: James Hilliard --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index f031bc8fae..52ce402281 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -113,6 +113,8 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 19:44:46 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 12:44:46 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: bump to version 21.3.0 Message-ID: <20220311194446.3952944-1-james.hilliard1@gmail.com> Migrate to new flit based build. Signed-off-by: James Hilliard --- package/python-argon2-cffi/Config.in | 8 +++----- package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 5cddb3314e..5940d1c910 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI bool "python-argon2-cffi" - depends on BR2_USE_MMU # libargon2 - depends on !BR2_STATIC_LIBS # libargon2 - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_LIBARGON2 + depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2 + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2 + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime help The secure Argon2 password hashing algorithm. diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash index 6c416ffd88..09da5855a3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.hash +++ b/package/python-argon2-cffi/python-argon2-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz # Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk index f01c940589..0fb3e50ff3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.mk +++ b/package/python-argon2-cffi/python-argon2-cffi.mk @@ -4,19 +4,11 @@ # ################################################################################ -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit PYTHON_ARGON2_CFFI_LICENSE = MIT PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 -else -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 -endif $(eval $(python-package)) -- 2.25.1 From thomas.petazzoni at bootlin.com Fri Mar 11 20:43:32 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Mar 2022 21:43:32 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311123636.13415-2-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> Message-ID: <20220311214332.4405ad89@windsurf> Hello Cl?ment, On Fri, 11 Mar 2022 13:36:30 +0100 Cl?ment L?ger wrote: > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + openssl This openssl dependency seems extremely dubious. Why would a host package depend on the target variant of openssl? > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ > $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > + Spurious newline added. > $(eval $(python-package)) > +$(eval $(host-python-package)) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Mar 11 20:46:15 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Mar 2022 21:46:15 +0100 Subject: [Buildroot] [PATCH v3 2/7] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220311123636.13415-3-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-3-clement.leger@bootlin.com> Message-ID: <20220311214615.6f6ab65c@windsurf> Hello Cl?ment, On Fri, 11 Mar 2022 13:36:31 +0100 Cl?ment L?ger wrote: > Newer version of optee-os (>= 3.16) uses python-cryptography instead of > python-pycryptodomex in python scripts. Add support to build these > newer versions by adding a new > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will > select host-python-cryptography dependency when building optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 8 ++++++++ > boot/optee-os/optee-os.mk | 7 ++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 0974578484..f8426f9ab2 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "optee-os needs host-python-cryptography to build" Just: bool "optee-os needs host-python-cryptography" you also need to add some dependencies, because rust is not supported on all host architectures, so you need: depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) > +OPTEE_OS_DEPENDENCIES += host-python-cryptography > +else > +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex > +endif Semantically speaking, it's a bit odd that enabling BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY drops the host-python-pycryptodomex dependency. But I guess this is what makes the most sense in that situation. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Fri Mar 11 20:47:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 11 Mar 2022 21:47:38 +0100 Subject: [Buildroot] [PATCH v3 3/7] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220311123636.13415-4-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-4-clement.leger@bootlin.com> Message-ID: <20220311214738.5b2142e3@windsurf> Hello Cl?ment, On Fri, 11 Mar 2022 13:36:32 +0100 Cl?ment L?ger wrote: > Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since > python-cryptography is now needed to build optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 5 +++-- > boot/optee-os/optee-os.hash | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index f8426f9ab2..6fe2ae95ac 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -18,7 +18,7 @@ choice > Select the version of OP-TEE OS you want to use > > config BR2_TARGET_OPTEE_OS_LATEST > - bool "3.15.0" > + bool "3.16.0" > help > Use the latest release tag from the OP-TEE OS official Git > repository. > @@ -50,6 +50,7 @@ endif > > config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > bool "optee-os needs host-python-cryptography to build" > + default y Rather than a "default y", I would instead make BR2_TARGET_OPTEE_OS_LATEST select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY, so that if the latest version of OP-TEE is used, BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY is forcefully selected. However, you will have to propagate the BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS to the OP-TEE package. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Fri Mar 11 21:15:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:15:59 +0100 Subject: [Buildroot] [PATCH 2/2] package/librsvg: fix loaders.cache In-Reply-To: <20220219122526.2954354-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 19 Feb 2022 13:25:26 +0100") References: <20220219122526.2954354-1-fontaine.fabrice@gmail.com> <20220219122526.2954354-2-fontaine.fabrice@gmail.com> Message-ID: <87k0d0xka8.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling > gdk-pixbuf-query-loaders to build a correct loaders.cache and fix the > following PPD build failure of adwaita-icon-theme raised since commit > b06294e9897e90862656416e8b67fdace15488d7 which now correctly updates > loaders.cache: > Can't load file: Unrecognized image file format > Fixes: > - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 11 21:20:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:20:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ipython: security bump to version 7.31.1 In-Reply-To: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Feb 2022 22:54:09 +0100") References: <20220220215409.1740105-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnoxk2i.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for > interactive computing in multiple programming languages, originally > developed for the Python programming language. Affected versions are > subject to an arbitrary code execution vulnerability achieved by not > properly managing cross user temporary files. This vulnerability allows > one user to run code as another on the same machine. All users are > advised to upgrade. > Also update indentation in hash file (two spaces) > https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 11 21:19:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:19:50 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-ipython: bump to version 7.28.0 Message-ID: <20220311211323.6232883C96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=688b256f9f4c6007d62b4a6ecd8177b281b4fafb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit dc34303f1bfa3cb07d19e986f0edc8991866e7c2) Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 4 ++-- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index e8e25f5cb7..5f591129a4 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 68542bca2ebf39af7d9d0557e7fb5708 ipython-7.9.0.tar.gz -sha256 dfd303b270b7b5232b3d08bd30ec6fd685d8a58cabd54055e3d69d8f029f7280 ipython-7.9.0.tar.gz +md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz +sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 8136353ae2..c669dd1b92 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.9.0 +PYTHON_IPYTHON_VERSION = 7.28.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c0/e5/ba19ae58e9bdd80832332873cb4e11a90cf2049df052c1aadeabc2cdadeb +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Fri Mar 11 21:20:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:20:02 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220311211323.6DBAB83C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84fd98b48b53065ec30f88ded5ea9a5f8c313591 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit aeb138911e773cf4011b81fc4fcec0037f366bb1) Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Fri Mar 11 21:14:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:14:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/librsvg: fix loaders.cache with with per-package directories Message-ID: <20220311211323.5689483C8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a08294ba1263d07cdd8e4a80ef7ea3c7577e4a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x host-librsvg installs a gdk-pixbuf module (aka plugin). As such, it needs to update [0] the modules cache (a kind of registry of which modules are installed and what the can handle). To that effect, it calls the utility gdk-pixbuf-queryloaders, which generates the cache of existing modules. gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been configured to be relocatable. However, it still embeds the path to where it was instaled, and thus where to look modules from. If it is run from its install location, then gdk-pixbuf-queryloaders looks modules in that location, and generates a modules cache with relative paths; otherwise, it still looks at that location, but generates a cache with absolute paths. In the later case, it will miss the modules that have not been installed by gdk-pixbuf itself. In the case of host-librsvg, that will miss the fact that librsvg just happened to have installed a module. Further down the road, packages that depend on host-librsvg, will get their PPD prepared, the path fixup hook run, so that the cache properly points to the current package's PPD, but the cache will not include the SVG module, which causes failures to load SVG images: Can't load file: Unrecognized image file format So, we need to tell gdk-pixbuf-queryloaders where the module path is, which restores the relativity of the paths it reports, by specifying the modules path pointing to the current package's PPD, passed in the environement variable GDK_PIXBUF_MODULEDIR. We need to do that at install time, so that the SVG module is properly listed in the cache, so that dependees can use it. A temporary cache is also generated at build time, but its usefullness is dubious; it seem to only be used by the test tool, which we do not run. However, for consistency-sake, we also fix that. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 [0] This will trigger file-overwrite detection in the future... But we currently do not have infrastructure to properly handle such a cache. Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword and extend an already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 63b780f5e96e2f9282fb48b2846bab1c0f4f9455) Signed-off-by: Peter Korsgaard --- ...loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 ++++++++++++++++++++++ package/librsvg/librsvg.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection From peter at korsgaard.com Fri Mar 11 21:17:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:17:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/python-ipython: security bump to version 7.31.1 Message-ID: <20220311211327.F13A783C9E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe570807b0fa02a839320250362759e327f7ad0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for interactive computing in multiple programming languages, originally developed for the Python programming language. Affected versions are subject to an arbitrary code execution vulnerability achieved by not properly managing cross user temporary files. This vulnerability allows one user to run code as another on the same machine. All users are advised to upgrade. Also update indentation in hash file (two spaces) https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit aeb138911e773cf4011b81fc4fcec0037f366bb1) Signed-off-by: Peter Korsgaard --- package/python-ipython/python-ipython.hash | 8 ++++---- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 5f591129a4..cd18c3d125 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz -sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz +md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz +sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz # Locally computed sha256 checksums -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index c669dd1b92..389ebfa897 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.28.0 +PYTHON_IPYTHON_VERSION = 7.31.1 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From peter at korsgaard.com Fri Mar 11 20:51:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 21:51:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/librsvg: fix loaders.cache with with per-package directories Message-ID: <20220311211327.E567E83C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3ddfdf64c189c2e08ae83146730f4aae660784d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x host-librsvg install a gdk-pixbuf module (aka plugin). As such, it needs to update [0] the modules cache (a kind of registry of which modules are installed and what the can handle). To that effect, it calls the utility gdk-pixbuf-queryloaders, which generates the cache of existing modules. gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been configured to be relocatable. However, it still embeds the path to where it was instaled, and thus where to look modules from. If it is run from its install location, then gdk-pixbuf-queryloaders looks modules in that location, and generates a modules cache with relative paths; otherwise, it still looks at that location, but generates a cache with absolute paths. In the later case, it will miss the modules that have not been installed by gdk-pixbuf itself. In the case of host-librsvg, that will miss the fact that librsvg just happened to have installed a module. Further down the road, packages that depend on host-librsvg, will get their PPD prepared, the path fixup hook run, so that the cache properly points to the current package's PPD, but the cache will not include the SVG module, which causes failures to load CVG images: Can't load file: Unrecognized image file format So, we need to tell gdk-pixbuf-queryloaders where the module path is, which restores the relativity of the paths it reports, by specifying the modules path pointing to the current package's PPD, passed in the environement variable GDK_PIXBUF_MODULEDIR. We need to do that at install time, so that the SVG module is properly listed in the cache, so that dependees can use it. A temporary cache is also generated at build time, but its usefullness is dubious; it seem to only be used by the test tool, which we do not run. However, for consistency-sake, we also fix that. Fixes: - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6 [0] This will trigger file-overwrite detection in the future... But we currently do not have infrastructure to properly handle such a cache. Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reword and extend an already-good commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 63b780f5e96e2f9282fb48b2846bab1c0f4f9455) Signed-off-by: Peter Korsgaard --- ...loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch | 41 ++++++++++++++++++++++ package/librsvg/librsvg.mk | 2 ++ 2 files changed, 43 insertions(+) diff --git a/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch new file mode 100644 index 0000000000..761ff92605 --- /dev/null +++ b/package/librsvg/0001-gdk-pixbuf-loader-Makefile.am-set-GDK_PIXBUF_MODULED.patch @@ -0,0 +1,41 @@ +From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 12:02:10 +0100 +Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR + +Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling +gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and +gdk-pixbuf.loaders on 'exotic' systems + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668] +--- + gdk-pixbuf-loader/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index c3493736..de1f9641 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \ + EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile +- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +@@ -68,7 +68,7 @@ endif + install-data-hook: + @if $(RUN_QUERY_LOADER_TEST) ; then \ + $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ ++ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ + else \ + echo "***" ; \ + echo "*** Warning: loaders.cache not built" ; \ +-- +2.34.1 + diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e4b1942b79..07a14b4366 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB LIBRSVG_CPE_ID_VENDOR = gnome +# We're patching gdk-pixbuf-loader/Makefile.am +LIBRSVG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection From peter at korsgaard.com Fri Mar 11 21:23:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:23:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/flac: security bump to version 1.3.4 Message-ID: <20220311211432.2505F83CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27503b58aa7d245981be1334111e4cbe98649144 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4c7e250c699b23051a64bc0c2ef3e3f2bd020b3d) Signed-off-by: Peter Korsgaard --- package/flac/0001-Fix-uclibc-build.patch | 81 ++++++++++++++++++++++ ...c-check-for-sys-auxv.h-before-defining-FL.patch | 36 ---------- package/flac/flac.hash | 12 ++-- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr From peter at korsgaard.com Fri Mar 11 21:22:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:22:32 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/flac: security bump to version 1.3.4 Message-ID: <20220311211437.556E983CA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37683e06b9daa9eff057ede540b844a12d0744f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release mostly fixes (security related) bugs including: - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 - Fix encoder bug CVE-2021-0561 Also: - Replace first patch which was reverted by https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 - Disable stack protection (enabled by default since https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) - Drop md5 which is not provided anymore - Update indentation in hash file (two spaces) https://github.com/xiph/flac/releases/tag/1.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4c7e250c699b23051a64bc0c2ef3e3f2bd020b3d) Signed-off-by: Peter Korsgaard --- package/flac/0001-Fix-uclibc-build.patch | 81 ++++++++++++++++++++++ ...c-check-for-sys-auxv.h-before-defining-FL.patch | 36 ---------- package/flac/flac.hash | 12 ++-- package/flac/flac.mk | 5 +- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch new file mode 100644 index 0000000000..fcba670fae --- /dev/null +++ b/package/flac/0001-Fix-uclibc-build.patch @@ -0,0 +1,81 @@ +From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 21 Feb 2022 18:21:11 +0100 +Subject: [PATCH] Fix uclibc build + +Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit +44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on +uclibc + +So put back the sys/auxv.h check as well as a getauxval check in a way +that doesn't break iOS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/xiph/flac/pull/292] +--- + configure.ac | 5 ++++- + src/libFLAC/cpu.c | 9 ++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d7dc2e4..6f32fa45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_C_INLINE + AC_C_VARARRAYS + AC_C_TYPEOF + +-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) ++AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) + + XIPH_C_BSWAP32 + XIPH_C_BSWAP16 +@@ -101,6 +101,9 @@ fi + # For the XMMS plugin. + AC_CHECK_TYPES(socklen_t, [], []) + ++dnl check for getauxval in standard library ++AC_CHECK_FUNCS(getauxval) ++ + dnl check for getopt in standard library + dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) + AC_CHECK_FUNCS(getopt_long, [], []) +diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c +index 8b92f4c7..64c6acad 100644 +--- a/src/libFLAC/cpu.c ++++ b/src/libFLAC/cpu.c +@@ -53,11 +53,9 @@ + #define dfprintf(file, format, ...) + #endif + +-#if defined FLAC__CPU_PPC +-#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) ++#if defined(HAVE_SYS_AUXV_H) + #include + #endif +-#endif + + #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM + +@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) + #define PPC_FEATURE2_ARCH_2_07 0x80000000 + #endif + +-#ifdef __linux__ ++#if defined (__linux__) && defined(HAVE_GETAUXVAL) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { + info->ppc.arch_3_00 = true; + } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { +@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) + info->ppc.arch_2_07 = false; + info->ppc.arch_3_00 = false; + #else +-#error Unsupported platform! Please add support for reading ppc hwcaps. ++ info->ppc.arch_2_07 = false; ++ info->ppc.arch_3_00 = false; + #endif + + #else +-- +2.34.1 + diff --git a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch deleted file mode 100644 index d1398d4b3e..0000000000 --- a/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 19 Sep 2019 21:18:04 +0200 -Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC - -Upstream: https://github.com/xiph/flac/pull/142 -Signed-off-by: Peter Seiderer ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0228a12..64cb3f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,7 +144,7 @@ case "$host_cpu" in - powerpc64|powerpc64le) - cpu_ppc64=true - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - AC_DEFINE(FLAC__CPU_PPC64) - AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) -@@ -152,7 +152,7 @@ case "$host_cpu" in - ;; - powerpc|powerpcle) - cpu_ppc=true -- AC_DEFINE(FLAC__CPU_PPC) -+ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) - AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) - asm_optimisation=$asm_opt - ;; --- -2.23.0 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash index df7c2d1b95..2444535e0f 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,10 +1,8 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS -md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz # From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz +sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 9aa00b7ffd..2ff048b6e6 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.3 +FLAC_VERSION = 1.3.4 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES @@ -19,7 +19,8 @@ FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ --disable-xmms-plugin \ - --disable-altivec + --disable-altivec \ + --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr From peter at korsgaard.com Fri Mar 11 21:23:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:23:31 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/flac: security bump to version 1.3.4 In-Reply-To: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 21 Feb 2022 23:00:25 +0100") References: <20220221220025.2198034-1-fontaine.fabrice@gmail.com> Message-ID: <87bkycxjxo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release mostly fixes (security related) bugs including: > - Fix 12 decoder bugs found by oss-fuzz, including CVE-2020-0499 > - Fix encoder bug CVE-2021-0561 > Also: > - Replace first patch which was reverted by > https://github.com/xiph/flac/commit/4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 > - Disable stack protection (enabled by default since > https://github.com/xiph/flac/commit/f706f2832270a0b7851cdffe62ad37acda9423fe) > - Drop md5 which is not provided anymore > - Update indentation in hash file (two spaces) > https://github.com/xiph/flac/releases/tag/1.3.4 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin and Peter Seiderer): > - Add upstream patch Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Fri Mar 11 21:34:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 14:34:52 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-flit-core: bump to version 3.7.1 Message-ID: <20220311213452.3961421-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-flit-core/python-flit-core.hash | 4 ++-- package/python-flit-core/python-flit-core.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index bd47fd4f6b..135be93660 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz -sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz +md5 4a4791e97f3a8c9a1645064a35636ee6 flit_core-3.7.1.tar.gz +sha256 14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f flit_core-3.7.1.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 8971223d1f..0e058a1f17 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_SETUP_TYPE = pep517 -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 21:38:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 14:38:57 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-installer: bump to version 0.5.1 Message-ID: <20220311213857.3962466-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-installer/python-installer.hash | 4 ++-- package/python-installer/python-installer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash index 68af457664..543bd0fa62 100644 --- a/package/python-installer/python-installer.hash +++ b/package/python-installer/python-installer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/installer/json -md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz -sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +md5 bf17db5e6b58c4cfa33642f5348d3814 installer-0.5.1.tar.gz +sha256 f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445 installer-0.5.1.tar.gz # Locally computed sha256 checksums sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 82739a8003..862a251415 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_VERSION = 0.5.1 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = distutils -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 21:49:50 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 14:49:50 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 60.9.3 Message-ID: <20220311214950.3965757-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index e04235e041..1a378d1b76 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz -sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz +md5 6c6a97cf68e1db789a2e5c054f067278 setuptools-60.9.3.tar.gz +sha256 2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 setuptools-60.9.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8653c42259..3309cd9df4 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.8.2 +PYTHON_SETUPTOOLS_VERSION = 60.9.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/14/74/54890935244ce053abcc4fa01ef4982a84743a8d128d4cf5eae56e2d156c PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.25.1 From peter at korsgaard.com Fri Mar 11 21:56:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:56:34 +0100 Subject: [Buildroot] [git commit] Makefile: unexport 'DEVICE_TREE' environment variable In-Reply-To: <20220223135658.66C7883845@busybox.osuosl.org> (Yann E. MORIN's message of "Wed, 23 Feb 2022 15:03:18 +0100") References: <20220223135658.66C7883845@busybox.osuosl.org> Message-ID: <877d90xiel.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=d3910057c6ae38e2cf72e8c86cd84756fffba2ac > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > U-Boot looks for the environment variable DEVICE_TREE and uses its value if > set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since > v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting > default FIT configuration) - So unexport it like we do for other > "troublesome" environment variables to ensure consistent behaviour. > Reported-by: Neal Frager > Signed-off-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 11 21:56:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:56:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220311214814.5175783CAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d7b0e8c1ed1e15ef6841c979b75c47695f6b134 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d3910057c6ae38e2cf72e8c86cd84756fffba2ac) Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a3dfc52f51..9dc0a8673c 100644 --- a/Makefile +++ b/Makefile @@ -420,6 +420,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From james.hilliard1 at gmail.com Fri Mar 11 22:50:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 15:50:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cssselect2: bump to version 0.5.0 Message-ID: <20220311225053.3970847-1-james.hilliard1@gmail.com> Migrate to new flit based build. Signed-off-by: James Hilliard --- package/python-cssselect2/python-cssselect2.hash | 4 ++-- package/python-cssselect2/python-cssselect2.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cssselect2/python-cssselect2.hash b/package/python-cssselect2/python-cssselect2.hash index ed5b863302..fd892e297f 100644 --- a/package/python-cssselect2/python-cssselect2.hash +++ b/package/python-cssselect2/python-cssselect2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect2/json -md5 6dfd5963c8a5d85f2634d1650b1ddfe1 cssselect2-0.4.1.tar.gz -sha256 93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8 cssselect2-0.4.1.tar.gz +md5 6206ebccfdd9fc02196f60e830fa7b1f cssselect2-0.5.0.tar.gz +sha256 d98a7bbdd8ebc46093279195d669a3359bd5a23f90c19e82c19d9eeef333e617 cssselect2-0.5.0.tar.gz # Locally computed sha256 checksums sha256 6fd97229a1d1b0f6a8b41e109f413426dbc0874b1e03746d66cc33282601c2c2 LICENSE diff --git a/package/python-cssselect2/python-cssselect2.mk b/package/python-cssselect2/python-cssselect2.mk index 18e0fba839..b3ddf41fef 100644 --- a/package/python-cssselect2/python-cssselect2.mk +++ b/package/python-cssselect2/python-cssselect2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_CSSSELECT2_VERSION = 0.4.1 +PYTHON_CSSSELECT2_VERSION = 0.5.0 PYTHON_CSSSELECT2_SOURCE = cssselect2-$(PYTHON_CSSSELECT2_VERSION).tar.gz -PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0 -PYTHON_CSSSELECT2_SETUP_TYPE = distutils +PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ce/e7/1333b9042beb33a9bb425900b6d9b59035b98c31c950a323d14ceca1275e +PYTHON_CSSSELECT2_SETUP_TYPE = flit PYTHON_CSSSELECT2_LICENSE = BSD-3-Clause PYTHON_CSSSELECT2_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 22:56:09 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 15:56:09 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pyphen: bump to version 0.12.0 Message-ID: <20220311225609.3975018-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 75ee909351..14938de9c4 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 f8ec095e4fe30dc2b518a918788b33ed pyphen-0.11.0.tar.gz -sha256 e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8 pyphen-0.11.0.tar.gz +md5 99a01a3806cc750c242cae330429a90f pyphen-0.12.0.tar.gz +sha256 b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b pyphen-0.12.0.tar.gz # Locally computed sha256 checksums sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 80f67c77c7..ac0bcf8aab 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.11.0 +PYTHON_PYPHEN_VERSION = 0.12.0 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/f8/af869a4983c1b3159945479510260985714265d48baf27d61f72b1ec8cbf -PYTHON_PYPHEN_SETUP_TYPE = distutils +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/0e/21/9e0841aa76db69e2d74cd64ea2271151d7332fa627a5f03eb0d9ccf3da87 +PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL -- 2.25.1 From james.hilliard1 at gmail.com Fri Mar 11 23:30:50 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 11 Mar 2022 16:30:50 -0700 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.48 Message-ID: <20220311233050.4686-1-james.hilliard1@gmail.com> Set new x11-xfixes meson config option. Signed-off-by: James Hilliard --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index a9d59663ae..e6fad56698 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 +sha256 68bbf83b4c12bbcaef5d4bfb0dda86177583cf0abe0026efcfedd837b2e4926e pipewire-0.3.48.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..80246cc8d0 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.45 +PIPEWIRE_VERSION = 0.3.48 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -136,6 +136,13 @@ else PIPEWIRE_CONF_OPTS += -Dx11=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled +PIPEWIRE_DEPENDENCIES += xlib_libXfixes +else +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb -- 2.25.1 From christian at paral.in Sat Mar 12 04:55:52 2022 From: christian at paral.in (Christian Stewart) Date: Fri, 11 Mar 2022 20:55:52 -0800 Subject: [Buildroot] sshd: fails with seccomp issue on arm Message-ID: Hi all, Running sshd on an odroid xu4 (armv7) w/ Buildroot 2022.02: connections fail with seccomp errors: SECCOMP auid=4294967295 uid=103 gid=105 ses=4294967295 pid=1041 comm="sshd" exe="/usr/sbin/sshd" sig=31 arch=40000028 syscall=414 compat=0 ip=0xb6bf41b0 code=0x0 I found this relevant issue & patch added to gentoo to fix this: https://www.mail-archive.com/debian-bugs-dist at lists.debian.org/msg1844602.html https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc55aee6b2534bbc8d8fe12128c1083ee6850 Shall we include this patch in Buildroot as well? https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch I also ran into a build error with fzero-call-regs, there is a patch to fix that too: https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch Thanks & best, Christian Stewart From thomas at ruschival.de Sat Mar 12 10:44:01 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Sat, 12 Mar 2022 11:44:01 +0100 Subject: [Buildroot] [PATCH 0/1] Bump pistache, switch to meson build (test-pkg fails) Message-ID: <20220312104402.33075-1-thomas@ruschival.de> The pistache project has moved to meson build and cmake build seems to be neglected e.g. the cmake build on host did no longer install header files. This patch switches to meson build. As a nice side effect newer upstream versions already include the patches by Fabrice Fontaine so the buildroot package does no longer need the patch files. The upstream project now has a hard dependency to RapidJSON. While I tested it with a full build for Raspberry Pi Zero W and BananaPi, I can't get it to work with utils/test-pkg. I set in pistache.cfg: BR2_PACKAGE_PISTACHE=y BR2_PACKAGE_RAPIDJSON=y and ran ./utils/test-pkg -c ./pistache.cfg -p pistache -d br-test The meson-build fails complaining about missing rapidjson. I am not sure if my patch is broken or if I am just don't use the tools correctly. Any help appreciated. regards Thomas Thomas Ruschival (1): package/pistache: bump version & switch to meson build ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 9 +- 6 files changed, 11 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch -- 2.30.2 From thomas at ruschival.de Sat Mar 12 10:44:02 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Sat, 12 Mar 2022 11:44:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312104402.33075-1-thomas@ruschival.de> References: <20220312104402.33075-1-thomas@ruschival.de> Message-ID: <20220312104402.33075-2-thomas@ruschival.de> While upstream pistache has not yet released a stable 'tag' a lot has changed since June 2020: * project has moved to meson build system, cmake builds do not install headers. * patches in buildroot are no longer required * project-implemented Pistache::Optional was replaced by use of std::optional. This is only available in C++17 * dependency to rapidjson has been introduced Signed-off-by: Thomas Ruschival --- ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 9 +- 6 files changed, 11 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d..0000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec..0000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a..0000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210a..806c27077a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,23 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_RAPIDJSON depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7..9a2cd1d1f9 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea..0f49ad12db 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,7 +4,7 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE @@ -13,9 +13,10 @@ PISTACHE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) -- 2.30.2 From mohd.faiz.rohani at gmail.com Sat Mar 12 11:12:11 2022 From: mohd.faiz.rohani at gmail.com (Mohd Faiz Rohani) Date: Sat, 12 Mar 2022 19:12:11 +0800 Subject: [Buildroot] User and Group Utility in Buildroot In-Reply-To: <8db51f93-0b22-57b3-5a99-a4199277ea91@163.com> References: <8db51f93-0b22-57b3-5a99-a4199277ea91@163.com> Message-ID: On Fri, Mar 11, 2022 at 8:47 PM TIAN Yuanhao wrote: > These tools seem to come from _shadow_, which Buildroot doesn't have. > Thank you for the information. I have read the buildroot user manual and found out that users and groups are created with the BR2_ROOTFS_USERS_TABLES. The format can be found at section 9.6 of the Buildroot manual. Thanks. Faiz > Thanks, > Yuanhao > On 3/10/22 23:10, Mohd Faiz Rohani wrote: > > Hi Guys > > > > I need help here. I could not find the correct utils for the Linux > > user and group management (useradd groupadd etc. etc.) in the > > Buildroot packages. Can anyone show me which utils I need to select in > > order to activate this?. Fyi I'm using buildroot-2022.02-rc3. > > > > Thank you > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From nicolas.cavallari at green-communications.fr Sat Mar 12 12:24:31 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Sat, 12 Mar 2022 13:24:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312104402.33075-2-thomas@ruschival.de> References: <20220312104402.33075-1-thomas@ruschival.de> <20220312104402.33075-2-thomas@ruschival.de> Message-ID: Hello, On 12/03/2022 11:44, Thomas Ruschival wrote: > While upstream pistache has not yet released a stable 'tag' > a lot has changed since June 2020: > > * project has moved to meson build system, cmake builds > do not install headers. > * patches in buildroot are no longer required > * project-implemented Pistache::Optional was replaced by > use of std::optional. This is only available in C++17 > * dependency to rapidjson has been introduced > [...] > diff --git a/package/pistache/Config.in b/package/pistache/Config.in > index 96aed5210a..806c27077a 100644 > --- a/package/pistache/Config.in > +++ b/package/pistache/Config.in > @@ -1,22 +1,23 @@ > config BR2_PACKAGE_PISTACHE > bool "pistache" > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_RAPIDJSON > depends on !BR2_TOOLCHAIN_USES_UCLIBC > depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > help > Pistache is a modern and elegant HTTP and REST framework > - for C++. It is entirely written in pure C++14 and provides > + for C++. It is entirely written in pure C++17 and provides > a clear and pleasant API. > > https://github.com/oktal/pistache > [...] > --- a/package/pistache/pistache.mk > +++ b/package/pistache/pistache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d > +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 > PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) > PISTACHE_LICENSE = Apache-2.0 > PISTACHE_LICENSE_FILES = LICENSE You need to add rapidjson to PISTACHE_DEPENDENCIES in pistache.mk, otherwise pistache may be compiled before rapidjson or without rapidjson's headers and libraries. The "depends on" in Config.in only ensures that rapidjson must be enabled if pistache is to be enabled. It does not impose any order. From thomas.petazzoni at bootlin.com Sat Mar 12 14:59:13 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 12 Mar 2022 15:59:13 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311123636.13415-2-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> Message-ID: <20220312155913.280739e0@windsurf> Hello, On Fri, 11 Mar 2022 13:36:30 +0100 Cl?ment L?ger wrote: > Enable host package and add needed dependencies. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index a524f729c8..4ff61c7f86 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > host-python-cffi \ > host-rustc \ > openssl > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + openssl Also, I am actually surprised this is enough. Indeed, there are some parts in Rust in python-cryptography, so we have quite some extra variables for the target packages to handle this: PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml For the last 3 variables, I can explain that it possibly worked for you because you perhaps already had the python-cryptography tarball in DL_DIR downloaded by the host variant of the package. But if you remove this tarball, and build just the host variant, I would suspect that it will fail to build. However, I can't really explain why your package works without HOST_PYTHON_CRYTOGRAPHY_ENV. Make sure to do a clean build in a Docker container that doesn't have Rust installed (there is an official Buildroot Docker image that is available for this kind of testing). Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Sat Mar 12 16:00:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:00:45 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220311082413.4bfe7465@gmx.net> References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> <20220311082413.4bfe7465@gmx.net> Message-ID: <3ce1b58b-7721-a63a-4503-11e89fd55f22@mind.be> On 11/03/2022 08:24, Peter Seiderer wrote: > Hello Arnout, > > On Thu, 10 Mar 2022 22:03:23 +0100, Arnout Vandecappelle wrote: > >> On 10/03/2022 21:38, Peter Seiderer wrote: >>> Hello John, >>> >>> thanks for the patch, some minor nitpicks... >>> >>> Better patch subject would be: >>> >>> package/openssh: add upstream patch to add seccomp ppoll_time64 support >> >> Applied to master with this changed. >> >>> >>> On Thu, 10 Mar 2022 14:03:50 +0000, John Keeping wrote: >>> >>>> sshd is broken on 32-bit systems because ppoll_time64 is used by the >>>> application although it is not allowed by the seccomp filter. >>>> >>>> Apply the upstream patch to fix this. >>> >>> Better: >>> >>> -add upstream patch ([1] to add seccomp ppoll_time64 support >> >> Since the subject now already says that it adds seccomp ppoll_time64 support, >> this is redundant. Since I'm lazy :-), I didn't change this. >> >>> >>> [1] https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch >> >> There's already a reference to the upstream commit in the patch itself, so >> this is not really needed. >> >>> >>>> >>>> Signed-off-by: John Keeping >>>> --- >>>> ...llow-ppoll_time64-in-seccomp-sandbox.patch | 31 +++++++++++++++++++ >>>> 1 file changed, 31 insertions(+) >>>> create mode 100644 package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >>>> >>>> diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >>>> new file mode 100644 >>>> index 0000000000..34b309bd9a >>>> --- /dev/null >>>> +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch >>>> @@ -0,0 +1,31 @@ >>>> +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 >>>> +From: Darren Tucker >>>> +Date: Sat, 26 Feb 2022 14:06:14 +1100 >>>> +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. >>>> + >>>> +Should fix sandbox violations on (some? at least i386 and armhf) 32bit >>>> +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at >>>> +debian.org via bz#3396. >>>> + >>> >>> Missing: >>> >>> [Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] >> >> Except for the signoff, the patch is literally the upstream patch, including >> the sha1 in the From line. So an upstream reference is not really needed. Still, >> it's useful so I overcame my laziness and added it. > > But the sha1 alone does not tell to which git repo it belongs to, but the explicit > upstream link does (and has the nice effect to gain a one-click link to the > corresponding patch/merge-request etc.) and is a prominent remainder in case > of package version bump where the patch comes from... I don't know about you, but the normal way that I generate patches is to clone the repo and do 'git format-patch -1 ', and then add my SoB. And if it doesn't apply cleanly, I first do 'git cherry-pick -x -s'. Obviously it's helpful to have a link there. However, requiring contributors to go and find the upstream web frontend and construct a URL is IMHO asking a lot, especially since chances are that no one is ever going to actually look at that link. There's already plenty of steps a contributor has to go through, I don't want to increase the threshold even more. Regards, Arnout > > Regards, > Peter > >> >> Regards, >> Arnout >> >> >>>> +Signed-off-by: John Keeping >>>> +--- >>>> + sandbox-seccomp-filter.c | 3 +++ >>>> + 1 file changed, 3 insertions(+) >>>> + >>>> +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c >>>> +index 2e065ba3..4ce80cb2 100644 >>>> +--- a/sandbox-seccomp-filter.c >>>> ++++ b/sandbox-seccomp-filter.c >>>> +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { >>>> + #ifdef __NR_ppoll >>>> + SC_ALLOW(__NR_ppoll), >>>> + #endif >>>> ++#ifdef __NR_ppoll_time64 >>>> ++ SC_ALLOW(__NR_ppoll_time64), >>>> ++#endif >>>> + #ifdef __NR_poll >>>> + SC_ALLOW(__NR_poll), >>>> + #endif >>>> +-- >>>> +2.35.1 >>>> + >>> >>> With this fixed you can add my >>> >>> Reviewed-by: Peter Seiderer >>> >>> Regards, >>> Peter >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Sat Mar 12 16:03:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:03:47 +0100 Subject: [Buildroot] error during cpio build failing to rm In-Reply-To: <20220311171325.jwcww5qb7ao5vnpy@hetzy.fluff.org> References: <20220311171325.jwcww5qb7ao5vnpy@hetzy.fluff.org> Message-ID: On 11/03/2022 18:13, Ben Dooks wrote: > I'm getting the following error with upstream buildroot: > > rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/home/ben/project/buildrot/output/build/buildroot-fs/cpio/target/tmp/..' > make: *** [fs/cpio/cpio.mk:74: /home/ben/project/buildroot/output/images/rootfs.c > > I've temprarily fixed this with: > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..6bb993663f 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/tmp/*" >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > > It looks like this was introduced in 5e78e7e97d772124f0d31653aca33731abe5b4db > > Author: Norbert Lange > Date: Sat Jun 6 00:48:57 2020 +0200 > > fs: clean the volatile /run and /tmp directories > > > Any ideas on how to fix properly? There's already a patch submitted [1]. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220310120256.GA11974 at parad0x.org/ From arnout at mind.be Sat Mar 12 16:06:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:06:57 +0100 Subject: [Buildroot] sshd: fails with seccomp issue on arm In-Reply-To: References: Message-ID: <105a4a50-cc20-9286-4121-96847904e5e6@mind.be> On 12/03/2022 05:55, Christian Stewart via buildroot wrote: > Hi all, > > Running sshd on an odroid xu4 (armv7) w/ Buildroot 2022.02: > > connections fail with seccomp errors: > > SECCOMP auid=4294967295 uid=103 gid=105 ses=4294967295 pid=1041 > comm="sshd" exe="/usr/sbin/sshd" sig=31 arch=40000028 syscall=414 > compat=0 ip=0xb6bf41b0 code=0x0 > > I found this relevant issue & patch added to gentoo to fix this: > > https://www.mail-archive.com/debian-bugs-dist at lists.debian.org/msg1844602.html > > https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc55aee6b2534bbc8d8fe12128c1083ee6850 > > Shall we include this patch in Buildroot as well? You mean [1] ? > > https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch > > I also ran into a build error with fzero-call-regs, there is a patch > to fix that too: > > https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch As in [2] ? Regards, Arnout [1] https://git.buildroot.net/buildroot/commit/?id=10c1d887d6082d8806b38b86097c212c4c3ec8f9 [2] https://patchwork.ozlabs.org/project/buildroot/patch/20220311065511.14015-1-ps.report at gmx.net/ From yann.morin.1998 at free.fr Sat Mar 12 16:19:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:19:12 +0100 Subject: [Buildroot] [PATCH v2] fs/common.mk: fix the globing pattern In-Reply-To: <20220310120256.GA11974@parad0x.org> References: <20220310101826.GA2353@parad0x.org> <20220310120256.GA11974@parad0x.org> Message-ID: <20220312161912.GF283544@scaer> Mathieu, All, On 2022-03-10 13:02 +0100, Mathieu Mirmont via buildroot spake thusly: > The FAKEROOT script uses [^x] wildcard patterns which, while supported > by many shells and interpreted like a regex, are undefined according > to POSIX. > > The dash shell (/bin/sh) on Debian testing switched to a different > fnmatch/glob implementation that does not support [^x]. Instead it > treats [^x] as either "^" or "x", and as a result buildroot fails to > build on this distro: > > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' > > The correct form should be [!x] rather than [^x]. > > Signed-off-by: Mathieu Mirmont > --- > fs/common.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..64a94d9ad8 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,7 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[!.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[!.]*" >> $$(FAKEROOT_SCRIPT) I think I preferred your find-based solution, because, as far as I understand, this is still broken, as it won't match files named, for example "..foo" The find-based solution, though, should work for everything and does not risk any issue with badly interpreted blobs in varios shells and various shell versions. Regards, Yann E. MORIN. > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > -- > 2.35.1 > Changes v1 -> v2: > - Fix the regex rather than use find|xargs (suggested by Edgar Bonet & David Laight) > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 16:24:01 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:24:01 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <3ce1b58b-7721-a63a-4503-11e89fd55f22@mind.be> References: <20220310140350.1955655-1-john@metanate.com> <20220310213840.32655ec7@gmx.net> <20220311082413.4bfe7465@gmx.net> <3ce1b58b-7721-a63a-4503-11e89fd55f22@mind.be> Message-ID: <20220312162401.GG283544@scaer> Arnout, Peter, All, On 2022-03-12 17:00 +0100, Arnout Vandecappelle spake thusly: > On 11/03/2022 08:24, Peter Seiderer wrote: > >But the sha1 alone does not tell to which git repo it belongs to, but the explicit > >upstream link does (and has the nice effect to gain a one-click link to the > >corresponding patch/merge-request etc.) and is a prominent remainder in case > >of package version bump where the patch comes from... > I don't know about you, but the normal way that I generate patches is to > clone the repo and do 'git format-patch -1 ', and then add my SoB. And > if it doesn't apply cleanly, I first do 'git cherry-pick -x -s'. Exactly what I do too, with an additional tag just before my SoB: [yann.morin.1998 at free.fr: backport from upstream] Signed-off-by: Yann E. MORIN > Obviously it's helpful to have a link there. However, requiring > contributors to go and find the upstream web frontend and construct a URL is > IMHO asking a lot, especially since chances are that no one is ever going to > actually look at that link. There's already plenty of steps a contributor > has to go through, I don't want to increase the threshold even more. I fully subscribe to Arnout's position. I only add an URL to the original patch if it was grabbed fro; a pending PR/MR/BZ/.. or a third-party tree. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 16:45:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:45:21 +0100 Subject: [Buildroot] [git commit] fs/common.mk: use find instead of shell glob patterns Message-ID: <20220312164122.04C5782A6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38c4f6b807e9b519922172089915559fb8642046 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Different shells can have different behaviours when it comes to globbing patterns. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that results in this new behaviour: Using bash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.[^.]* Using dash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.. The current FAKEROOT script uses this shell glob pattern which now fails on recent Debian testing systems: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' Additionally, the glob will miss files which have at least two leading dots, like ..foo ...bar or ......buz (highly improbable, but still). It seems safer to use `find | xargs rm` here instead of relying on shell globbing patterns. Signed-off-by: Mathieu Mirmont Signed-off-by: Yann E. MORIN --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..37eafac4f7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) From yann.morin.1998 at free.fr Sat Mar 12 16:52:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 17:52:26 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> References: <20220310101826.GA2353@parad0x.org> Message-ID: <20220312165226.GH283544@scaer> Mathieu, All, On 2022-03-10 11:18 +0100, Mathieu Mirmont via buildroot spake thusly: > Different shells can have different behaviours when it comes to > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > to a different fnmatch/glob implementation that results in this new > behaviour: > > Using bash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.[^.]* > > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. > > The current FAKEROOT script uses this shell glob pattern which now > fails on recent Debian testing systems: > > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' > > It seems safer to use `find | xargs rm` here instead of relying on > shell globbing patterns. > > Signed-off-by: Mathieu Mirmont I applied to master, after adding a little blurb about the ..foo files that would be missed with globs. > --- > fs/common.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index 45beb5ae7b..37eafac4f7 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) > > $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ > $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) > - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) > + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) > + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) That could have been a single call to find: find $$(TARGET_DIR)/run/ $$(TARGET_DIR)/tmp/ -mindepth 1 [...] but there not much loss calling it twice, and the lines are shorter, which is nicer too, so I kept it as is. Applied to master, thanks. Regards, Yann E. MORIN. > $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) > $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 16:56:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:56:18 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/intel-mediadriver: bump version to 22.2.1 In-Reply-To: <20220217183553.210835-1-bernd.kuhls@t-online.de> References: <20220217183553.210835-1-bernd.kuhls@t-online.de> Message-ID: <314366e5-64bd-57ea-284c-a21374d0bb91@mind.be> On 17/02/2022 19:35, Bernd Kuhls wrote: > Removed patch which was applied upstream: > https://github.com/intel/media-driver/commit/8eab97af6e1c41fc7b9d72999ecb1c22d9e52db6 > > Signed-off-by: Bernd Kuhls Both applied to master, thanks. Regards, Arnout > --- > ...001-Add-MEDIA-BUILD-HARDENING-option.patch | 106 ------------------ > .../intel-mediadriver/intel-mediadriver.hash | 2 +- > .../intel-mediadriver/intel-mediadriver.mk | 2 +- > 3 files changed, 2 insertions(+), 108 deletions(-) > delete mode 100644 package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch > > diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch > deleted file mode 100644 > index 968445759a..0000000000 > --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch > +++ /dev/null > @@ -1,106 +0,0 @@ > -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Wed, 11 Aug 2021 21:34:59 +0200 > -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option > - > -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening > -options such as stack-protector-all or FORTIFY SOURCE 2 which are not > -always available (e.g. fortify source 2 is only available on glibc >= 6 > -and not musl/uclibc-ng) > - > -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 > - > -Signed-off-by: Fabrice Fontaine > -Signed-off-by: Bernd Kuhls > -[Bernd: rebased for version 21.4.1] > ---- > - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- > - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- > - media_driver/media_top_cmake.cmake | 8 +++++++- > - 3 files changed, 27 insertions(+), 7 deletions(-) > - > -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt > -index 65f71ceef..b066138d9 100644 > ---- a/cmrtlib/linux/CMakeLists.txt > -+++ b/cmrtlib/linux/CMakeLists.txt > -@@ -32,12 +32,18 @@ else() > - endif() > - > - # Set up compile options that will be used for the Linux build > --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") > --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") > -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") > -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") > - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") > --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") > --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") > -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") > -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") > - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") > -+if(MEDIA_BUILD_HARDENING) > -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") > -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") > -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") > -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") > -+endif() > - if(MEDIA_BUILD_FATAL_WARNINGS) > - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") > - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") > -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake > -index 7a2bd64b6..98896b131 100755 > ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake > -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake > -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON > - # Other common flags > - -fmessage-length=0 > - -fvisibility=hidden > -- -fstack-protector > - -fdata-sections > - -ffunction-sections > - -Wl,--gc-sections > -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON > - -g > - ) > - > -+if(MEDIA_BUILD_HARDENING) > -+ set(MEDIA_COMPILER_FLAGS_COMMON > -+ ${MEDIA_COMPILER_FLAGS_COMMON} > -+ -fstack-protector) > -+endif() > - > - if(${UFO_MARCH} STREQUAL "slm") > - set(MEDIA_COMPILER_FLAGS_COMMON > -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") > - set(MEDIA_COMPILER_FLAGS_RELEASE > - ${MEDIA_COMPILER_FLAGS_RELEASE} > - -O2 > -- -D_FORTIFY_SOURCE=2 > - -fno-omit-frame-pointer > - ) > -+ if(MEDIA_BUILD_HARDENING) > -+ set(MEDIA_COMPILER_FLAGS_RELEASE > -+ ${MEDIA_COMPILER_FLAGS_RELEASE} > -+ -D_FORTIFY_SOURCE=2) > -+ endif() > - endif() > - > - if(NOT ${PLATFORM} STREQUAL "android") > -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake > -index f089ea45f..b0b428914 100755 > ---- a/media_driver/media_top_cmake.cmake > -+++ b/media_driver/media_top_cmake.cmake > -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) > - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") > - endif() > - > --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") > -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") > -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) > -+if(MEDIA_BUILD_HARDENING) > -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") > -+endif() > -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) > -+ > - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") > - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") > - > diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash > index ceafa20e80..7c615620ae 100644 > --- a/package/intel-mediadriver/intel-mediadriver.hash > +++ b/package/intel-mediadriver/intel-mediadriver.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz > +sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz > sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md > diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk > index d8820379e7..4895c1535d 100644 > --- a/package/intel-mediadriver/intel-mediadriver.mk > +++ b/package/intel-mediadriver/intel-mediadriver.mk > @@ -6,7 +6,7 @@ > > # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack > > -INTEL_MEDIADRIVER_VERSION = 22.1.1 > +INTEL_MEDIADRIVER_VERSION = 22.2.1 > INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive > INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz > INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sat Mar 12 16:58:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:58:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.12 In-Reply-To: <20220218105924.738666-1-fontaine.fabrice@gmail.com> References: <20220218105924.738666-1-fontaine.fabrice@gmail.com> Message-ID: On 18/02/2022 11:59, Fabrice Fontaine wrote: > https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/lxc/lxc.hash | 2 +- > package/lxc/lxc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash > index 2b58df2f1d..d460bc6a01 100644 > --- a/package/lxc/lxc.hash > +++ b/package/lxc/lxc.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz > +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk > index 08f64bcec7..9311dc8775 100644 > --- a/package/lxc/lxc.mk > +++ b/package/lxc/lxc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LXC_VERSION = 4.0.11 > +LXC_VERSION = 4.0.12 > LXC_SITE = https://linuxcontainers.org/downloads/lxc > LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ > LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From arnout at mind.be Sat Mar 12 16:58:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:58:43 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/tvheadend: bump version In-Reply-To: <20220217184836.418858-1-bernd.kuhls@t-online.de> References: <20220217184836.418858-1-bernd.kuhls@t-online.de> Message-ID: <994c5deb-cd52-508c-1041-a4679de3be49@mind.be> On 17/02/2022 19:48, Bernd Kuhls wrote: > Removed patch which was applied upstream: > https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > .../0002-configure-add-execinfo-option.patch | 55 ------------------- > package/tvheadend/tvheadend.hash | 2 +- > package/tvheadend/tvheadend.mk | 2 +- > 3 files changed, 2 insertions(+), 57 deletions(-) > delete mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch > > diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch > deleted file mode 100644 > index c55d127d58..0000000000 > --- a/package/tvheadend/0002-configure-add-execinfo-option.patch > +++ /dev/null > @@ -1,55 +0,0 @@ > -From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 1 Jan 2022 16:53:29 +0100 > -Subject: [PATCH] configure: add execinfo option > - > -Add execinfo option to allow the user to disable the feature even if > -execinfo.h is found on the system > - > -Signed-off-by: Fabrice Fontaine > -[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] > ---- > - configure | 17 +++++++++++++++-- > - 1 file changed, 15 insertions(+), 2 deletions(-) > - > -diff --git a/configure b/configure > -index 4dad024c4..c087502bf 100755 > ---- a/configure > -+++ b/configure > -@@ -75,6 +75,7 @@ OPTIONS=( > - "ddci:yes" > - "cclang_threadsan:no" > - "gperftools:no" > -+ "execinfo:auto" > - ) > - > - # > -@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then > - # If we don't have libunwind then fallback to execinfo. > - if ! enabled libunwind > - then > -- check_cc_header execinfo > -+ if enabled_or_auto execinfo; then > -+ if check_cc_header execinfo; then > -+ enable execinfo > -+ else > -+ die "execinfo.h not found (use --disable-execinfo)" > -+ fi > -+ fi > - fi > - > - else > -- check_cc_header execinfo > -+ if enabled_or_auto execinfo; then > -+ if check_cc_header execinfo; then > -+ enable execinfo > -+ else > -+ die "execinfo.h not found (use --disable-execinfo)" > -+ fi > -+ fi > - fi > - check_cc_option mmx > - check_cc_option sse2 > --- > -2.33.0 > - > diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash > index db06af53b7..44ff745221 100644 > --- a/package/tvheadend/tvheadend.hash > +++ b/package/tvheadend/tvheadend.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz > +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz > sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md > diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk > index 58ebdcb054..d2547b8746 100644 > --- a/package/tvheadend/tvheadend.mk > +++ b/package/tvheadend/tvheadend.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 > +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 > TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) > TVHEADEND_LICENSE = GPL-3.0+ > TVHEADEND_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 16:58:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:58:56 +0100 Subject: [Buildroot] [PATCH] package/harfbuzz: bump to version 3.4.0 In-Reply-To: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> References: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> Message-ID: <4993faaa-e51c-0f7c-6a1a-e4ca123dd1f3@mind.be> On 18/02/2022 18:36, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > package/harfbuzz/harfbuzz.hash | 2 +- > package/harfbuzz/harfbuzz.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash > index 61f2865563..e4674afa87 100644 > --- a/package/harfbuzz/harfbuzz.hash > +++ b/package/harfbuzz/harfbuzz.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz > +sha256 7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952 harfbuzz-3.4.0.tar.xz > sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING > diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk > index 1f5dfa8822..331b35c530 100644 > --- a/package/harfbuzz/harfbuzz.mk > +++ b/package/harfbuzz/harfbuzz.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HARFBUZZ_VERSION = 3.3.2 > +HARFBUZZ_VERSION = 3.4.0 > HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) > HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz > HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sat Mar 12 16:59:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:10 +0100 Subject: [Buildroot] [PATCH] package/trace-cmd: bump to version 2.9.7 In-Reply-To: <20220218173613.315794-2-giulio.benetti@benettiengineering.com> References: <20220218173613.315794-1-giulio.benetti@benettiengineering.com> <20220218173613.315794-2-giulio.benetti@benettiengineering.com> Message-ID: <9d00d702-8cb5-7738-364a-c4c4e967e88a@mind.be> On 18/02/2022 18:36, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > package/trace-cmd/trace-cmd.hash | 2 +- > package/trace-cmd/trace-cmd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash > index 00cecc7828..4d39e4d5ea 100644 > --- a/package/trace-cmd/trace-cmd.hash > +++ b/package/trace-cmd/trace-cmd.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz > +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz > sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING > sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB > sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 > diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk > index fe0cd71ec4..52bb99036c 100644 > --- a/package/trace-cmd/trace-cmd.mk > +++ b/package/trace-cmd/trace-cmd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TRACE_CMD_VERSION = 2.9.6 > +TRACE_CMD_VERSION = 2.9.7 > TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz > TRACE_CMD_SITE = \ > https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From arnout at mind.be Sat Mar 12 16:59:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:29 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kodi-pvr-zattoo: bump version to 19.7.11-Matrix In-Reply-To: <20220218190403.475643-1-bernd.kuhls@t-online.de> References: <20220218190403.475643-1-bernd.kuhls@t-online.de> Message-ID: <94f4ba32-a06a-671e-1bb5-a59a8b5587c6@mind.be> On 18/02/2022 20:04, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- > package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash > index ac4960df92..0b88d5c747 100644 > --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash > +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz > +sha256 07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 kodi-pvr-zattoo-19.7.11-Matrix.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > index 7a3b230e8b..95c5de0925 100644 > --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix > +KODI_PVR_ZATTOO_VERSION = 19.7.11-Matrix > KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) > KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ > KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 16:59:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump to version 2.20.0 In-Reply-To: <20220218211458.197332-1-egorenar@linux.ibm.com> References: <20220218211458.197332-1-egorenar@linux.ibm.com> Message-ID: <60962d31-05a8-5f8b-c3cd-e149d81a2eb3@mind.be> On 18/02/2022 22:14, Alexander Egorenkov wrote: > Fixes: > - https://release-monitoring.org/project/10714/ > > Signed-off-by: Alexander Egorenkov Applied to master, thanks. Regards, Arnout > --- > package/s390-tools/s390-tools.hash | 2 +- > package/s390-tools/s390-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash > index 13c68fbf52f4..6ea8f7ea2076 100644 > --- a/package/s390-tools/s390-tools.hash > +++ b/package/s390-tools/s390-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz > +sha256 6fa6add92e896541c0ef74885a4084474fc0d77049e8ac7372872a70a46ddd74 s390-tools-2.20.0.tar.gz > sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE > diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk > index 328986bcb37c..3c386af6fd10 100644 > --- a/package/s390-tools/s390-tools.mk > +++ b/package/s390-tools/s390-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -S390_TOOLS_VERSION = 2.19.0 > +S390_TOOLS_VERSION = 2.20.0 > S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) > S390_TOOLS_LICENSE = MIT > S390_TOOLS_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 16:59:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 17:59:58 +0100 Subject: [Buildroot] [PATCH] package/libxcrypt: bump to version 4.4.28 In-Reply-To: <20220219102309.15465-1-guillaume.bressaix@gmail.com> References: <20220219102309.15465-1-guillaume.bressaix@gmail.com> Message-ID: <32c388f8-e0af-3d4e-f370-1d9dece6c1ae@mind.be> On 19/02/2022 11:23, Guillaume W. Bres wrote: > Signed-off-by: Guillaume W. Bres Applied to master, thanks. Regards, Arnout > --- > package/libxcrypt/libxcrypt.hash | 2 +- > package/libxcrypt/libxcrypt.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash > index 99ddf62be0..bdda6b47c0 100644 > --- a/package/libxcrypt/libxcrypt.hash > +++ b/package/libxcrypt/libxcrypt.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz > +sha256 db7e37901969cb1d1e8020cb73a991ef81e48e31ea5b76a101862c806426b457 libxcrypt-4.4.28.tar.gz > sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk > index 65efa2bab9..f7a0fd4308 100644 > --- a/package/libxcrypt/libxcrypt.mk > +++ b/package/libxcrypt/libxcrypt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBXCRYPT_VERSION = 4.4.27 > +LIBXCRYPT_VERSION = 4.4.28 > LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) > LIBXCRYPT_LICENSE = LGPL-2.1+ > LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From arnout at mind.be Sat Mar 12 17:00:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:00:14 +0100 Subject: [Buildroot] [PATCH] package/libnids: bump version to 1.26 In-Reply-To: <20220219103507.29176-1-guillaume.bressaix@gmail.com> References: <20220219103507.29176-1-guillaume.bressaix@gmail.com> Message-ID: <22bed9cc-6ba8-f83c-f7c3-7a538f7f65eb@mind.be> On 19/02/2022 11:35, Guillaume W. Bres wrote: > Change repo source to official github.com repository which > is actively maintained. Previous sourceforge.net sources > remained untouched since 2010. > > Signed-off-by: Guillaume W. Bres Applied to master, thanks. Regards, Arnout > --- > package/libnids/libnids.hash | 4 ++-- > package/libnids/libnids.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash > index 4a2949c39d..e51dbf151c 100644 > --- a/package/libnids/libnids.hash > +++ b/package/libnids/libnids.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz > -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING > +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz > +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING > diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk > index 3e36838c40..57e68654dc 100644 > --- a/package/libnids/libnids.mk > +++ b/package/libnids/libnids.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBNIDS_VERSION = 1.24 > -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) > +LIBNIDS_VERSION = 1.26 > +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION),$(LIBNIDS_VERSION).tar.gz) > LIBNIDS_LICENSE = GPL-2.0 > LIBNIDS_LICENSE_FILES = COPYING > LIBNIDS_CPE_ID_VENDOR = libnids_project From arnout at mind.be Sat Mar 12 17:00:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:00:37 +0100 Subject: [Buildroot] [PATCH/next] package/grpc: bump to version 1.44.0 In-Reply-To: <20220221082724.2744765-1-buildroot@heine.tech> References: <20220221082724.2744765-1-buildroot@heine.tech> Message-ID: <81d17b09-3922-0e8c-6acf-a36432dc382e@mind.be> On 21/02/2022 09:27, Michael Nosthoff via buildroot wrote: > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Arnout > --- > package/grpc/grpc.hash | 2 +- > package/grpc/grpc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash > index 3da1d9a323..6db2acd759 100644 > --- a/package/grpc/grpc.hash > +++ b/package/grpc/grpc.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz > +sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz > sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index 5d8201f12f..23b92f1750 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GRPC_VERSION = 1.43.0 > +GRPC_VERSION = 1.44.0 > GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) > GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) > GRPC_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sat Mar 12 17:00:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:00:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312104402.33075-2-thomas@ruschival.de> References: <20220312104402.33075-1-thomas@ruschival.de> <20220312104402.33075-2-thomas@ruschival.de> Message-ID: <20220312170048.GI283544@scaer> Thomas, All, On 2022-03-12 11:44 +0100, Thomas Ruschival spake thusly: > While upstream pistache has not yet released a stable 'tag' > a lot has changed since June 2020: > > * project has moved to meson build system, cmake builds > do not install headers. > * patches in buildroot are no longer required > * project-implemented Pistache::Optional was replaced by > use of std::optional. This is only available in C++17 > * dependency to rapidjson has been introduced > > Signed-off-by: Thomas Ruschival I've marked this patch as chagnes-requested: Nicolas explained what you need to do to pass the test-pkg step. Can you look into that, test on your side, and respin an updated patch? Thanks! Regards, Yann E. MORIN. > --- > ...-add-C-language-to-project-statement.patch | 70 -------------- > ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- > ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- > package/pistache/Config.in | 9 +- > package/pistache/pistache.hash | 2 +- > package/pistache/pistache.mk | 9 +- > 6 files changed, 11 insertions(+), 212 deletions(-) > delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > > diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > deleted file mode 100644 > index c393a48d0d..0000000000 > --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > +++ /dev/null > @@ -1,70 +0,0 @@ > -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 16 Aug 2020 12:31:46 +0200 > -Subject: [PATCH] CMakeLists.txt: add C language to project statement > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -This will fix the detection of atomic: > - > --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB > --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed > --- Looking for __atomic_load_8 in atomic > --- Looking for __atomic_load_8 in atomic - not found > -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): > - Host compiler appears to require libatomic for 64-bit operations, but > - cannot find it. > -Call Stack (most recent call first): > - CMakeLists.txt:19 (include) > - > -Indeed if C language is not enabled, the test will be run with the C++ > -compiler resulting in the following error: > - > -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o > -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx > -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] > -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' > - CHECK_FUNCTION_EXISTS(void); > - ^~~~~~~~~~~~~~~~~~~~~ > -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': > -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' > - CHECK_FUNCTION_EXISTS(); > - ^ > - > -whereas with a C compiler, we'll get: > - > -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o > -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c > -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] > -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? > - CHECK_FUNCTION_EXISTS(void); > - ^~~~~~~~~~~~~~~~~~~~~ > -Linking C executable cmTC_4b0f4 > -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 > -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic > - > -Fixes: > - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 > - > -Signed-off-by: Fabrice Fontaine > ---- > - CMakeLists.txt | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index edc73c5..0286647 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) > - set(CMAKE_CXX_EXTENSIONS OFF) > - > - project (pistache > -- LANGUAGES CXX) > -+ LANGUAGES C CXX) > - > - include(GNUInstallDirs) > - > --- > -2.27.0 > - > diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > deleted file mode 100644 > index 09f59b11ec..0000000000 > --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > +++ /dev/null > @@ -1,95 +0,0 @@ > -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 15 Oct 2020 22:26:55 +0200 > -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS > - > -Don't build and install pistache_shared if the standard cmake > -BUILD_SHARED_LIBS is set to OFF > - > -Signed-off-by: Fabrice Fontaine > -[Backport from upstream: > - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 > -] > ---- > - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ > - 1 file changed, 25 insertions(+), 18 deletions(-) > - > -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > -index 6521b20..c5b049f 100644 > ---- a/src/CMakeLists.txt > -+++ b/src/CMakeLists.txt > -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) > - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) > - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) > - > --add_library(pistache_shared SHARED $) > --add_library(pistache_static STATIC $) > -+if (BUILD_SHARED_LIBS) > -+ add_library(pistache_shared SHARED $) > -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) > -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) > -+endif () > - > --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) > -+add_library(pistache_static STATIC $) > - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) > -- > --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) > - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) > - > - if (PISTACHE_USE_SSL) > - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) > -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) > - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) > - > - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) > -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) > - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) > -+ if (BUILD_SHARED_LIBS) > -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) > -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) > -+ endif () > - endif () > - > - set(Pistache_OUTPUT_NAME "pistache") > --set_target_properties(pistache_shared PROPERTIES > -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} > -- VERSION ${version} > -- SOVERSION ${VERSION_MAJOR} > --) > -+if (BUILD_SHARED_LIBS) > -+ set_target_properties(pistache_shared PROPERTIES > -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} > -+ VERSION ${version} > -+ SOVERSION ${VERSION_MAJOR} > -+ ) > -+endif () > - > - set_target_properties(pistache_static PROPERTIES > - OUTPUT_NAME ${Pistache_OUTPUT_NAME} > -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) > - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") > - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") > - > -- install( > -- TARGETS pistache_shared > -- EXPORT PistacheTargets > -- ARCHIVE DESTINATION ${lib_install_dir} > -- LIBRARY DESTINATION ${lib_install_dir} > -- RUNTIME DESTINATION ${bin_install_dir} > -- INCLUDES DESTINATION ${include_install_dir}) > -+ if (BUILD_SHARED_LIBS) > -+ install( > -+ TARGETS pistache_shared > -+ EXPORT PistacheTargets > -+ ARCHIVE DESTINATION ${lib_install_dir} > -+ LIBRARY DESTINATION ${lib_install_dir} > -+ RUNTIME DESTINATION ${bin_install_dir} > -+ INCLUDES DESTINATION ${include_install_dir}) > -+ endif() > - > - install( > - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" > --- > -2.28.0 > - > diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > deleted file mode 100644 > index be06ca760a..0000000000 > --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 5 Aug 2021 19:02:56 +0200 > -Subject: [PATCH] include/pistache/typeid.h: include cstddef > - > -Include cstddef to avoid the following build failure with gcc 11: > - > -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, > - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, > - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: > -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' > - 26 | operator size_t() const { return reinterpret_cast(id_); } > - | ^~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/pistacheio/pistache/pull/965] > ---- > - include/pistache/typeid.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h > -index 10353ca..893e7c1 100644 > ---- a/include/pistache/typeid.h > -+++ b/include/pistache/typeid.h > -@@ -7,6 +7,7 @@ > - > - #pragma once > - > -+#include > - #include > - > - namespace Pistache > --- > -2.30.2 > - > diff --git a/package/pistache/Config.in b/package/pistache/Config.in > index 96aed5210a..806c27077a 100644 > --- a/package/pistache/Config.in > +++ b/package/pistache/Config.in > @@ -1,22 +1,23 @@ > config BR2_PACKAGE_PISTACHE > bool "pistache" > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_RAPIDJSON > depends on !BR2_TOOLCHAIN_USES_UCLIBC > depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > help > Pistache is a modern and elegant HTTP and REST framework > - for C++. It is entirely written in pure C++14 and provides > + for C++. It is entirely written in pure C++17 and provides > a clear and pleasant API. > > https://github.com/oktal/pistache > > -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" > +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" > depends on !BR2_INSTALL_LIBSTDCPP || \ > BR2_TOOLCHAIN_USES_UCLIBC || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ > !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_USE_WCHAR || \ > BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash > index 5079387eb7..9a2cd1d1f9 100644 > --- a/package/pistache/pistache.hash > +++ b/package/pistache/pistache.hash > @@ -1,3 +1,3 @@ > #locally computed > -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz > +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz > sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE > diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk > index 4d6bd283ea..0f49ad12db 100644 > --- a/package/pistache/pistache.mk > +++ b/package/pistache/pistache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d > +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 > PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) > PISTACHE_LICENSE = Apache-2.0 > PISTACHE_LICENSE_FILES = LICENSE > @@ -13,9 +13,10 @@ PISTACHE_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > PISTACHE_DEPENDENCIES += openssl > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true > +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false > else > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false > endif > > -$(eval $(cmake-package)) > +$(eval $(meson-package)) > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 17:02:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:07 +0100 Subject: [Buildroot] [PATCH] package/qt5: enable for ARC In-Reply-To: <20220221140628.2295-1-abrodkin@synopsys.com> References: <20220221140628.2295-1-abrodkin@synopsys.com> Message-ID: <84862d80-ff12-8e92-e3d7-a0ee1a44485d@mind.be> On 21/02/2022 15:06, Alexey Brodkin via buildroot wrote: > Double-conversion got pulled-in Qt's sources from the upstream project > quite some time ago [1], so now Qt5 is buildable for ARC perfectly fine. > > This reverts the last part of [2], > commit e453fb9e3280 (qt5: disable qt-5.8.0 support for arc, nios2 and xtensa). > > [1] https://invent.kde.org/qt/qt/qtbase/-/commit/425df43d7fed19866fc7ceb3d26b6cc4190523f5 > [2] https://git.buildroot.net/buildroot/commit/?id=e453fb9e3280a1a1ce6180e165aab9c4f1642555 > > Signed-off-by: Alexey Brodkin > Cc: Thomas Petazzoni > Cc: Peter Seiderer Applied to master, thanks. There may be some qt5 packages that still don't build on ARC, but I guess the autobuilders will tell us. Also without JS support, half of qt5 is still not available... Regards, Arnout > --- > package/qt5/Config.in | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 8557fd1000..cbb2e06a21 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -13,7 +13,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > > comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" > depends on !BR2_ARM_CPU_ARMV4 > - depends on !BR2_arc > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ > !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 > depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 > depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ > - # no built-in double-conversion support > - depends on !BR2_arc > depends on !BR2_STATIC_LIBS > select BR2_PACKAGE_QT5BASE > help From arnout at mind.be Sat Mar 12 17:02:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:24 +0100 Subject: [Buildroot] [PATCH] package/apparmor: bump to version 3.0.4 In-Reply-To: <20220221153151.1780107-1-angelo@amarulasolutions.com> References: <20220221153151.1780107-1-angelo@amarulasolutions.com> Message-ID: On 21/02/2022 16:31, Angelo Compagnucci wrote: > Updating also the companion libapparmor library and removing upstreamed > patch. > > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/apparmor/apparmor.hash | 2 +- > package/apparmor/apparmor.mk | 2 +- > ...deprecated-distutils-with-setuptools.patch | 244 ------------------ > package/libapparmor/libapparmor.hash | 2 +- > package/libapparmor/libapparmor.mk | 2 +- > 5 files changed, 4 insertions(+), 248 deletions(-) > delete mode 100644 package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > > diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash > index 88280cbfcf..497491b6c9 100644 > --- a/package/apparmor/apparmor.hash > +++ b/package/apparmor/apparmor.hash > @@ -1,5 +1,5 @@ > # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace > -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz > +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz > > # locally computed > sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE > diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk > index 43bfa05308..76c9f2cafe 100644 > --- a/package/apparmor/apparmor.mk > +++ b/package/apparmor/apparmor.mk > @@ -6,7 +6,7 @@ > > # When updating the version here, please also update the libapparmor package > APPARMOR_VERSION_MAJOR = 3.0 > -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 > +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 > APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download > APPARMOR_DL_SUBDIR = libapparmor > APPARMOR_LICENSE = GPL-2.0 > diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > deleted file mode 100644 > index 5aed31d0b5..0000000000 > --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch > +++ /dev/null > @@ -1,244 +0,0 @@ > -From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 > -From: Georgia Garcia > -Date: Wed, 10 Nov 2021 19:50:35 +0000 > -Subject: [PATCH] replace deprecated distutils with setuptools > - > -Adds python3 setuptools as a build dependency for libapparmor > - > -Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 > -MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 > -Signed-off-by: Georgia Garcia > -Acked-by: Christian Boltz > - > -[Retrieved (and updated to remove changes on .gitlab-ci.yml and > -README.md) from: > -https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] > -Signed-off-by: Fabrice Fontaine > ---- > - .gitignore | 3 ++ > - .gitlab-ci.yml | 2 +- > - libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- > - libraries/libapparmor/swig/python/Makefile.am | 2 +- > - libraries/libapparmor/swig/python/setup.py.in | 2 +- > - .../libapparmor/swig/python/test/Makefile.am | 2 +- > - profiles/Makefile | 2 +- > - utils/Makefile | 1 + > - utils/python-tools-setup.py | 6 ++-- > - utils/test/Makefile | 2 +- > - utils/test/README.md | 2 +- > - 11 files changed, 32 insertions(+), 28 deletions(-) > - > -diff --git a/.gitignore b/.gitignore > -index 78a06fdf9..4782a351a 100644 > ---- a/.gitignore > -+++ b/.gitignore > -@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c > - libraries/libapparmor/swig/perl/libapparmor_wrap.o > - libraries/libapparmor/swig/perl/pm_to_blib > - libraries/libapparmor/swig/python/LibAppArmor.py > -+libraries/libapparmor/swig/python/LibAppArmor.egg-info/ > - libraries/libapparmor/swig/python/build/ > - libraries/libapparmor/swig/python/libapparmor_wrap.c > - libraries/libapparmor/swig/python/Makefile > -@@ -204,6 +205,8 @@ utils/*.tmp > - utils/po/*.mo > - utils/apparmor/*.pyc > - utils/apparmor/rule/*.pyc > -+utils/apparmor.egg-info/ > -+utils/build/ > - utils/htmlcov/ > - utils/test/common_test.pyc > - utils/test/.coverage > -diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 > -index 1da29d873..f21f70ce7 100644 > ---- a/libraries/libapparmor/m4/ac_python_devel.m4 > -+++ b/libraries/libapparmor/m4/ac_python_devel.m4 > -@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. > - fi > - > - # > -- # Check if you have distutils, else fail > -+ # Check if you have setuptools, else fail > - # > -- AC_MSG_CHECKING([for the distutils Python package]) > -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` > -- if test -z "$ac_distutils_result"; then > -+ AC_MSG_CHECKING([for the setuptools Python package]) > -+ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` > -+ if test -z "$ac_setuptools_result"; then > - AC_MSG_RESULT([yes]) > - else > - AC_MSG_RESULT([no]) > -- AC_MSG_ERROR([cannot import Python module "distutils". > -+ AC_MSG_ERROR([cannot import Python module "setuptools". > - Please check your Python installation. The error was: > --$ac_distutils_result]) > -+$ac_setuptools_result]) > - PYTHON_VERSION="" > - fi > - > -@@ -88,8 +88,8 @@ $ac_distutils_result]) > - PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` > - fi > - if test -z "$PYTHON_CPPFLAGS"; then > -- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ > --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` > -+ python_path=`$PYTHON -c "import sys; import sysconfig;\ > -+sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` > - if test -n "${python_path}"; then > - python_path="-I$python_path" > - fi > -@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` > - if test -z "$PYTHON_LDFLAGS"; then > - # (makes two attempts to ensure we've got a version number > - # from the interpreter) > -- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ > --sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` > -+ py_version=`$PYTHON -c "import sys; import sysconfig; \ > -+sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` > - if test "$py_version" == "[None]"; then > - if test -n "$PYTHON_VERSION"; then > - py_version=$PYTHON_VERSION > -@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` > - fi > - fi > - > -- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ > --sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ > -+ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ > -+sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ > - "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` > - fi > - AC_MSG_RESULT([$PYTHON_LDFLAGS]) > -@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO > - # > - AC_MSG_CHECKING([for Python site-packages path]) > - if test -z "$PYTHON_SITE_PKG"; then > -- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ > --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` > -+ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ > -+sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` > - fi > - AC_MSG_RESULT([$PYTHON_SITE_PKG]) > - AC_SUBST([PYTHON_SITE_PKG]) > -@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` > - PYTHON_EXTRA_LIBS='' > - fi > - if test -z "$PYTHON_EXTRA_LIBS"; then > -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ > --conf = distutils.sysconfig.get_config_var; \ > -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ > -+conf = sysconfig.get_config_var; \ > - sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` > - fi > - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) > -@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( > - PYTHON_EXTRA_LDFLAGS='' > - fi > - if test -z "$PYTHON_EXTRA_LDFLAGS"; then > -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ > --conf = distutils.sysconfig.get_config_var; \ > -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ > -+conf = sysconfig.get_config_var; \ > - sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` > - fi > - AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) > -diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am > -index 04edff003..bf05fe0fc 100644 > ---- a/libraries/libapparmor/swig/python/Makefile.am > -+++ b/libraries/libapparmor/swig/python/Makefile.am > -@@ -21,7 +21,7 @@ install-exec-local: > - > - clean-local: > - if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi > -- rm -rf build > -+ rm -rf build LibAppArmor.egg-info > - if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi > - > - endif > -diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in > -index 32abd46b2..b23e40746 100644 > ---- a/libraries/libapparmor/swig/python/setup.py.in > -+++ b/libraries/libapparmor/swig/python/setup.py.in > -@@ -1,4 +1,4 @@ > --from distutils.core import setup, Extension > -+from setuptools import setup, Extension > - import string > - > - setup(name = 'LibAppArmor', > -diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am > -index 7287819c9..9dccfdef6 100644 > ---- a/libraries/libapparmor/swig/python/test/Makefile.am > -+++ b/libraries/libapparmor/swig/python/test/Makefile.am > -@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status > - CLEANFILES = test_python.py > - > - # bah, how brittle is this? > --PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' > -+PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' > - > - TESTS = test_python.py > - TESTS_ENVIRONMENT = \ > -diff --git a/profiles/Makefile b/profiles/Makefile > -index c471e58e8..0b7f2655d 100644 > ---- a/profiles/Makefile > -+++ b/profiles/Makefile > -@@ -41,7 +41,7 @@ ifdef USE_SYSTEM > - LOGPROF?=aa-logprof > - else > - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am > -- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") > -+ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") > - LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ > - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) > - PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) > -diff --git a/utils/Makefile b/utils/Makefile > -index 1f08f259a..91a15107b 100644 > ---- a/utils/Makefile > -+++ b/utils/Makefile > -@@ -72,6 +72,7 @@ clean: pod_clean > - rm -rf staging/ build/ > - rm -f apparmor/*.pyc apparmor/rule/*.pyc > - rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ > -+ rm -rf apparmor.egg-info/ > - > - # ${CAPABILITIES} is defined in common/Make.rules > - .PHONY: check_severity_db > -diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py > -index 30ce0cb05..2cbde8fc1 100644 > ---- a/utils/python-tools-setup.py > -+++ b/utils/python-tools-setup.py > -@@ -20,14 +20,14 @@ > - # Note: --version=... must be the last argument to this script > - # > - > --from distutils.command.install import install as _install > --from distutils.core import setup > -+from setuptools.command.install import install as _install > -+from setuptools import setup > - import os > - import shutil > - import sys > - > - class Install(_install, object): > -- '''Override distutils to install the files where we want them.''' > -+ '''Override setuptools to install the files where we want them.''' > - def run(self): > - # Now byte-compile everything > - super(Install, self).run() > -diff --git a/utils/test/Makefile b/utils/test/Makefile > -index 90354aa50..9126bdd71 100644 > ---- a/utils/test/Makefile > -+++ b/utils/test/Makefile > -@@ -32,7 +32,7 @@ ifdef USE_SYSTEM > - PARSER= > - else > - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am > -- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") > -+ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") > - LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ > - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) > - PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) > --- > -GitLab > - > diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash > index 6a19aef77a..9fbfe3b92e 100644 > --- a/package/libapparmor/libapparmor.hash > +++ b/package/libapparmor/libapparmor.hash > @@ -1,5 +1,5 @@ > # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace > -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz > +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz > > # locally computed > sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE > diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk > index 7bb849ab94..fcd3a4389b 100644 > --- a/package/libapparmor/libapparmor.mk > +++ b/package/libapparmor/libapparmor.mk > @@ -6,7 +6,7 @@ > > # When updating the version here, please also update the apparmor package > LIBAPPARMOR_VERSION_MAJOR = 3.0 > -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 > +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 > LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz > LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download > LIBAPPARMOR_LICENSE = LGPL-2.1 From arnout at mind.be Sat Mar 12 17:02:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqmi: bump version to 1.30.4 In-Reply-To: <20220221192126.30231-1-petr.vorel@gmail.com> References: <20220221192126.30231-1-petr.vorel@gmail.com> Message-ID: On 21/02/2022 20:21, Petr Vorel wrote: > Remove 0001-build-add-an-option-to-not-build-man-pages.patch > as release contains very similar commit which does autodetection: > 1a474db ("build: add an option to not build man pages") > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Arnout > --- > Tested: > > > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > > andes-nds32 [ 1/45]: FAILED (not related to this change) > arm-aarch64 [ 2/45]: OK > bootlin-aarch64-glibc [ 3/45]: OK > bootlin-arcle-hs38-uclibc [ 4/45]: OK > bootlin-armv5-uclibc [ 5/45]: OK > bootlin-armv7-glibc [ 6/45]: OK > bootlin-armv7m-uclibc [ 7/45]: SKIPPED > bootlin-armv7-musl [ 8/45]: OK > bootlin-microblazeel-uclibc [ 9/45]: OK > bootlin-mipsel-uclibc [10/45]: OK > bootlin-mipsel32r6-glibc [11/45]: OK > bootlin-m68k-5208-uclibc [12/45]: SKIPPED > bootlin-m68k-68040-uclibc [13/45]: OK > bootlin-nios2-glibc [14/45]: OK > bootlin-openrisc-uclibc [15/45]: OK > bootlin-powerpc-e500mc-uclibc [16/45]: OK > bootlin-powerpc64le-power8-glibc [17/45]: OK > bootlin-riscv32-glibc [18/45]: OK > bootlin-riscv64-glibc [19/45]: OK > bootlin-riscv64-musl [20/45]: OK > bootlin-sh4-uclibc [21/45]: OK > bootlin-sparc-uclibc [22/45]: OK > bootlin-sparc64-glibc [23/45]: OK > bootlin-xtensa-uclibc [24/45]: OK > bootlin-x86-64-glibc [25/45]: OK > bootlin-x86-64-musl [26/45]: OK > bootlin-x86-64-uclibc [27/45]: OK > br-arm-basic [28/45]: SKIPPED > br-arm-full-nothread [29/45]: SKIPPED > br-arm-full-static [30/45]: OK > br-i386-pentium-mmx-musl [31/45]: OK > br-i386-pentium4-full [32/45]: OK > br-mips64-n64-full [33/45]: OK > br-mips64r6-el-hf-glibc [34/45]: OK > br-powerpc-603e-basic-cpp [35/45]: SKIPPED > br-powerpc64-power7-glibc [36/45]: OK > linaro-aarch64-be [37/45]: OK > linaro-aarch64 [38/45]: OK > linaro-arm [39/45]: OK > sourcery-arm-armv4t [40/45]: OK > sourcery-arm [41/45]: OK > sourcery-arm-thumb2 [42/45]: OK > sourcery-mips [43/45]: OK > sourcery-mips64 [44/45]: OK > sourcery-nios2 [45/45]: OK > > ...add-an-option-to-not-build-man-pages.patch | 65 ------------------- > package/libqmi/libqmi.hash | 2 +- > package/libqmi/libqmi.mk | 2 +- > 3 files changed, 2 insertions(+), 67 deletions(-) > delete mode 100644 package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch > > diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch > deleted file mode 100644 > index d9053de537..0000000000 > --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch > +++ /dev/null > @@ -1,65 +0,0 @@ > -From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 > -From: Aleksander Morgado > -Date: Wed, 3 Nov 2021 10:57:51 +0100 > -Subject: [PATCH] build: add an option to not build man pages > - > -When cross-compiling, the compiled binaries cannot be run on the build > -machine, unless one defines a helper (e.g. qemu) in the meson > -configuration, which is most of the time undesirable. > - > -If help2man is installed on the build machine, then the build would fail > -because of this, so add an option to disable generating the man pages. > - > -With later versions of meson, it will be possible to automatically > -detect this condition. > - > -Based on the same fix done in libmbim by Nicolas Cavallari, see > -https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 > - > -Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 > - > -[Retrieved (and backported) from: > -https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] > -Signed-off-by: Fabrice Fontaine > ---- > - meson.build | 8 +++++++- > - meson_options.txt | 1 + > - 2 files changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index e88b43a1..c7312146 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -223,8 +223,8 @@ if enable_gtk_doc > - subdir('docs/reference/libqmi-glib') > - endif > - > --help2man = find_program('help2man', required: false) > --if help2man.found() > -+enable_man = get_option('man') > -+if enable_man > - subdir('docs/man') > - endif > - > -@@ -237,6 +242,7 @@ summary({ > - output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' > - output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' > - output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' > -+output += ' man pages: ' + enable_man.to_string() + '\n\n' > - output += ' System paths\n' > - output += ' prefix: ' + qmi_prefix + '\n' > - output += ' udev base directory: ' + qmi_username + '\n\n' > -diff --git a/meson_options.txt b/meson_options.txt > -index 4d4f913d..bee5daac 100644 > ---- a/meson_options.txt > -+++ b/meson_options.txt > -@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc > - > - option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') > - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') > -+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') > - > - option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') > --- > -GitLab > - > diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash > index 1f2da45ac0..ef2da77a2a 100644 > --- a/package/libqmi/libqmi.hash > +++ b/package/libqmi/libqmi.hash > @@ -1,4 +1,4 @@ > # Locally computed: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz > +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz > diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk > index a4839f1efb..b33e2fdc47 100644 > --- a/package/libqmi/libqmi.mk > +++ b/package/libqmi/libqmi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBQMI_VERSION = 1.30.2 > +LIBQMI_VERSION = 1.30.4 > LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) > LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) > LIBQMI_LICENSE_FILES = COPYING COPYING.LIB From arnout at mind.be Sat Mar 12 17:02:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:02:55 +0100 Subject: [Buildroot] [PATCH v1] package/libinput: bump version to 1.20.0 In-Reply-To: <20220221213933.457-1-ps.report@gmx.net> References: <20220221213933.457-1-ps.report@gmx.net> Message-ID: <8ab5efb5-23c6-7feb-9a74-25b646b49f61@mind.be> On 21/02/2022 22:39, Peter Seiderer wrote: > - change site URL to new gitlab.freedesktop.org location > - change hash from upstream provided to locally computed (and drop sha512) > > For details see [1] and [2]. > > [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042111.html > [2] https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/libinput/libinput.hash | 5 ++--- > package/libinput/libinput.mk | 6 +++--- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash > index f18a727810..d1c7cfb104 100644 > --- a/package/libinput/libinput.hash > +++ b/package/libinput/libinput.hash > @@ -1,6 +1,5 @@ > -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html > -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz > -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz > +# Locally computed > +sha256 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85 libinput-1.20.0.tar.bz2 > > # License files > sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING > diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk > index 2f9c639c22..b814e3416d 100644 > --- a/package/libinput/libinput.mk > +++ b/package/libinput/libinput.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -LIBINPUT_VERSION = 1.19.3 > -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz > -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput > +LIBINPUT_VERSION = 1.20.0 > +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 > +LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) > LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev > LIBINPUT_INSTALL_STAGING = YES > LIBINPUT_LICENSE = MIT From yann.morin.1998 at free.fr Sat Mar 12 17:03:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:03:13 +0100 Subject: [Buildroot] [git commit] package/pkg-python: apply host platform and project base to pep517 env Message-ID: <20220312165446.C81AE82A94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f4ea8c95a3e3d6b74276884cfdae51cc8b81857 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The _PYTHON_HOST_PLATFORM and _PYTHON_PROJECT_BASE variables should also be set for pep517 builds as they are not setuptools/distutils specific. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index f031bc8fae..52ce402281 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -113,6 +113,8 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ From arnout at mind.be Sat Mar 12 17:03:22 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:03:22 +0100 Subject: [Buildroot] [PATCH] package/cups: bump to version 2.4.1 In-Reply-To: <20220222094913.2217366-1-angelo@amarulasolutions.com> References: <20220222094913.2217366-1-angelo@amarulasolutions.com> Message-ID: On 22/02/2022 10:49, Angelo Compagnucci wrote: > NOTICE hash is changed due to a copyright year update. > > Signed-off-by: Angelo Compagnucci ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/cups/cups.hash | 4 ++-- > package/cups/cups.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/cups/cups.hash b/package/cups/cups.hash > index b0e3654b3d..8308b7b803 100644 > --- a/package/cups/cups.hash > +++ b/package/cups/cups.hash > @@ -1,4 +1,4 @@ > # Locally calculated: > -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz > +sha256 c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 cups-2.4.1-source.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE > +sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE > diff --git a/package/cups/cups.mk b/package/cups/cups.mk > index e406d3bc64..298a6ed879 100644 > --- a/package/cups/cups.mk > +++ b/package/cups/cups.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CUPS_VERSION = 2.4.0 > +CUPS_VERSION = 2.4.1 > CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz > CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) > CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From yann.morin.1998 at free.fr Sat Mar 12 17:03:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:03:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-python: apply host platform and project base to pep517 env In-Reply-To: <20220311192726.3879992-1-james.hilliard1@gmail.com> References: <20220311192726.3879992-1-james.hilliard1@gmail.com> Message-ID: <20220312170346.GJ283544@scaer> Kames, All, On 2022-03-11 12:27 -0700, James Hilliard spake thusly: > The _PYTHON_HOST_PLATFORM and _PYTHON_PROJECT_BASE variables should > also be set for pep517 builds as they are not setuptools/distutils > specific. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-python.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index f031bc8fae..52ce402281 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -113,6 +113,8 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > > # Target pep517-based packages > PKG_PYTHON_PEP517_ENV = \ > + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ > + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ > _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ > PATH=$(BR_PATH) \ > $(TARGET_CONFIGURE_OPTS) \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 17:04:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:04:06 +0100 Subject: [Buildroot] [PATCH] package/cups-filters: bump to version 1.28.12 In-Reply-To: <20220222094923.2220294-1-angelo@amarulasolutions.com> References: <20220222094923.2220294-1-angelo@amarulasolutions.com> Message-ID: <51ad5bc3-69eb-6a65-3649-7e8bfe44c828@mind.be> On 22/02/2022 10:49, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. I also updated the hash file to use two spaces (check-package). Regards, Arnout > --- > package/cups-filters/cups-filters.hash | 2 +- > package/cups-filters/cups-filters.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash > index aefb67f651..5a95b998eb 100644 > --- a/package/cups-filters/cups-filters.hash > +++ b/package/cups-filters/cups-filters.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz > +sha256 3265017d2369e1130e732090165d6b4e3c0838d7ca9aa60978b087bee12247ff cups-filters-1.28.12.tar.gz > sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING > diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk > index c8f2dd0aae..f8ff42f0f4 100644 > --- a/package/cups-filters/cups-filters.mk > +++ b/package/cups-filters/cups-filters.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CUPS_FILTERS_VERSION = 1.28.10 > +CUPS_FILTERS_VERSION = 1.28.12 > CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters > CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause > CUPS_FILTERS_LICENSE_FILES = COPYING From arnout at mind.be Sat Mar 12 17:04:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:04:40 +0100 Subject: [Buildroot] [PATCH next v2 1/1] package/libgit2: bump version to 1.4.2 In-Reply-To: <20220228085659.17489-1-nicolas.cavallari@green-communications.fr> References: <20220222095340.29327-1-nicolas.cavallari@green-communications.fr> <20220228085659.17489-1-nicolas.cavallari@green-communications.fr> Message-ID: <6fe83bfc-c320-5f51-00af-dad3119a3fc6@mind.be> On 28/02/2022 09:57, Nicolas Cavallari wrote: > Licence changes mostly concern vendored dependencies (that buildroot does > not use) and a new bundled PRNG used to reimplement mkstemp() > > Some buildsystem options also changed: > - THREADSAFE is now USE_THREADS > - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. > > Signed-off-by: Nicolas Cavallari Applied to master, thanks. Thanks for the excellent commit message. Regards, Arnout > --- > package/libgit2/libgit2.hash | 4 ++-- > package/libgit2/libgit2.mk | 7 +++---- > 2 files changed, 5 insertions(+), 6 deletions(-) > > v2: bump to 1.4.2 instead of 1.4.1 > > diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash > index 07b1a260a4..ada411ea22 100644 > --- a/package/libgit2/libgit2.hash > +++ b/package/libgit2/libgit2.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz > -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING > +sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz > +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING > diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk > index 6cc0f1ea74..e94dd9c370 100644 > --- a/package/libgit2/libgit2.mk > +++ b/package/libgit2/libgit2.mk > @@ -4,21 +4,20 @@ > # > ################################################################################ > > -LIBGIT2_VERSION = 1.3.0 > +LIBGIT2_VERSION = 1.4.2 > LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) > -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) > +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) > LIBGIT2_LICENSE_FILES = COPYING > LIBGIT2_CPE_ID_VENDOR = libgit2_project > LIBGIT2_INSTALL_STAGING = YES > > LIBGIT2_CONF_OPTS = \ > -DUSE_GSSAPI=OFF \ > - -DBUILD_CLAR=OFF \ > -DUSE_ICONV=ON \ > -DREGEX_BACKEND=regcomp \ > -DUSE_HTTP_PARSER=system \ > -DUSE_NTLMCLIENT=OFF \ > - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) > + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) > > LIBGIT2_DEPENDENCIES = zlib libhttpparser > From arnout at mind.be Sat Mar 12 17:06:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:06:52 +0100 Subject: [Buildroot] [PATCH] package/python-can: bump to version 4.0.0 In-Reply-To: <20220222113326.2608582-1-angelo@amarulasolutions.com> References: <20220222113326.2608582-1-angelo@amarulasolutions.com> Message-ID: <31e94ffd-6814-e528-29d8-e140bf95bb55@mind.be> On 22/02/2022 12:33, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/python-can/python-can.hash | 2 +- > package/python-can/python-can.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash > index 5330e5899c..91b685cc17 100644 > --- a/package/python-can/python-can.hash > +++ b/package/python-can/python-can.hash > @@ -1,4 +1,4 @@ > # sha256 from https://pypi.org/pypi/python-can > -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz > +sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz > # Locally computed sha256 checksums > sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt > diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk > index 1ab813e2c9..9284a9cf99 100644 > --- a/package/python-can/python-can.mk > +++ b/package/python-can/python-can.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_CAN_VERSION = 3.3.4 > -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 > +PYTHON_CAN_VERSION = 4.0.0 > +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 > PYTHON_CAN_SETUP_TYPE = setuptools > PYTHON_CAN_LICENSE = LGPL-3.0 > PYTHON_CAN_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:07:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:07:13 +0100 Subject: [Buildroot] [PATCH] package/python-pydal: bump to version 20220213.2 In-Reply-To: <20220222113354.2609277-1-angelo@amarulasolutions.com> References: <20220222113354.2609277-1-angelo@amarulasolutions.com> Message-ID: <110c08a2-a1ec-6a20-b758-66126f605338@mind.be> On 22/02/2022 12:33, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/python-pydal/python-pydal.hash | 2 +- > package/python-pydal/python-pydal.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash > index eef00030bd..46271dfd91 100644 > --- a/package/python-pydal/python-pydal.hash > +++ b/package/python-pydal/python-pydal.hash > @@ -1,3 +1,3 @@ > # sha256 locally computed > -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz > +sha256 40a2cafb5aa830d51ababfe34a8f8a0e3b630bc4f931f04db75ed84c3f55ea38 python-pydal-20220213.2.tar.gz > sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt > diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk > index 428999f5c1..c3be683dda 100644 > --- a/package/python-pydal/python-pydal.mk > +++ b/package/python-pydal/python-pydal.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_PYDAL_VERSION = 20210626.3 > +PYTHON_PYDAL_VERSION = 20220213.2 > PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) > PYTHON_PYDAL_LICENSE = BSD-3-Clause > PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:07:29 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:07:29 +0100 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 In-Reply-To: <20220222113336.2608916-1-angelo@amarulasolutions.com> References: <20220222113336.2608916-1-angelo@amarulasolutions.com> Message-ID: On 22/02/2022 12:33, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/python-pillow/python-pillow.hash | 4 ++-- > package/python-pillow/python-pillow.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash > index f3ca8e6014..88a5d7cada 100644 > --- a/package/python-pillow/python-pillow.hash > +++ b/package/python-pillow/python-pillow.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pillow/json > -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz > -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz > +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz > +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz > > # Locally computed sha256 checksums > sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index 2f2e817882..901876e0ee 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_PILLOW_VERSION = 9.0.0 > -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 > +PYTHON_PILLOW_VERSION = 9.0.1 > +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 > PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz > PYTHON_PILLOW_LICENSE = HPND > PYTHON_PILLOW_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:07:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:07:44 +0100 Subject: [Buildroot] [PATCH] package/python-web2py: bump to version 2.22.3 In-Reply-To: <20220222113404.2609626-1-angelo@amarulasolutions.com> References: <20220222113404.2609626-1-angelo@amarulasolutions.com> Message-ID: <66ece35d-49bc-4fdb-fb78-d654caf0f39c@mind.be> On 22/02/2022 12:34, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. Regards, Arnout > --- > package/python-web2py/python-web2py.hash | 2 +- > package/python-web2py/python-web2py.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash > index 2ef52b0a5c..5830b71701 100644 > --- a/package/python-web2py/python-web2py.hash > +++ b/package/python-web2py/python-web2py.hash > @@ -1,3 +1,3 @@ > # sha256 locally computed > -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz > +sha256 a779adc5626999c854e9abc976296c2c1059bf6988a421c0bfba923f9b08d8cb python-web2py-2.22.3.tar.gz > sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE > diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk > index 3e453282a9..b1897978af 100644 > --- a/package/python-web2py/python-web2py.mk > +++ b/package/python-web2py/python-web2py.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PYTHON_WEB2PY_VERSION = 2.21.1 > +PYTHON_WEB2PY_VERSION = 2.22.3 > PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) > PYTHON_WEB2PY_LICENSE = LGPL-3.0 > PYTHON_WEB2PY_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:08:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: bump to version 1.7.0 In-Reply-To: <20220222185206.230318-1-ju.o@free.fr> References: <20220222185206.230318-1-ju.o@free.fr> Message-ID: <087a4660-c51e-098f-33a5-72544c8701d6@mind.be> On 22/02/2022 19:52, Julien Olivain wrote: > For change log since 1.6.0, see: > - https://github.com/python-distro/distro/releases/tag/v1.7.0 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > Tested with: > support/testing/run-tests \ > -d dl -o output_folder -k \ > tests.package.test_python_distro.TestPythonPy3Distro > --- > package/python-distro/python-distro.hash | 2 +- > package/python-distro/python-distro.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash > index e2b3c0a444..8f09197156 100644 > --- a/package/python-distro/python-distro.hash > +++ b/package/python-distro/python-distro.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz > +sha256 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 distro-1.7.0.tar.gz > sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE > diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk > index 753e74d020..c69849b7ac 100644 > --- a/package/python-distro/python-distro.mk > +++ b/package/python-distro/python-distro.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -PYTHON_DISTRO_VERSION = 1.6.0 > -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 > +PYTHON_DISTRO_VERSION = 1.7.0 > +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a > PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz > PYTHON_DISTRO_LICENSE = Apache-2.0 > PYTHON_DISTRO_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:08:23 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/modem-manager: bump version to 1.18.6 In-Reply-To: <20220222192905.20456-1-petr.vorel@gmail.com> References: <20220222192905.20456-1-petr.vorel@gmail.com> Message-ID: <4aafa550-a762-e702-854a-cbc38751e8a6@mind.be> On 22/02/2022 20:29, Petr Vorel wrote: > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Arnout > --- > Changes v1->v2: > * fix version in commit message subject (Yegor Yefremov) > > package/modem-manager/modem-manager.hash | 2 +- > package/modem-manager/modem-manager.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash > index 14597215df..ea91f42fe0 100644 > --- a/package/modem-manager/modem-manager.hash > +++ b/package/modem-manager/modem-manager.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz > +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk > index a881edc272..d7e2c55bf8 100644 > --- a/package/modem-manager/modem-manager.mk > +++ b/package/modem-manager/modem-manager.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MODEM_MANAGER_VERSION = 1.16.10 > +MODEM_MANAGER_VERSION = 1.18.6 > MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz > MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager > MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From arnout at mind.be Sat Mar 12 17:08:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 18:08:38 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libnetfilter_conntrack: bump to version 1.0.9 In-Reply-To: <20220222205317.3161653-1-fontaine.fabrice@gmail.com> References: <20220222205317.3161653-1-fontaine.fabrice@gmail.com> Message-ID: <5582b728-f738-a680-d29a-4ab3bb90e237@mind.be> On 22/02/2022 21:53, Fabrice Fontaine wrote: > Drop patch (already in version) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ------------------- > .../libnetfilter_conntrack.hash | 4 +- > .../libnetfilter_conntrack.mk | 2 +- > 3 files changed, 3 insertions(+), 41 deletions(-) > delete mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > > diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > deleted file mode 100644 > index 0b373d9261..0000000000 > --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sun, 12 Apr 2020 14:05:15 +0200 > -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private > - > -Since version 1.0.8 and commit > -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends > -on libmnl so add it to Libs.Private. > - > -Otherwise, applications such as dnsmasq will fail to link on: > - > -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink > -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': > -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' > - > -Fixes: > - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: commit e94172f09e4d] > ---- > - libnetfilter_conntrack.pc.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in > -index 857f993..fbd7132 100644 > ---- a/libnetfilter_conntrack.pc.in > -+++ b/libnetfilter_conntrack.pc.in > -@@ -12,5 +12,5 @@ Version: @VERSION@ > - Requires: libnfnetlink > - Conflicts: > - Libs: -L${libdir} -lnetfilter_conntrack > --Libs.private: @LIBNFNETLINK_LIBS@ > -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ > - Cflags: -I${includedir} > --- > -2.25.1 > - > diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash > index 19520aa3f0..205eecf1f3 100644 > --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash > +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash > @@ -1,5 +1,5 @@ > -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum > -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 > +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum > +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 > > # Hash for license file: > sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING > diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk > index 0a5a94be8f..e10bdd02e9 100644 > --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk > +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 > +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 > 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 From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/lxc: bump to version 4.0.12 Message-ID: <20220312170117.D37E87FF6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7b4ddd54d9d5dbeaa3646de3863f160c1504200 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7..9311dc8775 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 22.2.1 Message-ID: <20220312170117.B899E7FF6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7a71ba33db24738c6c3ab92daf82fe8348ad387 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 7cd61fe9b8..ee4f317242 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ed1d22b5c5a05d3e848e43caa2b3966dbfb7f74281a646e6d0774a0621a9b8b intel-mediasdk-22.1.0.tar.gz +sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7d57e0e928..7589ff9737 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.1.0 +INTEL_MEDIASDK_VERSION = 22.2.1 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/tvheadend: bump version Message-ID: <20220312170117.C470C82AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0846221426b1cefa9e569f1927bc6fed102acb36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://github.com/tvheadend/tvheadend/commit/fb7b24114685a7e38d842168dce4c613360cd330 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-configure-add-execinfo-option.patch | 55 ---------------------- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch deleted file mode 100644 index c55d127d58..0000000000 --- a/package/tvheadend/0002-configure-add-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Jan 2022 16:53:29 +0100 -Subject: [PATCH] configure: add execinfo option - -Add execinfo option to allow the user to disable the feature even if -execinfo.h is found on the system - -Signed-off-by: Fabrice Fontaine -[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] ---- - configure | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 4dad024c4..c087502bf 100755 ---- a/configure -+++ b/configure -@@ -75,6 +75,7 @@ OPTIONS=( - "ddci:yes" - "cclang_threadsan:no" - "gperftools:no" -+ "execinfo:auto" - ) - - # -@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then - # If we don't have libunwind then fallback to execinfo. - if ! enabled libunwind - then -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - - else -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - check_cc_option mmx - check_cc_option sse2 --- -2.33.0 - diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index db06af53b7..44ff745221 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz +sha256 10b8e8387cf341a8c639b3ecbab17dd245dc109afd6c99ca6b7fc3f2b5efc50e tvheadend-1295dd2be863f5beb764290fce9317b24193dfc0.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 58ebdcb054..d2547b8746 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 +TVHEADEND_VERSION = 1295dd2be863f5beb764290fce9317b24193dfc0 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/libnids: bump version to 1.26 Message-ID: <20220312170118.20EA582AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8aefa8807ecaf219b0dc7988e6bd14c70c9c761 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Change repo source to official github.com repository which is actively maintained. Previous sourceforge.net sources remained untouched since 2010. Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libnids/libnids.hash | 4 ++-- package/libnids/libnids.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash index 4a2949c39d..e51dbf151c 100644 --- a/package/libnids/libnids.hash +++ b/package/libnids/libnids.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 3e36838c40..57e68654dc 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNIDS_VERSION = 1.24 -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) +LIBNIDS_VERSION = 1.26 +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION),$(LIBNIDS_VERSION).tar.gz) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_CPE_ID_VENDOR = libnids_project From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/qt5: enable for ARC Message-ID: <20220312170118.35D1C82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16ffc6549465cb5d68b751f10603e8b0363bf9b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Double-conversion got pulled-in Qt's sources from the upstream project quite some time ago [1], so now Qt5 is buildable for ARC perfectly fine. This reverts the last part of [2], commit e453fb9e3280 (qt5: disable qt-5.8.0 support for arc, nios2 and xtensa). [1] https://invent.kde.org/qt/qt/qtbase/-/commit/425df43d7fed19866fc7ceb3d26b6cc4190523f5 [2] https://git.buildroot.net/buildroot/commit/?id=e453fb9e3280a1a1ce6180e165aab9c4f1642555 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/Config.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70..f2b1ff4a19 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -13,7 +13,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5BASE help From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-zattoo: bump version to 19.7.11-Matrix Message-ID: <20220312170118.0705782AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e36884420d1709fabc5a8b081f5a6cbd1e59e297 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index ac4960df92..0b88d5c747 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz +sha256 07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 kodi-pvr-zattoo-19.7.11-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 7a3b230e8b..95c5de0925 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix +KODI_PVR_ZATTOO_VERSION = 19.7.11-Matrix KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/s390-tools: bump to version 2.20.0 Message-ID: <20220312170118.0FE6C82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff4e3baa40a7fc3f86efbe14cc228c8b34c8bfb4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: - https://release-monitoring.org/project/10714/ Signed-off-by: Alexander Egorenkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 13c68fbf52..6ea8f7ea20 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz +sha256 6fa6add92e896541c0ef74885a4084474fc0d77049e8ac7372872a70a46ddd74 s390-tools-2.20.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 328986bcb3..3c386af6fd 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.19.0 +S390_TOOLS_VERSION = 2.20.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:53 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.2.1 Message-ID: <20220312170117.ABDBA82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ff7cb3460ae0b2d168764b89feb4e87e9024de4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which was applied upstream: https://github.com/intel/media-driver/commit/8eab97af6e1c41fc7b9d72999ecb1c22d9e52db6 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Add-MEDIA-BUILD-HARDENING-option.patch | 106 --------------------- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 108 deletions(-) diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch deleted file mode 100644 index 968445759a..0000000000 --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Aug 2021 21:34:59 +0200 -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option - -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening -options such as stack-protector-all or FORTIFY SOURCE 2 which are not -always available (e.g. fortify source 2 is only available on glibc >= 6 -and not musl/uclibc-ng) - -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 21.4.1] ---- - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- - media_driver/media_top_cmake.cmake | 8 +++++++- - 3 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt -index 65f71ceef..b066138d9 100644 ---- a/cmrtlib/linux/CMakeLists.txt -+++ b/cmrtlib/linux/CMakeLists.txt -@@ -32,12 +32,18 @@ else() - endif() - - # Set up compile options that will be used for the Linux build --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -+if(MEDIA_BUILD_HARDENING) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+endif() - if(MEDIA_BUILD_FATAL_WARNINGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake -index 7a2bd64b6..98896b131 100755 ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON - # Other common flags - -fmessage-length=0 - -fvisibility=hidden -- -fstack-protector - -fdata-sections - -ffunction-sections - -Wl,--gc-sections -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON - -g - ) - -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_COMMON -+ ${MEDIA_COMPILER_FLAGS_COMMON} -+ -fstack-protector) -+endif() - - if(${UFO_MARCH} STREQUAL "slm") - set(MEDIA_COMPILER_FLAGS_COMMON -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") - set(MEDIA_COMPILER_FLAGS_RELEASE - ${MEDIA_COMPILER_FLAGS_RELEASE} - -O2 -- -D_FORTIFY_SOURCE=2 - -fno-omit-frame-pointer - ) -+ if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_RELEASE -+ ${MEDIA_COMPILER_FLAGS_RELEASE} -+ -D_FORTIFY_SOURCE=2) -+ endif() - endif() - - if(NOT ${PLATFORM} STREQUAL "android") -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake -index f089ea45f..b0b428914 100755 ---- a/media_driver/media_top_cmake.cmake -+++ b/media_driver/media_top_cmake.cmake -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") - endif() - --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") -+endif() -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) -+ - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") - diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index ceafa20e80..7c615620ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz +sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9a2b4a8753..e286a8b2c5 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.1.1 +INTEL_MEDIADRIVER_VERSION = 22.2.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/grpc: bump to version 1.44.0 Message-ID: <20220312170118.2A83082AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e27390f85467f04e62a55748fd60fb304803f6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 3da1d9a323..6db2acd759 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz +sha256 8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d grpc-1.44.0.tar.gz sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 5d8201f12f..23b92f1750 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.43.0 +GRPC_VERSION = 1.44.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-pydal: bump to version 20220213.2 Message-ID: <20220312170118.7EB4E82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=556e84e5b85e5be3ca27f86955bce015a90f0c50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pydal/python-pydal.hash | 2 +- package/python-pydal/python-pydal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index eef00030bd..46271dfd91 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz +sha256 40a2cafb5aa830d51ababfe34a8f8a0e3b630bc4f931f04db75ed84c3f55ea38 python-pydal-20220213.2.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 428999f5c1..c3be683dda 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20210626.3 +PYTHON_PYDAL_VERSION = 20220213.2 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/libxcrypt: bump to version 4.4.28 Message-ID: <20220312170118.18CCB82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a599e9f3717bc9c875b6ebed0f1baa8310ed096 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxcrypt/libxcrypt.hash | 2 +- package/libxcrypt/libxcrypt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index 99ddf62be0..bdda6b47c0 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 db7e37901969cb1d1e8020cb73a991ef81e48e31ea5b76a101862c806426b457 libxcrypt-4.4.28.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 65efa2bab9..f7a0fd4308 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.27 +LIBXCRYPT_VERSION = 4.4.28 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-web2py: bump to version 2.22.3 Message-ID: <20220312170118.8870782AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9b4c11ed67055564c1b6bc8c44ec944bf458a87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci [Arnout: use 2 spaces in hash file] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-web2py/python-web2py.hash | 4 ++-- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 2ef52b0a5c..3f781a7016 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz -sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE +sha256 a779adc5626999c854e9abc976296c2c1059bf6988a421c0bfba923f9b08d8cb python-web2py-2.22.3.tar.gz +sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 3e453282a9..b1897978af 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.21.1 +PYTHON_WEB2PY_VERSION = 2.22.3 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-pillow: bump to version 9.0.1 Message-ID: <20220312170118.75CB682AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=07b070be39f9c51592c85fb76cd7af00539abc19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e6014..88a5d7cada 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz # Locally computed sha256 checksums sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882..901876e0ee 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/cups: bump to version 2.4.1 Message-ID: <20220312170118.5A5E282AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bac3eadda80eea6bac376571a2cfd51b91731f4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master NOTICE hash is changed due to a copyright year update. Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cups/cups.hash | 4 ++-- package/cups/cups.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index b0e3654b3d..8308b7b803 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz +sha256 c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 cups-2.4.1-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE +sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index e406d3bc64..298a6ed879 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.0 +CUPS_VERSION = 2.4.1 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-distro: bump to version 1.7.0 Message-ID: <20220312170118.91AA382AFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=726e974f5eaff5c5abd7550e100a117a3fa0b6c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since 1.6.0, see: - https://github.com/python-distro/distro/releases/tag/v1.7.0 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-distro/python-distro.hash | 2 +- package/python-distro/python-distro.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index e2b3c0a444..8f09197156 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz +sha256 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 distro-1.7.0.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index 753e74d020..c69849b7ac 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.6.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_VERSION = 1.7.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE From arnout at mind.be Sat Mar 12 17:08:56 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:56 +0100 Subject: [Buildroot] [git commit] package/libgit2: bump version to 1.4.2 Message-ID: <20220312170118.ACC3582AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba8c268e00bce6cbcb2d7d29143a34afaa5fdc46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Licence changes mostly concern vendored dependencies (that buildroot does not use) and a new bundled PRNG used to reimplement mkstemp() - added CC0 license for that. Some buildsystem options also changed: - THREADSAFE is now USE_THREADS - BUILD_CLAR is now BUILD_TESTS, which the cmake infra already give. Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4..ada411ea22 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19 libgit2-1.4.2.tar.gz +sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74..e94dd9c370 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,20 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.4.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/cups-filters: bump to version 1.28.12 Message-ID: <20220312170118.63A5082AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15d7ac9499d7cad063fa43c602fd73419f971c50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci [Arnout: also update hash file to two spaces] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cups-filters/cups-filters.hash | 4 ++-- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index aefb67f651..50f755488b 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz -sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING +sha256 3265017d2369e1130e732090165d6b4e3c0838d7ca9aa60978b087bee12247ff cups-filters-1.28.12.tar.gz +sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index c8f2dd0aae..f8ff42f0f4 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.10 +CUPS_FILTERS_VERSION = 1.28.12 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/apparmor: bump to version 3.0.4 Message-ID: <20220312170118.3FC8B82AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27cd0b5033bfe6fabc580659eb0c1f2efc7d4984 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updating also the companion libapparmor library and removing upstreamed patch. Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/apparmor/apparmor.hash | 2 +- package/apparmor/apparmor.mk | 2 +- ...lace-deprecated-distutils-with-setuptools.patch | 244 --------------------- package/libapparmor/libapparmor.hash | 2 +- package/libapparmor/libapparmor.mk | 2 +- 5 files changed, 4 insertions(+), 248 deletions(-) diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 88280cbfcf..497491b6c9 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 43bfa05308..76c9f2cafe 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the libapparmor package APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch deleted file mode 100644 index 5aed31d0b5..0000000000 --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 -From: Georgia Garcia -Date: Wed, 10 Nov 2021 19:50:35 +0000 -Subject: [PATCH] replace deprecated distutils with setuptools - -Adds python3 setuptools as a build dependency for libapparmor - -Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 -MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 -Signed-off-by: Georgia Garcia -Acked-by: Christian Boltz - -[Retrieved (and updated to remove changes on .gitlab-ci.yml and -README.md) from: -https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] -Signed-off-by: Fabrice Fontaine ---- - .gitignore | 3 ++ - .gitlab-ci.yml | 2 +- - libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- - libraries/libapparmor/swig/python/Makefile.am | 2 +- - libraries/libapparmor/swig/python/setup.py.in | 2 +- - .../libapparmor/swig/python/test/Makefile.am | 2 +- - profiles/Makefile | 2 +- - utils/Makefile | 1 + - utils/python-tools-setup.py | 6 ++-- - utils/test/Makefile | 2 +- - utils/test/README.md | 2 +- - 11 files changed, 32 insertions(+), 28 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 78a06fdf9..4782a351a 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c - libraries/libapparmor/swig/perl/libapparmor_wrap.o - libraries/libapparmor/swig/perl/pm_to_blib - libraries/libapparmor/swig/python/LibAppArmor.py -+libraries/libapparmor/swig/python/LibAppArmor.egg-info/ - libraries/libapparmor/swig/python/build/ - libraries/libapparmor/swig/python/libapparmor_wrap.c - libraries/libapparmor/swig/python/Makefile -@@ -204,6 +205,8 @@ utils/*.tmp - utils/po/*.mo - utils/apparmor/*.pyc - utils/apparmor/rule/*.pyc -+utils/apparmor.egg-info/ -+utils/build/ - utils/htmlcov/ - utils/test/common_test.pyc - utils/test/.coverage -diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 -index 1da29d873..f21f70ce7 100644 ---- a/libraries/libapparmor/m4/ac_python_devel.m4 -+++ b/libraries/libapparmor/m4/ac_python_devel.m4 -@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. - fi - - # -- # Check if you have distutils, else fail -+ # Check if you have setuptools, else fail - # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ AC_MSG_CHECKING([for the setuptools Python package]) -+ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` -+ if test -z "$ac_setuptools_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ AC_MSG_ERROR([cannot import Python module "setuptools". - Please check your Python installation. The error was: --$ac_distutils_result]) -+$ac_setuptools_result]) - PYTHON_VERSION="" - fi - -@@ -88,8 +88,8 @@ $ac_distutils_result]) - PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` - fi - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` -+ python_path=`$PYTHON -c "import sys; import sysconfig;\ -+sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` - if test -n "${python_path}"; then - python_path="-I$python_path" - fi -@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` - if test -z "$PYTHON_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) -- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ --sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` -+ py_version=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` - if test "$py_version" == "[None]"; then - if test -n "$PYTHON_VERSION"; then - py_version=$PYTHON_VERSION -@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` - fi - fi - -- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ --sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ -+ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ - "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` - fi - AC_MSG_RESULT([$PYTHON_LDFLAGS]) -@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO - # - AC_MSG_CHECKING([for Python site-packages path]) - if test -z "$PYTHON_SITE_PKG"; then -- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` -+ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` - fi - AC_MSG_RESULT([$PYTHON_SITE_PKG]) - AC_SUBST([PYTHON_SITE_PKG]) -@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` - PYTHON_EXTRA_LIBS='' - fi - if test -z "$PYTHON_EXTRA_LIBS"; then -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ --conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ -+conf = sysconfig.get_config_var; \ - sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) -@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( - PYTHON_EXTRA_LDFLAGS='' - fi - if test -z "$PYTHON_EXTRA_LDFLAGS"; then -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ --conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ -+conf = sysconfig.get_config_var; \ - sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) -diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am -index 04edff003..bf05fe0fc 100644 ---- a/libraries/libapparmor/swig/python/Makefile.am -+++ b/libraries/libapparmor/swig/python/Makefile.am -@@ -21,7 +21,7 @@ install-exec-local: - - clean-local: - if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi -- rm -rf build -+ rm -rf build LibAppArmor.egg-info - if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi - - endif -diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in -index 32abd46b2..b23e40746 100644 ---- a/libraries/libapparmor/swig/python/setup.py.in -+++ b/libraries/libapparmor/swig/python/setup.py.in -@@ -1,4 +1,4 @@ --from distutils.core import setup, Extension -+from setuptools import setup, Extension - import string - - setup(name = 'LibAppArmor', -diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am -index 7287819c9..9dccfdef6 100644 ---- a/libraries/libapparmor/swig/python/test/Makefile.am -+++ b/libraries/libapparmor/swig/python/test/Makefile.am -@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status - CLEANFILES = test_python.py - - # bah, how brittle is this? --PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' -+PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' - - TESTS = test_python.py - TESTS_ENVIRONMENT = \ -diff --git a/profiles/Makefile b/profiles/Makefile -index c471e58e8..0b7f2655d 100644 ---- a/profiles/Makefile -+++ b/profiles/Makefile -@@ -41,7 +41,7 @@ ifdef USE_SYSTEM - LOGPROF?=aa-logprof - else - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am -- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") -+ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") - LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) - PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) -diff --git a/utils/Makefile b/utils/Makefile -index 1f08f259a..91a15107b 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -72,6 +72,7 @@ clean: pod_clean - rm -rf staging/ build/ - rm -f apparmor/*.pyc apparmor/rule/*.pyc - rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ -+ rm -rf apparmor.egg-info/ - - # ${CAPABILITIES} is defined in common/Make.rules - .PHONY: check_severity_db -diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py -index 30ce0cb05..2cbde8fc1 100644 ---- a/utils/python-tools-setup.py -+++ b/utils/python-tools-setup.py -@@ -20,14 +20,14 @@ - # Note: --version=... must be the last argument to this script - # - --from distutils.command.install import install as _install --from distutils.core import setup -+from setuptools.command.install import install as _install -+from setuptools import setup - import os - import shutil - import sys - - class Install(_install, object): -- '''Override distutils to install the files where we want them.''' -+ '''Override setuptools to install the files where we want them.''' - def run(self): - # Now byte-compile everything - super(Install, self).run() -diff --git a/utils/test/Makefile b/utils/test/Makefile -index 90354aa50..9126bdd71 100644 ---- a/utils/test/Makefile -+++ b/utils/test/Makefile -@@ -32,7 +32,7 @@ ifdef USE_SYSTEM - PARSER= - else - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am -- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") -+ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") - LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) - PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) --- -GitLab - diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash index 6a19aef77a..9fbfe3b92e 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +sha256 09bf48d7a171f9790c39a1404bad105a788934cfe77b7490c7f5c63c2576b725 apparmor-3.0.4.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 7bb849ab94..fcd3a4389b 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -6,7 +6,7 @@ # When updating the version here, please also update the apparmor package LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).4 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1 From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/libqmi: bump version to 1.30.4 Message-ID: <20220312170118.4898182AD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c17e3e4b9af68a84adebd26c94700274a030a79 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove 0001-build-add-an-option-to-not-build-man-pages.patch as release contains very similar commit which does autodetection: 1a474db ("build: add an option to not build man pages") Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...uild-add-an-option-to-not-build-man-pages.patch | 65 ---------------------- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch deleted file mode 100644 index d9053de537..0000000000 --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Wed, 3 Nov 2021 10:57:51 +0100 -Subject: [PATCH] build: add an option to not build man pages - -When cross-compiling, the compiled binaries cannot be run on the build -machine, unless one defines a helper (e.g. qemu) in the meson -configuration, which is most of the time undesirable. - -If help2man is installed on the build machine, then the build would fail -because of this, so add an option to disable generating the man pages. - -With later versions of meson, it will be possible to automatically -detect this condition. - -Based on the same fix done in libmbim by Nicolas Cavallari, see -https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 - -Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 - -[Retrieved (and backported) from: -https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 8 +++++++- - meson_options.txt | 1 + - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e88b43a1..c7312146 100644 ---- a/meson.build -+++ b/meson.build -@@ -223,8 +223,8 @@ if enable_gtk_doc - subdir('docs/reference/libqmi-glib') - endif - --help2man = find_program('help2man', required: false) --if help2man.found() -+enable_man = get_option('man') -+if enable_man - subdir('docs/man') - endif - -@@ -237,6 +242,7 @@ summary({ - output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' - output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' - output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' -+output += ' man pages: ' + enable_man.to_string() + '\n\n' - output += ' System paths\n' - output += ' prefix: ' + qmi_prefix + '\n' - output += ' udev base directory: ' + qmi_username + '\n\n' -diff --git a/meson_options.txt b/meson_options.txt -index 4d4f913d..bee5daac 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc - - option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') -+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') - - option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') --- -GitLab - diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 1f2da45ac0..ef2da77a2a 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 82ddd3f77c602b1e0c11d3e41d0563ede11f95036ebfcf929bc89157b13928e6 libqmi-1.30.4.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb..b33e2fdc47 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.2 +LIBQMI_VERSION = 1.30.4 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/modem-manager: bump version to 1.18.6 Message-ID: <20220312170118.9A76C82B58@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e3ff4c21bafb562cf12ffdab93bb40bc5aae395 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df..ea91f42fe0 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +sha256 d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a ModemManager-1.18.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index a881edc272..d7e2c55bf8 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 +MODEM_MANAGER_VERSION = 1.18.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/harfbuzz: bump to version 3.4.0 Message-ID: <20220312170117.DFF5082AD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=37fe946d9d9c917f87544660aaf056066d71cb9c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 61f2865563..e4674afa87 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz +sha256 7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952 harfbuzz-3.4.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 1f5dfa8822..331b35c530 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.3.2 +HARFBUZZ_VERSION = 3.4.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From arnout at mind.be Sat Mar 12 17:08:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:54 +0100 Subject: [Buildroot] [git commit] package/trace-cmd: bump to version 2.9.7 Message-ID: <20220312170117.ECAE37FF6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df103584508586117b85f11d7fccb6b64c4b1492 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 00cecc7828..4d39e4d5ea 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index fe0cd71ec4..52bb99036c 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_VERSION = 2.9.7 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/libinput: bump version to 1.20.0 Message-ID: <20220312170118.51BBA82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9cddb7bd56b8e430f6b798426b5c111c7b7d8fdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - change site URL to new gitlab.freedesktop.org location - change hash from upstream provided to locally computed (and drop sha512) For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042111.html [2] https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libinput/libinput.hash | 5 ++--- package/libinput/libinput.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f18a727810..d1c7cfb104 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz +# Locally computed +sha256 6c1f97892a7d599f97349e5e7c1239901fe00edcd4f6289f410034d5dc06cc85 libinput-1.20.0.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 2f9c639c22..b814e3416d 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBINPUT_VERSION = 1.19.3 -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput +LIBINPUT_VERSION = 1.20.0 +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.bz2 +LIBINPUT_SITE = https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(LIBINPUT_VERSION) LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev LIBINPUT_INSTALL_STAGING = YES LIBINPUT_LICENSE = MIT From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/python-can: bump to version 4.0.0 Message-ID: <20220312170118.6CD1782AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90a3e71cd2b10ec254ff7e5c9a01342c9d53730d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-can/python-can.hash | 4 ++-- package/python-can/python-can.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 5330e5899c..dd8a9b107d 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/pypi/python-can -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz +sha256 59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d python-can-4.0.0.tar.gz # Locally computed sha256 checksums -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 1ab813e2c9..9284a9cf99 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.4 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 +PYTHON_CAN_VERSION = 4.0.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/1f/f7/a643cba269d59e108fe4c1854a8e71d5cdadadd4de1b9c8862b190171122 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sat Mar 12 17:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] package/libnetfilter_conntrack: bump to version 1.0.9 Message-ID: <20220312170118.A3FEF82AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9af9dfa543907c46091c706b0f3a0eb89445ae74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...r_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 ---------------------- .../libnetfilter_conntrack.hash | 4 +-- .../libnetfilter_conntrack.mk | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch deleted file mode 100644 index 0b373d9261..0000000000 --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Apr 2020 14:05:15 +0200 -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private - -Since version 1.0.8 and commit -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends -on libmnl so add it to Libs.Private. - -Otherwise, applications such as dnsmasq will fail to link on: - -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' - -Fixes: - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 - -Signed-off-by: Fabrice Fontaine -[Upstream status: commit e94172f09e4d] ---- - libnetfilter_conntrack.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in -index 857f993..fbd7132 100644 ---- a/libnetfilter_conntrack.pc.in -+++ b/libnetfilter_conntrack.pc.in -@@ -12,5 +12,5 @@ Version: @VERSION@ - Requires: libnfnetlink - Conflicts: - Libs: -L${libdir} -lnetfilter_conntrack --Libs.private: @LIBNFNETLINK_LIBS@ -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.25.1 - diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 19520aa3f0..205eecf1f3 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 # Hash for license file: sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 0a5a94be8f..e10bdd02e9 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 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 From bugzilla at busybox.net Sat Mar 12 17:18:48 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 12 Mar 2022 17:18:48 +0000 Subject: [Buildroot] [Bug 14661] Fakeroot script relies on bash-isms, does not work with dash In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 --- Comment #1 from Fabrice Fontaine --- Thanks for your bug report, this should be fixed by https://git.buildroot.net/buildroot/commit/?id=38c4f6b807e9b519922172089915559fb8642046 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Sat Mar 12 17:37:32 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 12 Mar 2022 17:37:32 +0000 Subject: [Buildroot] [Bug 14661] Fakeroot script relies on bash-isms, does not work with dash In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14661 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED CC| |yann.morin.1998 at free.fr -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Sat Mar 12 17:57:43 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:57:43 +0100 Subject: [Buildroot] [git commit] package/chrony: bump to version 4.2 Message-ID: <20220312174926.86E8A82D99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39d6deb60b32b86d819346ebd8fc94c7e170908e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.tuxfamily.org/chrony/chrony.git/tree/NEWS?id=4.2 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/chrony/chrony.hash | 5 +++-- package/chrony/chrony.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index f8dd1438bc..7fa67bf040 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,4 +1,5 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz +# Locally calculated after checking pgp signature +# https://download.tuxfamily.org/chrony/chrony-4.2-tar-gz-asc.txt +sha256 273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a chrony-4.2.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 5a34f70e1e..15b200aeff 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 4.1 +CHRONY_VERSION = 4.2 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Sat Mar 12 17:58:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 18:58:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/chrony: bump to version 4.2 In-Reply-To: <20220311150943.119252-1-james.knight@collins.com> References: <20220311150943.119252-1-james.knight@collins.com> Message-ID: <20220312175822.GK283544@scaer> James, All, On 2022-03-11 10:09 -0500, James Knight via buildroot spake thusly: > https://git.tuxfamily.org/chrony/chrony.git/tree/NEWS?id=4.2 > > Signed-off-by: James Knight Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/chrony/chrony.hash | 5 +++-- > package/chrony/chrony.mk | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash > index f8dd1438bc7d1f08dcbdccb7bff8e03cee3e2da8..7fa67bf040da0c00e23e3e4fb5ddd4a638cb91d0 100644 > --- a/package/chrony/chrony.hash > +++ b/package/chrony/chrony.hash > @@ -1,4 +1,5 @@ > -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html > -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz > +# Locally calculated after checking pgp signature > +# https://download.tuxfamily.org/chrony/chrony-4.2-tar-gz-asc.txt > +sha256 273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a chrony-4.2.tar.gz > # Locally calculated > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index 5a34f70e1e992f179784ad87b240967f5cf0a30f..15b200aeffe9bd70694bb1d490535ae8785dc3fc 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CHRONY_VERSION = 4.1 > +CHRONY_VERSION = 4.2 > CHRONY_SITE = http://download.tuxfamily.org/chrony > CHRONY_LICENSE = GPL-2.0 > CHRONY_LICENSE_FILES = COPYING > -- > 2.30.0.windows.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sat Mar 12 18:12:49 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 12 Mar 2022 19:12:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220312181249.7288-1-fontaine.fabrice@gmail.com> openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) -- 2.34.1 From arnout at mind.be Sat Mar 12 19:42:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:42:15 +0100 Subject: [Buildroot] [PATCH] package/mono: bump to version 6.12.0.122 In-Reply-To: <20220223075322.3044754-1-angelo@amarulasolutions.com> References: <20220223075322.3044754-1-angelo@amarulasolutions.com> Message-ID: On 23/02/2022 08:53, Angelo Compagnucci wrote: > Signed-off-by: Angelo Compagnucci Applied to master, thanks. I also updated the hash file with 2 spaces. Regards, Arnout > --- > package/mono/mono.hash | 2 +- > package/mono/mono.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mono/mono.hash b/package/mono/mono.hash > index 2477e9231c..ad070bf102 100644 > --- a/package/mono/mono.hash > +++ b/package/mono/mono.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz > +sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz > sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE > sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING > sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt > diff --git a/package/mono/mono.mk b/package/mono/mono.mk > index 27f7886224..219effc5d3 100644 > --- a/package/mono/mono.mk > +++ b/package/mono/mono.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MONO_VERSION = 6.12.0.90 > +MONO_VERSION = 6.12.0.122 > MONO_SITE = http://download.mono-project.com/sources/mono > MONO_SOURCE = mono-$(MONO_VERSION).tar.xz > MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial From arnout at mind.be Sat Mar 12 19:42:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:42:53 +0100 Subject: [Buildroot] [PATCH/next 1/1] Revert "heimdal: disable parallel make" In-Reply-To: <20220222214931.447344-1-bernd.kuhls@t-online.de> References: <20220222214931.447344-1-bernd.kuhls@t-online.de> Message-ID: <3c8878cb-cd8e-d09f-ca63-383b4a96c244@mind.be> On 22/02/2022 22:49, Bernd Kuhls wrote: > This reverts commit f6980126f26c63421d04a32b6710d9e3a380476a. > > Parallel make was disabled back in 2017: > https://git.buildroot.net/buildroot/commit/?id=f6980126f26c63421d04a32b6710d9e3a380476a > > Build-test with -j99 was successful. > > Signed-off-by: Bernd Kuhls ?Applied to master, thanks. ?It's unfortunate that we couldn't identify why it was fixed, but the autobuilders will complain if it isn't. ?Regards, ?Arnout > --- > package/heimdal/heimdal.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk > index ce509c7afa..a8d87531ec 100644 > --- a/package/heimdal/heimdal.mk > +++ b/package/heimdal/heimdal.mk > @@ -8,7 +8,6 @@ HEIMDAL_VERSION = 7.7.0 > HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) > HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf > HEIMDAL_INSTALL_STAGING = YES > -HEIMDAL_MAKE = $(MAKE1) > # static because of -fPIC issues with e2fsprogs on x86_64 host > HOST_HEIMDAL_CONF_OPTS = \ > --disable-shared \ From arnout at mind.be Sat Mar 12 19:43:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:43:06 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/duktape: bump to version 2.7.0 In-Reply-To: <20220222214247.3163690-1-fontaine.fabrice@gmail.com> References: <20220222214247.3163690-1-fontaine.fabrice@gmail.com> Message-ID: <40127387-dd75-3cd9-b0ea-00944c4b2f6e@mind.be> On 22/02/2022 22:42, Fabrice Fontaine wrote: > Update hash of license file (update in year: > https://github.com/svaarala/duktape/commit/03d4d728f8365021de6955c649e6dcd05dcca99f) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/duktape/duktape.hash | 4 ++-- > package/duktape/duktape.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash > index 4c55e39888..ef6f55aa9d 100644 > --- a/package/duktape/duktape.hash > +++ b/package/duktape/duktape.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz > -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt > +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz > +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt > diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk > index 89a6e451f5..674c5e9323 100644 > --- a/package/duktape/duktape.mk > +++ b/package/duktape/duktape.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DUKTAPE_VERSION = 2.6.0 > +DUKTAPE_VERSION = 2.7.0 > DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz > DUKTAPE_SITE = \ > https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) From arnout at mind.be Sat Mar 12 19:43:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:43:40 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 In-Reply-To: <20220222220255.22327-1-petr.vorel@gmail.com> References: <20220222220255.22327-1-petr.vorel@gmail.com> Message-ID: <48945229-3116-363f-f61f-89d495695cc1@mind.be> On 22/02/2022 23:02, Petr Vorel wrote: > BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. > > Changes: > * libuv (new dependency) > * openssl is now mandatory > * zlib must be detected with PKG_CONFIG_PATH (specifying zlib > installation path is not supported) > * bind9-config and isc-config.sh removed > * updated COPYRIGHT hash > > Signed-off-by: Petr Vorel Applied to master, thanks. I guess we'll get complaints if it doesn't work :-) Regards, Arnout > --- > Hi, > > time to move on to 9.16. > > Tested only local build as I don't use bind. > I'll also verify builds with utils/test-pkg. > But it'd be great if anybody could also test running bind. > > Kind regards, > Petr > > package/bind/Config.in | 12 +++++++++++- > package/bind/bind.hash | 6 +++--- > package/bind/bind.mk | 15 +++++++-------- > 3 files changed, 21 insertions(+), 12 deletions(-) > > diff --git a/package/bind/Config.in b/package/bind/Config.in > index db10ceb304..9887403ed9 100644 > --- a/package/bind/Config.in > +++ b/package/bind/Config.in > @@ -1,6 +1,11 @@ > config BR2_PACKAGE_BIND > bool "bind" > - depends on BR2_USE_MMU # fork() > + depends on BR2_USE_MMU # fork(), libuv > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv > + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv > + depends on !BR2_STATIC_LIBS # libuv > + select BR2_PACKAGE_LIBUV > + select BR2_PACKAGE_OPENSSL > help > BIND (Berkeley Internet Name Domain) is an > implementation of the Domain Name System (DNS) protocols > @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND > > https://www.isc.org/bind/ > > +comment "bind needs a toolchain w/ NPTL, dynamic library" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 > + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > + > if BR2_PACKAGE_BIND > > config BR2_PACKAGE_BIND_SERVER > diff --git a/package/bind/bind.hash b/package/bind/bind.hash > index 70299f1677..401e389e49 100644 > --- a/package/bind/bind.hash > +++ b/package/bind/bind.hash > @@ -1,4 +1,4 @@ > -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc > +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc > # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD > -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz > -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT > +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz > +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index e329c803a3..5b4c60b14c 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -4,12 +4,12 @@ > # > ################################################################################ > > -BIND_VERSION = 9.11.36 > +BIND_VERSION = 9.16.26 > +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz > BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) > # bind does not support parallel builds. > BIND_MAKE = $(MAKE1) > BIND_INSTALL_STAGING = YES > -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh > BIND_LICENSE = MPL-2.0 > BIND_LICENSE_FILES = COPYRIGHT > BIND_CPE_ID_VENDOR = isc > @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ > BIND_CONF_OPTS = \ > $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ > --without-lmdb \ > - --with-libjson=no \ > + --with-json-c=no \ > --with-randomdev=/dev/urandom \ > --enable-epoll \ > --enable-filter-aaaa \ > --disable-backtrace > > +BIND_DEPENDENCIES = libuv > + > ifeq ($(BR2_PACKAGE_ZLIB),y) > -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr > +BIND_CONF_OPTS += --with-zlib > BIND_DEPENDENCIES += zlib > +BIND_DEPENDENCIES += host-pkgconf zlib > else > BIND_CONF_OPTS += --without-zlib > endif > @@ -66,7 +69,6 @@ else > BIND_CONF_OPTS += --with-libxml2=no > endif > > -ifeq ($(BR2_PACKAGE_OPENSSL),y) > BIND_DEPENDENCIES += host-pkgconf openssl > BIND_CONF_OPTS += \ > --with-openssl=$(STAGING_DIR)/usr \ > @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes > else > BIND_CONF_OPTS += --with-gost=no > endif > -else > -BIND_CONF_OPTS += --with-openssl=no > -endif > > # Used by dnssec-keymgr > ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) From arnout at mind.be Sat Mar 12 19:43:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 20:43:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/alsa-plugins: bump to version 1.2.6 In-Reply-To: <20220223043320.25753-1-ckhardin@gmail.com> References: <20220223043320.25753-1-ckhardin@gmail.com> Message-ID: <4827f093-f828-2591-c7d8-de6be1900b5c@mind.be> On 23/02/2022 05:33, Charles Hardin wrote: > https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6 > > Signed-off-by: Charles Hardin Applied to master, thanks. Regards, Arnout > --- > package/alsa-plugins/alsa-plugins.hash | 2 +- > package/alsa-plugins/alsa-plugins.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash > index 8ecbd19965..2582a0d639 100644 > --- a/package/alsa-plugins/alsa-plugins.hash > +++ b/package/alsa-plugins/alsa-plugins.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 > +sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2 > sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING > sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL > diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk > index 396f47adaf..b8819151ef 100644 > --- a/package/alsa-plugins/alsa-plugins.mk > +++ b/package/alsa-plugins/alsa-plugins.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ALSA_PLUGINS_VERSION = 1.2.5 > +ALSA_PLUGINS_VERSION = 1.2.6 > ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 > ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins > ALSA_PLUGINS_LICENSE = LGPL-2.1+ From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/duktape: bump to version 2.7.0 Message-ID: <20220312193555.A17DA83A6B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5d5089789eb2a2c7881ac9b38ae547d901df997 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of license file (update in year: https://github.com/svaarala/duktape/commit/03d4d728f8365021de6955c649e6dcd05dcca99f) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/duktape/duktape.hash | 4 ++-- package/duktape/duktape.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash index 4c55e39888..ef6f55aa9d 100644 --- a/package/duktape/duktape.hash +++ b/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 89a6e451f5..674c5e9323 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUKTAPE_VERSION = 2.6.0 +DUKTAPE_VERSION = 2.7.0 DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_SITE = \ https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/bind: bump to version 9.16.26 Message-ID: <20220312193555.B7F7583A8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8adeaec8afacbc680edebae91524f6144926ac92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. Changes: * libuv (new dependency) * openssl is now mandatory * zlib must be detected with PKG_CONFIG_PATH (specifying zlib installation path is not supported) * bind9-config and isc-config.sh removed * updated COPYRIGHT hash Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bind/Config.in | 12 +++++++++++- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 15 +++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb304..9887403ed9 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND https://www.isc.org/bind/ +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677..401e389e49 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a3..5b4c60b14c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,12 +4,12 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.26 +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ - --with-libjson=no \ + --with-json-c=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ --disable-backtrace +BIND_DEPENDENCIES = libuv + ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib +BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -66,7 +69,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr \ @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes else BIND_CONF_OPTS += --with-gost=no endif -else -BIND_CONF_OPTS += --with-openssl=no -endif # Used by dnssec-keymgr ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/alsa-plugins: bump to version 1.2.6 Message-ID: <20220312193555.C1DCA83A6B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=691b1cebf56099e7f019281beb761c0b0fe4d5e0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6 Signed-off-by: Charles Hardin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alsa-plugins/alsa-plugins.hash | 2 +- package/alsa-plugins/alsa-plugins.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash index 8ecbd19965..2582a0d639 100644 --- a/package/alsa-plugins/alsa-plugins.hash +++ b/package/alsa-plugins/alsa-plugins.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 +sha256 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0 alsa-plugins-1.2.6.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 396f47adaf..b8819151ef 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_PLUGINS_VERSION = 1.2.5 +ALSA_PLUGINS_VERSION = 1.2.6 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins ALSA_PLUGINS_LICENSE = LGPL-2.1+ From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] Revert "heimdal: disable parallel make" Message-ID: <20220312193555.AC31282D98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94d1a54d8b941a44e7be93fc0f82913deaed34a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit f6980126f26c63421d04a32b6710d9e3a380476a. Parallel make was disabled back in 2017: https://git.buildroot.net/buildroot/commit/?id=f6980126f26c63421d04a32b6710d9e3a380476a Build-test with -j99 was successful. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/heimdal/heimdal.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index ce509c7afa..a8d87531ec 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -8,7 +8,6 @@ HEIMDAL_VERSION = 7.7.0 HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf HEIMDAL_INSTALL_STAGING = YES -HEIMDAL_MAKE = $(MAKE1) # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ --disable-shared \ From arnout at mind.be Sat Mar 12 19:44:08 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sat, 12 Mar 2022 20:44:08 +0100 Subject: [Buildroot] [git commit] package/mono: bump to version 6.12.0.122 Message-ID: <20220312193555.CE6A383A8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e8635ba94bfb029584171a52d135db145ac7bf1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci [Arnout: use 2 spaces in hash file] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mono/mono.hash | 8 ++++---- package/mono/mono.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 2477e9231c..8b72ae68ed 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz -sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE -sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING -sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt +sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 mono-6.12.0.122.tar.xz +sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE +sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING +sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 27f7886224..219effc5d3 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.90 +MONO_VERSION = 6.12.0.122 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial From arnout at mind.be Sat Mar 12 20:15:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:15:12 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/libva: bump version to 2.14.0 In-Reply-To: <20220223152040.188210-1-bernd.kuhls@t-online.de> References: <20220223152040.188210-1-bernd.kuhls@t-online.de> Message-ID: <9b37f529-0a40-482b-15c0-e1a9a977306b@mind.be> On 23/02/2022 16:20, Bernd Kuhls wrote: > Release notes: https://github.com/intel/libva/releases/tag/2.14.0 > > Signed-off-by: Bernd Kuhls ?Applied both to master, thanks. ?Regards, ?Arnout > --- > package/libva/libva.hash | 6 +++--- > package/libva/libva.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libva/libva.hash b/package/libva/libva.hash > index 7b66a7709d..4646a816bb 100644 > --- a/package/libva/libva.hash > +++ b/package/libva/libva.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum > -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 > +# From https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2.sha1sum > +sha1 36b482ec8c361a6c3a6198f4777409b136f2713c libva-2.14.0.tar.bz2 > # Locally computed > -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 > +sha256 511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454 libva-2.14.0.tar.bz2 > sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING > diff --git a/package/libva/libva.mk b/package/libva/libva.mk > index 6ac5386540..db1cfd29be 100644 > --- a/package/libva/libva.mk > +++ b/package/libva/libva.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBVA_VERSION = 2.13.0 > +LIBVA_VERSION = 2.14.0 > LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 > LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) > LIBVA_LICENSE = MIT From arnout at mind.be Sat Mar 12 20:15:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:15:47 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/kismet: bump to version 2022-02-R1 In-Reply-To: <20220223211202.3412693-1-fontaine.fabrice@gmail.com> References: <20220223211202.3412693-1-fontaine.fabrice@gmail.com> Message-ID: <269e9b3e-35d0-a044-9d84-9e2073400852@mind.be> On 23/02/2022 22:12, Fabrice Fontaine wrote: > Linking with -latomic is handled by configure.ac since version > 2022-01-R3 and > https://github.com/kismetwireless/kismet/commit/bbdfd21e2b41bf69513ded5ae5ab5a89f22a9912 > > https://www.kismetwireless.net/release/kismet-2022-02-R1 > https://www.kismetwireless.net/release/kismet-2022-01-R3 > https://www.kismetwireless.net/release/kismet-2022-01-R2 > https://www.kismetwireless.net/release/kismet-2022-01-R1 > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/kismet/kismet.hash | 2 +- > package/kismet/kismet.mk | 6 +----- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash > index 9a9d2260b9..fc5f854b7e 100644 > --- a/package/kismet/kismet.hash > +++ b/package/kismet/kismet.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz > +sha256 aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8 kismet-2022-02-R1.tar.xz > sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE > diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk > index 819ed510d7..3992a392f8 100644 > --- a/package/kismet/kismet.mk > +++ b/package/kismet/kismet.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KISMET_VERSION = 2021-08-R1 > +KISMET_VERSION = 2022-02-R1 > KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz > KISMET_SITE = http://www.kismetwireless.net/code > KISMET_DEPENDENCIES = \ > @@ -29,10 +29,6 @@ endif > > KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" > > -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -KISMET_CONF_ENV += LIBS=-latomic > -endif > - > ifeq ($(BR2_PACKAGE_LIBCAP),y) > KISMET_DEPENDENCIES += libcap > KISMET_CONF_OPTS += --enable-libcap From arnout at mind.be Sat Mar 12 20:16:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:16:23 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/screen: bump to version 4.9.0 In-Reply-To: <20220223221358.4097881-1-fontaine.fabrice@gmail.com> References: <20220223221358.4097881-1-fontaine.fabrice@gmail.com> Message-ID: <9f14637e-c0b5-2a6d-289c-cdc4a45f197b@mind.be> On 23/02/2022 23:13, Fabrice Fontaine wrote: > - Drop latest patch (already in version) > - Update indentation in hash file (two spaces) > > https://lists.gnu.org/archive/html/screen-users/2022-02/msg00000.html > > Signed-off-by: Fabrice Fontaine ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/screen/0008-CVE-2021-26937.patch | 68 ------------------------ > package/screen/screen.hash | 6 +-- > package/screen/screen.mk | 5 +- > 3 files changed, 4 insertions(+), 75 deletions(-) > delete mode 100644 package/screen/0008-CVE-2021-26937.patch > > diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch > deleted file mode 100644 > index df7efa0294..0000000000 > --- a/package/screen/0008-CVE-2021-26937.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -Description: [CVE-2021-26937] Fix out of bounds array access > -Author: Michael Schr?der > -Bug-Debian: https://bugs.debian.org/982435 > -Bug: https://savannah.gnu.org/bugs/?60030 > -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html > -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 > -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html > - > -Downloaded from Debian: > -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch > - > -Signed-off-by: Peter Korsgaard > ---- a/encoding.c > -+++ b/encoding.c > -@@ -43,7 +43,7 @@ > - # ifdef UTF8 > - static int recode_char __P((int, int, int)); > - static int recode_char_to_encoding __P((int, int)); > --static void comb_tofront __P((int, int)); > -+static void comb_tofront __P((int)); > - # ifdef DW_CHARS > - static int recode_char_dw __P((int, int *, int, int)); > - static int recode_char_dw_to_encoding __P((int, int *, int)); > -@@ -1263,6 +1263,8 @@ > - {0x30000, 0x3FFFD}, > - }; > - > -+ if (c >= 0xdf00 && c <= 0xdfff) > -+ return 1; /* dw combining sequence */ > - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || > - (cjkwidth && > - bisearch(c, ambiguous, > -@@ -1330,11 +1332,12 @@ > - } > - > - static void > --comb_tofront(root, i) > --int root, i; > -+comb_tofront(i) > -+int i; > - { > - for (;;) > - { > -+ int root = i >= 0x700 ? 0x801 : 0x800; > - debug1("bring to front: %x\n", i); > - combchars[combchars[i]->prev]->next = combchars[i]->next; > - combchars[combchars[i]->next]->prev = combchars[i]->prev; > -@@ -1396,9 +1399,9 @@ > - { > - /* full, recycle old entry */ > - if (c1 >= 0xd800 && c1 < 0xe000) > -- comb_tofront(root, c1 - 0xd800); > -+ comb_tofront(c1 - 0xd800); > - i = combchars[root]->prev; > -- if (c1 == i + 0xd800) > -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) > - { > - /* completely full, can't recycle */ > - debug("utf8_handle_comp: completely full!\n"); > -@@ -1422,7 +1425,7 @@ > - mc->font = (i >> 8) + 0xd8; > - mc->fontx = 0; > - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); > -- comb_tofront(root, i); > -+ comb_tofront(i); > - } > - > - #else /* !UTF8 */ > diff --git a/package/screen/screen.hash b/package/screen/screen.hash > index ca74ba8913..a261d3100d 100644 > --- a/package/screen/screen.hash > +++ b/package/screen/screen.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig > -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz > +# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig > +sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz > # Locally calculated > -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/screen/screen.mk b/package/screen/screen.mk > index 843c71fc2a..3239a1c1f3 100644 > --- a/package/screen/screen.mk > +++ b/package/screen/screen.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SCREEN_VERSION = 4.8.0 > +SCREEN_VERSION = 4.9.0 > SCREEN_SITE = $(BR2_GNU_MIRROR)/screen > SCREEN_LICENSE = GPL-3.0+ > SCREEN_LICENSE_FILES = COPYING > @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" > SCREEN_CONF_OPTS = --enable-colors256 > SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin > > -# 0008_CVE-2021-26937.patch > -SCREEN_IGNORE_CVES += CVE-2021-26937 > - > ifeq ($(BR2_PACKAGE_LINUX_PAM),y) > SCREEN_DEPENDENCIES += linux-pam > SCREEN_CONF_OPTS += --enable-pam From ju.o at free.fr Sat Mar 12 20:16:24 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:24 +0100 Subject: [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically Message-ID: <20220312201627.690544-1-ju.o@free.fr> This commit reorders dependencies and Kconfig package options alphabetically for better maintainability. This commit does not change anything else. Signed-off-by: Julien Olivain --- package/poco/Config.in | 82 +++++++++++++++++++++--------------------- package/poco/poco.mk | 28 +++++++-------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index dd87ee36bb..df3d3cbc66 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_CPP_PARSER + bool "cpp_parser" + +config BR2_PACKAGE_POCO_CRYPTO + bool "crypto" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL + +config BR2_PACKAGE_POCO_DATA + bool + +config BR2_PACKAGE_POCO_DATA_MYSQL + bool "mysql" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_POCO_DATA + +config BR2_PACKAGE_POCO_DATA_SQLITE + bool "sqlite" + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_SQLITE + config BR2_PACKAGE_POCO_JSON bool "json" -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_JSON -config BR2_PACKAGE_POCO_UTIL - bool "util" - select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_MONGODB + bool "mongodb" + select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET bool "net" -config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL - config BR2_PACKAGE_POCO_NETSSL_OPENSSL bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML + select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL -config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" - config BR2_PACKAGE_POCO_PDF bool "pdf" select BR2_PACKAGE_POCO_JSON @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS bool "redis" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" - select BR2_PACKAGE_POCO_NET - -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE +config BR2_PACKAGE_POCO_UTIL + bool "util" + select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_XML + bool "xml" + select BR2_PACKAGE_EXPAT -config BR2_PACKAGE_POCO_JWT - bool "jwt" - select BR2_PACKAGE_POCO_JSON - select BR2_PACKAGE_POCO_CRYPTO +config BR2_PACKAGE_POCO_ZIP + bool "zip" + select BR2_PACKAGE_POCO_NET + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML endif # BR2_PACKAGE_POCO diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 857f215e3a..81409ffec4 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ +POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring -- 2.35.1 From ju.o at free.fr Sat Mar 12 20:16:25 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:25 +0100 Subject: [Buildroot] [PATCH 2/4] package/poco: use poco component names in kconfig variables In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <20220312201627.690544-2-ju.o@free.fr> For clarity, use the same names used in documentation, and component selection in configure. Valid poco component names are defined in: https://github.com/pocoproject/poco/blob/poco-1.11.1-release/components Signed-off-by: Julien Olivain --- package/poco/Config.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index df3d3cbc66..79ffac741d 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -29,10 +29,10 @@ if BR2_PACKAGE_POCO comment "poco components" config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" + bool "CppParser" config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" + bool "Crypto" select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL @@ -40,58 +40,58 @@ config BR2_PACKAGE_POCO_DATA bool config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" + bool "Data/MySQL" depends on BR2_USE_MMU # mysql select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" + bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_SQLITE config BR2_PACKAGE_POCO_JSON - bool "json" + bool "JSON" config BR2_PACKAGE_POCO_JWT - bool "jwt" + bool "JWT" select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_JSON config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" + bool "MongoDB" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET - bool "net" + bool "Net" config BR2_PACKAGE_POCO_NETSSL_OPENSSL - bool "netssl_openssl" + bool "NetSSL_OpenSSL" select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL config BR2_PACKAGE_POCO_PDF - bool "pdf" + bool "PDF" select BR2_PACKAGE_POCO_JSON select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_REDIS - bool "redis" + bool "Redis" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_UTIL - bool "util" + bool "Util" select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_XML - bool "xml" + bool "XML" select BR2_PACKAGE_EXPAT config BR2_PACKAGE_POCO_ZIP - bool "zip" + bool "Zip" select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML -- 2.35.1 From arnout at mind.be Sat Mar 12 20:16:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:16:58 +0100 Subject: [Buildroot] [PATCH] package/erlang-jiffy: bump version to 1.1.1 In-Reply-To: <20220224152339.442421-1-giulio.benetti@benettiengineering.com> References: <20220224152339.442421-1-giulio.benetti@benettiengineering.com> Message-ID: On 24/02/2022 16:23, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti ?Applied to master, thanks. ?Regards, ?Arnout > --- > package/erlang-jiffy/erlang-jiffy.hash | 2 +- > package/erlang-jiffy/erlang-jiffy.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash > index 93c5e1f8c8..f172d1476e 100644 > --- a/package/erlang-jiffy/erlang-jiffy.hash > +++ b/package/erlang-jiffy/erlang-jiffy.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz > +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz > sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE > diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk > index cd94632962..de2e4749fb 100644 > --- a/package/erlang-jiffy/erlang-jiffy.mk > +++ b/package/erlang-jiffy/erlang-jiffy.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ERLANG_JIFFY_VERSION = 1.0.9 > +ERLANG_JIFFY_VERSION = 1.1.1 > ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) > ERLANG_JIFFY_LICENSE = MIT (core), \ > BSD-3-Clause (Google double conversion library), \ From ju.o at free.fr Sat Mar 12 20:16:26 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:26 +0100 Subject: [Buildroot] [PATCH 3/4] package/poco: add Data/PostgreSQL support In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <20220312201627.690544-3-ju.o@free.fr> PostgreSQL support was introduced in poco v1.10.0, in commit: https://github.com/pocoproject/poco/commit/8cec8f6451b9a0ead80f655eee986040863e3526 Signed-off-by: Julien Olivain --- package/poco/Config.in | 6 ++++++ package/poco/poco.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/package/poco/Config.in b/package/poco/Config.in index 79ffac741d..714e40f447 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -45,6 +45,12 @@ config BR2_PACKAGE_POCO_DATA_MYSQL select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA +config BR2_PACKAGE_POCO_DATA_PGSQL + bool "Data/PostgreSQL" + depends on BR2_USE_MMU # postgresql + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_POSTGRESQL + config BR2_PACKAGE_POCO_DATA_SQLITE bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 81409ffec4..119711f3fd 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -15,6 +15,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_POCO_XML),expat) @@ -24,6 +25,7 @@ POCO_OMIT = Data/ODBC PageCompiler \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),,Data/PostgreSQL) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ -- 2.35.1 From ju.o at free.fr Sat Mar 12 20:16:27 2022 From: ju.o at free.fr (Julien Olivain) Date: Sat, 12 Mar 2022 21:16:27 +0100 Subject: [Buildroot] [PATCH 4/4] package/poco: bump to version 1.11.1 In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <20220312201627.690544-4-ju.o@free.fr> This commit drop patches, as they are now included upstream or no longer needed. It also introduces a new patch to fix a build failure for nios2. MySQL include and library paths can now be provided in variables passed to the build command. Variables MYSQL_{INC,LIB}DIR are renamed to POCO_MYSQL_{INCLUDE,LIB}. For PostgreSQL support, variables POCO_PGSQL_{INCLUDE,LIB} are also passed the same way to the build command. This poco version 1.11.1 introduces a new ActiveRecord component. For changelog, see: https://raw.githubusercontent.com/pocoproject/poco/poco-1.11.1-release/CHANGELOG Signed-off-by: Julien Olivain --- This patch series was tested with: make check-package ... 0 warnings generated ./utils/test-pkg -a -p poco ... 45 builds, 17 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- ...ouble-conversion-detection-to-fix-co.patch | 36 +++++++++++++++++ ...-add-the-staging-path-to-search-path.patch | 40 ------------------- .../0002-Add-support-for-m68000-1856.patch | 32 --------------- ...tils.h-backport-double-conversion-ch.patch | 34 ---------------- package/poco/Config.in | 4 ++ package/poco/poco.hash | 2 +- package/poco/poco.mk | 9 +++-- 7 files changed, 47 insertions(+), 110 deletions(-) create mode 100644 package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch delete mode 100644 package/poco/0001-poco-add-the-staging-path-to-search-path.patch delete mode 100644 package/poco/0002-Add-support-for-m68000-1856.patch delete mode 100644 package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch diff --git a/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch new file mode 100644 index 0000000000..7b31729347 --- /dev/null +++ b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch @@ -0,0 +1,36 @@ +From d328829e9cb8b9fde9e70b07f2b991972cf474d1 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 12 Mar 2022 10:34:04 +0100 +Subject: [PATCH] Add back NIOS2 double conversion detection to fix compile + errors + +The commit +https://github.com/pocoproject/poco/commit/558324f672d824300498060aff63356bc6bb8097 + +removed the nios2 support, which was originally added in +https://github.com/pocoproject/poco/commit/e7b91e8125d6910b53f94de5be4bb53f38dc77c1 + +This commit add it back. + +Signed-off-by: Julien Olivain +--- + Foundation/src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 4328344d7..0a222c77d 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -102,7 +102,8 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__EMSCRIPTEN__) ++ defined(__EMSCRIPTEN__) || \ ++ defined(nios2) || defined(__nios2) || defined(__nios2__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) +-- +2.35.1 + diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch deleted file mode 100644 index fbabfc8f26..0000000000 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH] poco: add the staging path to search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach -[J?rg: Update to version 1.6.1 from github] -Signed-off-by: J?rg Krause -[Julien: Rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Data/MySQL/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 64a7d3f82..955fee2d4 100644 ---- a/Data/MySQL/Makefile -+++ b/Data/MySQL/Makefile -@@ -6,8 +6,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ --- -2.26.2 - diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch deleted file mode 100644 index bc04a9bf69..0000000000 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof -Date: Wed, 23 Aug 2017 16:50:51 +0200 -Subject: [PATCH] Add support for m68000 (#1856) - -Originally taken from - -https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da - -Signed-off-by: Thomas Petazzoni -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index c87cee13c..e891c0f10 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -66,6 +66,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. --- -2.26.2 - diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch deleted file mode 100644 index c06eebe8b0..0000000000 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 Jul 2018 15:37:47 +0200 -Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for - AArch64 BE support - -This commit, identical to upstream double-conversion commit -https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a -allows Poco to build on AArch64 big-endian. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/pocoproject/poco/pull/2378 -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index e891c0f10..892f7db18 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__riscv) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) --- -2.26.2 - diff --git a/package/poco/Config.in b/package/poco/Config.in index 714e40f447..699495a241 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,6 +28,10 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_ACTIVERECORD + bool "ActiveRecord" + select BR2_PACKAGE_POCO_XML + config BR2_PACKAGE_POCO_CPP_PARSER bool "CppParser" diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 2a2629733d..78d7d0b96e 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz +sha256 2412a5819a239ff2ee58f81033bcc39c40460d7a8b330013a687c8c0bd2b4ac0 poco-1.11.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 119711f3fd..fcf480c2a8 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.10.1 +POCO_VERSION = 1.11.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -20,6 +20,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \ $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ @@ -74,8 +75,10 @@ endef # Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25) define POCO_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ - MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ - MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_INCLUDE=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql \ + POCO_PGSQL_INCLUDE=$(STAGING_DIR)/usr/include/postgresql \ + POCO_PGSQL_LIB=$(STAGING_DIR)/usr/lib/postgresql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef -- 2.35.1 From arnout at mind.be Sat Mar 12 20:20:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:20:57 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/efl: handle input option In-Reply-To: <20220224162517.222437-2-romain.naour@gmail.com> References: <20220224162517.222437-1-romain.naour@gmail.com> <20220224162517.222437-2-romain.naour@gmail.com> Message-ID: <6c13f61c-d2e9-5433-d331-772d7d71fbfa@mind.be> On 24/02/2022 17:25, Romain Naour wrote: > From: Fabrice Fontaine > > Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input > option on target which was added (and enabled by default) by > https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be > resulting in the following build failure when eeze is disabled: > > ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". > > Fixes: > - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e > > Signed-off-by: Fabrice Fontaine > [Romain: > Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the > upstream name. > use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM > remove duplicate libxkbcommon in EFL_DEPENDENCIES] > Signed-off-by: Romain Naour > --- > v2: rework BR2_PACKAGE_EFL_DRM > --- > package/efl/Config.in | 19 +++++++++++++++---- > package/efl/efl.mk | 9 +++++++-- > 2 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/package/efl/Config.in b/package/efl/Config.in > index 4c78bef7c8..c4f82b92e3 100644 > --- a/package/efl/Config.in > +++ b/package/efl/Config.in > @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI > so you may also trigger code paths with bugs that are never > normally used. > > +config BR2_PACKAGE_EFL_ELPUT > + bool "Enable elput support (recommended)" > + default y > + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze > + select BR2_PACKAGE_EFL_EEZE > + select BR2_PACKAGE_LIBINPUT > + select BR2_PACKAGE_LIBXKBCOMMON > + help > + Eplut is used to support gesture recognition. > + > +comment "elput needs udev /dev management" > + depends on !BR2_PACKAGE_HAS_UDEV > + > config BR2_PACKAGE_EFL_LIBSNDFILE > bool "Enable libsndfile support (recommended)" > default y > @@ -216,13 +229,11 @@ endchoice # OpenGL support > > config BR2_PACKAGE_EFL_DRM > bool "Evas DRM Engine" > - depends on BR2_PACKAGE_HAS_UDEV # efl-eeze > + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze > depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm > depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d > - select BR2_PACKAGE_EFL_EEZE > + select BR2_PACKAGE_EFL_ELPUT Is this really true? The description of elput says that it's about gesture recognition, I don't see how that's related to the DRM backend. And the help text below is saying something like "you can use input gestures both on drm and fb", so it's weird that elput is only required for drm... > select BR2_PACKAGE_LIBDRM > - select BR2_PACKAGE_LIBINPUT # For elput There was a corresponding _DEPENDENCIES += in the .mk file, I removed that since it's covered by elput. With that change, both applied to master, thanks. Regards, Arnout > - select BR2_PACKAGE_LIBXKBCOMMON > help > This option enable building support for the Evas DRM Engine. > > diff --git a/package/efl/efl.mk b/package/efl/efl.mk > index 43a2dc4fcb..bb0bd3f76d 100644 > --- a/package/efl/efl.mk > +++ b/package/efl/efl.mk > @@ -67,6 +67,13 @@ else > EFL_CONF_OPTS += -Deeze=false > endif > > +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) > +EFL_DEPENDENCIES += libinput libxkbcommon > +EFL_CONF_OPTS += -Dinput=true > +else > +EFL_CONF_OPTS += -Dinput=false > +endif > + > ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) > EFL_DEPENDENCIES += util-linux > EFL_CONF_OPTS += -Dlibmount=true > @@ -204,8 +211,6 @@ else > EFL_CONF_OPTS += -Dwl=false > endif > > -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) > - > # json evas loader is disabled by default by upstream. > # Disable libspectre (ps). > # Keep all other evas loader enabled or handled below. From arnout at mind.be Sat Mar 12 20:22:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:22:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix musl build In-Reply-To: <20220224173615.486414-1-fontaine.fabrice@gmail.com> References: <20220224173615.486414-1-fontaine.fabrice@gmail.com> Message-ID: <651e1b1e-aef7-59af-c663-bdacb858bad3@mind.be> On 24/02/2022 18:36, Fabrice Fontaine wrote: > Fix the following musl build failure raised since commit > 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: > > In file included from src/shared/queue.c:15: > ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? > 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > | ^~~~~~~ > | size_t > > Fixes: > - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 > > Signed-off-by: Fabrice Fontaine > --- > ...rc-shared-util.h-include-sys-types.h.patch | 39 +++++++++++++++++++ > 1 file changed, 39 insertions(+) > create mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch > > diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch > new file mode 100644 > index 0000000000..8a5bd64d43 > --- /dev/null > +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch > @@ -0,0 +1,39 @@ > +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 24 Feb 2022 18:19:33 +0100 > +Subject: [PATCH] src/shared/util.h: include sys/types.h > + > +Include sys/types.h to avoid the following build failure on musl raised > +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: > + > +In file included from src/shared/queue.c:15: > +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? > + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > + | ^~~~~~~ > + | size_t > + > +Fixes: > + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 > + > +Signed-off-by: Fabrice Fontaine Your upstream submission was missing the Sob, but apparently it got committed nonetheless. Applied to master, thanks. Regards, Arnout > +[Upstream status: > +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] > +--- > + src/shared/util.h | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/shared/util.h b/src/shared/util.h > +index c01eccf8a..554481e1e 100644 > +--- a/src/shared/util.h > ++++ b/src/shared/util.h > +@@ -14,6 +14,7 @@ > + #include > + #include > + #include > ++#include > + > + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) > + #define BIT(n) (1 << (n)) > +-- > +2.34.1 > + From arnout at mind.be Sat Mar 12 20:24:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:24:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS In-Reply-To: <20220224175119.487040-1-fontaine.fabrice@gmail.com> References: <20220224175119.487040-1-fontaine.fabrice@gmail.com> Message-ID: <978fe72d-8a69-727c-8cf8-ae6b769bed0d@mind.be> On 24/02/2022 18:51, Fabrice Fontaine wrote: > bpftool uses its own local copy of libbpf so add > BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure > on ARM: > > btf.c: In function 'btf_type_by_id': > btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] > if (type_id < btf->start_id) > ^ > bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > > Fixes: > - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e > > Signed-off-by: Fabrice Fontaine > --- > package/bpftool/Config.in | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in > index e81d874343..a1ef3843e6 100644 > --- a/package/bpftool/Config.in > +++ b/package/bpftool/Config.in > @@ -1,5 +1,15 @@ > +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Would it make sense to define this as "default y if BR2_PACKAGE_LIBBPF_ARCH_SUPPORTS" instead? Hm, I suppose it's possible that one of them gains a new platform before the other one is updated... > + bool > + # see libbpf/src/bpf.c > + default y if BR2_arc > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_i386 || BR2_x86_64 > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_s390x > + > config BR2_PACKAGE_BPFTOOL > bool "bpftool" > + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS > depends on !BR2_nios2 # binutils It's weird to still have this nios2 dependency here, but I guess it's nice to simply propagate all dependencies, keeping the redundant ones. Applied to master, thanks. Regards, Arnout > depends on BR2_USE_WCHAR # binutils, elfutils > depends on !BR2_STATIC_LIBS # elfutils > @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL > of eBPF programs and maps. > > comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" > + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS > depends on !BR2_nios2 > depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ > || !BR2_TOOLCHAIN_HAS_THREADS \ From arnout at mind.be Sat Mar 12 20:25:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:25:24 +0100 Subject: [Buildroot] [PATCH] package/rust: set musl-root for musl toolchains In-Reply-To: <20220225083037.229109-1-romain.naour@gmail.com> References: <20220225083037.229109-1-romain.naour@gmail.com> Message-ID: On 25/02/2022 09:30, Romain Naour wrote: > Without musl-root in config.toml the build stop with the following error: > > thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 > > musl-root is needed to provide the path to libc.a and libunwind.a because > rust link them statically into the standard library and liblibc [1]. > > For other libc, musl-root is not used and ignored [2]. > > [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd > [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Arnout > --- > Runtime tested with TestRust with ripgrep and bat packages. > --- > package/rust/rust.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index 4a6b04dc8c..c2e0a361dd 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS > echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ > echo '[rust]'; \ > echo 'channel = "stable"'; \ > + echo 'musl-root = "$(STAGING_DIR)"' ; \ > echo '[target.$(RUSTC_TARGET_NAME)]'; \ > echo 'cc = "$(TARGET_CROSS)gcc"'; \ > echo '[llvm]'; \ From arnout at mind.be Sat Mar 12 20:26:05 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:26:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build with libexecinfo In-Reply-To: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> References: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> Message-ID: On 25/02/2022 19:52, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' > > Fixes: > - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...on-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 +++++++++++++++++++ > package/rpi-userland/rpi-userland.mk | 5 ++ > 2 files changed, 63 insertions(+) > create mode 100644 package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch > > diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch > new file mode 100644 > index 0000000000..bf2a9eb6ea > --- /dev/null > +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch > @@ -0,0 +1,58 @@ > +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 25 Feb 2022 19:21:06 +0100 > +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS > + > +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to > +pass additional flags such as -lexecinfo on musl and uclibc-ng > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/raspberrypi/userland/pull/719] > +--- > + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- > + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- > + makefiles/cmake/arm-linux.cmake | 2 +- > + 3 files changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt > +index e7206cc..16c64db 100644 > +--- a/host_applications/android/apps/vidtex/CMakeLists.txt > ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt > +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) > + # Set --no-as-needed to stop the linker discarding mmal_vc_client > + # as it can't see that the constructor registers a load of functionality > + # with the MMAL core. > +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) > ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) > + > + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) > + > +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt > +index e6bd373..2f72eb2 100644 > +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt > ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt > +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) > + # Set --no-as-needed to stop the linker discarding mmal_vc_client > + # as it can't see that the constructor registers a load of functionality > + # with the MMAL core. > +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) > ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) > + > + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) > + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) > +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake > +index 957846a..e172282 100644 > +--- a/makefiles/cmake/arm-linux.cmake > ++++ b/makefiles/cmake/arm-linux.cmake > +@@ -93,7 +93,7 @@ if(ANDROID) > + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") > + > + link_directories(${ANDROID_LIBS}) > +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") > ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") > + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") > +-- > +2.34.1 > + > diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk > index 84050b6df3..3564ec0703 100644 > --- a/package/rpi-userland/rpi-userland.mk > +++ b/package/rpi-userland/rpi-userland.mk > @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr > > RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +RPI_USERLAND_DEPENDENCIES += libexecinfo > +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo > +endif > + > ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) > > RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From arnout at mind.be Sat Mar 12 20:28:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:28:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/zabbix: fix shared netsnmp build In-Reply-To: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Message-ID: <41dda551-a569-3870-483c-736296887057@mind.be> On 26/02/2022 00:05, Fabrice Fontaine wrote: > Fix the following shared build failure with netsnmp raised since the > addition of the package in commit > 42382a171277ead59e365f5920e757f01c04ac77: > > configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" > > Fixes: > - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 > > Signed-off-by: Fabrice Fontaine > --- > ...-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 +++++++++++++++++++ > package/zabbix/zabbix.mk | 2 + > 2 files changed, 46 insertions(+) > create mode 100644 package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch > > diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch > new file mode 100644 > index 0000000000..ffb1f54ba2 > --- /dev/null > +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch > @@ -0,0 +1,44 @@ > +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 25 Feb 2022 23:30:19 +0100 > +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build > + > +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails > +with the following error if the user provides the path of > +net-snmp-config through the --with-net-snmp option: > + > +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" > + > +However, the assumption that a static library will be provided by the > +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN > + > +Fixes: > + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/zabbix/zabbix/pull/61] > +--- > + m4/netsnmp.m4 | 7 +++++-- > + 1 file changed, 5 insertions(+), 2 deletions(-) > + > +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 > +index 5e84d84303..87e21a67e6 100644 > +--- a/m4/netsnmp.m4 > ++++ b/m4/netsnmp.m4 > +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], > + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) > + > + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then > +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) > +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` This whole thing looks fishy... "if static linking is NO, then link with the static library"? Anyway, applied to master, thanks. Regards, Arnout > ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then > ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` > ++ else > ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) > ++ fi > + else > + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` > + fi > +-- > +2.34.1 > + > diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk > index e6564e68fd..a8ecbb42db 100644 > --- a/package/zabbix/zabbix.mk > +++ b/package/zabbix/zabbix.mk > @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO > ZABBIX_LICENSE = GPL-2.0+ > ZABBIX_LICENSE_FILES = README COPYING > ZABBIX_CPE_ID_VENDOR = zabbix > +# We're patching m4/netsnmp.m4 > +ZABBIX_AUTORECONF = YES > > ZABBIX_DEPENDENCIES = pcre > ZABBIX_CONF_OPTS = \ From arnout at mind.be Sat Mar 12 20:30:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:30:23 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <20220224154513.220976-1-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> Message-ID: On 24/02/2022 16:45, Romain Naour wrote: > TestRust and TestRustBin has been introduced at the time when there was > no cargo package infrastructure or any package using rust compiler > (Buildroot 2018.02). > > Since then the ripgrep package has been introduced, initially using > the generic package infrastructure and converted later to the cargo > package infrastructure. > > Due a recent change in rust/cargo removing the cargo config file [1] > the test TestRust and TestRustBin now fail to compile since they build > an hello-world crate outside of the cargo package infrastructure > without the correct environment for cross-compiling. > > Replace the 'hello-world' crate by ripgrep package and check if it > can run properly in Qemu. > > Fixes tests.package.test_rust.TestRustBin: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 > > But doesn't fixes tests.package.test_rust.TestRust due another bug: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > > [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 > > Signed-off-by: Romain Naour > Cc: Eric Le Bihan > --- > v2: no changes > --- > support/testing/tests/package/test_rust.py | 48 ++-------------------- > 1 file changed, 4 insertions(+), 44 deletions(-) > > diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py > index 884b40a4a3..a1abd20c09 100644 > --- a/support/testing/tests/package/test_rust.py > +++ b/support/testing/tests/package/test_rust.py > @@ -8,9 +8,6 @@ import infra.basetest > > class TestRustBase(infra.basetest.BRTest): > > - target = 'armv7-unknown-linux-gnueabihf' > - crate = 'hello-world' > - > def login(self): > img = os.path.join(self.builddir, "images", "rootfs.cpio") > self.emulator.boot(arch="armv7", > @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): > options=["-initrd", img]) > self.emulator.login() > > - def build_test_prog(self): > - hostdir = os.path.join(self.builddir, 'host') > - env = os.environ.copy() > - env["USER"] = "br-user" > - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] > - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') > - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') > - cargo = os.path.join(hostdir, 'bin', 'cargo') > - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), > - self.crate) > - manifest = os.path.join(workdir, 'Cargo.toml') > - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) > - > - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo init failed") > - > - cmd = [ > - cargo, 'build', '-vv', '--target', self.target, > - '--manifest-path', manifest > - ] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo build failed") > - > - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) > - self.b.build() > - shutil.rmtree(workdir) > - > - > class TestRustBin(TestRustBase): > config = \ > """ > @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") ?It now looks more like test_ripgrep than test_rust, but OK, we still have the rust-bin and full rust variants. ?Applied to master, thanks. ?Regards, ?Arnout > > > class TestRust(TestRustBase): > @@ -90,9 +50,9 @@ class TestRust(TestRustBase): > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > BR2_PACKAGE_HOST_RUST=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") From yann.morin.1998 at free.fr Sat Mar 12 20:33:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:33:35 +0100 Subject: [Buildroot] [git commit] package/pipewire: bump to version 0.3.48 Message-ID: <20220312202507.E350283AA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4550054d2ff6e086711c7a258f6596a0ef8a9f99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set new x11-xfixes meson config option. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index a9d59663ae..e6fad56698 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 +sha256 68bbf83b4c12bbcaef5d4bfb0dda86177583cf0abe0026efcfedd837b2e4926e pipewire-0.3.48.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86ac..80246cc8d0 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.45 +PIPEWIRE_VERSION = 0.3.48 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -136,6 +136,13 @@ else PIPEWIRE_CONF_OPTS += -Dx11=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled +PIPEWIRE_DEPENDENCIES += xlib_libXfixes +else +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb From yann.morin.1998 at free.fr Sat Mar 12 20:34:03 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/pipewire: bump to version 0.3.48 In-Reply-To: <20220311233050.4686-1-james.hilliard1@gmail.com> References: <20220311233050.4686-1-james.hilliard1@gmail.com> Message-ID: <20220312203403.GL283544@scaer> James, All, On 2022-03-11 16:30 -0700, James Hilliard spake thusly: > Set new x11-xfixes meson config option. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pipewire/pipewire.hash | 2 +- > package/pipewire/pipewire.mk | 9 ++++++++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash > index a9d59663ae..e6fad56698 100644 > --- a/package/pipewire/pipewire.hash > +++ b/package/pipewire/pipewire.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 > +sha256 68bbf83b4c12bbcaef5d4bfb0dda86177583cf0abe0026efcfedd837b2e4926e pipewire-0.3.48.tar.bz2 > sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING > sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE > diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk > index fc521c86ac..80246cc8d0 100644 > --- a/package/pipewire/pipewire.mk > +++ b/package/pipewire/pipewire.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PIPEWIRE_VERSION = 0.3.45 > +PIPEWIRE_VERSION = 0.3.48 > PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 > PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) > PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) > @@ -136,6 +136,13 @@ else > PIPEWIRE_CONF_OPTS += -Dx11=disabled > endif > > +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) > +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled > +PIPEWIRE_DEPENDENCIES += xlib_libXfixes > +else > +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled > +endif > + > ifeq ($(BR2_PACKAGE_LIBUSB),y) > PIPEWIRE_CONF_OPTS += -Dlibusb=enabled > PIPEWIRE_DEPENDENCIES += libusb > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Sat Mar 12 20:34:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sat, 12 Mar 2022 21:34:09 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <20220224154513.220976-2-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> <20220224154513.220976-2-romain.naour@gmail.com> Message-ID: <08edbbcf-8be3-4554-0d54-0dd349caa2ff@mind.be> On 24/02/2022 16:45, Romain Naour wrote: > The test TestRust is currently broken with ripgrep package with > the following error: > > error[E0514]: found crate `core` compiled by an incompatible version of rustc > | > = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) > = note: the following crate versions were found: > crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib > > error[E0514]: found crate `std` compiled by an incompatible version of rustc > > The problem is not really a cross-compilation issue (we are building > for an armv7 target on x86_64 host) but a problem with rust-std libraries > (rlib). > > We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same > version as the prebuilt rustc used to bootstrap the build: > > TestRust/host/bin/rustc --version > rustc 1.58.1 > > TestRustBin/host/bin/rustc --version > rustc 1.58.1 (db9d1b20b 2022-01-20) > > Indeed we are using host-rust-bin to bootstrap the host-rust compiler > package built by Buildroot. The problem is that the > libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) > and is not removed before installing host-rust built by Buildroot. > > We actually spent a lot of time to build host-rust with rust-std > and forget to install this important library HOST_DIR. > > Looking at the host-rust build directory we can notice two installer > script "install.sh" (the same scripts used to install host-rust-bin): > > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh > > The "tarball" directory is generated by the "python x.py dist" during > the install step, we have to keep it. > > Replace "python x.py install" by theses two install scripts. > Installing rust-std with the install.sh script replace the rust-std > libraries installed by host-rust-bin. Excellent description, thanks. It's almost Yann-level :-) > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > > Signed-off-by: Romain Naour > Cc: Eric Le Bihan > --- > package/rust/rust.mk | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index 46487fe4b7..4a6b04dc8c 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -67,9 +67,30 @@ define HOST_RUST_BUILD_CMDS > cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build > endef > > +HOST_RUST_INSTALL_COMMON_OPTS = \ > + --prefix=$(HOST_DIR) \ > + --disable-ldconfig > + > +HOST_RUST_INSTALL_OPTS = \ This variable is used only once, which makes it not very useful. I instead added the --components directly in HOST_RUST_INSTALL_RUSTC. I also renamend the INSTALL_COMMON_OPTS to INSTALL_OPTS since there's only one variable now. > + $(HOST_RUST_INSTALL_COMMON_OPTS) \ > + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) > + > +define HOST_RUST_INSTALL_RUSTC > + (cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ The parenthesis are not necessary - make already starts a sub-shell for every line, there's no need to add another shell level. We still have them in a lot of .mk files, but we try to avoid adding them. Applied to master with those two changes, thanks. Regards, Arnout > + ./install.sh $(HOST_RUST_INSTALL_OPTS)) > +endef > + > +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) > +define HOST_RUST_INSTALL_LIBSTD_TARGET > + (cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ > + ./install.sh $(HOST_RUST_INSTALL_COMMON_OPTS)) > +endef > +endif > + > define HOST_RUST_INSTALL_CMDS > cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist > - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install > + $(HOST_RUST_INSTALL_RUSTC) > + $(HOST_RUST_INSTALL_LIBSTD_TARGET) > endef > > $(eval $(host-generic-package)) From yann.morin.1998 at free.fr Sat Mar 12 20:36:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:36:27 +0100 Subject: [Buildroot] [PATCH v3 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220311123636.13415-1-clement.leger@bootlin.com> References: <20220311123636.13415-1-clement.leger@bootlin.com> Message-ID: <20220312203627.GM283544@scaer> Cl?ment, All, On 2022-03-11 13:36 +0100, Cl?ment L?ger via buildroot spake thusly: > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > and optee-test which needs to be aligned with optee-os version. Following the important review from Thomas on patch 1, I've marked this series as changes requested in Patchwork. Please, can you add me in Cc of patch 1 in a future respin (I too may have to deal with python-cryptography on the host in short order). Regards, Yann E. MORIN. > ---- > Changes in v3: > - Fix authorship for commits that were copied from Etienne ones. > - Fix package URL for optee-os > - Added Acked-by Etienne Carriere > > Changes in v2: > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > Cl?ment L?ger (7): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > package/optee-test: bump to version 3.16.0 > package/optee-examples: bump to version 3.16.0 > package/optee-client: bump to version 3.16.0 > package/optee-benchmark: bump to version 3.16.0 > > boot/optee-os/Config.in | 13 +++++++++++-- > boot/optee-os/optee-os.hash | 4 ++-- > boot/optee-os/optee-os.mk | 7 ++++++- > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > package/optee-benchmark/optee-benchmark.mk | 2 +- > package/optee-client/optee-client.hash | 4 ++-- > package/optee-client/optee-client.mk | 2 +- > package/optee-examples/optee-examples.hash | 4 ++-- > package/optee-examples/optee-examples.mk | 2 +- > package/optee-test/optee-test.hash | 4 ++-- > package/optee-test/optee-test.mk | 2 +- > package/python-cryptography/python-cryptography.mk | 7 +++++++ > 12 files changed, 38 insertions(+), 17 deletions(-) > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 20:37:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:37:08 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: bump version to 20220310 Message-ID: <20220312203525.0A16083C1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b9246703dbb92e1e556ff343746959fa04ca17e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - update hash of WHENCE file - update hash of LICENSE.amdgpu (copyright year update, see [1]) [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=34f9f8994a61192abfb597fc55810e3c27269ebf Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/linux-firmware/linux-firmware.hash | 6 +++--- package/linux-firmware/linux-firmware.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 83275ec6d7..382e9cb2ba 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,9 +1,9 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz +sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE +sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c..5ccb7f10dd 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20211216 +LINUX_FIRMWARE_VERSION = 20220310 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES From yann.morin.1998 at free.fr Sat Mar 12 20:44:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:44:17 +0100 Subject: [Buildroot] [PATCH v1] package/linux-firmware: bump version to 20220310 In-Reply-To: <20220311073333.29596-1-ps.report@gmx.net> References: <20220311073333.29596-1-ps.report@gmx.net> Message-ID: <20220312204417.GN283544@scaer> Peter, All, On 2022-03-11 08:33 +0100, Peter Seiderer spake thusly: > - update hash of WHENCE file > > - update hash of LICENSE.amdgpu (copyright year update, see [1]) > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=34f9f8994a61192abfb597fc55810e3c27269ebf > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/linux-firmware/linux-firmware.hash | 6 +++--- > package/linux-firmware/linux-firmware.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash > index 83275ec6d7..382e9cb2ba 100644 > --- a/package/linux-firmware/linux-firmware.hash > +++ b/package/linux-firmware/linux-firmware.hash > @@ -1,9 +1,9 @@ > # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc > -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz > +sha256 5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182 linux-firmware-20220310.tar.xz > > # Hash for license files > sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis > -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu > +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu > sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell > sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware > sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt > @@ -33,6 +33,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS > sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom > sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon > sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware > -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE > +sha256 75afdb5d45a21ff95ff7aa82d67bc42a83830f2def98ea937c01d6e7603d76f9 WHENCE > sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt > sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 2d103df05c..5ccb7f10dd 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LINUX_FIRMWARE_VERSION = 20211216 > +LINUX_FIRMWARE_VERSION = 20220310 > LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz > LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware > LINUX_FIRMWARE_INSTALL_IMAGES = YES > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 20:49:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:49:17 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: Add Intel WiFi 22000 series Message-ID: <20220312204122.8D48583C81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aee590b3bc953b538b87b2a97ea3d5cde6b6d90f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add Intel WiFi 22000 series firmware. This firmware supports WiFi 6 models like AX200/AX201/AX210. Signed-off-by: Stefan Agner [yann.morin.1998 at free.fr: fix prompt for consistency with other iwlwifi] Signed-off-by: Yann E. MORIN --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index c94ffe24de..4a44d4a2b6 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 + bool "Intel iwlwifi 22000" + help + Firmware files for the Intel Wifi 22000 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 5ccb7f10dd..2eec8a291a 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware From yann.morin.1998 at free.fr Sat Mar 12 20:50:55 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 21:50:55 +0100 Subject: [Buildroot] [PATCH] package/linux-firmware: Add Intel WiFi 22000 series In-Reply-To: <200a0dbe075eee7e2c6d309e8a00d68f74b671c7.1646217112.git.stefan@agner.ch> References: <200a0dbe075eee7e2c6d309e8a00d68f74b671c7.1646217112.git.stefan@agner.ch> Message-ID: <20220312205055.GO283544@scaer> Stefan, All, On 2022-03-02 11:32 +0100, Stefan Agner spake thusly: > Add Intel WiFi 22000 series firmware. This firmware supports WiFi 6 > models like AX200/AX201/AX210. > > Signed-off-by: Stefan Agner > --- > package/linux-firmware/Config.in | 6 ++++++ > package/linux-firmware/linux-firmware.mk | 5 +++++ > 2 files changed, 11 insertions(+) > > diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in > index c94ffe24de..c9294956cc 100644 > --- a/package/linux-firmware/Config.in > +++ b/package/linux-firmware/Config.in > @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX > help > Firmware files for the Cypress cyw54xxx FullMAC. > > +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 > + bool "Intel Wireless 22000 series" I've changed this to more closely match the other iwlwifi prompts that follow. Applied to master, thanks. Regards, Yann E. MORIN. > + help > + Firmware files for the Intel Wifi 22000 devices supported by > + the iwlwifi kernel driver. > + > config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 > bool "Intel iwlwifi 22260" > help > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 2d103df05c..6502b90e2d 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* > LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k > endif > > +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) > +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode > +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware > +endif > + > ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260),y) > LINUX_FIRMWARE_FILES += iwlwifi-cc-a0-*.ucode > LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 12 21:29:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 22:29:54 +0100 Subject: [Buildroot] [git commit] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220312212159.CEC7E83C8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66fd92a4ce0599ee8c59b9ba95bf0f2c6ec74c43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ???reserve???: bitmap.c:98:1: sorry, unimplemented: ???-fzero-call-used-regs??? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...ection-of-fzero-call-used-regs-all-suppor.patch | 38 ++++++++++++++++++++++ package/openssh/openssh.mk | 4 +++ 2 files changed, 42 insertions(+) diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From yann.morin.1998 at free.fr Sat Mar 12 21:31:02 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 12 Mar 2022 22:31:02 +0100 Subject: [Buildroot] [PATCH v2] package/openssh: fix '-fzero-call-used-regs' option support detection In-Reply-To: <20220311065511.14015-1-ps.report@gmx.net> References: <20220311065511.14015-1-ps.report@gmx.net> Message-ID: <20220312213102.GP283544@scaer> Peter, All, On 2022-03-11 07:55 +0100, Peter Seiderer spake thusly: > - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option > support detection > > - add autoreconf as the patch touches m4/openssh.m4 > > Fixes: > > - https://bugs.busybox.net/show_bug.cgi?id=14651 > > bitmap.c: In function ?reserve?: > bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target > 98 | } > | ^ > > [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - rebased and renumbered patch from 0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > to 0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > --- > ...n-of-fzero-call-used-regs-all-suppor.patch | 38 +++++++++++++++++++ > package/openssh/openssh.mk | 4 ++ > 2 files changed, 42 insertions(+) > create mode 100644 package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > > diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > new file mode 100644 > index 0000000000..ce5c5539ff > --- /dev/null > +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > @@ -0,0 +1,38 @@ > +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 > +From: Colin Watson > +Date: Thu, 24 Feb 2022 16:04:18 +0000 > +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support > + > +GCC doesn't tell us whether this option is supported unless it runs into > +the situation where it would need to emit corresponding code. > + > +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] > +Signed-off-by: Peter Seiderer > +--- > + m4/openssh.m4 | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/m4/openssh.m4 b/m4/openssh.m4 > +index 4f9c379..8c33c70 100644 > +--- a/m4/openssh.m4 > ++++ b/m4/openssh.m4 > +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ > + #include > + #include > ++/* Trivial function to help test for -fzero-call-used-regs */ > ++void f(int n) {} > + int main(int argc, char **argv) { > + (void)argv; > + /* Some math to catch -ftrapv problems in the toolchain */ > +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { > + float l = i * 2.1; > + double m = l / 0.5; > + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; > ++ f(0); > + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); > + /* > + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does > +-- > +2.35.1 > + > diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk > index 0e0d59e6ab..84add9563d 100644 > --- a/package/openssh/openssh.mk > +++ b/package/openssh/openssh.mk > @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) > OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable > OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain > OPENSSH_LICENSE_FILES = LICENCE > + > +# patch touching m4/openssh.m4 > +OPENSSH_AUTORECONF = YES > + > OPENSSH_CONF_ENV = \ > LD="$(TARGET_CC)" \ > LDFLAGS="$(TARGET_CFLAGS)" \ > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From christian at paral.in Sun Mar 13 00:17:15 2022 From: christian at paral.in (Christian Stewart) Date: Sat, 12 Mar 2022 16:17:15 -0800 Subject: [Buildroot] sshd: fails with seccomp issue on arm In-Reply-To: <105a4a50-cc20-9286-4121-96847904e5e6@mind.be> References: <105a4a50-cc20-9286-4121-96847904e5e6@mind.be> Message-ID: hi Arnout, On Sat, Mar 12, 2022 at 8:07 AM Arnout Vandecappelle wrote: > On 12/03/2022 05:55, Christian Stewart via buildroot wrote: > > I found this relevant issue & patch added to gentoo to fix this: > > > > https://www.mail-archive.com/debian-bugs-dist at lists.debian.org/msg1844602.html > > > > https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc55aee6b2534bbc8d8fe12128c1083ee6850 > > > > Shall we include this patch in Buildroot as well? > > You mean [1] ? This is currently the most recent commit on master, and was not applied yet when I sent the email :) > > I also ran into a build error with fzero-call-regs, there is a patch > > to fix that too: > > > > https://github.com/gentoo/gentoo/blob/9cbbc55/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch > > As in [2] Similarly this was applied very recently to master, I was using 2022.02 when sending this note. So, yes, this is fixed now with those things merged. Thanks, Christian From thomas.petazzoni at bootlin.com Sun Mar 13 07:07:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Mar 2022 07:07:11 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-12 Message-ID: <20220313070717.02D24409A7@smtp4.osuosl.org> Hello, Autobuild statistics for 2022-03-12 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 5 | 1 | 0 | 6 | 2021.11.x | 2 | 1 | 0 | 3 | master | 22 | 14 | 1 | 37 | Classification of failures by reason for master ----------------------------------------------- ola-0.10.8 | 5 bluez5_utils-5.63 | 2 bind-9.16.26 | 1 exempi-2.6.1 | 1 host-delve-1.8.0 | 1 libnetfilter_conntrack-1.0.9 | 1 libuwsc | 1 mesa3d-21.3.6 | 1 uhd-3.15.0.0 | 1 vlc-3.0.16 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/ff816a15507e195e74208e59900f25153c94cc7b | ORPH arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/88b9f653cd5ba4d6a3e2be327cb3bf2adca56565 | i586 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4103142f6e6c0b29b3d15011f995f68513178ba0 | arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/8addb3ab2f8e19552865ae566e93870281fba2ea | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/f61914fcf0c363d819e8b189d781baf3ab9c60d5 | arm | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd | mips64el | libuwsc | TIM | http://autobuild.buildroot.net/results/7fe48d5d7da3e26410b839557756108fe953e4c6 | x86_64 | mesa3d-21.3.6 | NOK | http://autobuild.buildroot.net/results/617e3e63afc837150af50d1af46d0ad067b2d2ca | sparc | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/80a222df03acc700b3a2ca7699cba63090b8310c | powerpc64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/8b3485c5cff8ad4046f26c934ab6dc84ec8d0b5a | or1k | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/c49d30f151db17e740189140089df813e9e0e740 | i586 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/ec33c1036a81158f5190e6c74bb03743c5d45cca | sh4 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/1fa46537748ecf46f09521ee71818fe3b1a1eeeb | arm | uhd-3.15.0.0 | NOK | http://autobuild.buildroot.net/results/502ec0be78adf9fc15b39aed63de419324398882 | mips64el | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/1690c11549764f65520aafc93b32ada8b4e9b832 | Classification of failures by reason for 2021.02.x -------------------------------------------------- zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/e4b2506d4e6839dfd32ff86fa817a740d87952bd | Classification of failures by reason for 2021.11.x -------------------------------------------------- libtheora-1.1.1 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- or1k | libtheora-1.1.1 | NOK | http://autobuild.buildroot.net/results/8589c5fe8c1f61604b166a1dbbf0fe3288cd66f2 | ORPH -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sun Mar 13 08:44:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 09:44:58 +0100 Subject: [Buildroot] [git commit] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220313083630.948D583C41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19294eb352feb9cc96bc7eeb8942da27f715ab87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) From yann.morin.1998 at free.fr Sun Mar 13 08:45:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 09:45:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 In-Reply-To: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> References: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> Message-ID: <20220313084548.GQ283544@scaer> Fabrice, All, On 2022-03-08 19:00 +0100, Fabrice Fontaine spake thusly: > This is a patch release for version 2 & 2.4, fixing a regression > introduced in 2.4.1. > > https://github.com/cisco/libsrtp/releases/tag/v2.4.2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libsrtp/libsrtp.hash | 2 +- > package/libsrtp/libsrtp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash > index 3de0130f4c..8e51e68ac2 100644 > --- a/package/libsrtp/libsrtp.hash > +++ b/package/libsrtp/libsrtp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz > +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz > sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE > diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk > index 885f05a33c..f2ba600dd6 100644 > --- a/package/libsrtp/libsrtp.mk > +++ b/package/libsrtp/libsrtp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSRTP_VERSION = 2.4.1 > +LIBSRTP_VERSION = 2.4.2 > LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) > LIBSRTP_INSTALL_STAGING = YES > LIBSRTP_LICENSE = BSD-3-Clause > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 13 09:02:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:02:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnetfilter_conntrack: fix musl build with headers >= 5.15 Message-ID: <20220313090209.161433-1-fontaine.fabrice@gmail.com> Fix the following build failure with musl and headers >= 5.15 raised since bump to version 1.0.9 in commit 9af9dfa543907c46091c706b0f3a0eb89445ae74: In file included from /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/arpa/inet.h:9, from ../../include/internal/internal.h:14, from proto.c:2: /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd Signed-off-by: Fabrice Fontaine --- ...-fix-build-with-kernel-5-15-and-musl.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch new file mode 100644 index 0000000000..9e96594120 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch @@ -0,0 +1,60 @@ +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko +Signed-off-by: Florian Westphal + +[Retrieved from: +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] +Signed-off-by: Fabrice Fontaine +--- + include/internal/internal.h | 1 - + include/internal/proto.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/internal.h b/include/internal/internal.h +index 2ef8a90..7cd7c44 100644 +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/include/internal/proto.h b/include/internal/proto.h +index 40e7bfe..60a5f4e 100644 +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include ++#include + #include + #include + +-- +cgit v1.2.3 + -- 2.34.1 From yann.morin.1998 at free.fr Sun Mar 13 09:09:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:09:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-weasyprint: bump to version 54.2 In-Reply-To: <20220311191717.3878852-1-james.hilliard1@gmail.com> References: <20220311191717.3878852-1-james.hilliard1@gmail.com> Message-ID: <20220313090942.GR283544@scaer> Kames, All, On 2022-03-11 12:17 -0700, James Hilliard spake thusly: > Migrate from distutils to flit package infrastructure. > > Signed-off-by: James Hilliard Applied to master, thanks. But see below, please... [--SNIP--] > diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk > index 0a944825bb..925de855bc 100644 > --- a/package/python-weasyprint/python-weasyprint.mk > +++ b/package/python-weasyprint/python-weasyprint.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_WEASYPRINT_VERSION = 53.4 > +PYTHON_WEASYPRINT_VERSION = 54.2 > PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz > -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 > -PYTHON_WEASYPRINT_SETUP_TYPE = distutils > +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 > +PYTHON_WEASYPRINT_SETUP_TYPE = flit 'flit', as well as 'pep5127', are not documented in the manual: https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages Can you please send updates to fix that, now? ;-) Regards, Yann E. MORIN. > PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause > PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-setuptools: bump to version 60.9.3 Message-ID: <20220313090240.B7FE283C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a56713b5088acf386748b4bbf00035dade42b45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index e04235e041..1a378d1b76 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz -sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz +md5 6c6a97cf68e1db789a2e5c054f067278 setuptools-60.9.3.tar.gz +sha256 2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 setuptools-60.9.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 8653c42259..3309cd9df4 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.8.2 +PYTHON_SETUPTOOLS_VERSION = 60.9.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/14/74/54890935244ce053abcc4fa01ef4982a84743a8d128d4cf5eae56e2d156c PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From yann.morin.1998 at free.fr Sun Mar 13 09:10:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:49 +0100 Subject: [Buildroot] [git commit] package/python-argon2-cffi: bump to version 21.3.0 Message-ID: <20220313090240.9923783C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2957f5ce743cfaf4fb3aaa98d619e83e8e6989e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate to new flit based build. Since upstream commit cb0248d29ab2 (Extract CFFI bindings into argon2-cffi-bindings), the dependency to libargon2 is carried by argon2-cffi-bindings which is already enforced in Buildroot. So drop it from python-argon2-cffi. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: - explain why we drop the dependency to libargon2 ] Signed-off-by: Yann E. MORIN --- package/python-argon2-cffi/Config.in | 8 +++----- package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 5cddb3314e..4d5a703d76 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI bool "python-argon2-cffi" - depends on BR2_USE_MMU # libargon2 - depends on !BR2_STATIC_LIBS # libargon2 - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_LIBARGON2 + depends on BR2_USE_MMU # python-argon2-cffi-bindings + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime help The secure Argon2 password hashing algorithm. diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash index 6c416ffd88..09da5855a3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.hash +++ b/package/python-argon2-cffi/python-argon2-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz # Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk index f01c940589..0fb3e50ff3 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.mk +++ b/package/python-argon2-cffi/python-argon2-cffi.mk @@ -4,19 +4,11 @@ # ################################################################################ -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit PYTHON_ARGON2_CFFI_LICENSE = MIT PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 -else -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 -endif $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Mar 13 08:47:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 09:47:37 +0100 Subject: [Buildroot] [git commit] package/python-weasyprint: bump to version 54.2 Message-ID: <20220313090240.8ED7F83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7557cb05410f981fe5b8784bb321b28767ea93a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from distutils to flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-weasyprint/python-weasyprint.hash | 4 ++-- package/python-weasyprint/python-weasyprint.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 8d231c50ba..90ccc1d057 100644 --- a/package/python-weasyprint/python-weasyprint.hash +++ b/package/python-weasyprint/python-weasyprint.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/weasyprint/json -md5 a90fd2d5a581a0e218943af3a8b64a31 weasyprint-53.4.tar.gz -sha256 10ccb17d55c73096bdf1edd3efe58cb855b07e4c307d9bad4ebc9a3f13ff4580 weasyprint-53.4.tar.gz +md5 3917447c277db6931b8370f1d725db49 weasyprint-54.2.tar.gz +sha256 d5e8aa82e3e2a2477a4543f0646d9fb14080c9ba34a0859751eb23757cc00466 weasyprint-54.2.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index 0a944825bb..925de855bc 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 53.4 +PYTHON_WEASYPRINT_VERSION = 54.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 -PYTHON_WEASYPRINT_SETUP_TYPE = distutils +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 +PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-installer: bump to version 0.5.1 Message-ID: <20220313090240.AE33A83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a1604d228d26bdbb61b2ce18329ef54e9581688 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-installer/python-installer.hash | 4 ++-- package/python-installer/python-installer.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash index 68af457664..543bd0fa62 100644 --- a/package/python-installer/python-installer.hash +++ b/package/python-installer/python-installer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/installer/json -md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz -sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +md5 bf17db5e6b58c4cfa33642f5348d3814 installer-0.5.1.tar.gz +sha256 f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445 installer-0.5.1.tar.gz # Locally computed sha256 checksums sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 82739a8003..862a251415 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_VERSION = 0.5.1 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE PYTHON_INSTALLER_SETUP_TYPE = distutils From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-flit-core: bump to version 3.7.1 Message-ID: <20220313090240.A3C3A83C77@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23b555a6ccfb80eb3d6065df753986c60b99a7a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-flit-core/python-flit-core.hash | 4 ++-- package/python-flit-core/python-flit-core.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index bd47fd4f6b..135be93660 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz -sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz +md5 4a4791e97f3a8c9a1645064a35636ee6 flit_core-3.7.1.tar.gz +sha256 14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f flit_core-3.7.1.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 8971223d1f..0e058a1f17 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_SETUP_TYPE = pep517 From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-cssselect2: bump to version 0.5.0 Message-ID: <20220313090240.C4A7B83A68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f74ab8d603d6782e522324019634c51247ddba5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate to new flit based build. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-cssselect2/python-cssselect2.hash | 4 ++-- package/python-cssselect2/python-cssselect2.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cssselect2/python-cssselect2.hash b/package/python-cssselect2/python-cssselect2.hash index ed5b863302..fd892e297f 100644 --- a/package/python-cssselect2/python-cssselect2.hash +++ b/package/python-cssselect2/python-cssselect2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect2/json -md5 6dfd5963c8a5d85f2634d1650b1ddfe1 cssselect2-0.4.1.tar.gz -sha256 93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8 cssselect2-0.4.1.tar.gz +md5 6206ebccfdd9fc02196f60e830fa7b1f cssselect2-0.5.0.tar.gz +sha256 d98a7bbdd8ebc46093279195d669a3359bd5a23f90c19e82c19d9eeef333e617 cssselect2-0.5.0.tar.gz # Locally computed sha256 checksums sha256 6fd97229a1d1b0f6a8b41e109f413426dbc0874b1e03746d66cc33282601c2c2 LICENSE diff --git a/package/python-cssselect2/python-cssselect2.mk b/package/python-cssselect2/python-cssselect2.mk index 18e0fba839..b3ddf41fef 100644 --- a/package/python-cssselect2/python-cssselect2.mk +++ b/package/python-cssselect2/python-cssselect2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_CSSSELECT2_VERSION = 0.4.1 +PYTHON_CSSSELECT2_VERSION = 0.5.0 PYTHON_CSSSELECT2_SOURCE = cssselect2-$(PYTHON_CSSSELECT2_VERSION).tar.gz -PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0 -PYTHON_CSSSELECT2_SETUP_TYPE = distutils +PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ce/e7/1333b9042beb33a9bb425900b6d9b59035b98c31c950a323d14ceca1275e +PYTHON_CSSSELECT2_SETUP_TYPE = flit PYTHON_CSSSELECT2_LICENSE = BSD-3-Clause PYTHON_CSSSELECT2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Sun Mar 13 09:10:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:10:57 +0100 Subject: [Buildroot] [git commit] package/python-pyphen: bump to version 0.12.0 Message-ID: <20220313090240.CEB0A83C4C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=280da9f2f46c736911b156dafdfb667951788edd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyphen/python-pyphen.hash | 4 ++-- package/python-pyphen/python-pyphen.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 75ee909351..14938de9c4 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 f8ec095e4fe30dc2b518a918788b33ed pyphen-0.11.0.tar.gz -sha256 e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8 pyphen-0.11.0.tar.gz +md5 99a01a3806cc750c242cae330429a90f pyphen-0.12.0.tar.gz +sha256 b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b pyphen-0.12.0.tar.gz # Locally computed sha256 checksums sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 80f67c77c7..ac0bcf8aab 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.11.0 +PYTHON_PYPHEN_VERSION = 0.12.0 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/f8/af869a4983c1b3159945479510260985714265d48baf27d61f72b1ec8cbf -PYTHON_PYPHEN_SETUP_TYPE = distutils +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/0e/21/9e0841aa76db69e2d74cd64ea2271151d7332fa627a5f03eb0d9ccf3da87 +PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL From yann.morin.1998 at free.fr Sun Mar 13 09:11:16 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 10:11:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: bump to version 21.3.0 In-Reply-To: <20220311194446.3952944-1-james.hilliard1@gmail.com> References: <20220311194446.3952944-1-james.hilliard1@gmail.com> Message-ID: <20220313091116.GS283544@scaer> James, All, On 2022-03-11 12:44 -0700, James Hilliard spake thusly: > Migrate to new flit based build. > > Signed-off-by: James Hilliard > --- > package/python-argon2-cffi/Config.in | 8 +++----- > package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- > package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- > 3 files changed, 8 insertions(+), 18 deletions(-) > > diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in > index 5cddb3314e..5940d1c910 100644 > --- a/package/python-argon2-cffi/Config.in > +++ b/package/python-argon2-cffi/Config.in > @@ -1,10 +1,8 @@ > config BR2_PACKAGE_PYTHON_ARGON2_CFFI > bool "python-argon2-cffi" > - depends on BR2_USE_MMU # libargon2 > - depends on !BR2_STATIC_LIBS # libargon2 > - select BR2_PACKAGE_PYTHON_CFFI # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > - select BR2_PACKAGE_LIBARGON2 > + depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2 > + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2 So, here, you are referencing libargon2, but you do not depend on it, neither do you select it. If your dependency is just on python-argon2-cffi-bindings, then that's all you need to document, not why it needs it. And so, why is the dependency to libargon2 dropped? Given the name of the two packages, python-argon2-cffi and libargon2, they really look like they are related, so dropping the dependency on libargon2 would really need a little explanation, maybe just to state that since upstream commit cb0248d29ab2 (Extract CFFI bindings into argon2-cffi-bindings), the dependency is carried by argon2-cffi-bindings which is already enforced in Buildroot. Applied with a blurb added to that effect. Regards, Yann E. MORIN. > + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime > help > The secure Argon2 password hashing algorithm. > > diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash > index 6c416ffd88..09da5855a3 100644 > --- a/package/python-argon2-cffi/python-argon2-cffi.hash > +++ b/package/python-argon2-cffi/python-argon2-cffi.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json > -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz > -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz > +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz > +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz > # Locally computed sha256 checksums > sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE > diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk > index f01c940589..0fb3e50ff3 100644 > --- a/package/python-argon2-cffi/python-argon2-cffi.mk > +++ b/package/python-argon2-cffi/python-argon2-cffi.mk > @@ -4,19 +4,11 @@ > # > ################################################################################ > > -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 > +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 > PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz > -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 > -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools > +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 > +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit > PYTHON_ARGON2_CFFI_LICENSE = MIT > PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE > -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 > -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 > - > -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 > -else > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 > -endif > > $(eval $(python-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 13 09:21:47 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:21:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/bind: reorder openssl variables Message-ID: <20220313092148.353432-1-fontaine.fabrice@gmail.com> openssl is mandatory since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in the beginning of bind.mk instead of keeping them in the middle of the file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as host-pkgconf is already mandatory Signed-off-by: Fabrice Fontaine --- package/bind/bind.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5ddf7652eb..e0c81152e1 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr \ + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes -BIND_DEPENDENCIES = libuv +BIND_DEPENDENCIES = host-pkgconf libuv openssl ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib -BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -76,13 +80,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 09:21:48 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:21:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/bind: fix libxml2 build In-Reply-To: <20220313092148.353432-1-fontaine.fabrice@gmail.com> References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> Message-ID: <20220313092148.353432-2-fontaine.fabrice@gmail.com> Fix the following build failure with libxml2 raised since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead Fixes: - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b Signed-off-by: Fabrice Fontaine --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e0c81152e1..63cc948c73 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -74,7 +74,7 @@ BIND_CONF_OPTS += --with-gssapi=no endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-libxml2 BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 09:28:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 10:28:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/tree: fix build with gcc 4.8 Message-ID: <20220313092821.357580-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc 4.8 raised since bump to version 2.0.2 in commit 11a3989dbf7ac2535fac04b24ab3d959da3686b3: color.c: In function 'parse_dir_colors': color.c:103:11: error: redeclaration of 'i' with no linkage for(int i=0; i < DOT_EXTENSION; i++) color_code[i] = NULL; ^ Fixes: - http://autobuild.buildroot.org/results/e05595696727622eaf517944d4ff4414baf66bb2 Signed-off-by: Fabrice Fontaine --- package/tree/tree.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 7c111b47d2..da0acbae49 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -11,7 +11,8 @@ TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE define TREE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + -C $(@D) endef define TREE_INSTALL_TARGET_CMDS -- 2.34.1 From james.hilliard1 at gmail.com Sun Mar 13 09:42:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 03:42:49 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-argon2-cffi: bump to version 21.3.0 In-Reply-To: <20220313091116.GS283544@scaer> References: <20220311194446.3952944-1-james.hilliard1@gmail.com> <20220313091116.GS283544@scaer> Message-ID: On Sun, Mar 13, 2022 at 3:11 AM Yann E. MORIN wrote: > > James, All, > > On 2022-03-11 12:44 -0700, James Hilliard spake thusly: > > Migrate to new flit based build. > > > > Signed-off-by: James Hilliard > > --- > > package/python-argon2-cffi/Config.in | 8 +++----- > > package/python-argon2-cffi/python-argon2-cffi.hash | 4 ++-- > > package/python-argon2-cffi/python-argon2-cffi.mk | 14 +++----------- > > 3 files changed, 8 insertions(+), 18 deletions(-) > > > > diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in > > index 5cddb3314e..5940d1c910 100644 > > --- a/package/python-argon2-cffi/Config.in > > +++ b/package/python-argon2-cffi/Config.in > > @@ -1,10 +1,8 @@ > > config BR2_PACKAGE_PYTHON_ARGON2_CFFI > > bool "python-argon2-cffi" > > - depends on BR2_USE_MMU # libargon2 > > - depends on !BR2_STATIC_LIBS # libargon2 > > - select BR2_PACKAGE_PYTHON_CFFI # runtime > > - select BR2_PACKAGE_PYTHON_SIX # runtime > > - select BR2_PACKAGE_LIBARGON2 > > + depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2 > > + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2 > > So, here, you are referencing libargon2, but you do not depend on it, > neither do you select it. If your dependency is just on > python-argon2-cffi-bindings, then that's all you need to document, not > why it needs it. Yeah, thought I was supposed to indicate the source of those dependencies using the "# python-argon2-cffi-bindings -> libargon2" comment style in these cases. > > And so, why is the dependency to libargon2 dropped? Given the name of > the two packages, python-argon2-cffi and libargon2, they really look > like they are related, so dropping the dependency on libargon2 would > really need a little explanation, maybe just to state that since > upstream commit cb0248d29ab2 (Extract CFFI bindings into > argon2-cffi-bindings), the dependency is carried by argon2-cffi-bindings > which is already enforced in Buildroot. Yep, libargon2 dep was moved to a separate bindings package that is now transient to python-argon2-cffi instead of direct. > > Applied with a blurb added to that effect. > > Regards, > Yann E. MORIN. > > > + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime > > help > > The secure Argon2 password hashing algorithm. > > > > diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash > > index 6c416ffd88..09da5855a3 100644 > > --- a/package/python-argon2-cffi/python-argon2-cffi.hash > > +++ b/package/python-argon2-cffi/python-argon2-cffi.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json > > -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz > > -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz > > +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz > > +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz > > # Locally computed sha256 checksums > > sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE > > diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk > > index f01c940589..0fb3e50ff3 100644 > > --- a/package/python-argon2-cffi/python-argon2-cffi.mk > > +++ b/package/python-argon2-cffi/python-argon2-cffi.mk > > @@ -4,19 +4,11 @@ > > # > > ################################################################################ > > > > -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 > > +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 > > PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz > > -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 > > -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools > > +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 > > +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit > > PYTHON_ARGON2_CFFI_LICENSE = MIT > > PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE > > -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 > > -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 > > - > > -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) > > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 > > -else > > -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 > > -endif > > > > $(eval $(python-package)) > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Sun Mar 13 09:52:04 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 10:52:04 +0100 Subject: [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 22.0.3 Message-ID: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 71a153e0a3..beb3cfd6ae 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz +sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 235f71341c..06628132a2 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.2 +INTEL_GMMLIB_VERSION = 22.0.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 13 09:52:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 10:52:06 +0100 Subject: [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 22.2.2 In-Reply-To: <20220313095206.1266409-1-bernd.kuhls@t-online.de> References: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Message-ID: <20220313095206.1266409-3-bernd.kuhls@t-online.de> Rebased patch 0001. Signed-off-by: Bernd Kuhls --- package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch | 2 +- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch index a7e3b70294..b3ecfc98b7 100644 --- a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch +++ b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -40,7 +40,7 @@ index 7e36ae2d..5b8b9b9d 100644 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) if( ARGV1 MATCHES hw AND Linux ) -@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) +@@ -452,7 +452,7 @@ function(configure_dependencies target dependencies variant) endforeach() set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index ee4f317242..d9acf49637 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz +sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7589ff9737..698d2348b2 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.1 +INTEL_MEDIASDK_VERSION = 22.2.2 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 13 09:52:05 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 10:52:05 +0100 Subject: [Buildroot] [PATCH 2/3] package/intel-mediadriver: bump version to 22.2.2 In-Reply-To: <20220313095206.1266409-1-bernd.kuhls@t-online.de> References: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Message-ID: <20220313095206.1266409-2-bernd.kuhls@t-online.de> Switch _SITE to https. Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 7c615620ae..044b9d7013 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz +sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 4895c1535d..84eda811ae 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,8 +6,8 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.1 -INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive +INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause INTEL_MEDIADRIVER_LICENSE_FILES = LICENSE.md -- 2.30.2 From gilles.talis at gmail.com Sun Mar 13 10:32:58 2022 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 13 Mar 2022 11:32:58 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ocrad: bump to version 0.28 In-Reply-To: <20220227101003.3702134-1-fontaine.fabrice@gmail.com> References: <20220227101003.3702134-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, thanks for the bump. Le dim. 27 f?vr. 2022 ? 11:10, Fabrice Fontaine a ?crit : > > - Add libpng mandatory dependency > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine > --- > package/ocrad/Config.in | 1 + > package/ocrad/ocrad.hash | 4 ++-- > package/ocrad/ocrad.mk | 3 ++- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in > index 38d37c612a..b6c4300f86 100644 > --- a/package/ocrad/Config.in > +++ b/package/ocrad/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_OCRAD > bool "ocrad" > depends on BR2_INSTALL_LIBSTDCPP > + select BR2_PACKAGE_LIBPNG > help > GNU Ocrad is an OCR (Optical Character Recognition) program > based on a feature extraction method. > diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash > index 7ae38c30e8..cd5b0039ea 100644 > --- a/package/ocrad/ocrad.hash > +++ b/package/ocrad/ocrad.hash > @@ -1,3 +1,3 @@ > # Locally calculated after checking pgp signature > -sha256 a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 ocrad-0.27.tar.lz > -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING > +sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz > +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING > diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk > index e037a08195..982bb002c9 100644 > --- a/package/ocrad/ocrad.mk > +++ b/package/ocrad/ocrad.mk > @@ -4,12 +4,13 @@ > # > ################################################################################ > > -OCRAD_VERSION = 0.27 > +OCRAD_VERSION = 0.28 > OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz > OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad > OCRAD_LICENSE = GPL-3.0+ I have just noticed that the license has changed since version 0.24 and is now GPLv2+. Please check the licensing section in [1] > OCRAD_LICENSE_FILES = COPYING > OCRAD_INSTALL_STAGING = YES > +OCRAD_DEPENDENCIES = libpng > > # This is not a true autotools package. > define OCRAD_CONFIGURE_CMDS > -- > 2.34.1 > Can you please send an update with a fix for the license? thanks Gilles [1] https://www.gnu.org/software/ocrad/ From fontaine.fabrice at gmail.com Sun Mar 13 10:37:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 11:37:36 +0100 Subject: [Buildroot] [PATCH 1/2] Revert "package/ola: drop autoreconf" Message-ID: <20220313103737.751528-1-fontaine.fabrice@gmail.com> This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because for an unknown reason, the build fails if autoreconf is dropped: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) Fixes: - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 1874350784..5090076175 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 10:37:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 11:37:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/ola: fix build with libexecinfo In-Reply-To: <20220313103737.751528-1-fontaine.fabrice@gmail.com> References: <20220313103737.751528-1-fontaine.fabrice@gmail.com> Message-ID: <20220313103737.751528-2-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: common/.libs/libolacommon.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/4362b20d786a0f44268ec32a689c23ac6d3b71c6 Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..471ae8ed9b 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -53,6 +53,11 @@ endef OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OLA_DEPENDENCIES += libexecinfo +OLA_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ## OLA Bindings and Interface selections ifeq ($(BR2_PACKAGE_OLA_WEB),y) -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:19:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:19:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix CVE comments Message-ID: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE comments Signed-off-by: Fabrice Fontaine --- package/qt5/qt5base/qt5base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a703481aed..f8edfe0847 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -14,8 +14,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 # A few comments: -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:26:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:26:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build on sparc v8 Message-ID: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> Fix the following build failure on sparc v8 raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: ERROR: detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr Fixes: - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log Signed-off-by: Fabrice Fontaine --- ...figure.json-fix-atomicfptr-detection.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 0000000000..5f0f81a4bd --- /dev/null +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:33:33 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:33:33 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nbd: security bump to version 3.24 Message-ID: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Tag as a security bump and add CVEs package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:41:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:41:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/minidlna: fix CVE-2022-26505 Message-ID: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine --- ...rotect-against-DNS-rebinding-attacks.patch | 66 +++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) create mode 100644 package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ -- 2.34.1 From fontaine.fabrice at gmail.com Sun Mar 13 11:47:41 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 12:47:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Sun Mar 13 12:21:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 06:21:11 -0600 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: migrate flit to new bootstrapping sequence Message-ID: <20220313122112.261290-1-james.hilliard1@gmail.com> There are a number of flit toolchain dependencies currently in the process of deprecating distutils based fallbacks. This will be needed in order to update tomli. We need to migrate these to use a new bootstrap based build+install sequence which relies on flit's bootstrap wheel build+install features to build and install host-python-pypa-build and host-python-installer which gives us a full pep517 toolchain. Signed-off-by: James Hilliard --- package/pkg-python.mk | 28 +++++++++++++++++--- package/python-flit-core/python-flit-core.mk | 2 +- package/python-installer/python-installer.mk | 3 ++- package/python-pep517/python-pep517.mk | 2 +- package/python-tomli/python-tomli.mk | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..6dee8aa7d1 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -212,7 +215,16 @@ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) $(2)_BASE_BUILD_CMD = -m build -n -w -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = $$(if $$(filter \ + host-python-flit-core \ + host-python-installer \ + host-python-pep517 \ + host-python-tomli,$(1)),\ + -m flit_core.wheel,\ + -m build -n -w) +$(2)_BASE_INSTALL_CMD = $$(if $$(filter host-python-flit-core,$(1)),\ + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS),\ + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS)) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") @@ -235,9 +247,19 @@ endif # ($(4),target) ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +$(2)_DEPENDENCIES += $$(if $$(filter \ + host-python-flit-core \ + host-python-installer \ + host-python-pep517 \ + host-python-pypa-build \ + host-python-tomli,$(1)),,\ + host-python-pypa-build) +$(2)_DEPENDENCIES += $$(if $$(filter \ + host-python-flit-core \ + host-python-installer,$(1)),,\ + host-python-installer) ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) endif endif # SETUP_TYPE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 0e058a1f17..d206a72f82 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 +PYTHON_FLIT_CORE_SETUP_TYPE = flit $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 862a251415..97a158b738 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE -PYTHON_INSTALLER_SETUP_TYPE = distutils +PYTHON_INSTALLER_SETUP_TYPE = flit +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src $(eval $(host-python-package)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 99aa62d51d..1ca1bc4e35 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE -PYTHON_PEP517_SETUP_TYPE = distutils +PYTHON_PEP517_SETUP_TYPE = flit HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index b8c20ca736..3539a505be 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -7,7 +7,7 @@ PYTHON_TOMLI_VERSION = 1.2.0 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa -PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_SETUP_TYPE = flit PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 12:21:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 06:21:12 -0600 Subject: [Buildroot] [PATCH 2/2] package/python-tomli: bump to version 2.0.1 In-Reply-To: <20220313122112.261290-1-james.hilliard1@gmail.com> References: <20220313122112.261290-1-james.hilliard1@gmail.com> Message-ID: <20220313122112.261290-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-tomli/python-tomli.hash | 4 ++-- package/python-tomli/python-tomli.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash index 1a274c8a40..8368f9ee13 100644 --- a/package/python-tomli/python-tomli.hash +++ b/package/python-tomli/python-tomli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tomli/json -md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz -sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +md5 d4341621d423a7ca6822e23d6d52bb9a tomli-2.0.1.tar.gz +sha256 de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f tomli-2.0.1.tar.gz # Locally computed sha256 checksums sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index 3539a505be..014e8db1f6 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_VERSION = 2.0.1 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz -PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3 PYTHON_TOMLI_SETUP_TYPE = flit PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE -- 2.25.1 From bernd.kuhls at t-online.de Sun Mar 13 12:55:40 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 13:55:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot: bump version to 2.3.18 Message-ID: <20220313125540.3017299-1-bernd.kuhls@t-online.de> Release notes: https://dovecot.org/pipermail/dovecot-news/2022-February/000470.html Signed-off-by: Bernd Kuhls --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 0363b6e922..e70b266d92 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz +sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fb299a8e45..053462c6dd 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 13 13:04:24 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 13 Mar 2022 14:04:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 Message-ID: <20220313130424.3046857-1-bernd.kuhls@t-online.de> Changelog: https://curl.se/changes.html Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 Signed-off-by: Bernd Kuhls --- package/libcurl/libcurl.hash | 6 +++--- package/libcurl/libcurl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 63d6ba306c..4be245041c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.81.0.tar.xz.asc +# https://curl.se/download/curl-7.82.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f271..863cc268b4 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.81.0 +LIBCURL_VERSION = 7.82.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ -- 2.30.2 From thomas.petazzoni at bootlin.com Sun Mar 13 13:20:24 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 13 Mar 2022 14:20:24 +0100 Subject: [Buildroot] [PATCH 1/2] Revert "package/ola: drop autoreconf" In-Reply-To: <20220313103737.751528-1-fontaine.fabrice@gmail.com> References: <20220313103737.751528-1-fontaine.fabrice@gmail.com> Message-ID: <20220313142024.56b9493e@windsurf> On Sun, 13 Mar 2022 11:37:36 +0100 Fabrice Fontaine wrote: > This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because > for an unknown reason, the build fails if autoreconf is dropped: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > > Fixes: > - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 > Signed-off-by: Fabrice Fontaine > --- > package/ola/ola.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 1874350784..5090076175 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE > OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) > OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE > OLA_INSTALL_STAGING = YES > +OLA_AUTORECONF = YES Perhaps a comment above this line would be useful, to explain why AUTORECONF is needed, otherwise there are risks for it to get dropped again in the future. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Sun Mar 13 14:37:26 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 08:37:26 -0600 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: add flit package support Message-ID: <20220313143726.267306-1-james.hilliard1@gmail.com> These packages don't have a setup.py so we instead need to parse their pyproject.toml file. Signed-off-by: James Hilliard --- utils/scanpypi | 126 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 105 insertions(+), 21 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..98426820c6 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -42,6 +42,48 @@ except ImportError: 'pip install spdx_lookup') liclookup = None +def toml_load(f): + with open(f, 'rb') as fh: + ex = None + + # Try regular tomli first + try: + from tomli import load + return load(fh) + except ImportError as e: + ex = e + + # Try pip's vendored tomli + try: + from pip._vendor.tomli import load + try: + return load(fh) + except TypeError: + # Fallback to handle older version + try: + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + return load(w) + finally: + w.detach() + except ImportError as e: + pass + + # Try regular toml last + try: + from toml import load + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + try: + return load(w) + finally: + w.detach() + except ImportError: + pass + + print('This package needs tomli') + raise ex + def setup_decorator(func, method): """ @@ -296,20 +338,52 @@ class BuildrootPackage(): current_dir = os.getcwd() os.chdir(self.tmp_extract) sys.path.insert(0, self.tmp_extract) - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - imp.load_module('__main__', s_file, s_path, s_desc) - if self.metadata_name in self.setup_args: - pass - elif self.metadata_name.replace('_', '-') in self.setup_args: - self.metadata_name = self.metadata_name.replace('_', '-') - elif self.metadata_name.replace('-', '_') in self.setup_args: - self.metadata_name = self.metadata_name.replace('-', '_') try: - self.setup_metadata = self.setup_args[self.metadata_name] - except KeyError: - # This means setup was not called - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) + imp.load_module('__main__', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') + try: + self.setup_metadata = self.setup_args[self.metadata_name] + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject_data = toml_load('pyproject.toml') + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + if build_backend is not None and build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + elif build_system.get('backend-path', None) is not None: + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + except FileNotFoundError: raise os.chdir(current_dir) sys.path.remove(self.tmp_extract) @@ -609,7 +683,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +692,17 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) + if home_page is None or len(home_page) == 0: + project_urls = md_info.get('project_urls', {}) + home_page = project_urls.get('Homepage', None) + + if home_page is not None and len(home_page) != 0: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) @@ -692,9 +773,12 @@ def main(): except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception as e: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 14:45:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 08:45:30 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-weasyprint: bump to version 54.2 In-Reply-To: <20220313090942.GR283544@scaer> References: <20220311191717.3878852-1-james.hilliard1@gmail.com> <20220313090942.GR283544@scaer> Message-ID: On Sun, Mar 13, 2022 at 3:09 AM Yann E. MORIN wrote: > > Kames, All, > > On 2022-03-11 12:17 -0700, James Hilliard spake thusly: > > Migrate from distutils to flit package infrastructure. > > > > Signed-off-by: James Hilliard > > Applied to master, thanks. > > But see below, please... > > [--SNIP--] > > diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk > > index 0a944825bb..925de855bc 100644 > > --- a/package/python-weasyprint/python-weasyprint.mk > > +++ b/package/python-weasyprint/python-weasyprint.mk > > @@ -4,10 +4,10 @@ > > # > > ################################################################################ > > > > -PYTHON_WEASYPRINT_VERSION = 53.4 > > +PYTHON_WEASYPRINT_VERSION = 54.2 > > PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz > > -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 > > -PYTHON_WEASYPRINT_SETUP_TYPE = distutils > > +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/f3/dc/d3d6f1d87a0a0b09637a1f5076790e229cc803c3584ed4edb76553844001 > > +PYTHON_WEASYPRINT_SETUP_TYPE = flit > > 'flit', as well as 'pep5127', are not documented in the manual: > https://buildroot.org/downloads/manual/manual.html#_infrastructure_for_python_packages > > Can you please send updates to fix that, now? ;-) Yeah, cleaning flit/pep517 support up a bit more first, the pep517 option may not be needed except for in tree backends, I guess we should keep it around for now but not sure if any packages are going to be using it: https://peps.python.org/pep-0517/#in-tree-build-backends No packages use direct pep517 anymore as of this refactor: https://patchwork.ozlabs.org/project/buildroot/patch/20220313122112.261290-1-james.hilliard1 at gmail.com/ I've added flit/pep517 support in scanpypi as well in: https://patchwork.ozlabs.org/project/buildroot/patch/20220313143726.267306-1-james.hilliard1 at gmail.com/ Will send a docs update after those are reviewed+merged since there are potential docs implications with those changes. > > Regards, > Yann E. MORIN. > > > PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause > > PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE > > > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Fri Mar 11 21:56:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 11 Mar 2022 22:56:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Makefile: unexport 'DEVICE_TREE' environment variable Message-ID: <20220313153102.CB17683CBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8cb00a283392b51bb34919e2366ba93762436ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x U-Boot looks for the environment variable DEVICE_TREE and uses its value if set instead of the CONFIG_DEFAULT_DEVICE_TREE configuration option since v2021.01, more specifically commit c0f1ebe9c1b9745e (binman: Allow selecting default FIT configuration) - So unexport it like we do for other "troublesome" environment variables to ensure consistent behaviour. Reported-by: Neal Frager Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d3910057c6ae38e2cf72e8c86cd84756fffba2ac) Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 49551aacc7..09bf835b05 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,7 @@ unexport O unexport GCC_COLORS unexport PLATFORM unexport OS +unexport DEVICE_TREE GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From yann.morin.1998 at free.fr Sun Mar 13 16:21:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 17:21:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <20220313122112.261290-1-james.hilliard1@gmail.com> References: <20220313122112.261290-1-james.hilliard1@gmail.com> Message-ID: <20220313162132.GT283544@scaer> James, All, On 2022-03-13 06:21 -0600, James Hilliard spake thusly: > There are a number of flit toolchain dependencies currently in the > process of deprecating distutils based fallbacks. > > This will be needed in order to update tomli. > > We need to migrate these to use a new bootstrap based build+install > sequence which relies on flit's bootstrap wheel build+install > features to build and install host-python-pypa-build and > host-python-installer which gives us a full pep517 toolchain. Would it be possible to split this change into separate patches: - introduce the new support, - migrate patches one by one - drop the leftovers of no longer needed stuff Also, see below... > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..6dee8aa7d1 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk [--SNIP--] > @@ -212,7 +215,16 @@ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* > else > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > $(2)_BASE_BUILD_CMD = -m build -n -w So this assignment to $(2)_BASE_BUILD_CMD... > -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > +$(2)_BASE_BUILD_CMD = $$(if $$(filter \ ... is completely overriden here... > + host-python-flit-core \ > + host-python-installer \ > + host-python-pep517 \ > + host-python-tomli,$(1)),\ > + -m flit_core.wheel,\ > + -m build -n -w) > +$(2)_BASE_INSTALL_CMD = $$(if $$(filter host-python-flit-core,$(1)),\ > + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS),\ > + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS)) > endif > else > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") > @@ -235,9 +247,19 @@ endif # ($(4),target) > ifeq ($$($(2)_SETUP_TYPE),setuptools) > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > +$(2)_DEPENDENCIES += $$(if $$(filter \ > + host-python-flit-core \ > + host-python-installer \ > + host-python-pep517 \ > + host-python-pypa-build \ > + host-python-tomli,$(1)),,\ > + host-python-pypa-build) This is totally unreadable. One can't easily spot what is filtered from what... $(2)_DEPENDENCIES += $$(if \ $$(filter \ host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ $(1)) \ , \ host-python-pypa-build ) So, what this is saying, as I can understand, is that if the current package is one of the list; host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli then we want to add host-python-pypa-build to their dependency. However, from what I understand, all those packages really are packages that implement the 'flit' and pep517 now?) infrastructure, and thus the dependency should be explicitly listed in those packages, rather than implcitly added by the infra. > +$(2)_DEPENDENCIES += $$(if $$(filter \ Why use an other assignment to the same variable? It could be a single assignment... > + host-python-flit-core \ > + host-python-installer,$(1)),,\ > + host-python-installer) Ditto, this should be explictly added to the packages. > ifeq ($$($(2)_SETUP_TYPE),flit) > -$(2)_DEPENDENCIES += host-python-flit-core > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) I don't understand how this is going to work. The dependency exclusion here is correct, indeed, I am not questionning that. However, I don't understand how host-python-flit-core can use the flit type at build time, when it is not already installed, especially since host-python-flit-core does not define any custom configure/build/install commands... You will have to add a blurb in the commit log to explain how it works... > endif > endif # SETUP_TYPE > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > index 0e058a1f17..d206a72f82 100644 > --- a/package/python-flit-core/python-flit-core.mk > +++ b/package/python-flit-core/python-flit-core.mk > @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > +PYTHON_FLIT_CORE_SETUP_TYPE = flit Yup, see my comment above, about the corresponding change in the infra. > $(eval $(host-python-package)) > diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk > index 862a251415..97a158b738 100644 > --- a/package/python-installer/python-installer.mk > +++ b/package/python-installer/python-installer.mk > @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz > PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 > PYTHON_INSTALLER_LICENSE = MIT > PYTHON_INSTALLER_LICENSE_FILES = LICENSE > -PYTHON_INSTALLER_SETUP_TYPE = distutils > +PYTHON_INSTALLER_SETUP_TYPE = flit > +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src Why do we need to provide this here? Can't that be made generic be using something like HOST_PYTHON_INSTALLER_SUBDIR=src ? python-package already uses $(2)_BUILDDIR, which by default is the same as $(2)_SRCDIR, which by default is (basically) $(@D)/$(2)_SUBDIR, so it should jsut work automatically, no? Regards, Yann E. MORIN. > $(eval $(host-python-package)) > diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk > index 99aa62d51d..1ca1bc4e35 100644 > --- a/package/python-pep517/python-pep517.mk > +++ b/package/python-pep517/python-pep517.mk > @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz > PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 > PYTHON_PEP517_LICENSE = MIT > PYTHON_PEP517_LICENSE_FILES = LICENSE > -PYTHON_PEP517_SETUP_TYPE = distutils > +PYTHON_PEP517_SETUP_TYPE = flit > HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli > > $(eval $(host-python-package)) > diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk > index b8c20ca736..3539a505be 100644 > --- a/package/python-tomli/python-tomli.mk > +++ b/package/python-tomli/python-tomli.mk > @@ -7,7 +7,7 @@ > PYTHON_TOMLI_VERSION = 1.2.0 > PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz > PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa > -PYTHON_TOMLI_SETUP_TYPE = distutils > +PYTHON_TOMLI_SETUP_TYPE = flit > PYTHON_TOMLI_LICENSE = MIT > PYTHON_TOMLI_LICENSE_FILES = LICENSE > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 16:31:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 17:31:51 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: add flit package support In-Reply-To: <20220313143726.267306-1-james.hilliard1@gmail.com> References: <20220313143726.267306-1-james.hilliard1@gmail.com> Message-ID: <20220313163151.GU283544@scaer> James, All, On 2022-03-13 08:37 -0600, James Hilliard spake thusly: > These packages don't have a setup.py so we instead need to parse their > pyproject.toml file. Please, split this into at least two patches; - offload the loading to a separate function (i.e. load_pyproject()) - introduce support for flit packages Also, even though I did not look at the code too closely, it looks like the handling of the homepage is not strictly tied to the flit support, so perhaps it should be also separated (unless it is tied to the introduction of load_pyproject()?) Anyway, separate patches into semantically contained minimalist patches, please. Alos, please try to provide more detailed explanations in your commit logs. Consider that reviewers are dumb in your area of expertise (I certainly am!), and consider what information we will need to understand the change, and also what we will need in two weeks, two months, two years when we have an issue and we want to understand how the code came to be... Regards, Yann E. MORIN. > Signed-off-by: James Hilliard > --- > utils/scanpypi | 126 ++++++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 105 insertions(+), 21 deletions(-) > > diff --git a/utils/scanpypi b/utils/scanpypi > index 17d8a0017a..98426820c6 100755 > --- a/utils/scanpypi > +++ b/utils/scanpypi > @@ -42,6 +42,48 @@ except ImportError: > 'pip install spdx_lookup') > liclookup = None > > +def toml_load(f): > + with open(f, 'rb') as fh: > + ex = None > + > + # Try regular tomli first > + try: > + from tomli import load > + return load(fh) > + except ImportError as e: > + ex = e > + > + # Try pip's vendored tomli > + try: > + from pip._vendor.tomli import load > + try: > + return load(fh) > + except TypeError: > + # Fallback to handle older version > + try: > + fh.seek(0) > + w = io.TextIOWrapper(fh, encoding="utf8", newline="") > + return load(w) > + finally: > + w.detach() > + except ImportError as e: > + pass > + > + # Try regular toml last > + try: > + from toml import load > + fh.seek(0) > + w = io.TextIOWrapper(fh, encoding="utf8", newline="") > + try: > + return load(w) > + finally: > + w.detach() > + except ImportError: > + pass > + > + print('This package needs tomli') > + raise ex > + > > def setup_decorator(func, method): > """ > @@ -296,20 +338,52 @@ class BuildrootPackage(): > current_dir = os.getcwd() > os.chdir(self.tmp_extract) > sys.path.insert(0, self.tmp_extract) > - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) > - imp.load_module('__main__', s_file, s_path, s_desc) > - if self.metadata_name in self.setup_args: > - pass > - elif self.metadata_name.replace('_', '-') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('_', '-') > - elif self.metadata_name.replace('-', '_') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('-', '_') > try: > - self.setup_metadata = self.setup_args[self.metadata_name] > - except KeyError: > - # This means setup was not called > - print('ERROR: Could not determine package metadata for {pkg}.\n' > - .format(pkg=self.real_name)) > + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) > + imp.load_module('__main__', s_file, s_path, s_desc) > + if self.metadata_name in self.setup_args: > + pass > + elif self.metadata_name.replace('_', '-') in self.setup_args: > + self.metadata_name = self.metadata_name.replace('_', '-') > + elif self.metadata_name.replace('-', '_') in self.setup_args: > + self.metadata_name = self.metadata_name.replace('-', '_') > + try: > + self.setup_metadata = self.setup_args[self.metadata_name] > + except KeyError: > + # This means setup was not called > + print('ERROR: Could not determine package metadata for {pkg}.\n' > + .format(pkg=self.real_name)) > + raise > + finally: > + os.chdir(current_dir) > + sys.path.remove(self.tmp_extract) > + > + def load_pyproject(self): > + """ > + Loads the corresponding pyproject.toml and store its metadata > + """ > + current_dir = os.getcwd() > + os.chdir(self.tmp_extract) > + sys.path.insert(0, self.tmp_extract) > + try: > + pyproject_data = toml_load('pyproject.toml') > + try: > + self.setup_metadata = pyproject_data.get('project', {}) > + self.metadata_name = self.setup_metadata.get('name', self.real_name) > + build_system = pyproject_data.get('build-system', {}) > + build_backend = build_system.get('build-backend', None) > + if build_backend is not None and build_backend == 'flit_core.buildapi': > + self.setup_metadata['method'] = 'flit' > + elif build_system.get('backend-path', None) is not None: > + self.setup_metadata['method'] = 'pep517' > + else: > + self.setup_metadata['method'] = 'unknown' > + except KeyError: > + # This means setup was not called > + print('ERROR: Could not determine package metadata for {pkg}.\n' > + .format(pkg=self.real_name)) > + raise > + except FileNotFoundError: > raise > os.chdir(current_dir) > sys.path.remove(self.tmp_extract) > @@ -609,7 +683,8 @@ class BuildrootPackage(): > > lines.append('\thelp\n') > > - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, > + md_info = self.metadata['info'] > + help_lines = textwrap.wrap(md_info['summary'], 62, > initial_indent='\t ', > subsequent_indent='\t ') > > @@ -617,11 +692,17 @@ class BuildrootPackage(): > if help_lines[-1][-1] != '.': > help_lines[-1] += '.' > > - # \t + two spaces is 3 char long > - help_lines.append('') > - help_lines.append('\t ' + self.metadata['info']['home_page']) > - help_lines = [x + '\n' for x in help_lines] > - lines += help_lines > + home_page = md_info.get('home_page', None) > + if home_page is None or len(home_page) == 0: > + project_urls = md_info.get('project_urls', {}) > + home_page = project_urls.get('Homepage', None) > + > + if home_page is not None and len(home_page) != 0: > + # \t + two spaces is 3 char long > + help_lines.append('') > + help_lines.append('\t ' + home_page) > + help_lines = [x + '\n' for x in help_lines] > + lines += help_lines > > with open(path_to_config, 'w') as config_file: > config_file.writelines(lines) > @@ -692,9 +773,12 @@ def main(): > except ImportError as err: > if 'buildutils' in str(err): > print('This package needs buildutils') > + continue > else: > - raise > - continue > + try: > + package.load_pyproject() > + except Exception as e: > + raise > except (AttributeError, KeyError) as error: > print('Error: Could not install package {pkg}: {error}'.format( > pkg=package.real_name, error=error)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Sun Mar 13 16:50:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 10:50:30 -0600 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: support alternative Homepage format Message-ID: <20220313165030.269338-1-james.hilliard1@gmail.com> Some packages only have a home page properly set inside project_urls. Signed-off-by: James Hilliard --- utils/scanpypi | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..681758a552 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -609,7 +609,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +618,17 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) + if home_page is None or len(home_page) == 0: + project_urls = md_info.get('project_urls', {}) + home_page = project_urls.get('Homepage', None) + + if home_page is not None and len(home_page) != 0: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 17:13:54 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 11:13:54 -0600 Subject: [Buildroot] [PATCH v2 1/2] utils/scanpypi: ensure tmp_extract is cleaned up on exception Message-ID: <20220313171355.271345-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- utils/scanpypi | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..724e59f759 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -296,23 +296,25 @@ class BuildrootPackage(): current_dir = os.getcwd() os.chdir(self.tmp_extract) sys.path.insert(0, self.tmp_extract) - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - imp.load_module('__main__', s_file, s_path, s_desc) - if self.metadata_name in self.setup_args: - pass - elif self.metadata_name.replace('_', '-') in self.setup_args: - self.metadata_name = self.metadata_name.replace('_', '-') - elif self.metadata_name.replace('-', '_') in self.setup_args: - self.metadata_name = self.metadata_name.replace('-', '_') try: - self.setup_metadata = self.setup_args[self.metadata_name] - except KeyError: - # This means setup was not called - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) - raise - os.chdir(current_dir) - sys.path.remove(self.tmp_extract) + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) + imp.load_module('__main__', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') + try: + self.setup_metadata = self.setup_args[self.metadata_name] + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) def get_requirements(self, pkg_folder): """ -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 13 17:13:55 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 11:13:55 -0600 Subject: [Buildroot] [PATCH v2 2/2] utils/scanpypi: add flit package support In-Reply-To: <20220313171355.271345-1-james.hilliard1@gmail.com> References: <20220313171355.271345-1-james.hilliard1@gmail.com> Message-ID: <20220313171355.271345-2-james.hilliard1@gmail.com> These packages don't have a setup.py so we instead need to parse their pyproject.toml file. Signed-off-by: James Hilliard --- Changes v1 -> v2: - remove homepage format fixes(sent as separate patch) - remove load_setup fixes - move load_pyproject cleanup to finally block --- utils/scanpypi | 80 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 724e59f759..f501b36232 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -42,6 +42,48 @@ except ImportError: 'pip install spdx_lookup') liclookup = None +def toml_load(f): + with open(f, 'rb') as fh: + ex = None + + # Try regular tomli first + try: + from tomli import load + return load(fh) + except ImportError as e: + ex = e + + # Try pip's vendored tomli + try: + from pip._vendor.tomli import load + try: + return load(fh) + except TypeError: + # Fallback to handle older version + try: + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + return load(w) + finally: + w.detach() + except ImportError as e: + pass + + # Try regular toml last + try: + from toml import load + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + try: + return load(w) + finally: + w.detach() + except ImportError: + pass + + print('This package needs tomli') + raise ex + def setup_decorator(func, method): """ @@ -316,6 +358,37 @@ class BuildrootPackage(): os.chdir(current_dir) sys.path.remove(self.tmp_extract) + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject_data = toml_load('pyproject.toml') + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + if build_backend is not None and build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + elif build_system.get('backend-path', None) is not None: + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + except FileNotFoundError: + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + def get_requirements(self, pkg_folder): """ Retrieve dependencies from the metadata found in the setup.py script of @@ -694,9 +767,12 @@ def main(): except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception as e: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) -- 2.25.1 From fontaine.fabrice at gmail.com Sun Mar 13 17:39:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 13 Mar 2022 18:39:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: switch to autotools-package Message-ID: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> Switch to autotools-package to avoid the following static build failure since commit d661740201405970f65c16c39a79f4148705af30: [ 56%] Linking C executable rtl_biast /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' collect2: error: ld returned 1 exit status Drop both cmake-related patches Fixes: - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 Signed-off-by: Fabrice Fontaine --- ...pect-DESTDIR-with-install-udev-rules.patch | 31 +++++ ...sable_shared_library_target_in_build.patch | 130 ------------------ ...rsion.cmake-don-t-use-Git-version-if.patch | 47 ------- package/librtlsdr/librtlsdr.mk | 26 ++-- 4 files changed, 42 insertions(+), 192 deletions(-) create mode 100644 package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch delete mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch delete mode 100644 package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 0000000000..1aec8166cc --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465de..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41..0000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a..908be158b1 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) -- 2.34.1 From james.hilliard1 at gmail.com Sun Mar 13 17:56:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 11:56:14 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence Message-ID: <20220313175615.406390-1-james.hilliard1@gmail.com> There are a number of flit toolchain dependencies currently in the process of deprecating distutils based fallbacks. This will be needed in order to update tomli. We need to migrate these to use a new bootstrap based build+install sequence which relies on flit's bootstrap wheel build+install features to build and install host-python-pypa-build and host-python-installer which gives us a full pep517 toolchain. Note that one can run host-python-flit-core commands for building and installing itself since the package build directory is the cwd. For host-python-installer to do this we need to add the package src directory to PYTHONPATH as we need to run it from the source directory for installing itself. This is due to a directory structure that does not let us run directly from the top level. Signed-off-by: James Hilliard --- Changes v1 -> v2: - formatting/cleanup - add comments --- package/pkg-python.mk | 45 ++++++++++++++++++-- package/python-flit-core/python-flit-core.mk | 2 +- package/python-installer/python-installer.mk | 3 +- package/python-pep517/python-pep517.mk | 2 +- package/python-tomli/python-tomli.mk | 2 +- 5 files changed, 46 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..f08d8ce04c 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -211,8 +214,25 @@ $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) -$(2)_BASE_BUILD_CMD = -m build -n -w -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +# Use flit built in wheel builder for packages that are host-python-pypa-build dependencies. +# This is needed to avoid a circular with host-python-pypa-build and those dependencies. +# +$(2)_BASE_BUILD_CMD = $$(if \ + $$(filter \ + host-python-flit-core host-python-installer host-python-pep517 host-python-tomli, \ + $(1)) \ + , \ + -m flit_core.wheel, \ + -m build -n -w \ + ) +# Use flit built in bootstrap_install for installing host-python-flit-core. +# This is due to host-python-installer depending on host-python-flit-core. +# +$(2)_BASE_INSTALL_CMD = $$(if \ + $$(filter host-python-flit-core,$(1)), \ + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS), \ + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) \ + ) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") @@ -235,9 +255,26 @@ endif # ($(4),target) ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +# Filter out host-python-pypa-build and any of its dependencies that need a flit based build. +# +$(2)_DEPENDENCIES += $$(if \ + $$(filter \ + host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ + $(1)) \ + ,, \ + host-python-pypa-build \ + ) +# Filter out host-python-installer and any of its dependencies that need a flit based build. +# +$(2)_DEPENDENCIES += $$(if \ + $$(filter \ + host-python-flit-core host-python-installer, \ + $(1)) \ + ,, \ + host-python-installer \ + ) ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) endif endif # SETUP_TYPE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 0e058a1f17..d206a72f82 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 +PYTHON_FLIT_CORE_SETUP_TYPE = flit $(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 862a251415..97a158b738 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE -PYTHON_INSTALLER_SETUP_TYPE = distutils +PYTHON_INSTALLER_SETUP_TYPE = flit +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src $(eval $(host-python-package)) diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 99aa62d51d..1ca1bc4e35 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE -PYTHON_PEP517_SETUP_TYPE = distutils +PYTHON_PEP517_SETUP_TYPE = flit HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli $(eval $(host-python-package)) diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk index b8c20ca736..3539a505be 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -7,7 +7,7 @@ PYTHON_TOMLI_VERSION = 1.2.0 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa -PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_SETUP_TYPE = flit PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE -- 2.25.1 From baruch at tkos.co.il Sun Mar 13 18:05:45 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 13 Mar 2022 20:05:45 +0200 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 In-Reply-To: <20220313130424.3046857-1-bernd.kuhls@t-online.de> References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> Message-ID: <877d8xd8nb.fsf@tarshish> Hi Bernd, On Sun, Mar 13 2022, Bernd Kuhls wrote: > Changelog: https://curl.se/changes.html > > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 > > Signed-off-by: Bernd Kuhls Thanks for the bump. It looks like NSS crypto back-end support requires --with-nss-deprecated now. Maybe just drop deprecated NSS support? baruch > --- > package/libcurl/libcurl.hash | 6 +++--- > package/libcurl/libcurl.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash > index 63d6ba306c..4be245041c 100644 > --- a/package/libcurl/libcurl.hash > +++ b/package/libcurl/libcurl.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://curl.se/download/curl-7.81.0.tar.xz.asc > +# https://curl.se/download/curl-7.82.0.tar.xz.asc > # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 > -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz > -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING > +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz > +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 20ebb4f271..863cc268b4 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBCURL_VERSION = 7.81.0 > +LIBCURL_VERSION = 7.82.0 > LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz > LIBCURL_SITE = https://curl.se/download > LIBCURL_DEPENDENCIES = host-pkgconf \ -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From james.hilliard1 at gmail.com Sun Mar 13 18:15:10 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 13 Mar 2022 12:15:10 -0600 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <20220313162132.GT283544@scaer> References: <20220313122112.261290-1-james.hilliard1@gmail.com> <20220313162132.GT283544@scaer> Message-ID: On Sun, Mar 13, 2022 at 10:21 AM Yann E. MORIN wrote: > > James, All, > > On 2022-03-13 06:21 -0600, James Hilliard spake thusly: > > There are a number of flit toolchain dependencies currently in the > > process of deprecating distutils based fallbacks. > > > > This will be needed in order to update tomli. > > > > We need to migrate these to use a new bootstrap based build+install > > sequence which relies on flit's bootstrap wheel build+install > > features to build and install host-python-pypa-build and > > host-python-installer which gives us a full pep517 toolchain. > > Would it be possible to split this change into separate patches: > > - introduce the new support, > - migrate patches one by one > - drop the leftovers of no longer needed stuff > > Also, see below... > > > Signed-off-by: James Hilliard > > --- > [--SNIP--] > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > > index 52ce402281..6dee8aa7d1 100644 > > --- a/package/pkg-python.mk > > +++ b/package/pkg-python.mk > [--SNIP--] > > @@ -212,7 +215,16 @@ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* > > else > > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > > $(2)_BASE_BUILD_CMD = -m build -n -w > > So this assignment to $(2)_BASE_BUILD_CMD... > > > -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > > +$(2)_BASE_BUILD_CMD = $$(if $$(filter \ Removed in v2. > > ... is completely overriden here... > > > + host-python-flit-core \ > > + host-python-installer \ > > + host-python-pep517 \ > > + host-python-tomli,$(1)),\ > > + -m flit_core.wheel,\ > > + -m build -n -w) > > +$(2)_BASE_INSTALL_CMD = $$(if $$(filter host-python-flit-core,$(1)),\ > > + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS),\ > > + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS)) > > endif > > else > > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") > > @@ -235,9 +247,19 @@ endif # ($(4),target) > > ifeq ($$($(2)_SETUP_TYPE),setuptools) > > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > > else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > > +$(2)_DEPENDENCIES += $$(if $$(filter \ > > + host-python-flit-core \ > > + host-python-installer \ > > + host-python-pep517 \ > > + host-python-pypa-build \ > > + host-python-tomli,$(1)),,\ > > + host-python-pypa-build) > > This is totally unreadable. One can't easily spot what is filtered from > what... > > $(2)_DEPENDENCIES += $$(if \ > $$(filter \ > host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ > $(1)) \ > , \ > host-python-pypa-build > ) Reformatted in v2: https://patchwork.ozlabs.org/project/buildroot/patch/20220313175615.406390-1-james.hilliard1 at gmail.com/ > > So, what this is saying, as I can understand, is that if the current > package is one of the list; > host-python-flit-core host-python-installer host-python-pep517 > host-python-pypa-build host-python-tomli > > then we want to add host-python-pypa-build to their dependency. No, host-python-pypa-build and those packages are normally flit infra dependencies but we must exclude them as bootstrapping requires special build+install procedures needed to prevent circular dependencies. > > However, from what I understand, all those packages really are packages > that implement the 'flit' and pep517 now?) infrastructure, and thus the > dependency should be explicitly listed in those packages, rather than > implcitly added by the infra. > > > +$(2)_DEPENDENCIES += $$(if $$(filter \ > > Why use an other assignment to the same variable? It could be a single > assignment... This is an exclusion to avoid circular dependencies. > > > + host-python-flit-core \ > > + host-python-installer,$(1)),,\ > > + host-python-installer) > > Ditto, this should be explictly added to the packages. This is also an exclusion to avoid circular dependencies. > > > ifeq ($$($(2)_SETUP_TYPE),flit) > > -$(2)_DEPENDENCIES += host-python-flit-core > > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) > > I don't understand how this is going to work. The dependency exclusion > here is correct, indeed, I am not questionning that. > > However, I don't understand how host-python-flit-core can use the flit > type at build time, when it is not already installed, especially since > host-python-flit-core does not define any custom configure/build/install > commands... Flit's bootstrap builder and installer both work without special handling since we run from the package source directly, this is fine for flit since flit is pure python and does not technically need to be built before it can run. > > You will have to add a blurb in the commit log to explain how it > works... > > > endif > > endif # SETUP_TYPE > > > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > > index 0e058a1f17..d206a72f82 100644 > > --- a/package/python-flit-core/python-flit-core.mk > > +++ b/package/python-flit-core/python-flit-core.mk > > @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > > -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > > +PYTHON_FLIT_CORE_SETUP_TYPE = flit > > Yup, see my comment above, about the corresponding change in the infra. > > > $(eval $(host-python-package)) > > diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk > > index 862a251415..97a158b738 100644 > > --- a/package/python-installer/python-installer.mk > > +++ b/package/python-installer/python-installer.mk > > @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz > > PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 > > PYTHON_INSTALLER_LICENSE = MIT > > PYTHON_INSTALLER_LICENSE_FILES = LICENSE > > -PYTHON_INSTALLER_SETUP_TYPE = distutils > > +PYTHON_INSTALLER_SETUP_TYPE = flit > > +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src > > Why do we need to provide this here? Can't that be made generic be using > something like HOST_PYTHON_INSTALLER_SUBDIR=src ? This is needed to allow host-python-installer to install itself, it's a one-off special case just needed for this package to avoid a circular dependency on itself for install. > > python-package already uses $(2)_BUILDDIR, which by default is the same > as $(2)_SRCDIR, which by default is (basically) $(@D)/$(2)_SUBDIR, so it > should jsut work automatically, no? We only want to modify PYTHONPATH, the installation still should be invoked from the $(2)_BUILDDIR as we normally do. We need to add $(2)_BUILDDIR/src to the PYTHONPATH since $(TOPDIR)/support/scripts/pyinstaller.py depends on host-python-installer. > > Regards, > Yann E. MORIN. > > > $(eval $(host-python-package)) > > diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk > > index 99aa62d51d..1ca1bc4e35 100644 > > --- a/package/python-pep517/python-pep517.mk > > +++ b/package/python-pep517/python-pep517.mk > > @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz > > PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 > > PYTHON_PEP517_LICENSE = MIT > > PYTHON_PEP517_LICENSE_FILES = LICENSE > > -PYTHON_PEP517_SETUP_TYPE = distutils > > +PYTHON_PEP517_SETUP_TYPE = flit > > HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli > > > > $(eval $(host-python-package)) > > diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk > > index b8c20ca736..3539a505be 100644 > > --- a/package/python-tomli/python-tomli.mk > > +++ b/package/python-tomli/python-tomli.mk > > @@ -7,7 +7,7 @@ > > PYTHON_TOMLI_VERSION = 1.2.0 > > PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz > > PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa > > -PYTHON_TOMLI_SETUP_TYPE = distutils > > +PYTHON_TOMLI_SETUP_TYPE = flit > > PYTHON_TOMLI_LICENSE = MIT > > PYTHON_TOMLI_LICENSE_FILES = LICENSE > > > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 18:25:58 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 19:25:58 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: support alternative Homepage format In-Reply-To: <20220313165030.269338-1-james.hilliard1@gmail.com> References: <20220313165030.269338-1-james.hilliard1@gmail.com> Message-ID: <20220313182558.GV283544@scaer> James, All, On 2022-03-13 10:50 -0600, James Hilliard spake thusly: > Some packages only have a home page properly set inside project_urls. > > Signed-off-by: James Hilliard > --- > utils/scanpypi | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/utils/scanpypi b/utils/scanpypi > index 17d8a0017a..681758a552 100755 > --- a/utils/scanpypi > +++ b/utils/scanpypi > @@ -609,7 +609,8 @@ class BuildrootPackage(): > > lines.append('\thelp\n') > > - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, > + md_info = self.metadata['info'] > + help_lines = textwrap.wrap(md_info['summary'], 62, > initial_indent='\t ', > subsequent_indent='\t ') > > @@ -617,11 +618,17 @@ class BuildrootPackage(): > if help_lines[-1][-1] != '.': > help_lines[-1] += '.' > > - # \t + two spaces is 3 char long > - help_lines.append('') > - help_lines.append('\t ' + self.metadata['info']['home_page']) > - help_lines = [x + '\n' for x in help_lines] > - lines += help_lines > + home_page = md_info.get('home_page', None) > + if home_page is None or len(home_page) == 0: I think this can be shortened to: if not home_page: [...] Indeed: - None tets as False - an empty string tests as False So, 'not home_page' will evaluate to True if it is either None, or if its length is zero. > + project_urls = md_info.get('project_urls', {}) > + home_page = project_urls.get('Homepage', None) > + > + if home_page is not None and len(home_page) != 0: Similarly, I think this could be shortened to just; if home_page: [...] So 'home_page' will only evaluate to True if it is not None and its length is not zero. And eventually, all this can be simplified even further: home_page = md_info.get('home_page', None) or \ md_info.get('project_urls', {}).get('Homepage', None) (and squelch flake8's E127) Applied to master with the above simplification, thanks. Regards, Yann E. MORIN. > + # \t + two spaces is 3 char long > + help_lines.append('') > + help_lines.append('\t ' + home_page) > + help_lines = [x + '\n' for x in help_lines] > + lines += help_lines > > with open(path_to_config, 'w') as config_file: > config_file.writelines(lines) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 13 18:24:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 13 Mar 2022 19:24:23 +0100 Subject: [Buildroot] [git commit] utils/scanpypi: support alternative Homepage format Message-ID: <20220313181742.3436682A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b09e05b5831541e19eb8a6cbaf216bfe08f6c8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some packages only have a home page properly set inside project_urls. Squelch flake8's E127, because a visual indent here is really nicer. Signed-off-by: James Hilliard [yann.morin.1998 at free.fr: simplify getting home_page fallbacks] Signed-off-by: Yann E. MORIN --- utils/scanpypi | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017a..cc13701c0e 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -609,7 +609,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +618,15 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) or \ + md_info.get('project_urls', {}).get('Homepage', None) # noqa: E127 + + if home_page: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) From peter at korsgaard.com Sun Mar 13 21:04:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:04:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireshark: security bump to version 3.4.12 In-Reply-To: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:10:45 +0100") References: <20220226181045.2922875-1-fontaine.fabrice@gmail.com> Message-ID: <87wngxwomc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, > CVE-2022-0585 and CVE-2022-0586 > https://www.wireshark.org/security/wnpa-sec-2021-22.html > https://www.wireshark.org/security/wnpa-sec-2022-01.html > https://www.wireshark.org/security/wnpa-sec-2022-02.html > https://www.wireshark.org/security/wnpa-sec-2022-03.html > https://www.wireshark.org/security/wnpa-sec-2022-04.html > https://www.wireshark.org/security/wnpa-sec-2022-05.html > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:05:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:05:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: security bump to version 371 In-Reply-To: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:15:08 +0100") References: <20220226181508.3011361-1-fontaine.fabrice@gmail.com> Message-ID: <87sfrlwojx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is > enabled, allows attackers to trigger a buffer overflow in set_sixel in > graphics_sixel.c via crafted text. > Update hash of COPYING (update in year) > https://invisible-island.net/xterm/xterm.log.html#xterm_371 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:09:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:09:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/exempi: security bump to version 2.6.1 In-Reply-To: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:34:23 +0100") References: <20220226183423.3086505-1-fontaine.fabrice@gmail.com> Message-ID: <87o829woea.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Extract from NEWS: > - Changes in v2021.08 > - Security Fixes > - Changes in v2021.07 > - Security Fixes > https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:12:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:12:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolfssl: security bump to version 5.2.0 In-Reply-To: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:50:33 +0100") References: <20220226185033.3097401-1-fontaine.fabrice@gmail.com> Message-ID: <87k0cxwo8x.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 > https://www.wolfssl.com/docs/security-vulnerabilities > https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:17:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:17:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxml2: security bump to version 2.9.13 In-Reply-To: <20220228175245.1585-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 28 Feb 2022 18:52:45 +0100") References: <20220228175245.1585-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnlwnzy.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues: > - [CVE-2022-23308] Use-after-free of ID and IDREF attributes > - Use-after-free in xmlXIncludeCopyRange > - Fix Null-deref-in-xmlSchemaGetComponentTargetNs > - Fix memory leak in xmlXPathCompNodeTest > - Fix null pointer deref in xmlStringGetNodeList > - Fix several memory leaks found by Coverity > https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:24:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:24:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpjsip: security bump to version 2.12 In-Reply-To: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 17:05:03 +0100") References: <20220226160503.2703879-1-fontaine.fabrice@gmail.com> Message-ID: <87bky9wnpi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, > CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): > - Potential integer underflow upon receiving STUN message > (GHSA-2qpg-f6wf-w984) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) > - Potential out-of-bounds read when parsing RTCP BYE message > (GHSA-3qx3-cg72-wrh9) > - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) > - Potential buffer overflow in pjsua_player_create(), > pjsua_recorder_create(), pjmedia_wav_player_create(), and > pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) > - Potential out-of-bound read during RTP/RTCP parsing > (GHSA-m66q-q64c-hv36) > - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) > - Use after free of dialog set (GHSA-ffff-m5fm-qm62) > https://github.com/pjsip/pjproject/releases/tag/2.12 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:25:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:25:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: security bump to version 10.3.34 In-Reply-To: (Peter Korsgaard's message of "Mon, 28 Feb 2022 19:51:25 +0100") References: <20220213202407.1205912-1-fontaine.fabrice@gmail.com> Message-ID: <877d8xwnnc.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Hi, > On 13/02/2022 21.24, Fabrice Fontaine wrote: >> Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, >> CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, >> CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, >> CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 >> Update hash of README.md (changes not related to license: >> https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) >> https://mariadb.com/kb/en/mariadb-10334-release-notes/ >> https://mariadb.com/kb/en/mariadb-10333-release-notes/ >> https://mariadb.com/kb/en/mariadb-10332-release-notes/ >> https://mariadb.com/kb/en/mariadb-10331-release-notes/ >> Signed-off-by: Fabrice Fontaine > Committed, thanks. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 13 21:05:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:05:25 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xterm: security bump to version 371 Message-ID: <20220313211754.63C0883CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=350ff34a730f10ea8beacfd8d6e1eb32fe5c93f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2de5cd85423083662eb0625978ef6da7577d76c6) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Sun Mar 13 21:03:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:03:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireshark: security bump to version 3.4.12 Message-ID: <20220313211754.5A9D183CFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cfa24865aa56d69cce702ec3957e43244b005de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit db0f8006c1c8685dc98446b5b9e768e52d2f2591) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7b67e316ed..db1f71e9ef 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 7715680767..5c811319be 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From peter at korsgaard.com Sun Mar 13 21:08:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:08:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/exempi: security bump to version 2.6.1 Message-ID: <20220313211754.6E08483CFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2bb1068b43d4ef9a05b7e55693a285c68b3c2bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 55f1d0a3592253df2a356c195e5131a970eade9b) Signed-off-by: Peter Korsgaard --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From peter at korsgaard.com Sun Mar 13 21:23:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:23:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libpjsip: security bump to version 2.12 Message-ID: <20220313211754.8CD4B83CFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8bec43ffc3ff0077a9df6327a156f1da671e2f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5ed26bb378c02f2ce7f7377481853b12ad55d808) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:11:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:11:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220313211754.78B2C83CFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e838466c74dd7088074156e722a2c28797eb4f2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 14e0c4de719a0d63192cc5de66a608f75297f37d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:17:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:17:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libxml2: security bump to version 2.9.13 Message-ID: <20220313211754.8320683CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d578d93e0e1dce841d8d9fe75f12d37a6c1f1661 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4b6703847376838d0b091acd9b0e0193b6439657) Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..f13eaff1ad 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Mar 13 21:25:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:25:03 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mariadb: security bump to version 10.3.34 Message-ID: <20220313211754.97E0083CFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ef50335dd5c0735e90bf042edc876f2fe154dbf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e7a9a1bce4b081a721799ff62ee5fff8456203ce) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 374b3dc352..3fad22c8c1 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 From peter at korsgaard.com Sun Mar 13 21:08:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:08:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/exempi: security bump to version 2.6.1 Message-ID: <20220313212141.ADF1183D1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f29b1ab92e79da770b58825c0ccdcbbdd6a77a98 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Extract from NEWS: - Changes in v2021.08 - Security Fixes - Changes in v2021.07 - Security Fixes https://gitlab.freedesktop.org/libopenraw/exempi/-/blob/2.6.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 55f1d0a3592253df2a356c195e5131a970eade9b) Signed-off-by: Peter Korsgaard --- package/exempi/exempi.hash | 2 +- package/exempi/exempi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5ea9683053..5df610de17 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5 exempi-2.5.2.tar.bz2 +sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f481469d2c..56fbe20379 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.5.2 +EXEMPI_VERSION = 2.6.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES From peter at korsgaard.com Sun Mar 13 21:05:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:05:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xterm: security bump to version 371 Message-ID: <20220313212141.9E0EB83CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed5497beda4da70456df19b41de5a8111194a316 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-24130: xterm through Patch 370, when Sixel support is enabled, allows attackers to trigger a buffer overflow in set_sixel in graphics_sixel.c via crafted text. Update hash of COPYING (update in year) https://invisible-island.net/xterm/xterm.log.html#xterm_371 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2de5cd85423083662eb0625978ef6da7577d76c6) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index d6d80ad977..3f6ec765ce 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz +sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz # Locally calculated -sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING +sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index e09d350a7d..95984f1cf9 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 367 +XTERM_VERSION = 371 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Sun Mar 13 21:22:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:22:35 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libpjsip: security bump to version 2.12 Message-ID: <20220313212141.D35EB83CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=909acef27b14e73d633d347d13eab04298596a99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following security issues (i.e. CVE-2021-37706, CVE-2021-41141, CVE-2021-43804, CVE-2021-43845, CVE-2022-21722 and CVE-2022-21723): - Potential integer underflow upon receiving STUN message (GHSA-2qpg-f6wf-w984) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) - Missing unreleased of locks in failure cases (GHSA-8fmx-hqw7-6gmc) - Potential out-of-bounds read when parsing RTCP BYE message (GHSA-3qx3-cg72-wrh9) - Prevent OOB read for RTCP XR block (GHSA-r374-qrwv-86hh) - Potential buffer overflow in pjsua_player_create(), pjsua_recorder_create(), pjmedia_wav_player_create(), and pjsua_call_dump() (GHSA-qcvw-h34v-c7r9) - Potential out-of-bound read during RTP/RTCP parsing (GHSA-m66q-q64c-hv36) - Prevent OOB read in multipart parsing (GHSA-7fw8-54cv-r7pm) - Use after free of dialog set (GHSA-ffff-m5fm-qm62) https://github.com/pjsip/pjproject/releases/tag/2.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5ed26bb378c02f2ce7f7377481853b12ad55d808) Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index f39ebf4060..74331ab6fb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45f6604372df3f49293749cd7c0b42cb21c4fb666c66f8ed9765de004d1eae38 pjproject-2.11.1.tar.gz +sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index b05cc31a83..32cfa8c53c 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.11.1 +LIBPJSIP_VERSION = 2.12 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.11.1.tar.gz +# https://github.com/pjsip/pjproject/archive/2.12.tar.gz LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:12:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:12:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wolfssl: security bump to version 5.2.0 Message-ID: <20220313212141.B978483CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1f98ccd7c1f024a659e234f3076f23130a42058 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-44718, CVE-2022-23408, CVE-2022-25638 and CVE-2022-25640 https://www.wolfssl.com/docs/security-vulnerabilities https://github.com/wolfSSL/wolfssl/blob/v5.2.0-stable/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 14e0c4de719a0d63192cc5de66a608f75297f37d) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 9896713ca7..63eebf93bb 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 wolfssl-4.8.1-stable.tar.gz +sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index d3dce0a401..bfb54445e4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 4.8.1-stable -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) +WOLFSSL_VERSION = 5.2.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ From peter at korsgaard.com Sun Mar 13 21:25:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:25:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mariadb: security bump to version 10.3.34 Message-ID: <20220313212141.DEE5883D1E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77545c497e74ca68099969a86c1434d7aa695273 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-46665, CVE-2021-46664, CVE-2021-46661, CVE-2021-46668, CVE-2021-46663, CVE-2022-24052, CVE-2022-24051, CVE-2022-24050, CVE-2022-24048, CVE-2021-46659, CVE-2021-35604, CVE-2021-46667, CVE-2021-46662, CVE-2021-2372, CVE-2021-2389 and CVE-2021-46658 Update hash of README.md (changes not related to license: https://github.com/MariaDB/server/commit/773a07b65517327add6348c045cee14bdf489fe0) https://mariadb.com/kb/en/mariadb-10334-release-notes/ https://mariadb.com/kb/en/mariadb-10333-release-notes/ https://mariadb.com/kb/en/mariadb-10332-release-notes/ https://mariadb.com/kb/en/mariadb-10331-release-notes/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e7a9a1bce4b081a721799ff62ee5fff8456203ce) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 +++---- package/mariadb/mariadb.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4025be317f..4da26bdf94 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,7 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.30 -sha256 bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b mariadb-10.3.30.tar.gz -sha512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc mariadb-10.3.30.tar.gz +# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt +sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d08b768a2e..146ce0ee09 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.30 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.34 +MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 From peter at korsgaard.com Sun Mar 13 21:16:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:16:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libxml2: security bump to version 2.9.13 Message-ID: <20220313212141.C623D83D1E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8691a82932d1ff665729da108b4c3df6f59be802 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following security issues: - [CVE-2022-23308] Use-after-free of ID and IDREF attributes - Use-after-free in xmlXIncludeCopyRange - Fix Null-deref-in-xmlSchemaGetComponentTargetNs - Fix memory leak in xmlXPathCompNodeTest - Fix null pointer deref in xmlStringGetNodeList - Fix several memory leaks found by Coverity https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4b6703847376838d0b091acd9b0e0193b6439657) Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ce6c3c4825..81ac3e3f31 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz +# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum +sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5d688acae5..f13eaff1ad 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.12 -LIBXML2_SITE = http://xmlsoft.org/sources +LIBXML2_VERSION_MAJOR = 2.9 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz +LIBXML2_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Mar 13 21:02:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 13 Mar 2022 22:02:43 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireshark: security bump to version 3.4.12 Message-ID: <20220313212141.9164C83D1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91339db0ee99a5257b7e964f0c12bd307a421e54 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2021-4190, CVE-2022-0581, CVE-2022-0582, CVE-2022-0583, CVE-2022-0585 and CVE-2022-0586 https://www.wireshark.org/security/wnpa-sec-2021-22.html https://www.wireshark.org/security/wnpa-sec-2022-01.html https://www.wireshark.org/security/wnpa-sec-2022-02.html https://www.wireshark.org/security/wnpa-sec-2022-03.html https://www.wireshark.org/security/wnpa-sec-2022-04.html https://www.wireshark.org/security/wnpa-sec-2022-05.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit db0f8006c1c8685dc98446b5b9e768e52d2f2591) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7b67e316ed..db1f71e9ef 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.11.txt -sha1 b656d8709b8b0b3d2a94665af6bec88495ad994c wireshark-3.4.11.tar.xz -sha256 a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279 wireshark-3.4.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt +sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz +sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 0361d0bb64..a5ca4b1f73 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.11 +WIRESHARK_VERSION = 3.4.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From clement.leger at bootlin.com Mon Mar 14 07:38:47 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 14 Mar 2022 08:38:47 +0100 Subject: [Buildroot] [PATCH v3 0/7] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220312203627.GM283544@scaer> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220312203627.GM283544@scaer> Message-ID: <20220314083847.6149edde@fixe.home> Le Sat, 12 Mar 2022 21:36:27 +0100, "Yann E. MORIN" a ?crit : > Cl?ment, All, > > On 2022-03-11 13:36 +0100, Cl?ment L?ger via buildroot spake thusly: > > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > > of python-pycryptodomex to build. This series adds support to build > > host-python-cryptography and uses it in optee-os package to build the > > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > > and optee-test which needs to be aligned with optee-os version. > > Following the important review from Thomas on patch 1, I've marked this > series as changes requested in Patchwork. > > Please, can you add me in Cc of patch 1 in a future respin (I too may > have to deal with python-cryptography on the host in short order). Ok, I'll do so ! Thanks, Cl?ment > > Regards, > Yann E. MORIN. > > > ---- > > Changes in v3: > > - Fix authorship for commits that were copied from Etienne ones. > > - Fix package URL for optee-os > > - Added Acked-by Etienne Carriere > > > > Changes in v2: > > - Bump optee-client, optee-benchmark, optee-examples and optee-test > > > > Cl?ment L?ger (7): > > package/python-cryptography: enable host package > > boot/optee-os: add support to build with python-cryptography > > boot/optee-os: bump to version 3.16.0 > > package/optee-test: bump to version 3.16.0 > > package/optee-examples: bump to version 3.16.0 > > package/optee-client: bump to version 3.16.0 > > package/optee-benchmark: bump to version 3.16.0 > > > > boot/optee-os/Config.in | 13 +++++++++++-- > > boot/optee-os/optee-os.hash | 4 ++-- > > boot/optee-os/optee-os.mk | 7 ++++++- > > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > > package/optee-benchmark/optee-benchmark.mk | 2 +- > > package/optee-client/optee-client.hash | 4 ++-- > > package/optee-client/optee-client.mk | 2 +- > > package/optee-examples/optee-examples.hash | 4 ++-- > > package/optee-examples/optee-examples.mk | 2 +- > > package/optee-test/optee-test.hash | 4 ++-- > > package/optee-test/optee-test.mk | 2 +- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 12 files changed, 38 insertions(+), 17 deletions(-) > > > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From clement.leger at bootlin.com Mon Mar 14 08:38:26 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 14 Mar 2022 09:38:26 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220311214332.4405ad89@windsurf> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> <20220311214332.4405ad89@windsurf> Message-ID: <20220314093826.5a30c765@fixe.home> Le Fri, 11 Mar 2022 21:43:32 +0100, Thomas Petazzoni a ?crit : > Hello Cl?ment, > > On Fri, 11 Mar 2022 13:36:30 +0100 > Cl?ment L?ger wrote: > > > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > > + host-python-setuptools-rust \ > > + host-python-cffi \ > > + host-rustc \ > > + openssl > > This openssl dependency seems extremely dubious. Why would a host > package depend on the target variant of openssl? Yes, of course that is a host-openssl dependency that is needed. > > > PYTHON_CRYPTOGRAPHY_ENV = \ > > $(PKG_CARGO_ENV) \ > > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > > @@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ > > $(PKG_CARGO_ENV) \ > > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > > > + > > Spurious newline added. > > > $(eval $(python-package)) > > +$(eval $(host-python-package)) > > Thomas -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From clement.leger at bootlin.com Mon Mar 14 08:47:52 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 14 Mar 2022 09:47:52 +0100 Subject: [Buildroot] [PATCH v3 1/7] package/python-cryptography: enable host package In-Reply-To: <20220312155913.280739e0@windsurf> References: <20220311123636.13415-1-clement.leger@bootlin.com> <20220311123636.13415-2-clement.leger@bootlin.com> <20220312155913.280739e0@windsurf> Message-ID: <20220314094752.7ea852c1@fixe.home> Le Sat, 12 Mar 2022 15:59:13 +0100, Thomas Petazzoni a ?crit : > Hello, > > On Fri, 11 Mar 2022 13:36:30 +0100 > Cl?ment L?ger wrote: > > > Enable host package and add needed dependencies. > > > > Acked-by: Etienne Carriere > > Signed-off-by: Cl?ment L?ger > > --- > > package/python-cryptography/python-cryptography.mk | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > > index a524f729c8..4ff61c7f86 100644 > > --- a/package/python-cryptography/python-cryptography.mk > > +++ b/package/python-cryptography/python-cryptography.mk > > @@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > > host-python-cffi \ > > host-rustc \ > > openssl > > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > > + host-python-setuptools-rust \ > > + host-python-cffi \ > > + host-rustc \ > > + openssl > > Also, I am actually surprised this is enough. Indeed, there are some > parts in Rust in python-cryptography, so we have quite some extra > variables for the target packages to handle this: > > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > # We need to vendor the Cargo crates at download time > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > For the last 3 variables, I can explain that it possibly worked for you > because you perhaps already had the python-cryptography tarball in > DL_DIR downloaded by the host variant of the package. But if you remove > this tarball, and build just the host variant, I would suspect that it > will fail to build. Indeed, I'm using a shared BR2_DL_DIR which might explain why it worked. > > However, I can't really explain why your package works without > HOST_PYTHON_CRYTOGRAPHY_ENV. > > Make sure to do a clean build in a Docker container that doesn't have > Rust installed (there is an official Buildroot Docker image that is > available for this kind of testing). Ok, I'll do that. > > Thanks! > > Thomas -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From peter at korsgaard.com Mon Mar 14 09:10:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:10:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: security bump version to 4.15.5 In-Reply-To: <20220222214114.374855-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Tue, 22 Feb 2022 22:41:14 +0100") References: <20220222214114.374855-1-bernd.kuhls@t-online.de> Message-ID: <8735jkx5lf.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.5.html > Fixes CVE-2021-44141, CVE-2021-44142 & CVE-2022-0336. > Signed-off-by: Bernd Kuhls For 2021.02.x / 2021.11.x I have instead bumped to 4.14.12, which contains fixes for the last two issues. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:09:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:09:16 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/samba4: security bump to version 4.14.12 Message-ID: <20220314090138.BF68583D28@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae76fa4469a604b034082339150b986cde5687ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://www.samba.org/samba/history/samba-4.14.12.html Fixes CVE-2021-44142 & CVE-2022-0336. Notice that upstream has decided that the fix for CVE-2021-44141 is too complex to backport, so it is NOT fixed: https://www.samba.org/samba/security/CVE-2021-44141.html Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 033d932732..0f18c76ebd 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.14.10.tar.asc -sha256 107ee862f58062682cec362ec68a24251292805f89aa4c97e7ab80237f91c7af samba-4.14.10.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.14.12.tar.asc +sha256 155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d samba-4.14.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index de019e7afc..c18d406704 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.14.10 +SAMBA4_VERSION = 4.14.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 14 09:19:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:19:48 +0100 Subject: [Buildroot] [PATCH] package/gnutls: security bump to version 3.7.3 In-Reply-To: <20220223172817.3002782-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 23 Feb 2022 18:28:17 +0100") References: <20220223172817.3002782-1-francois.perrad@gadz.org> Message-ID: <87y21cvqkr.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:19:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:19:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads In-Reply-To: <20220309173503.527227-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 18:35:03 +0100") References: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Message-ID: <87tuc0vqkg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without threads raised since bump to > version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: > kx.c: In function '_gnutls_nss_keylog_write': > kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? > 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { > | ^~~~~~~~~~~~ > | keylog_once > Fixes: > - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:20:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:20:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4450 In-Reply-To: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Feb 2022 23:43:02 +0100") References: <20220222224302.3185944-1-fontaine.fabrice@gmail.com> Message-ID: <87pmmovqjo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub > repository vim/vim prior to 8.2. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 09:16:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:16:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4450 Message-ID: <20220314091155.251AA83D5F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a717432b35e304d345df2cedd36da67d5f6514ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 28c9cb5ff34aa98bf2d0db63f593745db006c910) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Mon Mar 14 09:05:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:05:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/samba4: security bump to version 4.14.12 Message-ID: <20220314091155.1B6FC83D5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e89b9c12d56eef237e93c4b5e5735da60e9315df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://www.samba.org/samba/history/samba-4.14.12.html Fixes CVE-2021-44142 & CVE-2022-0336. Notice that upstream has decided that the fix for CVE-2021-44141 is too complex to backport, so it is NOT fixed: https://www.samba.org/samba/security/CVE-2021-44141.html Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 033d932732..0f18c76ebd 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.14.10.tar.asc -sha256 107ee862f58062682cec362ec68a24251292805f89aa4c97e7ab80237f91c7af samba-4.14.10.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.14.12.tar.asc +sha256 155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d samba-4.14.12.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 5673521836..2deca70266 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.14.10 +SAMBA4_VERSION = 4.14.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 14 09:16:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:16:30 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnutls: fix build without threads Message-ID: <20220314091155.3B90183D5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8fec0fb6cac22b276700ad8f75ef987fd290fea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2f4f57b62b371252425bde4440cedcac45fcaebd) Signed-off-by: Peter Korsgaard --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From peter at korsgaard.com Mon Mar 14 09:16:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:16:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gnutls: security bump to version 3.7.3 Message-ID: <20220314091155.2F29783D60@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5bbfe01c0238f998ee4ffdf46588a251db694d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0dc..2ffc6c1b4e 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index be5af1933e..49a8f49cd1 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Mon Mar 14 09:15:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:15:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/vim: security bump to version 8.2.4450 Message-ID: <20220314091203.71AD783D74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b20502662e935bcdf529e66792a93c84398b2e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-0554: Use of Out-of-range Pointer Offset in GitHub repository vim/vim prior to 8.2. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 28c9cb5ff34aa98bf2d0db63f593745db006c910) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index fa3ca53cc8..8b60b7461f 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz +sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 98a5f153a8..28fd33c8ef 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4301 +VIM_VERSION = 8.2.4450 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Mon Mar 14 09:15:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:15:47 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gnutls: security bump to version 3.7.3 Message-ID: <20220314091203.7E6FD83D75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9250201b565b119696b6c731deb1daf93a6e59ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://www.gnutls.org/security-new.html#GNUTLS-SA-2022-01-17 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 5d4fd1a0dc..2ffc6c1b4e 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig -sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig +sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 11c2d81e7d..ded4a393f2 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Mon Mar 14 09:15:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 10:15:59 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gnutls: fix build without threads Message-ID: <20220314091203.88D1A83D74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbb6baf8ba33ea0cacf80fcac726c83ca26a804c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2f4f57b62b371252425bde4440cedcac45fcaebd) Signed-off-by: Peter Korsgaard --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/erlang-jiffy: bump version to 1.1.1 Message-ID: <20220314121152.EECB883E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4eaddce8db60f6840d5d3a159b7d2320f8b96f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/erlang-jiffy/erlang-jiffy.hash | 2 +- package/erlang-jiffy/erlang-jiffy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 93c5e1f8c8..f172d1476e 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index cd94632962..de2e4749fb 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 1.0.9 +ERLANG_JIFFY_VERSION = 1.1.1 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/libva-utils: bump version to 2.14.0 Message-ID: <20220314121152.D10DF82868@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b526bdb5ee40c753096a397afc2dfa2353c8dc5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/intel/libva-utils/releases/tag/2.14.0 Upstream does not provide a tarball so switch to github helper. Switch build system to meson to avoid autoreconf. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libva-utils/libva-utils.hash | 4 +--- package/libva-utils/libva-utils.mk | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 18a078dc1c..5f21af800e 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva-utils/releases/download/2.13.0/libva-utils-2.13.0.tar.bz2.sha1sum -sha1 7ab945cf232387f762891f9e4f7a6cb41e0766e8 libva-utils-2.13.0.tar.bz2 # Locally computed -sha256 db3ae0bd63c2a3f6ef498450c29ffc99c387ce611e1eb5db6a8da1f88845d612 libva-utils-2.13.0.tar.bz2 +sha256 0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31 libva-utils-2.14.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index e6e31df8bd..4c527a748c 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.13.0 -LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 -LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) +LIBVA_UTILS_VERSION = 2.14.0 +LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/efl: rework eeze handling in Kconfig Message-ID: <20220314121153.1706D83E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7229db872acd6db83ccb7e4bb22cb4cfd06be75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit [1] added eeze dependency using "depends on" to several efl options (drm, libmount) instead of selecting eeze and propagate the udev reverse dependency. [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/efl/Config.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..4c78bef7c8 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +174,16 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm, efl-eeze depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,9 +216,10 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON @@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/screen: bump to version 4.9.0 Message-ID: <20220314121152.E50AC82868@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a346843eedef792f48ef6a49cc83ae89d97287fe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop latest patch (already in version) - Update indentation in hash file (two spaces) https://lists.gnu.org/archive/html/screen-users/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/screen/0008-CVE-2021-26937.patch | 68 -------------------------------- package/screen/screen.hash | 6 +-- package/screen/screen.mk | 5 +-- 3 files changed, 4 insertions(+), 75 deletions(-) diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch deleted file mode 100644 index df7efa0294..0000000000 --- a/package/screen/0008-CVE-2021-26937.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: [CVE-2021-26937] Fix out of bounds array access -Author: Michael Schr??der -Bug-Debian: https://bugs.debian.org/982435 -Bug: https://savannah.gnu.org/bugs/?60030 -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html - -Downloaded from Debian: -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch - -Signed-off-by: Peter Korsgaard ---- a/encoding.c -+++ b/encoding.c -@@ -43,7 +43,7 @@ - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront(i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ca74ba8913..a261d3100d 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig +sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 843c71fc2a..3239a1c1f3 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.8.0 +SCREEN_VERSION = 4.9.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin -# 0008_CVE-2021-26937.patch -SCREEN_IGNORE_CVES += CVE-2021-26937 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/zabbix: fix shared netsnmp build Message-ID: <20220314121153.53A3283E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=532e5063f54434cce4afec2ad5371fbf02488b67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following shared build failure with netsnmp raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...01-m4-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 ++++++++++++++++++++++ package/zabbix/zabbix.mk | 2 + 2 files changed, 46 insertions(+) diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 0000000000..ffb1f54ba2 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd..a8ecbb42db 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/rpi-userland: fix build with libexecinfo Message-ID: <20220314121153.49D6783E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc4cc27705de50356d7e9945e41bd989fdc56fe8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 ++++++++++++++++++++++ package/rpi-userland/rpi-userland.mk | 5 ++ 2 files changed, 63 insertions(+) diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch new file mode 100644 index 0000000000..bf2a9eb6ea --- /dev/null +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch @@ -0,0 +1,58 @@ +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to +pass additional flags such as -lexecinfo on musl and uclibc-ng + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- + makefiles/cmake/arm-linux.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index e7206cc..16c64db 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt +index e6bd373..2f72eb2 100644 +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake +index 957846a..e172282 100644 +--- a/makefiles/cmake/arm-linux.cmake ++++ b/makefiles/cmake/arm-linux.cmake +@@ -93,7 +93,7 @@ if(ANDROID) + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") + + link_directories(${ANDROID_LIBS}) +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") +-- +2.34.1 + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..3564ec0703 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/bluez5_utils: fix musl build Message-ID: <20220314121153.2DC4C83E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96ebed1eed6dcd55d8024cbc6fe8bec646d739c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since commit 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: In file included from src/shared/queue.c:15: ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); | ^~~~~~~ | size_t Fixes: - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...006-src-shared-util.h-include-sys-types.h.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch new file mode 100644 index 0000000000..8a5bd64d43 --- /dev/null +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch @@ -0,0 +1,39 @@ +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Feb 2022 18:19:33 +0100 +Subject: [PATCH] src/shared/util.h: include sys/types.h + +Include sys/types.h to avoid the following build failure on musl raised +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: + +In file included from src/shared/queue.c:15: +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); + | ^~~~~~~ + | size_t + +Fixes: + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] +--- + src/shared/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.h b/src/shared/util.h +index c01eccf8a..554481e1e 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + #define BIT(n) (1 << (n)) +-- +2.34.1 + From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/rust: set musl-root for musl toolchains Message-ID: <20220314121153.4008A83E42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a41b0f31dea3e62b006ac815bf628600676b328f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Without musl-root in config.toml the build stop with the following error: thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 musl-root is needed to provide the path to libc.a and libunwind.a because rust link them statically into the standard library and liblibc [1]. For other libc, musl-root is not used and ignored [2]. [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 3c560882ca..cd8c87b68d 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/kismet: bump to version 2022-02-R1 Message-ID: <20220314121152.DA7E283E42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4aaa7ac4d86b3f509dea696d972b092d09442d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Linking with -latomic is handled by configure.ac since version 2022-01-R3 and https://github.com/kismetwireless/kismet/commit/bbdfd21e2b41bf69513ded5ae5ab5a89f22a9912 https://www.kismetwireless.net/release/kismet-2022-02-R1 https://www.kismetwireless.net/release/kismet-2022-01-R3 https://www.kismetwireless.net/release/kismet-2022-01-R2 https://www.kismetwireless.net/release/kismet-2022-01-R1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kismet/kismet.hash | 2 +- package/kismet/kismet.mk | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 9a9d2260b9..fc5f854b7e 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz +sha256 aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8 kismet-2022-02-R1.tar.xz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 819ed510d7..3992a392f8 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KISMET_VERSION = 2021-08-R1 +KISMET_VERSION = 2022-02-R1 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code KISMET_DEPENDENCIES = \ @@ -29,10 +29,6 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KISMET_CONF_ENV += LIBS=-latomic -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap KISMET_CONF_OPTS += --enable-libcap From arnout at mind.be Mon Mar 14 12:17:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:41 +0100 Subject: [Buildroot] [git commit] package/zabbix: netsnmp needs mib Message-ID: <20220314121153.5D1CA83E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=77f9d2d6a6fc4a6485acd7b5f1970b638764c1fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master netsnmp support needs mib to avoid the following build failure raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: checks_snmp.c: In function ???zbx_snmp_get_octet_string???: checks_snmp.c:694:35: error: invalid use of undefined type ???struct tree??? 694 | hint = (NULL != subtree ? subtree->hint : NULL); | ^~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index a8ecbb42db..adc54028ad 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -55,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Message-ID: <20220314121153.36A5283E3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c750dd4e5d03430148841d2d897e90dbe19ce172 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master bpftool uses its own local copy of libbpf so add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure on ARM: btf.c: In function 'btf_type_by_id': btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (type_id < btf->start_id) ^ bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fixes: - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bpftool/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343..a1ef3843e6 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + config BR2_PACKAGE_BPFTOOL bool "bpftool" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/rust: install rustc and rust-std built by Buildroot Message-ID: <20220314121153.0D83583E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=15682493918ead960d326bf24763e9b5d8d331d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The test TestRust is currently broken with ripgrep package with the following error: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 target on x86_64 host) but a problem with rust-std libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc used to bootstrap the build: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) and is not removed before installing host-rust built by Buildroot. We actually spent a lot of time to build host-rust with rust-std and forget to install this important library HOST_DIR. Looking at the host-rust build directory we can notice two installer script "install.sh" (the same scripts used to install host-rust-bin): TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh The "tarball" directory is generated by the "python x.py dist" during the install step, we have to keep it. Replace "python x.py install" by theses two install scripts. Installing rust-std with the install.sh script replace the rust-std libraries installed by host-rust-bin. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 Signed-off-by: Romain Naour Cc: Eric Le Bihan [Arnout: remove redundant parenthesis; only use a variable for the common install opts] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rust/rust.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b7..3c560882ca 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -67,9 +67,26 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +define HOST_RUST_INSTALL_RUSTC + cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) From arnout at mind.be Mon Mar 14 12:17:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:39 +0100 Subject: [Buildroot] [git commit] package/libva: bump version to 2.14.0 Message-ID: <20220314121152.C849283E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93752b8ba401d4be211b19a2753fec00d9c4d9ed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/intel/libva/releases/tag/2.14.0 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libva/libva.hash | 6 +++--- package/libva/libva.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 7b66a7709d..4646a816bb 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.14.0/libva-2.14.0.tar.bz2.sha1sum +sha1 36b482ec8c361a6c3a6198f4777409b136f2713c libva-2.14.0.tar.bz2 # Locally computed -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 +sha256 511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454 libva-2.14.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 6ac5386540..db1cfd29be 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.13.0 +LIBVA_VERSION = 2.14.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] package/efl: handle input option Message-ID: <20220314121153.20B6783E3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70ad44ffd00786cf25145445afa374cbb295f722 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input option on target which was added (and enabled by default) by https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be resulting in the following build failure when eeze is disabled: ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". Fixes: - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e Signed-off-by: Fabrice Fontaine [Romain: Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the upstream name. use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM remove duplicate libxkbcommon in EFL_DEPENDENCIES] Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 11 ++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 4c78bef7c8..c4f82b92e3 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -216,13 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcb..d4a16475e5 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true @@ -192,7 +199,7 @@ endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) EFL_CONF_OPTS += -Ddrm=true -EFL_DEPENDENCIES += libdrm libegl libinput mesa3d +EFL_DEPENDENCIES += libdrm libegl mesa3d else EFL_CONF_OPTS += -Ddrm=false endif @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. From arnout at mind.be Mon Mar 14 12:17:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 14 Mar 2022 13:17:40 +0100 Subject: [Buildroot] [git commit] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220314121153.039C583E42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0d1f211950fe7cdf1bbb52397cdb86519d4a404 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour Cc: Eric Le Bihan Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/testing/tests/package/test_rust.py | 48 +++--------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") From peter at korsgaard.com Mon Mar 14 13:20:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:20:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/seatd: security bump to version 0.6.4 In-Reply-To: <20220228213432.3289480-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Mon, 28 Feb 2022 23:34:32 +0200") References: <20220228213432.3289480-1-aperez@igalia.com> Message-ID: <87lexcvffw.fsf@dell.be.48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This release contains a security fix in seatd-launch which prevents > removal of files that the calling user did not have privileges to > remove. Release notes: > https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 > Signed-off-by: Adrian Perez de Castro Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 13:20:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:20:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: bump to version 1.12.22 In-Reply-To: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 19:17:47 +0100") References: <20220226181747.3033483-1-fontaine.fabrice@gmail.com> Message-ID: <87h780vfff.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 14 13:19:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:19:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/dbus: bump to version 1.12.22 Message-ID: <20220314131209.F380D83E4D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08854c455d93067625d6737424eb68845686f1ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7af7acabe051c1b394f53fd02084be7b97d8a8d8) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 14 13:19:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:19:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/dbus: bump to version 1.12.22 Message-ID: <20220314131235.BA30383E5E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=845c2d2669a9af79b56b7bb538819d96c70bbeed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.12.22/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7af7acabe051c1b394f53fd02084be7b97d8a8d8) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 06512e5656..176396fe2f 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe dbus-1.12.20.tar.gz +sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d78e102427..de447d8680 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.12.20 +DBUS_VERSION = 1.12.22 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 14 13:19:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 14 Mar 2022 14:19:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/seatd: security bump to version 0.6.4 Message-ID: <20220314131235.C302183E68@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e5536ce361ffbb7b76b843eb3eaec2e78af84dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release contains a security fix in seatd-launch which prevents removal of files that the calling user did not have privileges to remove. Release notes: https://git.sr.ht/~kennylevinsen/seatd/refs/0.6.4 Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 41139cb0997af800c7d89213c5d89652b65ec6cb) Signed-off-by: Peter Korsgaard --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 18f65d3aeb..88793b6dd5 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 5226850c163b485aebe71da0d3f4941761637e146a5c9393cb40c52617ad84a8 0.6.3.tar.gz +sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27d3155b2b..5382cad39b 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.3 +SEATD_VERSION = 0.6.4 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT From clement.leger at bootlin.com Mon Mar 14 15:31:03 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:03 +0100 Subject: [Buildroot] [PATCH v4 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220314153111.1390512-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which needs to be aligned with optee-os version. ---- Changes in v4: - Add missing variables for python host package - Found a missing DTC dependency while testing build in docker container - Fix BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY title - Change the logic to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY - optee-os now depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS Changes in v3: - Fix authorship for commits that were copied from Etienne ones. - Fix package URL for optee-os - Added Acked-by Etienne Carriere Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (8): boot/optee-os: add option to select DTC dependency package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 boot/optee-os/Config.in | 21 +++++++++++++++++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 12 ++++++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- .../python-cryptography.mk | 14 +++++++++++++ 12 files changed, 58 insertions(+), 17 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:04 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:04 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-2-clement.leger@bootlin.com> Some platforms (stm32, sam) needs DTC to build the platform device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration option to select host-dtc package when building. Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..2f6143f1f4 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..9f76d8450e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -23,6 +23,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif + # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit # trusted applications. Since buildroot currently references -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:05 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:05 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-3-clement.leger@bootlin.com> Enable host package and add needed dependencies. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..8a4ffe6d75 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,14 +17,28 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:06 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:06 +0100 Subject: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-4-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 9 +++++++++ boot/optee-os/optee-os.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 2f6143f1f4..3996039191 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_OPTEE_OS bool "optee_os" depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help OP-TEE OS provides the secure world boot image and the trust application development kit of the OP-TEE project. OP-TEE OS @@ -55,6 +56,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_VERSION string default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 9f76d8450e..5313a1badc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,13 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:07 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:07 +0100 Subject: [Buildroot] [PATCH v4 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-5-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 3996039191..29924d9198 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -19,7 +19,8 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -66,7 +67,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b9b0e5b43f 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:08 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:08 +0100 Subject: [Buildroot] [PATCH v4 5/8] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-6-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:09 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:09 +0100 Subject: [Buildroot] [PATCH v4 6/8] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-7-clement.leger@bootlin.com> Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:10 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:10 +0100 Subject: [Buildroot] [PATCH v4 7/8] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-8-clement.leger@bootlin.com> Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Mon Mar 14 15:31:11 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Mon, 14 Mar 2022 16:31:11 +0100 Subject: [Buildroot] [PATCH v4 8/8] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220314153111.1390512-1-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> Message-ID: <20220314153111.1390512-9-clement.leger@bootlin.com> Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From etienne.carriere at linaro.org Mon Mar 14 17:20:47 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Mon, 14 Mar 2022 18:20:47 +0100 Subject: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220314153111.1390512-4-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-4-clement.leger@bootlin.com> Message-ID: Hello Cl?ment, Once bumped to 3.16.0, optee-os won't revert to pycryptodomex. Why not using a single change to upgrade optee_os to 3.16.0 and update dependencies? This would get rid of BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY. Best regards, Etienne On Mon, 14 Mar 2022 at 16:33, Cl?ment L?ger wrote: > > Newer version of optee-os (>= 3.16) uses python-cryptography instead of > python-pycryptodomex in python scripts. Add support to build these > newer versions by adding a new > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will > select host-python-cryptography dependency when building optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 9 +++++++++ > boot/optee-os/optee-os.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 2f6143f1f4..3996039191 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -1,6 +1,7 @@ > config BR2_TARGET_OPTEE_OS > bool "optee_os" > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > help > OP-TEE OS provides the secure world boot image and the trust > application development kit of the OP-TEE project. OP-TEE OS > @@ -55,6 +56,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > Select this option if your OP-TEE OS platform configuration > requires the Device Tree compiler to be available. > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "OP-TEE OS needs host-python-cryptography" > + help > + OP-TEE OS version below 3.16 used python-pycryptodomex > + package in python scripts. Newer version uses > + python-cryptography. Select this option if optee-os needs > + python-cryptography to be built. > + > config BR2_TARGET_OPTEE_OS_VERSION > string > default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 9f76d8450e..5313a1badc 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -21,7 +21,13 @@ else > OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) > endif > > -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools > + > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) > +OPTEE_OS_DEPENDENCIES += host-python-cryptography > +else > +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex > +endif > > ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > OPTEE_OS_DEPENDENCIES += host-dtc > -- > 2.34.1 > From thomas at ruschival.de Mon Mar 14 17:21:13 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Mon, 14 Mar 2022 18:21:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220312170048.GI283544@scaer> References: <20220312104402.33075-1-thomas@ruschival.de> <20220312104402.33075-2-thomas@ruschival.de> <20220312170048.GI283544@scaer> Message-ID: <87sfrkpi0m.fsf@ruschival.de> Hi Yann, Nicolas, I will look into that and send an updated patch later this week. Thanks Nicolas for the hint, I forgot about the DEPENDENCIES... Regards Thomas On 2022-03-12 at 18:00 CET, Yann E. MORIN wrote: > Thomas, All, > > On 2022-03-12 11:44 +0100, Thomas Ruschival spake thusly: >> While upstream pistache has not yet released a stable 'tag' >> a lot has changed since June 2020: >> >> * project has moved to meson build system, cmake builds >> do not install headers. >> * patches in buildroot are no longer required >> * project-implemented Pistache::Optional was replaced by >> use of std::optional. This is only available in C++17 >> * dependency to rapidjson has been introduced >> >> Signed-off-by: Thomas Ruschival > > I've marked this patch as chagnes-requested: Nicolas explained what you > need to do to pass the test-pkg step. Can you look into that, test on > your side, and respin an updated patch? > > Thanks! > > Regards, > Yann E. MORIN. > >> --- >> ...-add-C-language-to-project-statement.patch | 70 -------------- >> ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- >> ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- >> package/pistache/Config.in | 9 +- >> package/pistache/pistache.hash | 2 +- >> package/pistache/pistache.mk | 9 +- >> 6 files changed, 11 insertions(+), 212 deletions(-) >> delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch >> delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch >> delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch >> >> diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch >> deleted file mode 100644 >> index c393a48d0d..0000000000 >> --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch >> +++ /dev/null >> @@ -1,70 +0,0 @@ >> -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Sun, 16 Aug 2020 12:31:46 +0200 >> -Subject: [PATCH] CMakeLists.txt: add C language to project statement >> -MIME-Version: 1.0 >> -Content-Type: text/plain; charset=UTF-8 >> -Content-Transfer-Encoding: 8bit >> - >> -This will fix the detection of atomic: >> - >> --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB >> --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed >> --- Looking for __atomic_load_8 in atomic >> --- Looking for __atomic_load_8 in atomic - not found >> -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): >> - Host compiler appears to require libatomic for 64-bit operations, but >> - cannot find it. >> -Call Stack (most recent call first): >> - CMakeLists.txt:19 (include) >> - >> -Indeed if C language is not enabled, the test will be run with the C++ >> -compiler resulting in the following error: >> - >> -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o >> -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx >> -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] >> -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' >> - CHECK_FUNCTION_EXISTS(void); >> - ^~~~~~~~~~~~~~~~~~~~~ >> -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': >> -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' >> - CHECK_FUNCTION_EXISTS(); >> - ^ >> - >> -whereas with a C compiler, we'll get: >> - >> -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o >> -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c >> -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] >> -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? >> - CHECK_FUNCTION_EXISTS(void); >> - ^~~~~~~~~~~~~~~~~~~~~ >> -Linking C executable cmTC_4b0f4 >> -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 >> -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 >> - >> -Signed-off-by: Fabrice Fontaine >> ---- >> - CMakeLists.txt | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/CMakeLists.txt b/CMakeLists.txt >> -index edc73c5..0286647 100644 >> ---- a/CMakeLists.txt >> -+++ b/CMakeLists.txt >> -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) >> - set(CMAKE_CXX_EXTENSIONS OFF) >> - >> - project (pistache >> -- LANGUAGES CXX) >> -+ LANGUAGES C CXX) >> - >> - include(GNUInstallDirs) >> - >> --- >> -2.27.0 >> - >> diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch >> deleted file mode 100644 >> index 09f59b11ec..0000000000 >> --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch >> +++ /dev/null >> @@ -1,95 +0,0 @@ >> -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Thu, 15 Oct 2020 22:26:55 +0200 >> -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS >> - >> -Don't build and install pistache_shared if the standard cmake >> -BUILD_SHARED_LIBS is set to OFF >> - >> -Signed-off-by: Fabrice Fontaine >> -[Backport from upstream: >> - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 >> -] >> ---- >> - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ >> - 1 file changed, 25 insertions(+), 18 deletions(-) >> - >> -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt >> -index 6521b20..c5b049f 100644 >> ---- a/src/CMakeLists.txt >> -+++ b/src/CMakeLists.txt >> -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) >> - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) >> - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) >> - >> --add_library(pistache_shared SHARED $) >> --add_library(pistache_static STATIC $) >> -+if (BUILD_SHARED_LIBS) >> -+ add_library(pistache_shared SHARED $) >> -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) >> -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) >> -+endif () >> - >> --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) >> -+add_library(pistache_static STATIC $) >> - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) >> -- >> --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) >> - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) >> - >> - if (PISTACHE_USE_SSL) >> - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) >> -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) >> - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) >> - >> - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) >> -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) >> - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) >> -+ if (BUILD_SHARED_LIBS) >> -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) >> -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) >> -+ endif () >> - endif () >> - >> - set(Pistache_OUTPUT_NAME "pistache") >> --set_target_properties(pistache_shared PROPERTIES >> -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} >> -- VERSION ${version} >> -- SOVERSION ${VERSION_MAJOR} >> --) >> -+if (BUILD_SHARED_LIBS) >> -+ set_target_properties(pistache_shared PROPERTIES >> -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} >> -+ VERSION ${version} >> -+ SOVERSION ${VERSION_MAJOR} >> -+ ) >> -+endif () >> - >> - set_target_properties(pistache_static PROPERTIES >> - OUTPUT_NAME ${Pistache_OUTPUT_NAME} >> -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) >> - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") >> - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") >> - >> -- install( >> -- TARGETS pistache_shared >> -- EXPORT PistacheTargets >> -- ARCHIVE DESTINATION ${lib_install_dir} >> -- LIBRARY DESTINATION ${lib_install_dir} >> -- RUNTIME DESTINATION ${bin_install_dir} >> -- INCLUDES DESTINATION ${include_install_dir}) >> -+ if (BUILD_SHARED_LIBS) >> -+ install( >> -+ TARGETS pistache_shared >> -+ EXPORT PistacheTargets >> -+ ARCHIVE DESTINATION ${lib_install_dir} >> -+ LIBRARY DESTINATION ${lib_install_dir} >> -+ RUNTIME DESTINATION ${bin_install_dir} >> -+ INCLUDES DESTINATION ${include_install_dir}) >> -+ endif() >> - >> - install( >> - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" >> --- >> -2.28.0 >> - >> diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch >> deleted file mode 100644 >> index be06ca760a..0000000000 >> --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch >> +++ /dev/null >> @@ -1,38 +0,0 @@ >> -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine >> -Date: Thu, 5 Aug 2021 19:02:56 +0200 >> -Subject: [PATCH] include/pistache/typeid.h: include cstddef >> - >> -Include cstddef to avoid the following build failure with gcc 11: >> - >> -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, >> - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, >> - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: >> -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' >> - 26 | operator size_t() const { return reinterpret_cast(id_); } >> - | ^~~~~~ >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b >> - >> -Signed-off-by: Fabrice Fontaine >> -[Upstream status: https://github.com/pistacheio/pistache/pull/965] >> ---- >> - include/pistache/typeid.h | 1 + >> - 1 file changed, 1 insertion(+) >> - >> -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h >> -index 10353ca..893e7c1 100644 >> ---- a/include/pistache/typeid.h >> -+++ b/include/pistache/typeid.h >> -@@ -7,6 +7,7 @@ >> - >> - #pragma once >> - >> -+#include >> - #include >> - >> - namespace Pistache >> --- >> -2.30.2 >> - >> diff --git a/package/pistache/Config.in b/package/pistache/Config.in >> index 96aed5210a..806c27077a 100644 >> --- a/package/pistache/Config.in >> +++ b/package/pistache/Config.in >> @@ -1,22 +1,23 @@ >> config BR2_PACKAGE_PISTACHE >> bool "pistache" >> - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 >> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional >> depends on BR2_USE_WCHAR >> depends on BR2_TOOLCHAIN_HAS_THREADS >> depends on BR2_INSTALL_LIBSTDCPP >> + depends on BR2_PACKAGE_RAPIDJSON >> depends on !BR2_TOOLCHAIN_USES_UCLIBC >> depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 >> help >> Pistache is a modern and elegant HTTP and REST framework >> - for C++. It is entirely written in pure C++14 and provides >> + for C++. It is entirely written in pure C++17 and provides >> a clear and pleasant API. >> >> https://github.com/oktal/pistache >> >> -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" >> +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" >> depends on !BR2_INSTALL_LIBSTDCPP || \ >> BR2_TOOLCHAIN_USES_UCLIBC || \ >> - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ >> + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ >> !BR2_TOOLCHAIN_HAS_THREADS || \ >> !BR2_USE_WCHAR || \ >> BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 >> diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash >> index 5079387eb7..9a2cd1d1f9 100644 >> --- a/package/pistache/pistache.hash >> +++ b/package/pistache/pistache.hash >> @@ -1,3 +1,3 @@ >> #locally computed >> -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz >> +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz >> sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE >> diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk >> index 4d6bd283ea..0f49ad12db 100644 >> --- a/package/pistache/pistache.mk >> +++ b/package/pistache/pistache.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d >> +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 >> PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) >> PISTACHE_LICENSE = Apache-2.0 >> PISTACHE_LICENSE_FILES = LICENSE >> @@ -13,9 +13,10 @@ PISTACHE_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_OPENSSL),y) >> PISTACHE_DEPENDENCIES += openssl >> -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON >> +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true >> +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false >> else >> -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF >> +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false >> endif >> >> -$(eval $(cmake-package)) >> +$(eval $(meson-package)) >> -- >> 2.30.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From etienne.carriere at linaro.org Mon Mar 14 17:23:39 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Mon, 14 Mar 2022 18:23:39 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-2-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-2-clement.leger@bootlin.com> Message-ID: Hello Cl?ment, On Mon, 14 Mar 2022 at 16:32, Cl?ment L?ger wrote: > > Some platforms (stm32, sam) needs DTC to build the platform > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration > option to select host-dtc package when building. > > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 7 +++++++ > boot/optee-os/optee-os.mk | 4 ++++ > 2 files changed, 11 insertions(+) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 0974578484..2f6143f1f4 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_OPTEE_OS_NEEDS_DTC > + bool "OP-TEE OS needs dtc" > + select BR2_PACKAGE_HOST_DTC > + help > + Select this option if your OP-TEE OS platform configuration > + requires the Device Tree compiler to be available. > + > config BR2_TARGET_OPTEE_OS_VERSION > string > default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 166b5e693c..9f76d8450e 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -23,6 +23,10 @@ endif > > OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > +OPTEE_OS_DEPENDENCIES += host-dtc > +endif > + > # On 64bit targets, OP-TEE OS can be built in 32bit mode, or > # can be built in 64bit mode and support 32bit and 64bit > # trusted applications. Since buildroot currently references > -- > 2.34.1 > Acked-by: Etienne Carriere From thomas at ruschival.de Mon Mar 14 18:13:46 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Mon, 14 Mar 2022 19:13:46 +0100 Subject: [Buildroot] [PATCH v2 0/1] Bump pistache, switch to meson build (test-pkg o.k.) In-Reply-To: <20220312104402.33075-2-thomas@ruschival.de> References: <20220312104402.33075-2-thomas@ruschival.de> Message-ID: <20220314181347.190747-1-thomas@ruschival.de> The pistache project has moved to meson build and cmake build seems to be neglected e.g. the cmake build on host did no longer install header files. This patch switches to meson build. As a nice side effect newer upstream versions already include the patches by Fabrice Fontaine so the buildroot package does no longer need the patch files. The upstream project now has a hard dependency to RapidJSON. Tested with a full build for Raspberry Pi Zero W and BananaPi and test-pkg bootlin-armv5-uclibc [1/6]: SKIPPED bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 4 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Thomas Ruschival (1): package/pistache: bump version & switch to meson build ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 10 +- 6 files changed, 12 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch -- 2.30.2 From thomas at ruschival.de Mon Mar 14 18:13:47 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Mon, 14 Mar 2022 19:13:47 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220314181347.190747-1-thomas@ruschival.de> References: <20220312104402.33075-2-thomas@ruschival.de> <20220314181347.190747-1-thomas@ruschival.de> Message-ID: <20220314181347.190747-2-thomas@ruschival.de> While upstream pistache has not yet released a stable 'tag' a lot has changed since June 2020: * project has moved to meson build system, cmake builds do not install headers. * patches in buildroot are no longer required * project-implemented Pistache::Optional was replaced by use of std::optional. This is only available in C++17 * dependency to rapidjson has been introduced Signed-off-by: Thomas Ruschival --- ...-add-C-language-to-project-statement.patch | 70 -------------- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 10 +- 6 files changed, 12 insertions(+), 212 deletions(-) delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d..0000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ?__atomic_load_8? [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ?CHECK_FUNCTION_EXISTS? - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec..0000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a..0000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210a..806c27077a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,23 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_RAPIDJSON depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7..9a2cd1d1f9 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea..65d9b2412c 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,18 +4,20 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE PISTACHE_INSTALL_STAGING = YES +PISTACHE_DEPENDENCIES += rapidjson ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) -- 2.30.2 From james.hilliard1 at gmail.com Mon Mar 14 18:15:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:15:19 -0600 Subject: [Buildroot] [PATCH 2/2] package/bind: fix libxml2 build In-Reply-To: <20220313092148.353432-2-fontaine.fabrice@gmail.com> References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> <20220313092148.353432-2-fontaine.fabrice@gmail.com> Message-ID: On Sun, Mar 13, 2022 at 3:23 AM Fabrice Fontaine wrote: > > Fix the following build failure with libxml2 raised since bump to > version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: > > configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead > > Fixes: > - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b > > Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard > --- > package/bind/bind.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index e0c81152e1..63cc948c73 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -74,7 +74,7 @@ BIND_CONF_OPTS += --with-gssapi=no > endif > > ifeq ($(BR2_PACKAGE_LIBXML2),y) > -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr > +BIND_CONF_OPTS += --with-libxml2 > BIND_DEPENDENCIES += libxml2 > else > BIND_CONF_OPTS += --with-libxml2=no > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Mon Mar 14 18:16:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:16:34 -0600 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: bump to version 0.14.0 Message-ID: <20220314181634.2155997-1-james.hilliard1@gmail.com> Drop patches that are now upstream. Signed-off-by: James Hilliard --- ...d-check-user-xenv.sh-for-systemd-se.patch} | 0 ...treamer-check-1.0-unless-tests-are-e.patch | 33 ---------------- ...on-python-module-for-python-install.patch} | 0 ...tive-symlink-for-gstd-gst-client-exe.patch | 38 ------------------- package/gstreamer1/gstd/gstd.hash | 2 +- package/gstreamer1/gstd/gstd.mk | 2 +- 6 files changed, 2 insertions(+), 73 deletions(-) rename package/gstreamer1/gstd/{0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch => 0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch} (100%) delete mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch rename package/gstreamer1/gstd/{0005-Use-native-meson-python-module-for-python-install.patch => 0003-Use-native-meson-python-module-for-python-install.patch} (100%) delete mode 100644 package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch deleted file mode 100644 index 495fbfc3fa..0000000000 --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:49:49 -0600 -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/248] ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1d9ce9d..76990a0 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') - libd_dep = dependency('libdaemon', version : '>=0.14') - jansson_dep = dependency('jansson', version : '>=2.7') --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') - thread_dep = dependency('threads') - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') - -+gst_check_required = get_option('enable-tests').enabled() -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') -+ - systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch similarity index 100% rename from package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch rename to package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch deleted file mode 100644 index 265ea8d8c3..0000000000 --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 02:49:10 -0600 -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. - -This should fix the symlink path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/249] ---- - gst_client/gst_client_symbolic_link.sh | 2 +- - gstd/gstd_symbolic_link.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gst_client/gst_client_symbolic_link.sh -+++ b/gst_client/gst_client_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gstd/gstd_symbolic_link.sh -+++ b/gstd/gstd_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 6ec84bd58d..20c821a27f 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz +sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 959e277272..08a29f26ff 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTD_VERSION = 0.13.0 +GSTD_VERSION = 0.14.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING GSTD_LICENSE = GPL-2.0+ -- 2.25.1 From james.hilliard1 at gmail.com Mon Mar 14 18:30:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:30:14 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.3 Message-ID: <20220314183014.2173419-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d4..d909709b24 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd46..4615e839fe 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 0.61.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From james.hilliard1 at gmail.com Mon Mar 14 18:32:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 14 Mar 2022 12:32:34 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.1 Message-ID: <20220314183234.2174325-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b2..af8b5c4de9 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d4..a58fd33a61 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.4.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE -- 2.25.1 From bernd.kuhls at t-online.de Mon Mar 14 18:43:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 19:43:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: security bump version to 2.4.53 Message-ID: <20220314184353.2639955-1-bernd.kuhls@t-online.de> Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Signed-off-by: Bernd Kuhls --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..d3857d00ad 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 -- 2.30.2 From bernd.kuhls at t-online.de Mon Mar 14 18:59:45 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 19:59:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support Message-ID: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 0db0c088cb..a6e5b06b8f 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) -- 2.30.2 From bernd.kuhls at t-online.de Mon Mar 14 19:00:33 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 20:00:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> <877d8xd8nb.fsf__45952.9784087621$1647195156$gmane$org@tarshish> Message-ID: Am Sun, 13 Mar 2022 20:05:45 +0200 schrieb Baruch Siach via buildroot: > It looks like NSS crypto back-end support requires --with-nss-deprecated > now. Maybe just drop deprecated NSS support? Hi Baruch, curl will drop nss support in August 2022: https://github.com/curl/curl/blob/master/docs/DEPRECATE.md Until then why not change the nss configure option? Regards, Bernd From baruch at tkos.co.il Mon Mar 14 19:17:14 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 14 Mar 2022 21:17:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 In-Reply-To: References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> <877d8xd8nb.fsf__45952.9784087621$1647195156$gmane$org@tarshish> Message-ID: <87pmmobafl.fsf@tarshish> Hi Bernd, On Mon, Mar 14 2022, Bernd Kuhls wrote: > Am Sun, 13 Mar 2022 20:05:45 +0200 schrieb Baruch Siach via buildroot: > >> It looks like NSS crypto back-end support requires --with-nss-deprecated >> now. Maybe just drop deprecated NSS support? > > curl will drop nss support in August 2022: > https://github.com/curl/curl/blob/master/docs/DEPRECATE.md > > Until then why not change the nss configure option? Upstream decision to deprecate NSS support hints that NSS is already not the best choice for curl crypto back-end. The DEPRECATE.md document lists specific issues with NSS. baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From baruch at tkos.co.il Mon Mar 14 19:31:15 2022 From: baruch at tkos.co.il (Baruch Siach) Date: Mon, 14 Mar 2022 21:31:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support In-Reply-To: <20220314185945.2823356-1-bernd.kuhls@t-online.de> References: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Message-ID: <87lexcbaa9.fsf@tarshish> Hi Bernd, On Mon, Mar 14 2022, Bernd Kuhls wrote: > Contrary to the helptext > https://github.com/curl/curl/blob/master/configure.ac#L152 > > the configure option is called --with-libgsasl: > https://github.com/curl/curl/blob/master/configure.ac#L1989 > > Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Thanks, baruch > --- > package/libcurl/libcurl.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 0db0c088cb..a6e5b06b8f 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -128,9 +128,9 @@ endif > > ifeq ($(BR2_PACKAGE_LIBGSASL),y) > LIBCURL_DEPENDENCIES += libgsasl > -LIBCURL_CONF_OPTS += --with-gsasl > +LIBCURL_CONF_OPTS += --with-libgsasl > else > -LIBCURL_CONF_OPTS += --without-gsasl > +LIBCURL_CONF_OPTS += --without-libgsasl > endif > > ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From huth at tuxfamily.org Mon Mar 14 19:57:09 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Mon, 14 Mar 2022 20:57:09 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/kvm-unit-tests: bump to version 2022-03-08 In-Reply-To: <20220310221908.30588-1-fontaine.fabrice@gmail.com> References: <20220310221908.30588-1-fontaine.fabrice@gmail.com> Message-ID: <20220314205709.0024bd95@tuxfamily.org> Am Thu, 10 Mar 2022 23:19:08 +0100 schrieb Fabrice Fontaine : > - Switch site: > https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 > - Update first patch > - Drop second patch (binutils < 2.23 is not supported by buildroot > anymore) > - Drop third and fourth patches (already in version) > - This bump will fix the following build failure with powerpc and gcc 11 > thanks to > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 > > /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian > > Fixes: > - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be > > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Thomas Huth): > - Drop second patch > > ...emove-Werror-to-avoid-build-failures.patch | 17 +-- > ...vm-unit-tests-test-for-rdseed-rdrand.patch | 110 ------------------ > ...3-Makefile-fix-stack-protector-tests.patch | 36 ------ > ...issue-with-the-linker-from-Fedora-32.patch | 61 ---------- > package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- > package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- > 6 files changed, 14 insertions(+), 218 deletions(-) > delete mode 100644 package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch Reviewed-by: Thomas Huth From thomas.petazzoni at bootlin.com Mon Mar 14 20:23:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 14 Mar 2022 21:23:39 +0100 Subject: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-4-clement.leger@bootlin.com> Message-ID: <20220314212339.45d1da77@windsurf> Hello Etienne, On Mon, 14 Mar 2022 18:20:47 +0100 Etienne Carriere wrote: > Once bumped to 3.16.0, optee-os won't revert to pycryptodomex. > Why not using a single change to upgrade optee_os to 3.16.0 and update > dependencies? > This would get rid of BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY. OP-TEE is one of those Buildroot packages for which we offer a version selection (because it is heavily tied to the hardware, like a bootloader or the Linux kernel). So you can't assume that everybody will be building 3.16.x or newer. Some people will probably still be using older versions for quite some time, which we still have to support. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ps.report at gmx.net Mon Mar 14 20:28:25 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 14 Mar 2022 21:28:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: security bump version to 2.4.53 In-Reply-To: <20220314184353.2639955-1-bernd.kuhls@t-online.de> References: <20220314184353.2639955-1-bernd.kuhls@t-online.de> Message-ID: <20220314212825.72645f04@gmx.net> Hello Bernd, On Mon, 14 Mar 2022 19:43:53 +0100, Bernd Kuhls wrote: > Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 > > Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. From the Changelog: *) Support pcre2 (10.x) library in place of the now end-of-life pcre (8.x) for regular expression evaluation. This depends on locating pcre2-config. [William Rowe, Petr Pisar , Rainer Jung] Time to switch from pcre dependency to pcre2? Regards, Peter > > Signed-off-by: Bernd Kuhls > --- > package/apache/apache.hash | 6 +++--- > package/apache/apache.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/apache/apache.hash b/package/apache/apache.hash > index 014d920772..11dcdefe46 100644 > --- a/package/apache/apache.hash > +++ b/package/apache/apache.hash > @@ -1,5 +1,5 @@ > -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} > -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 > -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 > +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} > +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 > +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 > # Locally computed > sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index b280d4dc3a..d3857d00ad 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -APACHE_VERSION = 2.4.52 > +APACHE_VERSION = 2.4.53 > APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 > APACHE_SITE = https://downloads.apache.org/httpd > APACHE_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Mon Mar 14 20:31:49 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Mar 2022 21:31:49 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220314153111.1390512-3-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-3-clement.leger@bootlin.com> Message-ID: <20220314203149.GW283544@scaer> Cl?ment, All, On 2022-03-14 16:31 +0100, Cl?ment L?ger via buildroot spake thusly: > Enable host package and add needed dependencies. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > package/python-cryptography/python-cryptography.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index a524f729c8..8a4ffe6d75 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -17,14 +17,28 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > host-python-cffi \ > host-rustc \ > openssl > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + host-openssl > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > # We need to vendor the Cargo crates at download time > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo I think the host variant should automatically inherit that setting from the target variant. Afterall, it seems reasonable to expect that the download of the host and target variants should usually be exactly the same. > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc Ditto for the download dependencies. Although that may intoduce a circular dependency (i.e.: foo has host-foo as a download dependency, so of course host-foo can't have host-foo as download dependency...) > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml I am going to suggest that should also be the case for the _DL_ENV. Note however that you would anyway need to override it for this package, becasue thwe host and target variants have different go env. So, something like (with _DL_SUBDIR thrown into the mix; of course, the whole was thoroughly untested): package/pkg-generic: host variant inherits download settings Blablabla Afterall, it seems reasonable to expect that the download of the host and target variants should usually be exactly the same, but packages can still override that for the host vairant in special cases blablabla... Signed-off-by: Yann E. MORIN diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) Thoughts? Regards, Yann E. MORIN. > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From huth at tuxfamily.org Mon Mar 14 20:32:26 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Mon, 14 Mar 2022 21:32:26 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220314203226.4481-1-huth@tuxfamily.org> I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 70d71186ed..4083e87d30 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2753,8 +2753,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni -- 2.34.1 From yann.morin.1998 at free.fr Mon Mar 14 20:59:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Mar 2022 21:59:26 +0100 Subject: [Buildroot] [git commit] boot/optee-os: add option to select DTC dependency Message-ID: <20220314205118.1FB3283E75@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67be54cd943a466aab6bf53df2aa9e712da43556 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Some platforms (stm32, sam) needs DTC to build the platform device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration option to select host-dtc package when building. Signed-off-by: Cl??ment L??ger Acked-by: Etienne Carriere [yann.morin.1998 at free.fr: move option] Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..ea16550b72 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -54,6 +54,13 @@ config BR2_TARGET_OPTEE_OS_VERSION default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..9f76d8450e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -23,6 +23,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif + # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit # trusted applications. Since buildroot currently references From yann.morin.1998 at free.fr Mon Mar 14 21:01:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 14 Mar 2022 22:01:32 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-2-clement.leger@bootlin.com> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-2-clement.leger@bootlin.com> Message-ID: <20220314210132.GX283544@scaer> Cl?ment, All, On 2022-03-14 16:31 +0100, Cl?ment L?ger via buildroot spake thusly: > Some platforms (stm32, sam) needs DTC to build the platform > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration > option to select host-dtc package when building. > > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 7 +++++++ > boot/optee-os/optee-os.mk | 4 ++++ > 2 files changed, 11 insertions(+) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 0974578484..2f6143f1f4 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION > > endif > > +config BR2_TARGET_OPTEE_OS_NEEDS_DTC > + bool "OP-TEE OS needs dtc" > + select BR2_PACKAGE_HOST_DTC > + help > + Select this option if your OP-TEE OS platform configuration > + requires the Device Tree compiler to be available. The following option, BR2_TARGET_OPTEE_OS_VERSION, is related to the version selection, above, so adding this new option right in the middle is not very great. I've moved that new option below. Applied to master, thanks. Regards, Yann E. MORIN. > config BR2_TARGET_OPTEE_OS_VERSION > string > default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 166b5e693c..9f76d8450e 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -23,6 +23,10 @@ endif > > OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > +OPTEE_OS_DEPENDENCIES += host-dtc > +endif > + > # On 64bit targets, OP-TEE OS can be built in 32bit mode, or > # can be built in 64bit mode and support 32bit and 64bit > # trusted applications. Since buildroot currently references > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd.kuhls at t-online.de Mon Mar 14 21:20:00 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Mon, 14 Mar 2022 22:20:00 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/apache: security bump version to 2.4.53 Message-ID: <20220314212000.2949718-1-bernd.kuhls@t-online.de> Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls --- v2: switch from pcre to pcre2 (Peter S.) package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ -- 2.30.2 From noreply at busybox.net Mon Mar 14 19:41:19 2022 From: noreply at busybox.net (busybox.net) Date: 15 Mar 2022 03:41:19 +0800 Subject: [Buildroot] Important Security Alert for buildroot@busybox.net (3) Message-ID: <20220315034119.E49E19B144111DD5@busybox.net> An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Tue Mar 15 08:10:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 09:10:41 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220314203149.GW283544@scaer> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-3-clement.leger@bootlin.com> <20220314203149.GW283544@scaer> Message-ID: <20220315091041.015209a9@windsurf> On Mon, 14 Mar 2022 21:31:49 +0100 "Yann E. MORIN" wrote: > I think the host variant should automatically inherit that setting from > the target variant. > > Afterall, it seems reasonable to expect that the download of the host > and target variants should usually be exactly the same. I agree, but I thought this was really too much outside of what Cl?ment is trying to achieve in this patch series (I helped Cl?ment internally by reviewing/discussing this patch series, and indeed identified the fact that those variables should be inherited between target/host). But of course if as a maintainer you think this is something that is really needed as a pre-requisite to merge those patches, we can ask Cl?ment to work on this :-) Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From bugzilla at busybox.net Tue Mar 15 08:51:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 08:51:04 +0000 Subject: [Buildroot] [Bug 13731] Readline Patch is missing Author Information In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13731 --- Comment #2 from Andrei Gherghescu --- (In reply to Fabrice Fontaine from comment #1) Shouldn't this ticket be closed as the corrected patch was merged into master? -- You are receiving this mail because: You are on the CC list for the bug. From angelo at amarulasolutions.com Tue Mar 15 09:02:09 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 15 Mar 2022 10:02:09 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3 Message-ID: <20220315090209.206025-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 36744c5337..3678ee061f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.104-cip3)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf856..18480a87bf 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz +sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes -- 2.25.1 From angelo at amarulasolutions.com Tue Mar 15 09:02:20 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 15 Mar 2022 10:02:20 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3-rt3 Message-ID: <20220315090220.206426-1-angelo@amarulasolutions.com> Signed-off-by: Angelo Compagnucci --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 3678ee061f..9d2ccd59cb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.104-cip3-rt3)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 18480a87bf..976f1d07c0 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -- 2.25.1 From bugzilla at busybox.net Tue Mar 15 11:50:05 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 11:50:05 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 --- Comment #8 from Andrei Gherghescu --- (In reply to mbuil from comment #0) Can you provide the linux kernel config and a board config you used for this? I could try to reproduce, but I don't know what exactly your configuration was. -- You are receiving this mail because: You are on the CC list for the bug. From hrsourabh011 at gmail.com Tue Mar 15 13:05:08 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Tue, 15 Mar 2022 14:05:08 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: Helllo Jan, Thanks for the answer. >From Buildroot 2021 release "ctrl_interface" is disabled and so I have commented out below line in etc/wpa_supplicant.conf file # ctrl_interface=/var/run/wpa_supplicant And also in my rootfs, there is no "/var/run/wpa_supplicant" file. I have set below options in menuconfig [image: menuconfig.PNG] Then doing make clean & make results in below errors: >>> wpa_supplicant 2.10 Installing to staging directory /usr/bin/install -m 0644 -D /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so /usr/bin/install: cannot stat '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': No such file or directory make[1]: *** [package/pkg-generic.mk:331: /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] Error 1 make: *** [Makefile:23: _all] Error 2 Can you please let me know what could be the issue and how to resolve it? Thanks in advance On Thu, 10 Mar 2022 at 19:03, Jan Havran wrote: > Hi Sourabh, > > after enabling RPi firmware you must load the Wifi driver - since you are > using > systemd, it should by handled by udev on start I think. > > So you probably just need to configure /etc/network/interfaces to start > wpa_supplicant > on wlan0 with /etc/wpa_supplicant.conf file, where you can put your > credentials. > Or at least that is what I have done, but I am not using systemd. > > I did something similar some time ago, you can check it here: > > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > (note that to make "my" credentials public in that commit was an > intention). > > P.S.: if you want to have any modifications to be part of your image with > filesystem, > you can do it by using rootfs overlays for example: > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > Regards, > > Jan Havran > > V Thu, Mar 10, 2022 at 05:43:27PM +0100, Sourabh Hegde napsal(a): > > Hello All, > > > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > > start-up. I am using Buildroot based Linux distribution. I have worked > with > > Yocto before and it provides systemd-networkd and wpa_supplicant feature > to > > connect to wifi on boot. I am lloking something similar in Buildroot but > > couldn't find any notes online. > > > > So far, I think I have enabled the necessary config/driver using "make > > menuconfig" : > > [image: wpa_supplicant.png] > > [image: firmware.png] > > > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > > suggestion would be helpful. > > > > Can anyone please let me know how to proceed further with it? > > > > Your help will be much appreciated. > > > > Thanks in advance. > > > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > > and let me know if any info is missing here. > > > > Regards, > > > > Sourabh > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: menuconfig.PNG Type: image/png Size: 19269 bytes Desc: not available URL: From joel at jms.id.au Tue Mar 15 13:07:37 2022 From: joel at jms.id.au (Joel Stanley) Date: Tue, 15 Mar 2022 23:37:37 +1030 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le Message-ID: <20220315130737.428449-1-joel@jms.id.au> When generating a filesystem image on a power10 build machine running Ubuntu, we see a segfault when fakeroot is running chmod. This has been reported and fixed upstream in Debian in version 1.26-1.2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 Add the samae patch to resolve the segfault. Signed-off-by: Joel Stanley --- This isn't a commit in the fakeroot tree, rather a patch from the Debian packaging. I would appreciate if this was added to the 2022.02 stable tree. Signed-off-by: Joel Stanley --- .../fakeroot/fix-prototype-generation.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/fakeroot/fix-prototype-generation.patch diff --git a/package/fakeroot/fix-prototype-generation.patch b/package/fakeroot/fix-prototype-generation.patch new file mode 100644 index 000000000000..38d32ff3b22c --- /dev/null +++ b/package/fakeroot/fix-prototype-generation.patch @@ -0,0 +1,59 @@ +Subject: Fix prototype generation for openat +Author: Christoph Biedl +Date: 2021-12-30 +Bug-Debian: https://bugs.debian.org/995393 +Forwarded: Yes (implicitely) + + As jrtc27 pointed out in IRC, ppc64el is more strict than other + architectures when it comes to va_arg handling: + + it's that ppc64le uses the elfv2 abi, and for variadic calls you + must reserve space for a parameter save area + + So enhance wrapawk to create a proper prototype and argument + handling although it's specific to the openat call. Also add the + missing documentation for the sixth column to wrapfunc.inp. + +--- a/wrapawk ++++ b/wrapawk +@@ -37,7 +37,25 @@ + argtype=$3; + argname=$4; + MACRO=$5; +- if(MACRO){ ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -9,8 +9,10 @@ + /**/ */ + /* each line of this file lists 4 fields, seperated by a ";". */ + /* The first field is the name of the wrapped function, then it's return */ +-/* value. After that come the function arguments with types, and the last */ ++/* value. After that come the function arguments with types, and the fifth */ + /* field contains the function arguments without types. */ ++/* A sixth field is a special needed when wrapping the openat syscall. */ ++/* Otherwise it's like the third (function arguments with types). */ + /**/ + + /* __*xstat are used on glibc systems instead of just *xstat. */ -- 2.35.1 From mirza.kapetanovic at gmail.com Tue Mar 15 14:26:40 2022 From: mirza.kapetanovic at gmail.com (Mirza Kapetanovic) Date: Tue, 15 Mar 2022 15:26:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpi-gpio: enable package on aarch64 Message-ID: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. Signed-off-by: Mirza Kapetanovic --- package/python-rpi-gpio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb06..f3c0928c62 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. -- 2.25.1 From fontaine.fabrice at gmail.com Tue Mar 15 17:32:31 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 18:32:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo Message-ID: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 Signed-off-by: Fabrice Fontaine --- package/grpc/grpc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 23b92f1750..9138b4ea59 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +GRPC_DEPENDENCIES += libexecinfo +GRPC_EXE_LINKER_FLAGS += -lexecinfo +endif + # grpc can use __atomic builtins, so we need to link with # libatomic when available ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +GRPC_EXE_LINKER_FLAGS += -latomic endif GRPC_CFLAGS = $(TARGET_CFLAGS) -- 2.35.1 From fperrad at gmail.com Tue Mar 15 17:33:24 2022 From: fperrad at gmail.com (Francois Perrad) Date: Tue, 15 Mar 2022 18:33:24 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.1 Message-ID: <20220315173324.1113174-1-francois.perrad@gadz.org> diff README: -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Larry Wall and others. +2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 +by Larry Wall and others. Signed-off-by: Francois Perrad --- package/perl/perl.hash | 14 +++++++------- package/perl/perl.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b0f60ef6f..d8344d975 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt +md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz +sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz +sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.hash +sha256 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335 perl-cross-1.3.7.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index d7f9c58dd..392fb8b6e 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.6 +PERL_CROSS_VERSION = 1.3.7 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz -- 2.32.0 From fontaine.fabrice at gmail.com Tue Mar 15 17:34:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 18:34:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING -- 2.35.1 From bugzilla at busybox.net Tue Mar 15 19:15:37 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 19:15:37 +0000 Subject: [Buildroot] [Bug 14146] Cannot build for beaglebone black. Build fails with errors In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14146 --- Comment #3 from Andrei Gherghescu --- Dear Afua, You should check your GCC version. I get the same error with GCC 10. It looks that this is due to the kernel version and GCC 10 combination as reported here: https://lkml.org/lkml/2020/4/1/1206 This was fixed in release 2021.08.1 with the upgrade to 5.10.30-ti-r3 as Adam Duskett also mentioned. You should switch to that release. If you need to stick with 4.19 kernel for whatever reason, then you can use 4.19.94-ti-r72, as listed here https://github.com/beagleboard/linux/tags 4.19.94-ti-r72 kernel builds fine with GCC 10. Change to the following line in your config. BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.94-ti-r72)/linux-4.19.94-ti-r72.tar.gz" Regards, Andrei -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 15 19:45:31 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 19:45:31 +0000 Subject: [Buildroot] [Bug 13731] Readline Patch is missing Author Information In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13731 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Tue Mar 15 20:00:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:00:54 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: On 15/03/2022 14:05, Sourabh Hegde wrote: > Helllo Jan, > > Thanks for the answer. > > From Buildroot 2021 release "ctrl_interface" is disabled and so I have It's disabled unless BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > commented out below line in etc/wpa_supplicant.conf file > > # |ctrl_interface=/var/run/wpa_supplicant| This shouldn't be needed. AFAIK wpa_supplicant ignores the option if CTRL_IFACE is not enabled. > | > | > |And also in my rootfs, there is no "|/var/run/wpa_supplicant|" file. The file (actually, named pipe) is created when wpa_supplicants starts up. /var/run is a tmpfs so it can only be created at runtime. > | > | > | > |I have set below options in menuconfig| > | > | > menuconfig.PNG > > Then doing make clean & make results in below errors: > > >>> wpa_supplicant 2.10 Installing to staging directory > /usr/bin/install -m 0644 -D > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so > /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so > /usr/bin/install: cannot stat > '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': > No such file or directory > make[1]: *** [package/pkg-generic.mk:331 : > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] > Error 1 > make: *** [Makefile:23: _all] Error 2 > > Can you please let me know what could be the issue and how to resolve it? I've tried to build the same configuration (with current git master) and it builds without problems. Please supply the defconfig and also the full build log (by uploading to a pastebin). Regards, Arnout > > Thanks in advance > || > > On Thu, 10 Mar 2022 at 19:03, Jan Havran > wrote: > > Hi Sourabh, > > after enabling RPi firmware you must load the Wifi driver - since you are using > systemd, it should by handled by udev on start I think. > > So you probably just need to configure /etc/network/interfaces to start > wpa_supplicant > on wlan0 with /etc/wpa_supplicant.conf file, where you can put your credentials. > Or at least that is what I have done, but I am not using systemd. > > I did something similar some time ago, you can check it here: > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > (note that to make "my" credentials public in that commit was an intention). > > P.S.: if you want to have any modifications to be part of your image with > filesystem, > you can do it by using rootfs overlays for example: > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > Regards, > > Jan Havran > > V?Thu, Mar 10, 2022 at 05:43:27PM +0100,?Sourabh Hegde napsal(a): > > Hello All, > > > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > > start-up. I am using Buildroot based Linux distribution. I have worked with > > Yocto before and it provides systemd-networkd and wpa_supplicant feature to > > connect to wifi on boot. I am lloking something similar in Buildroot but > > couldn't find any notes online. > > > > So far, I think I have enabled the necessary config/driver using "make > > menuconfig" : > > [image: wpa_supplicant.png] > > [image: firmware.png] > > > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > > suggestion would be helpful. > > > > Can anyone please let me know how to proceed further with it? > > > > Your help will be much appreciated. > > > > Thanks in advance. > > > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > > and let me know if any info is missing here. > > > > Regards, > > > > Sourabh > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Mar 15 20:15:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:15:34 +0100 Subject: [Buildroot] [PATCH/next v2 1/2] package/bubblewrap: bump to version 0.6.1 In-Reply-To: <20220226161444.2221042-1-aperez@igalia.com> References: <20220224231609.1097793-1-aperez@igalia.com> <20220226161444.2221042-1-aperez@igalia.com> Message-ID: On 26/02/2022 17:14, Adrian Perez de Castro wrote: > This version includes a new feature which allows specifying multiple > seccomp filters. There is now a Meson-based build system as well, but > for the moment the build recipe keeps using the autotools based one. > Release notes can be found at: > > https://github.com/containers/bubblewrap/releases/tag/v0.6.0 > https://github.com/containers/bubblewrap/releases/tag/v0.6.1 > > Signed-off-by: Adrian Perez de Castro Applied both to master, thanks. Regards, Arnout > --- > package/bubblewrap/bubblewrap.hash | 4 ++-- > package/bubblewrap/bubblewrap.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash > index 88aba150cd..c3bf4d8212 100644 > --- a/package/bubblewrap/bubblewrap.hash > +++ b/package/bubblewrap/bubblewrap.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 > -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz > +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.1 > +sha256 9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 bubblewrap-0.6.1.tar.xz > > # Hash for license files: > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING > diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk > index 5f3d95e826..1ca2029700 100644 > --- a/package/bubblewrap/bubblewrap.mk > +++ b/package/bubblewrap/bubblewrap.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BUBBLEWRAP_VERSION = 0.5.0 > +BUBBLEWRAP_VERSION = 0.6.1 > BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) > BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz > BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap From arnout at mind.be Tue Mar 15 20:15:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:15:50 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/cukinia: bump to version 0.6.0 In-Reply-To: <20220226182356.3035297-1-fontaine.fabrice@gmail.com> References: <20220226182356.3035297-1-fontaine.fabrice@gmail.com> Message-ID: <470a4f5c-1015-d48c-4a6d-5509194f5374@mind.be> On 26/02/2022 19:23, Fabrice Fontaine wrote: > https://github.com/savoirfairelinux/cukinia/compare/v0.5.1...v0.6.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/cukinia/cukinia.hash | 2 +- > package/cukinia/cukinia.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash > index e6ae602011..6e76a6ab88 100644 > --- a/package/cukinia/cukinia.hash > +++ b/package/cukinia/cukinia.hash > @@ -1,4 +1,4 @@ > # locally computed > -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz > +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz > sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 > diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk > index 84d4e60ea8..798c199b67 100644 > --- a/package/cukinia/cukinia.mk > +++ b/package/cukinia/cukinia.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CUKINIA_VERSION = 0.5.1 > +CUKINIA_VERSION = 0.6.0 > CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) > CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 > CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 From arnout at mind.be Tue Mar 15 20:16:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:16:07 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/botan: bump to version 2.19.1 In-Reply-To: <20220227091533.3645027-1-fontaine.fabrice@gmail.com> References: <20220227091533.3645027-1-fontaine.fabrice@gmail.com> Message-ID: On 27/02/2022 10:15, Fabrice Fontaine wrote: > - Drop patch (not needed since > https://github.com/randombit/botan/commit/97483f93bdcfcb2cc86bcb103802be55c24ad633) > - Update hash of license file (update in year: > https://github.com/randombit/botan/commit/ff62a51ac2ed2e265edaf51b532d32eed5864d4b) > > https://github.com/randombit/botan/blob/2.19.1/news.rst > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...d-a-miscompilation-issue-in-clang-12.patch | 144 ------------------ > package/botan/botan.hash | 4 +- > package/botan/botan.mk | 2 +- > 3 files changed, 3 insertions(+), 147 deletions(-) > delete mode 100644 package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch > > diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch > deleted file mode 100644 > index b43aeafe13..0000000000 > --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch > +++ /dev/null > @@ -1,144 +0,0 @@ > -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Tue, 9 Nov 2021 19:01:20 +0100 > -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 > - (XCode 13)" > - > -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/randombit/botan/issues/2845] > ---- > - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- > - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- > - 2 files changed, 22 insertions(+), 70 deletions(-) > - > -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp > -index 289e451ff..690c2b264 100644 > ---- a/src/lib/hash/sha3/sha3.cpp > -+++ b/src/lib/hash/sha3/sha3.cpp > -@@ -11,47 +11,23 @@ > - #include > - #include > - > --#include > -- > - namespace Botan { > - > - namespace { > - > --// This is a workaround for a suspected bug in clang 12 (and XCode 13) > --// that caused a miscompile of the SHA3 implementation for optimization > --// level -O2 and higher. > --// > --// For details, see: https://github.com/randombit/botan/issues/2802 > --#if defined(__clang__) && \ > -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ > -- (!defined(__apple_build_version__) && __clang_major__ == 12)) > --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) > --#else > --#define BOTAN_WORKAROUND_MAYBE_INLINE inline > --#endif > -- > --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple > -- xor_CNs(const uint64_t A[25]) > -- { > -- return { > -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], > -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], > -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], > -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], > -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; > -- } > -- > --#undef BOTAN_WORKAROUND_MAYBE_INLINE > -- > - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) > - { > -- const auto Cs = xor_CNs(A); > -- > -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); > -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); > -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); > -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); > -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); > -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; > -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; > -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; > -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; > -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; > -+ > -+ const uint64_t D0 = rotl<1>(C0) ^ C3; > -+ const uint64_t D1 = rotl<1>(C1) ^ C4; > -+ const uint64_t D2 = rotl<1>(C2) ^ C0; > -+ const uint64_t D3 = rotl<1>(C3) ^ C1; > -+ const uint64_t D4 = rotl<1>(C4) ^ C2; > - > - const uint64_t B00 = A[ 0] ^ D1; > - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); > -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp > -index c7f1914a3..a9650ad9d 100644 > ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp > -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp > -@@ -8,47 +8,23 @@ > - #include > - #include > - > --#include > -- > - namespace Botan { > - > - namespace { > - > --// This is a workaround for a suspected bug in clang 12 (and XCode 13) > --// that caused a miscompile of the SHA3 implementation for optimization > --// level -O2 and higher. > --// > --// For details, see: https://github.com/randombit/botan/issues/2802 > --#if defined(__clang__) && \ > -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ > -- (!defined(__apple_build_version__) && __clang_major__ == 12)) > --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) > --#else > --#define BOTAN_WORKAROUND_MAYBE_INLINE inline > --#endif > -- > --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple > -- xor_CNs(const uint64_t A[25]) > -- { > -- return { > -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], > -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], > -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], > -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], > -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; > -- } > -- > --#undef BOTAN_WORKAROUND_MAYBE_INLINE > -- > - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) > - { > -- const auto Cs = xor_CNs(A); > -- > -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); > -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); > -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); > -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); > -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); > -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; > -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; > -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; > -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; > -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; > -+ > -+ const uint64_t D0 = rotl<1>(C0) ^ C3; > -+ const uint64_t D1 = rotl<1>(C1) ^ C4; > -+ const uint64_t D2 = rotl<1>(C2) ^ C0; > -+ const uint64_t D3 = rotl<1>(C3) ^ C1; > -+ const uint64_t D4 = rotl<1>(C4) ^ C2; > - > - const uint64_t B00 = A[ 0] ^ D1; > - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); > --- > -2.33.0 > - > diff --git a/package/botan/botan.hash b/package/botan/botan.hash > index 91e1bf741a..2729cb493f 100644 > --- a/package/botan/botan.hash > +++ b/package/botan/botan.hash > @@ -1,4 +1,4 @@ > # From https://botan.randombit.net/releases/sha256sums.txt > -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz > +sha256 e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 Botan-2.19.1.tar.xz > # Locally computed > -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt > +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt > diff --git a/package/botan/botan.mk b/package/botan/botan.mk > index ebff1343b1..f9ebcf8d0a 100644 > --- a/package/botan/botan.mk > +++ b/package/botan/botan.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BOTAN_VERSION = 2.18.2 > +BOTAN_VERSION = 2.19.1 > BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz > BOTAN_SITE = http://botan.randombit.net/releases > BOTAN_LICENSE = BSD-2-Clause From arnout at mind.be Tue Mar 15 20:17:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:17:20 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libsecret: bump to version 0.20.5 In-Reply-To: <20220227100104.3694504-1-fontaine.fabrice@gmail.com> References: <20220227100104.3694504-1-fontaine.fabrice@gmail.com> Message-ID: On 27/02/2022 11:01, Fabrice Fontaine wrote: > - Switch to meson-package > - Add bash-completion and tpm2-tss optional dependencies > > https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libsecret/libsecret.hash | 4 ++-- > package/libsecret/libsecret.mk | 36 +++++++++++++++++++++----------- > 2 files changed, 26 insertions(+), 14 deletions(-) > > diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash > index 792ec838e3..4eb3d9b95c 100644 > --- a/package/libsecret/libsecret.hash > +++ b/package/libsecret/libsecret.hash > @@ -1,5 +1,5 @@ > -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum > -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz > +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum > +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz > > # Hash for license file: > sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING > diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk > index 4d14c231d7..82fe38ac1a 100644 > --- a/package/libsecret/libsecret.mk > +++ b/package/libsecret/libsecret.mk > @@ -5,33 +5,45 @@ > ################################################################################ > > LIBSECRET_VERSION_MAJOR = 0.20 > -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 > +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 > LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) > LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz > LIBSECRET_INSTALL_STAGING = YES > LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) > -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) > +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) > LIBSECRET_CONF_OPTS = \ > - --disable-manpages \ > - --disable-strict \ > - --disable-coverage \ > - --enable-vala=no > + -Dgtk_doc=false \ > + -Dmanpage=false \ > + -Dvapi=false > LIBSECRET_LICENSE = LGPL-2.1+ > LIBSECRET_LICENSE_FILES = COPYING > > +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) > +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled > +LIBSECRET_DEPENDENCIES += bash-completion > +else > +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled > +endif > + > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -LIBSECRET_CONF_OPTS += --enable-introspection=yes > +LIBSECRET_CONF_OPTS += -Dintrospection=true > LIBSECRET_DEPENDENCIES += gobject-introspection > else > -LIBSECRET_CONF_OPTS += --enable-introspection=no > +LIBSECRET_CONF_OPTS += -Dintrospection=false > endif > > ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) > LIBSECRET_DEPENDENCIES += libgcrypt > -LIBSECRET_CONF_OPTS += --enable-gcrypt \ > - --with-libgcrypt-prefix=$(STAGING_DIR)/usr > +LIBSECRET_CONF_OPTS += -Dgcrypt=true > +else > +LIBSECRET_CONF_OPTS += -Dgcrypt=false > +endif > + > +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) > +LIBSECRET_CONF_OPTS += -Dtpm2=true > +LIBSECRET_DEPENDENCIES += tpm2-tss > else > -LIBSECRET_CONF_OPTS += --disable-gcrypt > +LIBSECRET_CONF_OPTS += -Dtpm2=false > endif > > -$(eval $(autotools-package)) > +$(eval $(meson-package)) From arnout at mind.be Tue Mar 15 20:17:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:17:43 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/valijson: drop boost dependency In-Reply-To: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> References: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> Message-ID: On 27/02/2022 11:35, Fabrice Fontaine wrote: > boost is not mandatory since the deactivation of tests when bumping to > version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and > https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/valijson/Config.in | 8 ++------ > package/valijson/valijson.mk | 1 - > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/package/valijson/Config.in b/package/valijson/Config.in > index 10721b3703..07706cd963 100644 > --- a/package/valijson/Config.in > +++ b/package/valijson/Config.in > @@ -1,10 +1,6 @@ > config BR2_PACKAGE_VALIJSON > bool "valijson" > - depends on BR2_USE_WCHAR > depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_TOOLCHAIN_HAS_THREADS > - select BR2_PACKAGE_BOOST > - select BR2_PACKAGE_BOOST_REGEX > help > Valijson is a header-only JSON Schema Validation library for > C++. Valijson provides a simple validation API that allows > @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON > > https://github.com/tristanpenman/valijson > > -comment "valijson needs a toolchain w/ C++, threads, wchar support" > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR > +comment "valijson needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk > index e425757d26..71c5b05f2b 100644 > --- a/package/valijson/valijson.mk > +++ b/package/valijson/valijson.mk > @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE > VALIJSON_CPE_ID_VENDOR = valijson_project > VALIJSON_INSTALL_STAGING = YES > VALIJSON_INSTALL_TARGET = NO > -VALIJSON_DEPENDENCIES = boost > VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE > > $(eval $(cmake-package)) From arnout at mind.be Tue Mar 15 20:18:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 21:18:36 +0100 Subject: [Buildroot] [PATCH] package/shairport-sync: install dbus policy file to target In-Reply-To: <20220228022840.2140908-1-t123yh.xyz@gmail.com> References: <20220228022840.2140908-1-t123yh.xyz@gmail.com> Message-ID: On 28/02/2022 03:28, Yunhao Tian wrote: > This adds two extra commands to install dbus policy config > to target if dbus option is enabled. > > Signed-off-by: Yunhao Tian > --- > package/shairport-sync/shairport-sync.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk > index 487e0c05e5..ab67da3964 100644 > --- a/package/shairport-sync/shairport-sync.mk > +++ b/package/shairport-sync/shairport-sync.mk > @@ -59,6 +59,14 @@ endif > ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) > SHAIRPORT_SYNC_DEPENDENCIES += libglib2 > SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface > +define SHAIRPORT_SYNC_INSTALL_DBUS > + $(INSTALL) -m 0644 -D \ > + $(@D)/scripts/shairport-sync-dbus-policy.conf \ > + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf > + $(INSTALL) -m 0644 -D \ > + $(@D)/scripts/shairport-sync-mpris-policy.conf \ > + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf > +endef > else > SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface > endif > @@ -77,11 +85,13 @@ else > SHAIRPORT_SYNC_CONF_OPTS += --without-mqtt-client > endif > > + You shouldn't add this empty line. check-package detects that. Applied to master with that changed, thanks. Regards, Arnout > define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS > $(INSTALL) -D -m 0755 $(@D)/shairport-sync \ > $(TARGET_DIR)/usr/bin/shairport-sync > $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ > $(TARGET_DIR)/etc/shairport-sync.conf > + $(SHAIRPORT_SYNC_INSTALL_DBUS) > endef > > define SHAIRPORT_SYNC_INSTALL_INIT_SYSV From arnout at mind.be Tue Mar 15 19:54:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:15 +0100 Subject: [Buildroot] [git commit] package/bubblewrap: bump to version 0.6.1 Message-ID: <20220315201012.7847683F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d589604b46dbfea8df5f1e73baa025ace8b7e92f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This version includes a new feature which allows specifying multiple seccomp filters. There is now a Meson-based build system as well, but for the moment the build recipe keeps using the autotools based one. Release notes can be found at: https://github.com/containers/bubblewrap/releases/tag/v0.6.0 https://github.com/containers/bubblewrap/releases/tag/v0.6.1 Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cd..c3bf4d8212 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.6.1 +sha256 9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 bubblewrap-0.6.1.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826..1ca2029700 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.6.1 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap From arnout at mind.be Tue Mar 15 19:54:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:20 +0100 Subject: [Buildroot] [git commit] package/cukinia: bump to version 0.6.0 Message-ID: <20220315201012.9A45883F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=978b6be59f144bc5f7e2f0948cb357415238d56a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/savoirfairelinux/cukinia/compare/v0.5.1...v0.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cukinia/cukinia.hash | 2 +- package/cukinia/cukinia.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash index e6ae602011..6e76a6ab88 100644 --- a/package/cukinia/cukinia.hash +++ b/package/cukinia/cukinia.hash @@ -1,4 +1,4 @@ # locally computed -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk index 84d4e60ea8..798c199b67 100644 --- a/package/cukinia/cukinia.mk +++ b/package/cukinia/cukinia.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUKINIA_VERSION = 0.5.1 +CUKINIA_VERSION = 0.6.0 CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 From arnout at mind.be Tue Mar 15 19:54:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:18 +0100 Subject: [Buildroot] [git commit] package/bubblewrap: switch to the meson build system Message-ID: <20220315201012.8D91183F84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eceb90dc76f8e1a49e92076fd032dc98622a4535 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Version 0.6.0 introduced a Meson build system, and upstream seems to have the intention to abandon the previous autotools based one. Switch to Meson for future proofing. Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bubblewrap/bubblewrap.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 1ca2029700..5875b0d6e2 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -14,22 +14,24 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +40,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Mar 15 19:54:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:26 +0100 Subject: [Buildroot] [git commit] package/libsecret: bump to version 0.20.5 Message-ID: <20220315201012.B196883F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2106f02bae984e97bc151fe47de0a792b84919a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to meson-package - Add bash-completion and tpm2-tss optional dependencies https://gitlab.gnome.org/GNOME/libsecret/-/tags/0.20.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsecret/libsecret.hash | 4 ++-- package/libsecret/libsecret.mk | 36 ++++++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index 792ec838e3..4eb3d9b95c 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index 4d14c231d7..82fe38ac1a 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,33 +5,45 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSECRET_CONF_OPTS = \ - --disable-manpages \ - --disable-strict \ - --disable-coverage \ - --enable-vala=no + -Dgtk_doc=false \ + -Dmanpage=false \ + -Dvapi=false LIBSECRET_LICENSE = LGPL-2.1+ LIBSECRET_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled +LIBSECRET_DEPENDENCIES += bash-completion +else +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSECRET_CONF_OPTS += --enable-introspection=yes +LIBSECRET_CONF_OPTS += -Dintrospection=true LIBSECRET_DEPENDENCIES += gobject-introspection else -LIBSECRET_CONF_OPTS += --enable-introspection=no +LIBSECRET_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSECRET_DEPENDENCIES += libgcrypt -LIBSECRET_CONF_OPTS += --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSECRET_CONF_OPTS += -Dgcrypt=true +else +LIBSECRET_CONF_OPTS += -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +LIBSECRET_CONF_OPTS += -Dtpm2=true +LIBSECRET_DEPENDENCIES += tpm2-tss else -LIBSECRET_CONF_OPTS += --disable-gcrypt +LIBSECRET_CONF_OPTS += -Dtpm2=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From arnout at mind.be Tue Mar 15 19:54:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:31 +0100 Subject: [Buildroot] [git commit] package/valijson: bump to version 0.6 Message-ID: <20220315201012.C9A5483F85@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a5476ef0d4eb417df6787b68125862aa30a6b4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/tristanpenman/valijson/releases/tag/v0.6 https://github.com/tristanpenman/valijson/releases/tag/v0.5 https://github.com/tristanpenman/valijson/releases/tag/v0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/valijson/valijson.hash | 2 +- package/valijson/valijson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index e184ccb7c0..0aab93dd2a 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz +sha256 e06bf78fc1d26d4956fabc182408ebbbc47e3a6699778cda4aa439c2a6110b09 valijson-0.6.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 71c5b05f2b..4b1f722f77 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALIJSON_VERSION = 0.3 +VALIJSON_VERSION = 0.6 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE From arnout at mind.be Tue Mar 15 19:54:29 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:29 +0100 Subject: [Buildroot] [git commit] package/valijson: drop boost dependency Message-ID: <20220315201012.BCC3483F84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9391c7dd21dee3eff04e665bf6a92ef6fc5f234 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master boost is not mandatory since the deactivation of tests when bumping to version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/valijson/Config.in | 8 ++------ package/valijson/valijson.mk | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b3703..07706cd963 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26..71c5b05f2b 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) From arnout at mind.be Tue Mar 15 20:01:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 21:01:20 +0100 Subject: [Buildroot] [git commit] package/shairport-sync: install dbus policy file to target Message-ID: <20220315201012.DB14583F83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d74963400633ec9056646fdc50a91a046489a719 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This adds two extra commands to install dbus policy config to target if dbus option is enabled. Signed-off-by: Yunhao Tian Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/shairport-sync/shairport-sync.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e5..4430014ec9 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -82,6 +90,7 @@ define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV From arnout at mind.be Tue Mar 15 19:54:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 20:54:23 +0100 Subject: [Buildroot] [git commit] package/botan: bump to version 2.19.1 Message-ID: <20220315201012.A55BF83F85@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e28156074d296f02b02b7f01767fda314365b890 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (not needed since https://github.com/randombit/botan/commit/97483f93bdcfcb2cc86bcb103802be55c24ad633) - Update hash of license file (update in year: https://github.com/randombit/botan/commit/ff62a51ac2ed2e265edaf51b532d32eed5864d4b) https://github.com/randombit/botan/blob/2.19.1/news.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...around-a-miscompilation-issue-in-clang-12.patch | 144 --------------------- package/botan/botan.hash | 4 +- package/botan/botan.mk | 2 +- 3 files changed, 3 insertions(+), 147 deletions(-) diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch deleted file mode 100644 index b43aeafe13..0000000000 --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 9 Nov 2021 19:01:20 +0100 -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 - (XCode 13)" - -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/randombit/botan/issues/2845] ---- - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- - 2 files changed, 22 insertions(+), 70 deletions(-) - -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp -index 289e451ff..690c2b264 100644 ---- a/src/lib/hash/sha3/sha3.cpp -+++ b/src/lib/hash/sha3/sha3.cpp -@@ -11,47 +11,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -index c7f1914a3..a9650ad9d 100644 ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -@@ -8,47 +8,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); --- -2.33.0 - diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 91e1bf741a..2729cb493f 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz +sha256 e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 Botan-2.19.1.tar.xz # Locally computed -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index ebff1343b1..f9ebcf8d0a 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.18.2 +BOTAN_VERSION = 2.19.1 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From ps.report at gmx.net Tue Mar 15 20:33:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 15 Mar 2022 21:33:47 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: References: Message-ID: <20220315213347.09ddc034@gmx.net> On Tue, 15 Mar 2022 21:00:54 +0100, Arnout Vandecappelle wrote: > On 15/03/2022 14:05, Sourabh Hegde wrote: > > Helllo Jan, > > > > Thanks for the answer. > > > > From Buildroot 2021 release "ctrl_interface" is disabled and so I have > > It's disabled unless BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > > > commented out below line in etc/wpa_supplicant.conf file > > > > # |ctrl_interface=/var/run/wpa_supplicant| > > This shouldn't be needed. AFAIK wpa_supplicant ignores the option if > CTRL_IFACE is not enabled. > > > | > > | > > |And also in my rootfs, there is no "|/var/run/wpa_supplicant|" file. > > The file (actually, named pipe) is created when wpa_supplicants starts up. > /var/run is a tmpfs so it can only be created at runtime. > > > | > > | > > | > > |I have set below options in menuconfig| > > | > > | > > menuconfig.PNG > > > > Then doing make clean & make results in below errors: > > > > >>> wpa_supplicant 2.10 Installing to staging directory > > /usr/bin/install -m 0644 -D > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so > > /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so > > /usr/bin/install: cannot stat > > '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': > > No such file or directory > > make[1]: *** [package/pkg-generic.mk:331 : > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] > > Error 1 > > make: *** [Makefile:23: _all] Error 2 > > > > Can you please let me know what could be the issue and how to resolve it? > > I've tried to build the same configuration (with current git master) and it > builds without problems. Problem introduced on buildroot git master with wpa_supplicant version bump [1] and fixed with [2]... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=39381a467cd2cfc15f77d3f9adbf329d2f92e312 [2] https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=c4eebf191c781a3ea6b5eb1811cc17ae92ea2fb2 > > Please supply the defconfig and also the full build log (by uploading to a > pastebin). > > Regards, > Arnout > > > > > > Thanks in advance > > || > > > > On Thu, 10 Mar 2022 at 19:03, Jan Havran > > wrote: > > > > Hi Sourabh, > > > > after enabling RPi firmware you must load the Wifi driver - since you are using > > systemd, it should by handled by udev on start I think. > > > > So you probably just need to configure /etc/network/interfaces to start > > wpa_supplicant > > on wlan0 with /etc/wpa_supplicant.conf file, where you can put your credentials. > > Or at least that is what I have done, but I am not using systemd. > > > > I did something similar some time ago, you can check it here: > > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > > > > (note that to make "my" credentials public in that commit was an intention). > > > > P.S.: if you want to have any modifications to be part of your image with > > filesystem, > > you can do it by using rootfs overlays for example: > > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > > > > Regards, > > > > Jan Havran > > > > V?Thu, Mar 10, 2022 at 05:43:27PM +0100,?Sourabh Hegde napsal(a): > > > Hello All, > > > > > > I am trying to connect my Raspberry Pi CM4 to Wifi automatically after > > > start-up. I am using Buildroot based Linux distribution. I have worked with > > > Yocto before and it provides systemd-networkd and wpa_supplicant feature to > > > connect to wifi on boot. I am lloking something similar in Buildroot but > > > couldn't find any notes online. > > > > > > So far, I think I have enabled the necessary config/driver using "make > > > menuconfig" : > > > [image: wpa_supplicant.png] > > > [image: firmware.png] > > > > > > But now, how can I set-up wpa_supplicant.conf? Any link to notes or > > > suggestion would be helpful. > > > > > > Can anyone please let me know how to proceed further with it? > > > > > > Your help will be much appreciated. > > > > > > Thanks in advance. > > > > > > P.S: I am using Buildroot 2022.02 release and also using systemd feature > > > and let me know if any info is missing here. > > > > > > Regards, > > > > > > Sourabh > > > > > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Tue Mar 15 20:54:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Tue, 15 Mar 2022 21:54:05 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n Message-ID: <20220315205405.9291-1-ps.report@gmx.net> Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom?? Mr?z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay -- 2.35.1 From bugzilla at busybox.net Tue Mar 15 20:59:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 20:59:11 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 --- Comment #9 from Peter Seiderer --- Re-add bug description from one of the duplicates: > From mbuil at suse.com 2021-07-08 15:27:37 UTC > > Since 1.6, iptables supports the MASQUERADE target options: > > MASQUERADE target options: > --to-ports [-] > Port (range) to map to. > --random > Randomize source port. > --random-fully > Fully randomize source port. > > When building iptables-nft, the MASQUERADE target options are included in the iptables-nft binary, however, they are not in the ip6tables-nft: > > $> sudo ./output/target/usr/sbin/iptables-nft -A POSTROUTING -s 10.244.0.0/16 ! -d 224.0.0.0/4 -j MASQUERADE --help | grep random > --random > --random-fully > Fully randomize source port. > $> sudo ./output/target/usr/sbin/ip6tables-nft -A POSTROUTING -s 10.244.0.0/16 ! -d 224.0.0.0/4 -j MASQUERADE --help | grep random > $> > > Those targets come from the files libipt_MASQUERADE.c and libip6t_MASQUERADE.c in https://git.netfilter.org/iptables/tree/extensions but for some reason the ip6 one does not get included in the binary -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Tue Mar 15 20:57:07 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 21:57:07 +0100 Subject: [Buildroot] [git commit] package/mtools: bump version to 4.0.38 Message-ID: <20220315205049.DE4C383F95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88de5d08226b490ea2784fbfd0580dd3430b5699 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486f..a162bfdc95 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231..c875814bc7 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Tue Mar 15 20:59:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 21:59:35 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.38 In-Reply-To: <20220311065928.14849-1-ps.report@gmx.net> References: <20220311065928.14849-1-ps.report@gmx.net> Message-ID: <20220315215935.6341fafd@windsurf> On Fri, 11 Mar 2022 07:59:28 +0100 Peter Seiderer wrote: > For details see [1]. > > [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html > > Signed-off-by: Peter Seiderer > --- > package/mtools/mtools.hash | 2 +- > package/mtools/mtools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Tue Mar 15 20:59:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 21:59:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls Message-ID: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command FAILED: src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine --- ...-meson.build-fix-g_ir_compiler-calls.patch | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 0000000000..3961ad0564 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + -- 2.35.1 From bugzilla at busybox.net Tue Mar 15 21:03:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 15 Mar 2022 21:03:23 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 --- Comment #10 from Peter Seiderer --- (In reply to Peter Seiderer from comment #9) Not reproducible here (raspberrypi0w_defconfig with glibc, gcc-11.x, eudev): $ ip6tables-nft -A POSTROUTING -s 10.244.0.0/16 ! -d 224.0.0.0/4 -j MASQUERADE --help ip6tables v1.8.7 [...] MASQUERADE target options: --to-ports [-] Port (range) to map to. --random Randomize source port. --random-fully Fully randomize source port. -- You are receiving this mail because: You are on the CC list for the bug. From thomas.petazzoni at bootlin.com Tue Mar 15 21:05:31 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 22:05:31 +0100 Subject: [Buildroot] [PATCH v1] package/wget: bump version to 1.21.3 In-Reply-To: <20220311065042.8687-1-ps.report@gmx.net> References: <20220311065042.8687-1-ps.report@gmx.net> Message-ID: <20220315220531.2bac9c2d@windsurf> Hello Peter, On Fri, 11 Mar 2022 07:50:42 +0100 Peter Seiderer wrote: > - explicit set some default options (--without-metalink, --enable-opie, > --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, > --disable-assert) > > - add optional libpsl dependency > > - remove legacy --with-libidn option (see [1]), replace with > new --enable-iri option in case libiconv and libidn2 are available > > - use explicit --with-libuuid option > > - add optional c-ares dependency > > For details see [2]. > > [1] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > [2] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > > Signed-off-by: Peter Seiderer You're mixing up a minor version bump with a significant rework of the package, which is unrelated to the version bump. This really needs separate commit. Also, see below. > +WGET_CONF_OPTS = \ > + --without-metalink \ > + --enable-opie \ > + --enable-digest \ > + --enable-ntlm \ So opie, digest and ntlm enabled is the default? > + --disable-debug \ > + --disable-valgrind-tests \ > + --disable-assert > + > +ifeq ($(BR2_PACKAGE_LIBPSL),y) > +WGET_CONF_OPTS += --with-libpsl > +WGET_DEPENDENCIES += libpsl > +else > +WGET_CONF_OPTS += --without-libpsl > +endif > + > ifeq ($(BR2_PACKAGE_GNUTLS),y) > WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > @@ -22,19 +38,18 @@ else > WGET_CONF_OPTS += --without-ssl > endif > > -ifeq ($(BR2_PACKAGE_LIBICONV),y) > -WGET_DEPENDENCIES += libiconv > -endif > - > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > -WGET_CONF_OPTS += --with-libidn > -WGET_DEPENDENCIES += libidn2 > +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) This is very likely wrong. Indeed BR2_PACKAGE_LIBICONV=y is only possible when the toolchain does *not* have locale support. When the toolchain has locale support, iconv support is provided by the toolchain itself. Could you revisit this, and also clarify the interaction between --enable-iri/--disable-iri on one side and --with-libidn/--without-libidn on the other side? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Mar 15 21:06:11 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 22:06:11 +0100 Subject: [Buildroot] [git commit] package/ts4900-fpga: bump version to 20170510 Message-ID: <20220315205750.DC9C983F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=503948f452d0cb46cbc7990ecaeabd60f2b3dfd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte transmits. Signed-off-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni --- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 9ffff643af..1d3c62bfd1 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index a3e42c0812..73e7a28e31 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,7 +4,7 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. From thomas.petazzoni at bootlin.com Tue Mar 15 21:06:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 15 Mar 2022 22:06:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/ts4900-fpga: bump version to 20170510 In-Reply-To: <20220310185921.8852-1-kris@embeddedTS.com> References: <20220310185921.8852-1-kris@embeddedTS.com> Message-ID: <20220315220639.29413684@windsurf> On Thu, 10 Mar 2022 10:59:21 -0800 Kris Bahnsen via buildroot wrote: > Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte > transmits. > > Signed-off-by: Kris Bahnsen > --- > package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- > package/ts4900-fpga/ts4900-fpga.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Tue Mar 15 21:11:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:11:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: bump version to 0.4.8 In-Reply-To: <20220228161345.378966-1-theo.lebrun@bootlin.com> References: <20220228161345.378966-1-theo.lebrun@bootlin.com> Message-ID: <80b6dcef-8b08-5ee0-9c82-b10758a5af54@mind.be> On 28/02/2022 17:13, Th?o Lebrun via buildroot wrote: > Changelog: > https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst > > Signed-off-by: Th?o Lebrun Applied to master, thanks. Regards, Arnout > --- > package/wireplumber/wireplumber.hash | 2 +- > package/wireplumber/wireplumber.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash > index 561fcc2e5e..206d7d15af 100644 > --- a/package/wireplumber/wireplumber.hash > +++ b/package/wireplumber/wireplumber.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 > +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 > sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > index 2dab6042ea..3bf7cece45 100644 > --- a/package/wireplumber/wireplumber.mk > +++ b/package/wireplumber/wireplumber.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WIREPLUMBER_VERSION = 0.4.2 > +WIREPLUMBER_VERSION = 0.4.8 > WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 > WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) > WIREPLUMBER_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:11:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:11:57 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix kernel image format for aarch64 BE In-Reply-To: <20220228162632.2777188-1-remi.duraffort@linaro.org> References: <20220228162632.2777188-1-remi.duraffort@linaro.org> Message-ID: <43f2b96c-16e0-b37c-7c41-25d4332ce2e6@mind.be> On 28/02/2022 17:26, R?mi Duraffort wrote: > Signed-off-by: R?mi Duraffort > --- > linux/Config.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in > index 13d99bd09d..1f2a8db545 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE > > config BR2_LINUX_KERNEL_IMAGE > bool "Image" > - depends on BR2_aarch64 || BR2_riscv > + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be I changed the order here so the two aarch64 ones are next to each other. Applied to master with that changed, thanks. Regards, Arnout > > config BR2_LINUX_KERNEL_IMAGEGZ > bool "Image.gz" > - depends on BR2_aarch64 || BR2_riscv > + depends on BR2_aarch64 || BR2_riscv || BR2_aarch64_be > > config BR2_LINUX_KERNEL_LINUX_BIN > bool "linux.bin" From arnout at mind.be Tue Mar 15 21:13:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:13:16 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <20220224154513.220976-1-romain.naour@gmail.com> References: <20220224154513.220976-1-romain.naour@gmail.com> Message-ID: <3897f71d-5622-b118-09a7-b23da8eb87c7@mind.be> On 24/02/2022 16:45, Romain Naour wrote: > TestRust and TestRustBin has been introduced at the time when there was > no cargo package infrastructure or any package using rust compiler > (Buildroot 2018.02). > > Since then the ripgrep package has been introduced, initially using > the generic package infrastructure and converted later to the cargo > package infrastructure. > > Due a recent change in rust/cargo removing the cargo config file [1] > the test TestRust and TestRustBin now fail to compile since they build > an hello-world crate outside of the cargo package infrastructure > without the correct environment for cross-compiling. > > Replace the 'hello-world' crate by ripgrep package and check if it > can run properly in Qemu. > > Fixes tests.package.test_rust.TestRustBin: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 > > But doesn't fixes tests.package.test_rust.TestRust due another bug: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > > [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 > > Signed-off-by: Romain Naour > Cc: Eric Le Bihan ?This introduced a few flake8 errors, which I fixed now. In the future: run flake8! (I also always forget :-)) ?Regards, ?Arnout > --- > v2: no changes > --- > support/testing/tests/package/test_rust.py | 48 ++-------------------- > 1 file changed, 4 insertions(+), 44 deletions(-) > > diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py > index 884b40a4a3..a1abd20c09 100644 > --- a/support/testing/tests/package/test_rust.py > +++ b/support/testing/tests/package/test_rust.py > @@ -8,9 +8,6 @@ import infra.basetest > > class TestRustBase(infra.basetest.BRTest): > > - target = 'armv7-unknown-linux-gnueabihf' > - crate = 'hello-world' > - > def login(self): > img = os.path.join(self.builddir, "images", "rootfs.cpio") > self.emulator.boot(arch="armv7", > @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): > options=["-initrd", img]) > self.emulator.login() > > - def build_test_prog(self): > - hostdir = os.path.join(self.builddir, 'host') > - env = os.environ.copy() > - env["USER"] = "br-user" > - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] > - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') > - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') > - cargo = os.path.join(hostdir, 'bin', 'cargo') > - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), > - self.crate) > - manifest = os.path.join(workdir, 'Cargo.toml') > - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) > - > - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo init failed") > - > - cmd = [ > - cargo, 'build', '-vv', '--target', self.target, > - '--manifest-path', manifest > - ] > - ret = subprocess.call(cmd, > - stdout=self.b.logfile, > - stderr=self.b.logfile, > - env=env) > - if ret != 0: > - raise SystemError("Cargo build failed") > - > - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) > - self.b.build() > - shutil.rmtree(workdir) > - > - > class TestRustBin(TestRustBase): > config = \ > """ > @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") > > > class TestRust(TestRustBase): > @@ -90,9 +50,9 @@ class TestRust(TestRustBase): > # BR2_TARGET_ROOTFS_TAR is not set > BR2_PACKAGE_HOST_RUSTC=y > BR2_PACKAGE_HOST_RUST=y > + BR2_PACKAGE_RIPGREP=y > """ > > def test_run(self): > - self.build_test_prog() > self.login() > - self.assertRunOk(self.crate) > + self.assertRunOk("rg Buildroot /etc/issue") From arnout at mind.be Tue Mar 15 21:13:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:13:40 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/ace: bump to version 7.0.6 In-Reply-To: <20220301223416.947624-1-fontaine.fabrice@gmail.com> References: <20220301223416.947624-1-fontaine.fabrice@gmail.com> Message-ID: On 01/03/2022 23:34, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/ace/ace.hash | 5 ++++- > package/ace/ace.mk | 4 ++-- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/ace/ace.hash b/package/ace/ace.hash > index 92fd42e131..2387927879 100644 > --- a/package/ace/ace.hash > +++ b/package/ace/ace.hash > @@ -1,3 +1,6 @@ > +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: > +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 > + > # Locally Computed: > -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz > +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 > sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING > diff --git a/package/ace/ace.mk b/package/ace/ace.mk > index 8df89d8c6f..7299f0d40c 100644 > --- a/package/ace/ace.mk > +++ b/package/ace/ace.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -ACE_VERSION = 7.0.1 > -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz > +ACE_VERSION = 7.0.6 > +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 > ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions > ACE_LICENSE = DOC > ACE_LICENSE_FILES = COPYING From arnout at mind.be Tue Mar 15 21:13:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:13:57 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libfreeglut: bump to version 3.2.2 In-Reply-To: <20220301225107.988549-1-fontaine.fabrice@gmail.com> References: <20220301225107.988549-1-fontaine.fabrice@gmail.com> Message-ID: On 01/03/2022 23:51, Fabrice Fontaine wrote: > - Drop patch (already in version) > - Update indentation in hash file (two spaces) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ropped-up-with-the-release-of-gcc-10.patch | 69 ------------------- > package/libfreeglut/libfreeglut.hash | 10 +-- > package/libfreeglut/libfreeglut.mk | 2 +- > 3 files changed, 6 insertions(+), 75 deletions(-) > delete mode 100644 package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch > > diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch > deleted file mode 100644 > index e98e71537f..0000000000 > --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 > -From: jtsiomb > -Date: Fri, 21 Feb 2020 22:25:31 +0000 > -Subject: [PATCH] Work-around for an issue which cropped up with the release of > - gcc-10. In their infinite wisdom, they decided to build with -fno-common as > - default from now on, breaking every piece of C code which used to declare > - common symbols in header files, as was the convention since the dawn of time. > - We now have to duplicate all declarations to an arbitrary source file, and > - change the header-file ones to prefix them with extern. > - > -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk at 1863 7f0cb862-5218-0410-a997-914c9d46530a > -[Retrieved from: > -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] > -Signed-off-by: Fabrice Fontaine > ---- > - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ > - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- > - 2 files changed, 21 insertions(+), 7 deletions(-) > - > -diff --git a/src/fg_gl2.c b/src/fg_gl2.c > -index 38b0acbb..54b4285b 100644 > ---- a/src/fg_gl2.c > -+++ b/src/fg_gl2.c > -@@ -27,6 +27,20 @@ > - #include "fg_internal.h" > - #include "fg_gl2.h" > - > -+#ifndef GL_ES_VERSION_2_0 > -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed > -+ * names are defined in fg_gl2.h header to reference them, for any other case, > -+ * define them as function pointers here. > -+ */ > -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; > -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; > -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; > -+FGH_PFNGLBUFFERDATAPROC fghBufferData; > -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; > -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; > -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; > -+#endif > -+ > - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { > - if (fgStructure.CurrentWindow != NULL) > - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; > -diff --git a/src/fg_gl2.h b/src/fg_gl2.h > -index ab8ba5c7..fb3d4676 100644 > ---- a/src/fg_gl2.h > -+++ b/src/fg_gl2.h > -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); > - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); > - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); > - > --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; > --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; > --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; > --FGH_PFNGLBUFFERDATAPROC fghBufferData; > --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; > --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; > --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; > -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; > -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; > -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; > -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; > -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; > -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; > -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; > - > - # endif > - > diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash > index 2771cbde2f..ce9fb9e299 100644 > --- a/package/libfreeglut/libfreeglut.hash > +++ b/package/libfreeglut/libfreeglut.hash > @@ -1,6 +1,6 @@ > -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ > -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz > -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz > +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ > +md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz > +sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz > # Locally computed > -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz > -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING > +sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz > +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING > diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk > index 379de3121b..484b0f4b97 100644 > --- a/package/libfreeglut/libfreeglut.mk > +++ b/package/libfreeglut/libfreeglut.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBFREEGLUT_VERSION = 3.2.1 > +LIBFREEGLUT_VERSION = 3.2.2 > LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz > LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut > LIBFREEGLUT_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:14:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:14:51 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/parted: bump to version 3.4 In-Reply-To: <20220301230504.1000454-1-fontaine.fabrice@gmail.com> References: <20220301230504.1000454-1-fontaine.fabrice@gmail.com> Message-ID: <69767a0f-a765-7149-381a-5ad3e07f4531@mind.be> On 02/03/2022 00:05, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://git.savannah.gnu.org/cgit/parted.git/tree/NEWS?h=v3.4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/parted/parted.hash | 4 ++-- > package/parted/parted.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/parted/parted.hash b/package/parted/parted.hash > index 2c466eb8d2..392436ec4b 100644 > --- a/package/parted/parted.hash > +++ b/package/parted/parted.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz > +sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz > > # Locally calculated > -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING > +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING > diff --git a/package/parted/parted.mk b/package/parted/parted.mk > index 66940fc516..23158179e4 100644 > --- a/package/parted/parted.mk > +++ b/package/parted/parted.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PARTED_VERSION = 3.3 > +PARTED_VERSION = 3.4 > PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz > PARTED_SITE = $(BR2_GNU_MIRROR)/parted > PARTED_DEPENDENCIES = host-pkgconf util-linux From arnout at mind.be Tue Mar 15 21:15:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:15:08 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libscrypt: bump to version 1.22 In-Reply-To: <20220301232111.1092975-1-fontaine.fabrice@gmail.com> References: <20220301232111.1092975-1-fontaine.fabrice@gmail.com> Message-ID: <71ec36a0-eef9-a6a5-c7b4-ea8d2a4d64b5@mind.be> On 02/03/2022 00:21, Fabrice Fontaine wrote: > - Drop patch and use {C,LD}FLAGS_EXTRA which are available since > https://github.com/technion/libscrypt/commit/bdfec26744122e8f52a58bc086c89b27faaf5888 > - While at it, also move PREFIX to LIBSCRYPT_MAKE_OPTS as advocated by > Arnout in > https://patchwork.ozlabs.org/project/buildroot/patch/20220221172900.1937856-1-fontaine.fabrice at gmail.com/ > - Update indentation in hash file (two spaces) > > https://github.com/technion/libscrypt/compare/v1.21...v1.22 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...ions-to-CFLAGS-and-LDFLAGS-variables.patch | 34 ------------------- > package/libscrypt/libscrypt.hash | 4 +-- > package/libscrypt/libscrypt.mk | 14 +++++--- > 3 files changed, 12 insertions(+), 40 deletions(-) > delete mode 100644 package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch > > diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch > deleted file mode 100644 > index a023a6fe1c..0000000000 > --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= > -Date: Tue, 14 Mar 2017 09:23:51 +0100 > -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -This also removes a number of hard-coded CFLAGS, leaving it up to the > -user to pass appropriate optimization/hardening flags. > - > -Signed-off-by: Stefan S?rensen > ---- > - Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 7022a4a..3098a9a 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d > - INSTALL_DATA ?= install > - > - CC?=gcc > --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC > --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version > -+override CFLAGS+=-fPIC > -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version > - CFLAGS_EXTRA?=-Wl,-rpath=. > - > - all: reference > --- > -2.7.4 > - > diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash > index fda63d1c0d..fcdc4bbeeb 100644 > --- a/package/libscrypt/libscrypt.hash > +++ b/package/libscrypt/libscrypt.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz > -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE > +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz > +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE > diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk > index fa89ed31bc..d28bd4e900 100644 > --- a/package/libscrypt/libscrypt.mk > +++ b/package/libscrypt/libscrypt.mk > @@ -4,23 +4,29 @@ > # > ################################################################################ > > -LIBSCRYPT_VERSION = 1.21 > +LIBSCRYPT_VERSION = 1.22 > LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) > LIBSCRYPT_LICENSE = BSD-2-Clause > LIBSCRYPT_LICENSE_FILES = LICENSE > LIBSCRYPT_INSTALL_STAGING = YES > > +LIBSCRYPT_MAKE_OPTS = \ > + $(TARGET_CONFIGURE_OPTS) \ > + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ > + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ > + PREFIX=/usr > + > define LIBSCRYPT_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) > endef > > define LIBSCRYPT_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ > DESTDIR=$(STAGING_DIR) install > endef > > define LIBSCRYPT_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ > DESTDIR=$(TARGET_DIR) install > endef > From arnout at mind.be Tue Mar 15 21:15:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:15:30 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.7 In-Reply-To: <20220302173433.28939-1-bernd.kuhls@t-online.de> References: <20220302173433.28939-1-bernd.kuhls@t-online.de> Message-ID: <79c9a68c-4b86-3201-8efb-a6e3eae29bf9@mind.be> On 02/03/2022 18:34, Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > package/mesa3d/mesa3d.hash | 6 +++--- > package/mesa3d/mesa3d.mk | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk > index c8573fafad..736dedc25e 100644 > --- a/package/mesa3d-headers/mesa3d-headers.mk > +++ b/package/mesa3d-headers/mesa3d-headers.mk > @@ -12,7 +12,7 @@ endif > > # Not possible to directly refer to mesa3d variables, because of > # first/second expansion trickery... > -MESA3D_HEADERS_VERSION = 21.3.6 > +MESA3D_HEADERS_VERSION = 21.3.7 > MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz > MESA3D_HEADERS_SITE = https://archive.mesa3d.org > MESA3D_HEADERS_DL_SUBDIR = mesa3d > diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash > index d64b833100..b680411051 100644 > --- a/package/mesa3d/mesa3d.hash > +++ b/package/mesa3d/mesa3d.hash > @@ -1,6 +1,6 @@ > -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html > -sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz > -sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz > +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html > +sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz > +sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz > > # License > sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst > diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk > index 95618b2072..d0b12932c4 100644 > --- a/package/mesa3d/mesa3d.mk > +++ b/package/mesa3d/mesa3d.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # When updating the version, please also update mesa3d-headers > -MESA3D_VERSION = 21.3.6 > +MESA3D_VERSION = 21.3.7 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos From fontaine.fabrice at gmail.com Tue Mar 15 21:16:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 22:16:52 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-avro: renumber patch Message-ID: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine --- ...h => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/python-avro/{0002-drop-install-time-linting-and-imports-sorting.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} (100%) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 15 21:16:53 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 22:16:53 +0100 Subject: [Buildroot] [PATCH 2/2] package/{avro-c, python-avro}: bump to version 1.11.0 In-Reply-To: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> References: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Message-ID: <20220315211653.2297582-2-fontaine.fabrice@gmail.com> - Drop avro-c patch (already in version) - Drop python-avro patch (not needed anymore) https://github.com/apache/avro/releases/tag/release-1.11.0 Signed-off-by: Fabrice Fontaine --- ...d-failure-without-a-C-compiler-again.patch | 34 -------------- package/avro-c/avro-c.hash | 4 +- package/avro-c/avro-c.mk | 2 +- ...all-time-linting-and-imports-sorting.patch | 46 ------------------- package/python-avro/python-avro.hash | 4 +- package/python-avro/python-avro.mk | 5 +- 6 files changed, 8 insertions(+), 87 deletions(-) delete mode 100644 package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch delete mode 100644 package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch diff --git a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch b/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch deleted file mode 100644 index 8f7e59cf62..0000000000 --- a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Jul 2020 09:35:09 +0200 -Subject: [PATCH] cmake: Build failure without a C++ compiler (again) - -avro-c fails to build (again) without a C++ compiler because commit -664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by -commit 414a51fdc1856083bb16851f09a4c61a48796132 - -Fixes: - - http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c8d7aaf..aa923e18 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # under the License. - # - cmake_minimum_required(VERSION 3.1) --project(AvroC) -+project(AvroC C) - enable_testing() - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) --- -2.27.0 - diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index c4fd7d3f57..7a4a6f7aca 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 -sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/c/avro-c-1.11.0.tar.gz.sha512 +sha512 5369ec11832e0ce1aa0181d594f657bae82ab5fb317ec1bee5ba190de9ed42956b425a5bf7e423940e8f871a54ae1246b92db2ce8562f270b4a05523ec4b60ae avro-c-1.11.0.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index ee6e864161..262a0fee5f 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRO_C_VERSION = 1.10.0 +AVRO_C_VERSION = 1.11.0 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch deleted file mode 100644 index 41231e923d..0000000000 --- a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Mon, 17 Feb 2020 15:12:13 +0100 -Subject: [PATCH] drop install time linting and imports sorting - -Since the 1.9.2 release, the setup script is also performing code linting -tasks, which require additional python libraries. - -These linting tasks are not needed anyway, since they are intended to prepare -the code for distribution, but the Buildroot package is already using a -distributed version. We therefore simply remove them. - -Signed-off-by: Titouan Christophe ---- - setup.cfg | 2 -- - setup.py | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 7b5de18..d46a36e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -25,8 +25,6 @@ package_dir = - include_package_data = true - packages = avro - setup_requires = -- isort -- pycodestyle - install_requires = - zip_safe = true - scripts = -diff --git a/setup.py b/setup.py -index f6297bb..91d3287 100755 ---- a/setup.py -+++ b/setup.py -@@ -164,7 +164,6 @@ def main(): - setuptools.setup(cmdclass={ - "clean": CleanCommand, - "generate_interop_data": GenerateInteropDataCommand, -- "lint": LintCommand, - }) - - --- -2.24.1 - diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index 2428be96e5..d752fa8ae6 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 -sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/py/avro-1.11.0.tar.gz.sha512 +sha512 8af67deb33b9990b74ffd7ab5c3c55e13a649070b4623c7bbe2b278287fd0929e57ed6d0344f9e93f3eb79663b43f75891d0810812349dfaecce65fdd9b44e93 avro-1.11.0.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index dd6008b1ba..0c4c431777 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -5,8 +5,9 @@ ################################################################################ PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) -PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3 -PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz +PYTHON_AVRO_SITE = \ + https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py +PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE PYTHON_AVRO_SETUP_TYPE = setuptools -- 2.35.1 From arnout at mind.be Tue Mar 15 21:19:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:19:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/{gnupg, gnupg2}: use gnupg2 by default In-Reply-To: <20220302210150.33658-1-ju.o@free.fr> References: <20220302210150.33658-1-ju.o@free.fr> Message-ID: <5424d33f-c1db-f3ed-ff87-b3cfb061be33@mind.be> On 02/03/2022 22:01, Julien Olivain wrote: > This patch reverses the logic to select gnupg2 by default, while still > allowing to select gnupg (v1). > > Quoting: https://gnupg.org/download/index.html > """ > GnuPG 1.4 is the old, single binary version which still support the > unsafe PGP-2 keys. This branch has no dependencies on the above listed > libraries or the Pinentry. However, it lacks many modern features and > will receive only important updates. > """ > > gnupg 1.4 is kept in Buildroot for now, as the package is still > maintained upstream. It might still be useful is some specific cases: > - it has a smaller footprint (compared to v2), > - it has less dependencies (only zlib), > - it has less build dependencies (can build static, no need for > MMU/threads, ...) > > Most Linux distributions are now shipping gnupg2 by default. gnupg v1 > is now more for legacy/compatibility/specific cases. > > There is currently only two packages selecting gnupg in Buildroot: > gpgme and python-gnupg > This commit also reverses the logic for those packages. > > Signed-off-by: Julien Olivain > --- > Tested with: > > support/testing/run-tests \ > -d dl -o output_folder \ > -k tests.package.test_python_gnupg.TestPythonPy3GnuPG You should also test such changes in Config.in dependency handling with: while true; do make randconfig; done There are still a few errors that come out of that, but you can check that you don't introduce new ones. Which you did :-) > > Note: this change was quickly discussed in: > https://lists.buildroot.org/pipermail/buildroot/2022-January/634021.html > --- > package/gnupg/Config.in | 1 - > package/gnupg2/Config.in | 1 + > package/libgpgme/Config.in | 2 +- > package/python-gnupg/Config.in | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in > index 2db46318f1..e92fca709d 100644 > --- a/package/gnupg/Config.in > +++ b/package/gnupg/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_GNUPG > bool "gnupg" > - depends on !BR2_PACKAGE_GNUPG2 > select BR2_PACKAGE_ZLIB > help > GnuPG is the GNU project's complete and free implementation > diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in > index ef1817ef02..9438cf69f6 100644 > --- a/package/gnupg2/Config.in > +++ b/package/gnupg2/Config.in > @@ -8,6 +8,7 @@ config BR2_PACKAGE_GNUPG2 > depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth > depends on BR2_USE_MMU # libassuan, libnpth > depends on !BR2_STATIC_LIBS I could fix those by moving all the dependencies to a new blind symbol BR2_PACKAGE_GNUPG2_DEPENDS... > + depends on !BR2_PACKAGE_GNUPG > select BR2_PACKAGE_ZLIB > select BR2_PACKAGE_LIBGPG_ERROR > select BR2_PACKAGE_LIBGCRYPT > diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in > index 4aabd06367..20f491b664 100644 > --- a/package/libgpgme/Config.in > +++ b/package/libgpgme/Config.in > @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBGPGME > depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error > depends on BR2_USE_MMU # libassuan > #gnupg is not needed to build, but at runtime. > - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 > + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG And changing this into select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime See what got committed for the full context. Also, there's package/gcr that had some missing dependencies, so I fixed that in a separate commit as well. Applied to master, thanks. Regards, Arnout > select BR2_PACKAGE_LIBGPG_ERROR > select BR2_PACKAGE_LIBASSUAN > help > diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in > index 038a940778..54f8fb6a29 100644 > --- a/package/python-gnupg/Config.in > +++ b/package/python-gnupg/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_PYTHON_GNUPG > bool "python-gnupg" > - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime > + select BR2_PACKAGE_GNUPG2 if !BR2_PACKAGE_GNUPG # runtime > help > A wrapper for the Gnu Privacy Guard (GPG or GnuPG). > From arnout at mind.be Tue Mar 15 21:19:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:19:42 +0100 Subject: [Buildroot] [PATCH/next 1/1] package/libss7: bump to version 2.0.1 In-Reply-To: <20220302212621.2357671-1-fontaine.fabrice@gmail.com> References: <20220302212621.2357671-1-fontaine.fabrice@gmail.com> Message-ID: <650ae221-efed-6e35-a653-ff2170f915a1@mind.be> On 02/03/2022 22:26, Fabrice Fontaine wrote: > http://downloads.asterisk.org/pub/telephony/libss7/releases/libss7-2.0.1-summary.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libss7/libss7.hash | 4 ++-- > package/libss7/libss7.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash > index 8e1d6635db..442422fcd9 100644 > --- a/package/libss7/libss7.hash > +++ b/package/libss7/libss7.hash > @@ -1,6 +1,6 @@ > # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ > -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz > -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz > +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz > +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz > > # License file, locally calculated > sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE > diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk > index 151b6a61b5..faa147c78e 100644 > --- a/package/libss7/libss7.mk > +++ b/package/libss7/libss7.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSS7_VERSION = 2.0.0 > +LIBSS7_VERSION = 2.0.1 > LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases > > LIBSS7_LICENSE = GPL-2.0 From arnout at mind.be Tue Mar 15 21:20:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:20:02 +0100 Subject: [Buildroot] [PATCH/next v3 1/1] package/kodi: bump version to 19.4 In-Reply-To: <20220303174121.55867-1-bernd.kuhls@t-online.de> References: <20220303174121.55867-1-bernd.kuhls@t-online.de> Message-ID: <2a12dfa3-9ca9-193f-bdd8-690e489df42e@mind.be> On 03/03/2022 18:41, Bernd Kuhls wrote: > Add dependencies to giflib, libjpeg and libpng due to > https://github.com/xbmc/xbmc/pull/20462 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > v3: removed remnants from internal patch, sorry for the noise > v2: added dependencies to giflib, libjpeg and libpng > > package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- > package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- > package/kodi/Config.in | 3 +++ > package/kodi/kodi.hash | 2 +- > package/kodi/kodi.mk | 5 ++++- > 5 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > index 81fc2bb9f1..8cc2297bdb 100644 > --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix > +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix > KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) > KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz > KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi > diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk > index 2ebcd7d8de..4733399edc 100644 > --- a/package/kodi-texturepacker/kodi-texturepacker.mk > +++ b/package/kodi-texturepacker/kodi-texturepacker.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix > +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix > KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) > KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz > KODI_TEXTUREPACKER_DL_SUBDIR = kodi > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index f31bf19b99..ebc95343a9 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI > select BR2_PACKAGE_FONTCONFIG # needed for libass > select BR2_PACKAGE_FREETYPE > select BR2_PACKAGE_FSTRCMP > + select BR2_PACKAGE_GIFLIB > + select BR2_PACKAGE_JPEG > select BR2_PACKAGE_LIBASS > select BR2_PACKAGE_LIBCDIO > select BR2_PACKAGE_LIBCROSSGUID > @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI > select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE > select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE > select BR2_PACKAGE_LIBPLIST > + select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_LZO > select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_PCRE > diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash > index 7f96af385a..a17e0fb29f 100644 > --- a/package/kodi/kodi.hash > +++ b/package/kodi/kodi.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz > +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz > sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz > sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz > sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index 56e901fa17..7326cd536d 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -6,7 +6,7 @@ > > # When updating the version, please also update kodi-jsonschemabuilder > # and kodi-texturepacker > -KODI_VERSION_MAJOR = 19.3 > +KODI_VERSION_MAJOR = 19.4 > KODI_VERSION_NAME = Matrix > KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) > KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) > @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ > fontconfig \ > freetype \ > fstrcmp \ > + giflib \ > host-flatbuffers \ > host-gawk \ > host-gettext \ > @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ > host-nasm \ > host-swig \ > host-xmlstarlet \ > + jpeg \ > libass \ > libcdio \ > libcrossguid \ > @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ > libegl \ > libfribidi \ > libplist \ > + libpng \ > lzo \ > openssl \ > pcre \ From arnout at mind.be Tue Mar 15 21:20:19 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:20:19 +0100 Subject: [Buildroot] [PATCH/next] package/libnss: bump to version 3.76 In-Reply-To: <20220304213828.3870123-1-giulio.benetti@benettiengineering.com> References: <20220304213828.3870123-1-giulio.benetti@benettiengineering.com> Message-ID: <42548c26-0cba-d9db-4069-30e82e83ce16@mind.be> On 04/03/2022 22:38, Giulio Benetti wrote: > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Arnout > --- > package/libnss/libnss.hash | 4 ++-- > package/libnss/libnss.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash > index 07fb340c33..b4b8be11f6 100644 > --- a/package/libnss/libnss.hash > +++ b/package/libnss/libnss.hash > @@ -1,4 +1,4 @@ > -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS > -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz > +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_RTM/src/SHA256SUMS > +sha256 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 nss-3.76.tar.gz > # Locally calculated > sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index a9549e48dd..2f7a265136 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBNSS_VERSION = 3.75 > +LIBNSS_VERSION = 3.76 > LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz > LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src > LIBNSS_DISTDIR = dist From arnout at mind.be Tue Mar 15 21:20:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:20:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: bump to version v0.3.20 In-Reply-To: <20220305175041.2225915-1-ju.o@free.fr> References: <20220305175041.2225915-1-ju.o@free.fr> Message-ID: <312e14e4-4f32-98c2-ed42-0e40e18ff7c5@mind.be> On 05/03/2022 18:50, Julien Olivain wrote: > This commit dropped a patch included upstream. The other patch was > rebased. > > For change log since v0.3.18, see: > - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19 > - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > Tested with: > > make check-package > ... > 0 warnings generated > > ./utils/test-pkg -p openblas -a > ... > 45 builds, 25 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > ...nsider-Os-when-determining-LAPACK_NO.patch | 31 ------------------- > ...on-t-specify-optimization-level-bui.patch} | 9 +++--- > package/openblas/openblas.hash | 2 +- > package/openblas/openblas.mk | 2 +- > 4 files changed, 6 insertions(+), 38 deletions(-) > delete mode 100644 package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch > rename package/openblas/{0002-Makefile.system-don-t-specify-optimization-level-bui.patch => 0001-Makefile.system-don-t-specify-optimization-level-bui.patch} (86%) > > diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch > deleted file mode 100644 > index f9278bd099..0000000000 > --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 > -From: Thomas De Schampheleire > -Date: Fri, 5 Mar 2021 11:15:52 +0100 > -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags > - > -gcc also supports -O, -Og and -Os as optimization flags. > -They may be given on the make command-line by users. > - > -For the calculation of LAPACK_NOOPT, all such flags should be considered. > - > -Signed-off-by: Thomas De Schampheleire > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index a22e16ba..fc5fe3f5 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -32,7 +32,7 @@ export NOFORTRAN > - export NO_LAPACK > - endif > - > --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) > -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) > - > - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test > - > --- > -2.26.2 > - > diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch > similarity index 86% > rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch > rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch > index bcc3e0eb6a..e0c738748a 100644 > --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch > +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch > @@ -1,4 +1,4 @@ > -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 > +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 > From: Thomas De Schampheleire > Date: Fri, 5 Mar 2021 14:09:23 +0100 > Subject: [PATCH] Makefile.system: don't specify optimization level > @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. > Remove the optimization level specified in openblas itself. > > Signed-off-by: Thomas De Schampheleire > - > --- > Makefile.system | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.system b/Makefile.system > -index 1e30d05a..04b0be16 100644 > +index 438a8148..9de1bbd5 100644 > --- a/Makefile.system > +++ b/Makefile.system > -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g > +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g > endif > > ifndef COMMON_OPT > @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644 > > override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) > -- > -2.26.2 > +2.35.1 > > diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash > index a1e35f4fc4..71fc4d34c5 100644 > --- a/package/openblas/openblas.hash > +++ b/package/openblas/openblas.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz > +sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz > sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE > diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk > index 4d506fa618..608c2f24ea 100644 > --- a/package/openblas/openblas.mk > +++ b/package/openblas/openblas.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -OPENBLAS_VERSION = 0.3.18 > +OPENBLAS_VERSION = 0.3.20 > OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) > OPENBLAS_LICENSE = BSD-3-Clause > OPENBLAS_LICENSE_FILES = LICENSE From arnout at mind.be Tue Mar 15 21:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:09:59 +0100 Subject: [Buildroot] [git commit] package/wireplumber: bump version to 0.4.8 Message-ID: <20220315211222.9FED78408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38dbc73d3989c9081f94f1ed1380af3b3be02bf3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst Signed-off-by: Th??o Lebrun Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wireplumber/wireplumber.hash | 2 +- package/wireplumber/wireplumber.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 561fcc2e5e..206d7d15af 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..3bf7cece45 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.4.2 +WIREPLUMBER_VERSION = 0.4.8 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.7 Message-ID: <20220315211222.D56688408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bc66b940cb8655cb0694e0c6a1c74f1eb9c007c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c8573fafad..736dedc25e 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.6 +MESA3D_HEADERS_VERSION = 21.3.7 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d64b833100..b680411051 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html -sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz -sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html +sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz +sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 95618b2072..d0b12932c4 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.6 +MESA3D_VERSION = 21.3.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/ace: bump to version 7.0.6 Message-ID: <20220315211222.B119A8408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=539d915e44ae3b9a826966f106a3cfb3ced1801e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ace/ace.hash | 5 ++++- package/ace/ace.mk | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/ace/ace.hash b/package/ace/ace.hash index 92fd42e131..2387927879 100644 --- a/package/ace/ace.hash +++ b/package/ace/ace.hash @@ -1,3 +1,6 @@ +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 + # Locally Computed: -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk index 8df89d8c6f..7299f0d40c 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -4,8 +4,8 @@ # ################################################################################ -ACE_VERSION = 7.0.1 -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_VERSION = 7.0.6 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions ACE_LICENSE = DOC ACE_LICENSE_FILES = COPYING From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/parted: bump to version 3.4 Message-ID: <20220315211222.C3D088408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e0bf309a46dcda2be8c2491ac0aabc5883f5c89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://git.savannah.gnu.org/cgit/parted.git/tree/NEWS?h=v3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/parted/parted.hash | 4 ++-- package/parted/parted.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 2c466eb8d2..392436ec4b 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz +sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz # Locally calculated -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 66940fc516..23158179e4 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.3 +PARTED_VERSION = 3.4 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux From arnout at mind.be Tue Mar 15 21:09:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:09:59 +0100 Subject: [Buildroot] [git commit] linux: make Image{, .gz} format available for aarch64 BE Message-ID: <20220315211222.A79748408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1579589e0a7d1870aa0ad587acd78f799f31257 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Just like aarch64, aarch64 BE supports the Image and Image.gz format. Signed-off-by: R??mi Duraffort Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 36744c5337..043e7c6574 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/libfreeglut: bump to version 3.2.2 Message-ID: <20220315211222.BACBD8408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3f25dffbcb6b4a3f3d0cad968bc5e4499529e61 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ich-cropped-up-with-the-release-of-gcc-10.patch | 69 ---------------------- package/libfreeglut/libfreeglut.hash | 10 ++-- package/libfreeglut/libfreeglut.mk | 2 +- 3 files changed, 6 insertions(+), 75 deletions(-) diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch deleted file mode 100644 index e98e71537f..0000000000 --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 -From: jtsiomb -Date: Fri, 21 Feb 2020 22:25:31 +0000 -Subject: [PATCH] Work-around for an issue which cropped up with the release of - gcc-10. In their infinite wisdom, they decided to build with -fno-common as - default from now on, breaking every piece of C code which used to declare - common symbols in header files, as was the convention since the dawn of time. - We now have to duplicate all declarations to an arbitrary source file, and - change the header-file ones to prefix them with extern. - -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk at 1863 7f0cb862-5218-0410-a997-914c9d46530a -[Retrieved from: -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] -Signed-off-by: Fabrice Fontaine ---- - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c -index 38b0acbb..54b4285b 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index 2771cbde2f..ce9fb9e299 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ +md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz +sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz # Locally computed -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING +sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 379de3121b..484b0f4b97 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.1 +LIBFREEGLUT_VERSION = 3.2.2 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut LIBFREEGLUT_LICENSE = MIT From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/libscrypt: bump to version 1.22 Message-ID: <20220315211222.CC6208408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4542c6714d3951070c31739d24e4bd42b446fbae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop patch and use {C,LD}FLAGS_EXTRA which are available since https://github.com/technion/libscrypt/commit/bdfec26744122e8f52a58bc086c89b27faaf5888 - While at it, also move PREFIX to LIBSCRYPT_MAKE_OPTS as advocated by Arnout in https://patchwork.ozlabs.org/project/buildroot/patch/20220221172900.1937856-1-fontaine.fabrice at gmail.com/ - Update indentation in hash file (two spaces) https://github.com/technion/libscrypt/compare/v1.21...v1.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...g-options-to-CFLAGS-and-LDFLAGS-variables.patch | 34 ---------------------- package/libscrypt/libscrypt.hash | 4 +-- package/libscrypt/libscrypt.mk | 14 ++++++--- 3 files changed, 12 insertions(+), 40 deletions(-) diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch deleted file mode 100644 index a023a6fe1c..0000000000 --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Tue, 14 Mar 2017 09:23:51 +0100 -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This also removes a number of hard-coded CFLAGS, leaving it up to the -user to pass appropriate optimization/hardening flags. - -Signed-off-by: Stefan S??rensen ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7022a4a..3098a9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d - INSTALL_DATA ?= install - - CC?=gcc --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version -+override CFLAGS+=-fPIC -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - CFLAGS_EXTRA?=-Wl,-rpath=. - - all: reference --- -2.7.4 - diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash index fda63d1c0d..fcdc4bbeeb 100644 --- a/package/libscrypt/libscrypt.hash +++ b/package/libscrypt/libscrypt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index fa89ed31bc..d28bd4e900 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -4,23 +4,29 @@ # ################################################################################ -LIBSCRYPT_VERSION = 1.21 +LIBSCRYPT_VERSION = 1.22 LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) LIBSCRYPT_LICENSE = BSD-2-Clause LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES +LIBSCRYPT_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ + PREFIX=/usr + define LIBSCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) endef define LIBSCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(STAGING_DIR) install endef define LIBSCRYPT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) install endef From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/gcr: depends on !gnupg Message-ID: <20220315211222.E6D258408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5783a418f4b30931068b81f850fc06cd8d3d9732 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From arnout at mind.be Tue Mar 15 21:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] package/openblas: bump to version v0.3.20 Message-ID: <20220315211223.1798D8408C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c2f90f44d6d563d4a641d3f634aab8637e53bfb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit dropped a patch included upstream. The other patch was rebased. For change log since v0.3.18, see: - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.19 - https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.20 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...so-consider-Os-when-determining-LAPACK_NO.patch | 31 ---------------------- ...tem-don-t-specify-optimization-level-bui.patch} | 9 +++---- package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 2 +- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch deleted file mode 100644 index f9278bd099..0000000000 --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:15:52 +0100 -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags - -gcc also supports -O, -Og and -Os as optimization flags. -They may be given on the make command-line by users. - -For the calculation of LAPACK_NOOPT, all such flags should be considered. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a22e16ba..fc5fe3f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ export NOFORTRAN - export NO_LAPACK - endif - --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) - - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test - --- -2.26.2 - diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 86% rename from package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch index bcc3e0eb6a..e0c738748a 100644 --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -1,4 +1,4 @@ -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 5 Mar 2021 14:09:23 +0100 Subject: [PATCH] Makefile.system: don't specify optimization level @@ -12,16 +12,15 @@ The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. Remove the optimization level specified in openblas itself. Signed-off-by: Thomas De Schampheleire - --- Makefile.system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system -index 1e30d05a..04b0be16 100644 +index 438a8148..9de1bbd5 100644 --- a/Makefile.system +++ b/Makefile.system -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g endif ifndef COMMON_OPT @@ -36,5 +35,5 @@ index 1e30d05a..04b0be16 100644 override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -- -2.26.2 +2.35.1 diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a1e35f4fc4..71fc4d34c5 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz +sha256 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c openblas-0.3.20.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..608c2f24ea 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.18 +OPENBLAS_VERSION = 0.3.20 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/kodi: bump version to 19.4 Message-ID: <20220315211223.04EE48408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a0fb798be7432fb88047eb3a7d6a0915879b7ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add dependencies to giflib, libjpeg and libpng due to https://github.com/xbmc/xbmc/pull/20462 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/Config.in | 3 +++ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 5 ++++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1..8cc2297bdb 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 2ebcd7d8de..4733399edc 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.4-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 6896e85e7b..c8e1e5d0ed 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -72,6 +72,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +83,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385a..a17e0fb29f 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 58ad115475..c41c515d10 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 19.3 +KODI_VERSION_MAJOR = 19.4 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ From arnout at mind.be Tue Mar 15 21:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] support/testing: test_rust.py: fix flake8 errors Message-ID: <20220315211223.1F9208408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12588a667a6e4d3c852a82a9d89c58bcf43eea1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix flake8 errors introduced in commit f0d1f21195 Fixes: support/testing/tests/package/test_rust.py:2:1: F401 'tempfile' imported but unused support/testing/tests/package/test_rust.py:3:1: F401 'subprocess' imported but unused support/testing/tests/package/test_rust.py:4:1: F401 'shutil' imported but unused support/testing/tests/package/test_rust.py:18:1: E302 expected 2 blank lines, found 1 --- support/testing/tests/package/test_rust.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index a1abd20c09..fb9dd2d916 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,7 +1,4 @@ import os -import tempfile -import subprocess -import shutil import infra.basetest @@ -15,6 +12,7 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() + class TestRustBin(TestRustBase): config = \ """ From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/libss7: bump to version 2.0.1 Message-ID: <20220315211222.EF4F88408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c7e517e4b2e17d4a244da9268b4b0071bddc4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master http://downloads.asterisk.org/pub/telephony/libss7/releases/libss7-2.0.1-summary.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libss7/libss7.hash | 4 ++-- package/libss7/libss7.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash index 8e1d6635db..442422fcd9 100644 --- a/package/libss7/libss7.hash +++ b/package/libss7/libss7.hash @@ -1,6 +1,6 @@ # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz # License file, locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk index 151b6a61b5..faa147c78e 100644 --- a/package/libss7/libss7.mk +++ b/package/libss7/libss7.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSS7_VERSION = 2.0.0 +LIBSS7_VERSION = 2.0.1 LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases LIBSS7_LICENSE = GPL-2.0 From arnout at mind.be Tue Mar 15 21:10:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:00 +0100 Subject: [Buildroot] [git commit] package/{gnupg, gnupg2}: use gnupg2 by default Message-ID: <20220315211222.DE6128408B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56b49691abf4625d3d5915f3956b02f0fbd2ed4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch reverses the logic to select gnupg2 by default, while still allowing to select gnupg (v1). Quoting: https://gnupg.org/download/index.html """ GnuPG 1.4 is the old, single binary version which still support the unsafe PGP-2 keys. This branch has no dependencies on the above listed libraries or the Pinentry. However, it lacks many modern features and will receive only important updates. """ gnupg 1.4 is kept in Buildroot for now, as the package is still maintained upstream. It might still be useful is some specific cases: - it has a smaller footprint (compared to v2), - it has less dependencies (only zlib), - it has less build dependencies (can build static, no need for MMU/threads, ...) Most Linux distributions are now shipping gnupg2 by default. gnupg v1 is now more for legacy/compatibility/specific cases. There is currently only two packages selecting gnupg in Buildroot: gpgme and python-gnupg This commit also reverses the logic for those packages. However, this means we also need to propagate the dependencies of gnupg2, and still select gnupg if those dependencies are not met. To simplify this, add a blind option BR2_PACKAGE_GNUPG2_DEPENDS. Note that due to the intricacies of Kconfig dependencies, "depends on !BR2_PACKAGE_GNUPG" must *not* be part of BR2_PACKAGE_GNUPG2_DEPENDS. Signed-off-by: Julien Olivain [Arnout: rework dependency handling to make sure gnupg2 dependencies are properly propagated] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gnupg/Config.in | 1 - package/gnupg2/Config.in | 14 ++++++++++++-- package/libgpgme/Config.in | 4 ++-- package/python-gnupg/Config.in | 3 ++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in index 2db46318f1..e92fca709d 100644 --- a/package/gnupg/Config.in +++ b/package/gnupg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_GNUPG bool "gnupg" - depends on !BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_ZLIB help GnuPG is the GNU project's complete and free implementation diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index ef1817ef02..043d53554c 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -2,12 +2,22 @@ comment "gnupg2 needs a toolchain w/ threads and dynamic library support" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_GNUPG2 - bool "gnupg2" +# helper to make it easier to select gnupg2 or gnupg; usage: +# select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG +# select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS + +config BR2_PACKAGE_GNUPG2_DEPENDS + bool + default y depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth depends on BR2_USE_MMU # libassuan, libnpth depends on !BR2_STATIC_LIBS + +config BR2_PACKAGE_GNUPG2 + bool "gnupg2" + depends on BR2_PACKAGE_GNUPG2_DEPENDS + depends on !BR2_PACKAGE_GNUPG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGCRYPT diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in index 4aabd06367..16ce27d0ef 100644 --- a/package/libgpgme/Config.in +++ b/package/libgpgme/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBGPGME bool "libgpgme" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_USE_MMU # libassuan - #gnupg is not needed to build, but at runtime. - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBASSUAN help diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in index 038a940778..234792977a 100644 --- a/package/python-gnupg/Config.in +++ b/package/python-gnupg/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_GNUPG bool "python-gnupg" - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime help A wrapper for the Gnu Privacy Guard (GPG or GnuPG). From arnout at mind.be Tue Mar 15 21:10:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:10:01 +0100 Subject: [Buildroot] [git commit] package/libnss: bump to version 3.76 Message-ID: <20220315211223.0E6B18408A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e1e941b67035187d153eeb4ececb69fde104311 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 07fb340c33..b4b8be11f6 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_75_RTM/src/SHA256SUMS -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_RTM/src/SHA256SUMS +sha256 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 nss-3.76.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a9549e48dd..2f7a265136 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.75 +LIBNSS_VERSION = 3.76 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From fontaine.fabrice at gmail.com Tue Mar 15 21:41:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 22:41:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbdplus: bump to version 0.2.0 Message-ID: <20220315214113.2322315-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://code.videolan.org/videolan/libbdplus/-/blob/0.2.0/ChangeLog Signed-off-by: Fabrice Fontaine --- package/libbdplus/libbdplus.hash | 6 +++--- package/libbdplus/libbdplus.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash index 6abc0e4970..2445af6e82 100644 --- a/package/libbdplus/libbdplus.hash +++ b/package/libbdplus/libbdplus.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk index b0e8b1488d..600cb6b545 100644 --- a/package/libbdplus/libbdplus.mk +++ b/package/libbdplus/libbdplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBDPLUS_VERSION = 0.1.2 +LIBBDPLUS_VERSION = 0.2.0 LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 LIBBDPLUS_LICENSE = LGPL-2.1+ -- 2.35.1 From arnout at mind.be Tue Mar 15 21:43:00 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:43:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/boinc: disable fcgi In-Reply-To: <20220308211205.3682-1-fontaine.fabrice@gmail.com> References: <20220308211205.3682-1-fontaine.fabrice@gmail.com> Message-ID: <310520fc-337b-37d3-06b7-b2c236c585b7@mind.be> On 08/03/2022 22:12, Fabrice Fontaine wrote: > libfcgi raises the following build failure with glibc 2.34 and gcc > 11.2.0: > > In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, > from boinc_fcgi.h:19, > from coproc.cpp:22: > /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous > 582 | __attribute_malloc__ __attr_dealloc_fclose; > | ^~~~~~~~~~~~~~~~~~~~~ > > RawTherapee has the same kind of issue: > - https://github.com/Beep6581/RawTherapee/issues/6324 > - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 > > Fixes: > - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/boinc/boinc.mk | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk > index 7f78c427ea..0d992f136c 100644 > --- a/package/boinc/boinc.mk > +++ b/package/boinc/boinc.mk > @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ > BOINC_CONF_OPTS = \ > --disable-apps \ > --disable-boinczip \ > + --disable-fcgi \ > --disable-manager \ > --disable-server \ > --enable-client \ > @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) > BOINC_DEPENDENCIES += freetype > endif > > -ifeq ($(BR2_PACKAGE_LIBFCGI),y) > -BOINC_DEPENDENCIES += libfcgi > -BOINC_CONF_OPTS += --enable-fcgi > -else > -BOINC_CONF_OPTS += --disable-fcgi > -endif > - > BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" > > # Remove boinc-client because it is incompatible with buildroot From arnout at mind.be Tue Mar 15 21:45:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:45:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix dnssec static build In-Reply-To: <20220308231733.176991-1-fontaine.fabrice@gmail.com> References: <20220308231733.176991-1-fontaine.fabrice@gmail.com> Message-ID: On 09/03/2022 00:17, Fabrice Fontaine wrote: > Drop -DHAVE_DNSSEC_STATIC which has been added by commit > e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises > the following static build failure because dnsmasq will wrongly append > "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": > > /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' > > Strangely enough, this is the first time this build failure is raised by > the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: > https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 I also couldn't find an explanation, except that static build with dnssec is probably relatively rare, and it can be hidden by all the other errors that were there - e.g. apparently before the last bump, the build already failed because of nettle. Applied to master, thanks. Regards, Arnout > > Fixes: > - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e > > Signed-off-by: Fabrice Fontaine > --- > package/dnsmasq/dnsmasq.mk | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk > index 0569475fc4..230e4a8116 100644 > --- a/package/dnsmasq/dnsmasq.mk > +++ b/package/dnsmasq/dnsmasq.mk > @@ -26,9 +26,6 @@ endif > ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) > DNSMASQ_DEPENDENCIES += gmp nettle > DNSMASQ_COPTS += -DHAVE_DNSSEC > -ifeq ($(BR2_STATIC_LIBS),y) > -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC > -endif > endif > > ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) From arnout at mind.be Tue Mar 15 21:47:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:47:10 +0100 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC In-Reply-To: <20220309132835.7251-1-abrodkin@synopsys.com> References: <20220309132835.7251-1-abrodkin@synopsys.com> Message-ID: <0fc0da93-ce87-7965-be20-f197d0825cbe@mind.be> On 09/03/2022 14:28, Alexey Brodkin via buildroot wrote: > This patch adds support of ARC architecture in Qt's JS core and Webkit. > The change itself is quite straight-forward: > > 1. Enable JS core for ARC > 2. Make sure so-called "large memory model" is used, > i.e. relocations with long jumps are being generated for global > symbols, as otherwise insanely huge libqt5webkit.so fails to link > because some symbols might be more than 32 MiB away from each other. > 3. Make the original WebKit build system aware of yet another CPU > architecture with explicitly disabled JIT in JS core for ARC. > > Obviously, this one depends on [1]. > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ > > Signed-off-by: Alexey Brodkin > Cc: Thomas Petazzoni > Cc: Peter Seiderer > --- > package/qt5/Config.in | 2 +- > package/qt5/qt5base/qt5base.mk | 13 +++ > .../0005-Add-support-for-ARC-processors.patch | 93 +++++++++++++++++++ > 3 files changed, 107 insertions(+), 1 deletion(-) > create mode 100644 package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index f2b1ff4a19..cbb2e06a21 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > bool > default y > # Javascript engine is only available on certain architectures > - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel > + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc > # ARM needs BLX, so v5t+ > depends on !BR2_ARM_CPU_ARMV4 > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef38d03253..b25e0f44b6 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -201,6 +201,19 @@ endif > QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) > QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) > > +ifeq ($(BR2_arc),y) > +# In case of -Os (which is default in BR) gcc will use millicode implementation > +# from libgcc. That along with performance degradation may lead to issues during > +# linkage stage. In case of QtWebkit exactly that happens - millicode functions > +# get put way too far from caller functions and so linker fails. > +# To solve that problem we explicitly disable millicode call generation for Qt. > +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) > +# it's good to firce compiler to not assume short or even medium-length calls > +# could be used. I.e. always use long jump instaructions. > +# Otherwise there's a high risk of hitting link-time failures. > +QT5BASE_CFLAGS += -mno-millicode -mlong-calls > +endif > + > ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) > QT5BASE_CONFIGURE_OPTS += -eglfs > QT5BASE_DEPENDENCIES += libegl > diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > new file mode 100644 > index 0000000000..92f023eab6 > --- /dev/null > +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > @@ -0,0 +1,93 @@ > +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 > +From: Alexey Brodkin > +Date: Mon, 21 Feb 2022 18:28:00 +0300 > +Subject: [PATCH] Add support for ARC processors > + > +Signed-off-by: Alexey Brodkin Upstream status of this patch? Anyway, applied to master, thanks. Regards, Arnout > +--- > + CMakeLists.txt | 4 +++- > + Source/JavaScriptCore/CMakeLists.txt | 3 ++- > + Source/WTF/wtf/Platform.h | 8 ++++++++ > + Source/WTF/wtf/dtoa/utils.h | 2 +- > + Source/cmake/OptionsQt.cmake | 4 ++++ > + 5 files changed, 18 insertions(+), 3 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 31a2ea1fd..f0dfbda5b 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) > + else () > + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) > + endif () > +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") > ++ set(WTF_CPU_ARC 1) > ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > + set(WTF_CPU_ARM 1) > + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") > + set(WTF_CPU_ARM64 1) > +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt > +index 937b3ed00..205dde288 100644 > +--- a/Source/JavaScriptCore/CMakeLists.txt > ++++ b/Source/JavaScriptCore/CMakeLists.txt > +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) > + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) > + endif () > + > +-if (WTF_CPU_ARM) > ++if (WTF_CPU_ARC) > ++elseif (WTF_CPU_ARM) > + elseif (WTF_CPU_ARM64) > + elseif (WTF_CPU_ALPHA) > + elseif (WTF_CPU_HPPA) > +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h > +index 5717f3ea1..b327ed693 100644 > +--- a/Source/WTF/wtf/Platform.h > ++++ b/Source/WTF/wtf/Platform.h > +@@ -349,6 +349,14 @@ > + > + #endif /* ARM */ > + > ++/* CPU(ARC) - ARC */ > ++#if defined(__arc__) > ++#define WTF_CPU_ARC 1 > ++#if defined(__BIG_ENDIAN__) > ++#define WTF_CPU_BIG_ENDIAN 1 > ++#endif > ++#endif > ++ > + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) > + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 > + #endif > +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h > +index 889642cee..8f1e9933e 100644 > +--- a/Source/WTF/wtf/dtoa/utils.h > ++++ b/Source/WTF/wtf/dtoa/utils.h > +@@ -49,7 +49,7 @@ > + defined(__ARMEL__) || \ > + defined(_MIPS_ARCH_MIPS32R2) > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) > ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > + #elif defined(_M_IX86) || defined(__i386__) > + #if defined(_WIN32) > +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake > +index ec6081de0..e1a5efc1e 100644 > +--- a/Source/cmake/OptionsQt.cmake > ++++ b/Source/cmake/OptionsQt.cmake > +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) > + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > + endif () > + > ++if (WTF_CPU_ARC) > ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > ++endif () > ++ > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) > + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) > +-- > +2.25.1 > + From arnout at mind.be Tue Mar 15 21:47:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:47:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: bump to version 6.03 In-Reply-To: <20220309210953.540376-1-fontaine.fabrice@gmail.com> References: <20220309210953.540376-1-fontaine.fabrice@gmail.com> Message-ID: On 09/03/2022 22:09, Fabrice Fontaine wrote: > xlib_libXft and xlib_libXi are now mandatory > > https://www.jwz.org/xscreensaver/changelog.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/xscreensaver/Config.in | 2 ++ > package/xscreensaver/xscreensaver.hash | 2 +- > package/xscreensaver/xscreensaver.mk | 18 +++--------------- > 3 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in > index 10b2b7012c..48eefdfa70 100644 > --- a/package/xscreensaver/Config.in > +++ b/package/xscreensaver/Config.in > @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_JPEG > select BR2_PACKAGE_XLIB_LIBX11 > + select BR2_PACKAGE_XLIB_LIBXFT > + select BR2_PACKAGE_XLIB_LIBXI > select BR2_PACKAGE_XLIB_LIBXT > help > XScreenSaver is the standard screen saver collection shipped > diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash > index 26ecd8bbbf..27ef7d8f00 100644 > --- a/package/xscreensaver/xscreensaver.hash > +++ b/package/xscreensaver/xscreensaver.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz > +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz > sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h > sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h > diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk > index 46dedc3211..0a91d22d14 100644 > --- a/package/xscreensaver/xscreensaver.mk > +++ b/package/xscreensaver/xscreensaver.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -XSCREENSAVER_VERSION = 5.45 > +XSCREENSAVER_VERSION = 6.03 > XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver > > # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. > @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ > libgtk2 \ > libxml2 \ > xlib_libX11 \ > + xlib_libXft \ > + xlib_libXi \ > xlib_libXt \ > $(TARGET_NLS_DEPENDENCIES) \ > host-intltool > @@ -51,20 +53,6 @@ else > XSCREENSAVER_CONF_OPTS += --with-systemd=no > endif > > -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) > -XSCREENSAVER_CONF_OPTS += --with-xft=yes > -XSCREENSAVER_DEPENDENCIES += xlib_libXft > -else > -XSCREENSAVER_CONF_OPTS += --with-xft=no > -endif > - > -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) > -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes > -XSCREENSAVER_DEPENDENCIES += xlib_libXi > -else > -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no > -endif > - > ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) > XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes > XSCREENSAVER_DEPENDENCIES += xlib_libXinerama From arnout at mind.be Tue Mar 15 21:47:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:47:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: add USBGUARD_CPE_ID_VENDOR In-Reply-To: <20220309213459.677932-1-fontaine.fabrice@gmail.com> References: <20220309213459.677932-1-fontaine.fabrice@gmail.com> Message-ID: On 09/03/2022 22:34, Fabrice Fontaine wrote: > cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/usbguard/usbguard.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk > index 8df8aedeb3..54a4031056 100644 > --- a/package/usbguard/usbguard.mk > +++ b/package/usbguard/usbguard.mk > @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 > USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) > USBGUARD_LICENSE = GPL-2.0+ > USBGUARD_LICENSE_FILES = LICENSE > +USBGUARD_CPE_ID_VENDOR = usbguard_project > USBGUARD_SELINUX_MODULES = usbguard > USBGUARD_CONF_OPTS = \ > --with-bundled-catch \ From arnout at mind.be Tue Mar 15 21:48:12 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:48:12 +0100 Subject: [Buildroot] [PATCH] docs/manual: Remove link to emdebian and replace with debian port page In-Reply-To: <20220309215531.638593-1-yannick.brosseau@gmail.com> References: <20220309215531.638593-1-yannick.brosseau@gmail.com> Message-ID: <3f1330db-ce9e-dfa5-4b61-beba3b200ebe@mind.be> On 09/03/2022 22:55, Yannick Brosseau wrote: > In the list of full distribution, the FAQ contains a link to Emdebian. > This project stopped receiving updates in 2014 and the main web page does not exist anymore. > This replace the entry with a link to the Debian ports page. > > Signed-off-by: Yannick Brosseau Applied to master, thanks. Regards, Arnout > --- > docs/manual/faq-troubleshooting.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt > index 5adf3fa6ce..b08bf9bc4a 100644 > --- a/docs/manual/faq-troubleshooting.txt > +++ b/docs/manual/faq-troubleshooting.txt > @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: > > * http://www.openembedded.org[openembedded] > * https://www.yoctoproject.org[yocto] > -* http://www.emdebian.org[emdebian] > +* https://www.debian.org/ports/[Debian] > * https://fedoraproject.org/wiki/Architectures[Fedora] > * http://en.opensuse.org/Portal:ARM[openSUSE ARM] > * http://archlinuxarm.org[Arch Linux ARM] From arnout at mind.be Tue Mar 15 21:48:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:48:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: bump to version LTS_01_2022_Ref01 In-Reply-To: <20220309220219.787315-1-fontaine.fabrice@gmail.com> References: <20220309220219.787315-1-fontaine.fabrice@gmail.com> Message-ID: <9e834c37-6052-93c5-9ee7-b73268a7389b@mind.be> On 09/03/2022 23:02, Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_01_2022_Ref01 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...c-fix-mismatching-function-prototype.patch | 35 ------------------- > package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- > package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- > 3 files changed, 2 insertions(+), 37 deletions(-) > delete mode 100644 package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch > > diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch > deleted file mode 100644 > index 0c262e6c46..0000000000 > --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 > -From: Francesco Giancane <30423178+fgiancane8 at users.noreply.github.com> > -Date: Fri, 2 Jul 2021 20:47:38 +0200 > -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) > - > -The reported function raises a warning when compilers assert the flag > -`-Warray-parameter=`, signaling that an array-type argument was promoted > -to a pointer-type argument. > - > -While in practice in most C implementations this is correct, fixing the > -warning (and, in this case, indicating the maximum size for the array) > -would represent a best-practice for finding out-of-bound accesses or > -identifying wrongly-sized arrays passed in the function. > - > -Signed-off-by: Francesco Giancane > -[Retrieved from: > -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] > -Signed-off-by: Fabrice Fontaine > ---- > - src/hmac.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/hmac.c b/src/hmac.c > -index 53f2411f8..160af9d2f 100644 > ---- a/c-utility/src/hmac.c > -+++ b/c-utility/src/hmac.c > -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, > - * sha Error Code. > - * > - */ > --int hmacResult(HMACContext *ctx, uint8_t *digest) > -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) > - { > - if (!ctx) return shaNull; > - > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash > index 72fa99c44d..5dbb530954 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash > @@ -1,5 +1,5 @@ > # Locally computed: > -sha256 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz > +sha256 082e41f7cdf06fec036b8cfa1793f03e81ba527b55ea13c66be0e4cf9f20ff7b azure-iot-sdk-c-LTS_01_2022_Ref01-br1.tar.gz > > # Hash for license files: > sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE > diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > index e6de8c851b..874646c445 100644 > --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 > +AZURE_IOT_SDK_C_VERSION = LTS_01_2022_Ref01 > AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c > AZURE_IOT_SDK_C_SITE_METHOD = git > AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From arnout at mind.be Tue Mar 15 21:48:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:48:50 +0100 Subject: [Buildroot] [PATCH] package/libgcrypt: bump to version 1.10.0 In-Reply-To: <20220310114047.919725-1-francois.perrad@gadz.org> References: <20220310114047.919725-1-francois.perrad@gadz.org> Message-ID: <73df06d6-44e7-09fb-06ae-6dc5089d338b@mind.be> On 10/03/2022 12:40, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > .../0001-configure.ac-add-an-option-to-disable-tests.patch | 2 +- > package/libgcrypt/libgcrypt.hash | 6 ++---- > package/libgcrypt/libgcrypt.mk | 2 +- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch > index 4ef02fba6..e32f93863 100644 > --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch > +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch > @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac > index e8c8cd39..1a6b61e5 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], > +@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], > AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) > > > diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash > index 23562d0ed..2ea4d74c2 100644 > --- a/package/libgcrypt/libgcrypt.hash > +++ b/package/libgcrypt/libgcrypt.hash > @@ -1,7 +1,5 @@ > -# From https://www.gnupg.org/download/integrity_check.html > -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 > # Locally calculated after checking signature > -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig > +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig > # using key 6DAA6E64A76D2840571B4902528897B826403ADA > -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 > +sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 > sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB > diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk > index e5fdfcfc8..c6c88f607 100644 > --- a/package/libgcrypt/libgcrypt.mk > +++ b/package/libgcrypt/libgcrypt.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBGCRYPT_VERSION = 1.9.4 > +LIBGCRYPT_VERSION = 1.10.0 > LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 > LIBGCRYPT_LICENSE = LGPL-2.1+ > LIBGCRYPT_LICENSE_FILES = COPYING.LIB From arnout at mind.be Tue Mar 15 21:49:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:49:08 +0100 Subject: [Buildroot] [PATCH] package/libglib2: bump to version 2.70.4 In-Reply-To: <20220310114122.919781-1-francois.perrad@gadz.org> References: <20220310114122.919781-1-francois.perrad@gadz.org> Message-ID: <9b06cb4d-5616-8c9e-5686-5b3f66690605@mind.be> On 10/03/2022 12:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- > ...03-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- > ...son.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- > package/libglib2/libglib2.hash | 4 ++-- > package/libglib2/libglib2.mk | 2 +- > 5 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > index 2f9522893..b5603c92f 100644 > --- a/package/libglib2/0002-remove-cpp-requirement.patch > +++ b/package/libglib2/0002-remove-cpp-requirement.patch > @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 > @@ -1,4 +1,4 @@ > -project('glib', 'c', 'cpp', > +project('glib', 'c', > - version : '2.70.0', > + version : '2.70.4', > # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships > meson_version : '>= 0.49.2', > @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', > @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 > > cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() > > -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs > +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs > #endif''') > endif > > @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 > g_have_gnuc_varargs = cc.compiles(''' > void some_func (void) { > int a(int p1, int p2, int p3); > -@@ -2330,7 +2315,6 @@ subdir('gobject') > +@@ -2339,7 +2324,6 @@ subdir('gobject') > subdir('gthread') > subdir('gmodule') > subdir('gio') > diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch > index 67aea7982..e21239301 100644 > --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch > +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch > @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build > index 3c615b7..7cae4e8 100644 > --- a/meson.build > +++ b/meson.build > -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' > +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' > # building with -Wbad-function-cast. > '-Wno-bad-function-cast', > '-Wno-cast-function-type', > diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > index a29587bd3..db77a7320 100644 > --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch > @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build > index 29473d26b..112d4ada9 100644 > --- a/gio/meson.build > +++ b/gio/meson.build > -@@ -831,6 +831,7 @@ pkg.generate(libgio, > +@@ -841,6 +841,7 @@ pkg.generate(libgio, > variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), > 'schemasdir=' + join_paths('${datadir}', schemas_subdir), > 'bindir=' + join_paths('${prefix}', get_option('bindir')), > @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build > index f78f32969..6c5486699 100644 > --- a/glib/meson.build > +++ b/glib/meson.build > -@@ -377,6 +377,7 @@ pkg.generate(libglib, > +@@ -384,6 +384,7 @@ pkg.generate(libglib, > subdirs : ['glib-2.0'], > extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, > variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash > index 580be3e08..f0f0cb55a 100644 > --- a/package/libglib2/libglib2.hash > +++ b/package/libglib2/libglib2.hash > @@ -1,4 +1,4 @@ > -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum > -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz > +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum > +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz > # License files, locally calculated > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > index d3cba1a8b..18f5b329c 100644 > --- a/package/libglib2/libglib2.mk > +++ b/package/libglib2/libglib2.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGLIB2_VERSION_MAJOR = 2.70 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz > LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) > LIBGLIB2_LICENSE = LGPL-2.1+ From arnout at mind.be Tue Mar 15 21:49:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:49:28 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.33 In-Reply-To: <20220310114141.919836-1-francois.perrad@gadz.org> References: <20220310114141.919836-1-francois.perrad@gadz.org> Message-ID: <71887a9d-2d28-0bd1-22bc-b9a9cd8c7968@mind.be> On 10/03/2022 12:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/libgtk3/libgtk3.hash | 4 ++-- > package/libgtk3/libgtk3.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash > index c23abcb51..23ce1f42b 100644 > --- a/package/libgtk3/libgtk3.hash > +++ b/package/libgtk3/libgtk3.hash > @@ -1,5 +1,5 @@ > -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum > -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz > +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum > +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz > > # Hash for license file: > sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING > diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk > index f298afade..cd0a75eb2 100644 > --- a/package/libgtk3/libgtk3.mk > +++ b/package/libgtk3/libgtk3.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > LIBGTK3_VERSION_MAJOR = 3.24 > -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 > +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 > LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz > LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) > LIBGTK3_LICENSE = LGPL-2.0+ From arnout at mind.be Tue Mar 15 21:49:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:49:48 +0100 Subject: [Buildroot] [PATCH] package/moarvm: bump to version 2022.02 In-Reply-To: <20220310114153.919891-1-francois.perrad@gadz.org> References: <20220310114153.919891-1-francois.perrad@gadz.org> Message-ID: On 10/03/2022 12:41, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/moarvm/moarvm.hash | 2 +- > package/moarvm/moarvm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash > index 01e3ee4ae..58e3ce8ac 100644 > --- a/package/moarvm/moarvm.hash > +++ b/package/moarvm/moarvm.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz > +sha256 4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 MoarVM-2022.02.tar.gz > sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt > diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk > index 99e26c73c..db336bfe4 100644 > --- a/package/moarvm/moarvm.mk > +++ b/package/moarvm/moarvm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MOARVM_VERSION = 2021.10 > +MOARVM_VERSION = 2022.02 > MOARVM_SITE = http://moarvm.com/releases > MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz > MOARVM_LICENSE = Artistic-2.0 From arnout at mind.be Tue Mar 15 21:50:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 15 Mar 2022 22:50:06 +0100 Subject: [Buildroot] [PATCH] package/nano: bump to version 6.2 In-Reply-To: <20220310114201.919946-1-francois.perrad@gadz.org> References: <20220310114201.919946-1-francois.perrad@gadz.org> Message-ID: <4397d658-78de-2e9a-66a5-69d339caab96@mind.be> On 10/03/2022 12:42, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/nano/nano.hash | 4 ++-- > package/nano/nano.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/nano/nano.hash b/package/nano/nano.hash > index 80529437d..69ebc27b7 100644 > --- a/package/nano/nano.hash > +++ b/package/nano/nano.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://www.nano-editor.org/dist/v6/nano-6.0.tar.xz.asc > +# https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz.asc > # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 > -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz > +sha256 2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 nano-6.2.tar.xz > sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING > diff --git a/package/nano/nano.mk b/package/nano/nano.mk > index 30db3249e..e3ecbab56 100644 > --- a/package/nano/nano.mk > +++ b/package/nano/nano.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > NANO_VERSION_MAJOR = 6 > -NANO_VERSION = $(NANO_VERSION_MAJOR).0 > +NANO_VERSION = $(NANO_VERSION_MAJOR).2 > NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) > NANO_SOURCE = nano-$(NANO_VERSION).tar.xz > NANO_LICENSE = GPL-3.0+ From arnout at mind.be Tue Mar 15 21:27:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:46 +0100 Subject: [Buildroot] [git commit] package/boinc: disable fcgi Message-ID: <20220315214147.7C16A8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54cb3b506de44fb8389832a1612b55d179b2cfd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot From arnout at mind.be Tue Mar 15 21:27:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:48 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: fix dnssec static build Message-ID: <20220315214147.85AC484130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6a4453bd7352d3bb27aef565d9023a1d11209c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop -DHAVE_DNSSEC_STATIC which has been added by commit e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises the following static build failure because dnsmasq will wrongly append "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' Strangely enough, this is the first time this build failure is raised by the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 Fixes: - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dnsmasq/dnsmasq.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4..230e4a8116 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -26,9 +26,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) From arnout at mind.be Tue Mar 15 21:28:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:01 +0100 Subject: [Buildroot] [git commit] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220315214147.AD02784131@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From arnout at mind.be Tue Mar 15 21:27:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:57 +0100 Subject: [Buildroot] [git commit] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220315214147.A40D584130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6a8192081a65fee20b7757ece8880c25c32ee6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a9..d2b03eeb2a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ From arnout at mind.be Tue Mar 15 21:28:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:13 +0100 Subject: [Buildroot] [git commit] package/libgtk3: bump to version 3.24.33 Message-ID: <20220315214147.D647884131@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed721a0b9b3bbb3fca8487b49117f55bbf791180 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb518..23ce1f42bb 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade6..cd0a75eb23 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From arnout at mind.be Tue Mar 15 21:28:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:09 +0100 Subject: [Buildroot] [git commit] package/libglib2: bump to version 2.70.4 Message-ID: <20220315214147.CAEF784130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a8ceb5cb30a9c28447e89c4b5bef67277697935 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- .../0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- .../0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f95228932..b5603c92f4 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', + version : '2.70.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2339,7 +2324,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982e..e212393011 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd31..db77a73203 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08e..f0f0cb55ad 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8bb..18f5b329c7 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From arnout at mind.be Tue Mar 15 21:27:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:54 +0100 Subject: [Buildroot] [git commit] package/xscreensaver: bump to version 6.03 Message-ID: <20220315214147.9ADEB8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbcbd66b0f241184288232972d9cd9d03c9f0ce1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master xlib_libXft and xlib_libXi are now mandatory https://www.jwz.org/xscreensaver/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xscreensaver/Config.in | 2 ++ package/xscreensaver/xscreensaver.hash | 2 +- package/xscreensaver/xscreensaver.mk | 18 +++--------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 10b2b7012c..48eefdfa70 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXT help XScreenSaver is the standard screen saver collection shipped diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 26ecd8bbbf..27ef7d8f00 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 46dedc3211..0a91d22d14 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.45 +XSCREENSAVER_VERSION = 6.03 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ libgtk2 \ libxml2 \ xlib_libX11 \ + xlib_libXft \ + xlib_libXi \ xlib_libXt \ $(TARGET_NLS_DEPENDENCIES) \ host-intltool @@ -51,20 +53,6 @@ else XSCREENSAVER_CONF_OPTS += --with-systemd=no endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XSCREENSAVER_CONF_OPTS += --with-xft=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXft -else -XSCREENSAVER_CONF_OPTS += --with-xft=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXi -else -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes XSCREENSAVER_DEPENDENCIES += xlib_libXinerama From arnout at mind.be Tue Mar 15 21:28:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:18 +0100 Subject: [Buildroot] [git commit] package/nano: bump to version 6.2 Message-ID: <20220315214147.E8BCA84130@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8c07b68469a7446c16359dd38fdb34bf996527d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 80529437d1..69ebc27b7f 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v6/nano-6.0.tar.xz.asc +# https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz +sha256 2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 nano-6.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 30db3249e7..e3ecbab56f 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From arnout at mind.be Tue Mar 15 21:28:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:16 +0100 Subject: [Buildroot] [git commit] package/moarvm: bump to version 2022.02 Message-ID: <20220315214147.DF6658412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e25d386c0f719cef93553ec60ef697d732ee39a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 01e3ee4aee..58e3ce8ac3 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz +sha256 4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 MoarVM-2022.02.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 99e26c73c9..db336bfe4a 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2021.10 +MOARVM_VERSION = 2022.02 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From arnout at mind.be Tue Mar 15 21:27:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:27:52 +0100 Subject: [Buildroot] [git commit] qt5: enable JS and WebKit for ARC Message-ID: <20220315214147.9091C84131@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b081717ad6b865b6278940678e432b4a4d07222d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support of ARC architecture in Qt's JS core and Webkit. The change itself is quite straight-forward: 1. Enable JS core for ARC 2. Make sure so-called "large memory model" is used, i.e. relocations with long jumps are being generated for global symbols, as otherwise insanely huge libqt5webkit.so fails to link because some symbols might be more than 32 MiB away from each other. 3. Make the original WebKit build system aware of yet another CPU architecture with explicitly disabled JIT in JS core for ARC. Obviously, this one depends on [1]. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/Config.in | 2 +- package/qt5/qt5base/qt5base.mk | 13 +++ .../0005-Add-support-for-ARC-processors.patch | 93 ++++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index f2b1ff4a19..cbb2e06a21 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE bool default y # Javascript engine is only available on certain architectures - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 010df7ec75..ef02edfc1d 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -201,6 +201,19 @@ endif QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) +ifeq ($(BR2_arc),y) +# In case of -Os (which is default in BR) gcc will use millicode implementation +# from libgcc. That along with performance degradation may lead to issues during +# linkage stage. In case of QtWebkit exactly that happens - millicode functions +# get put way too far from caller functions and so linker fails. +# To solve that problem we explicitly disable millicode call generation for Qt. +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) +# it's good to firce compiler to not assume short or even medium-length calls +# could be used. I.e. always use long jump instaructions. +# Otherwise there's a high risk of hitting link-time failures. +QT5BASE_CFLAGS += -mno-millicode -mlong-calls +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch new file mode 100644 index 0000000000..92f023eab6 --- /dev/null +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch @@ -0,0 +1,93 @@ +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 21 Feb 2022 18:28:00 +0300 +Subject: [PATCH] Add support for ARC processors + +Signed-off-by: Alexey Brodkin +--- + CMakeLists.txt | 4 +++- + Source/JavaScriptCore/CMakeLists.txt | 3 ++- + Source/WTF/wtf/Platform.h | 8 ++++++++ + Source/WTF/wtf/dtoa/utils.h | 2 +- + Source/cmake/OptionsQt.cmake | 4 ++++ + 5 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31a2ea1fd..f0dfbda5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) + else () + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) + endif () +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") ++ set(WTF_CPU_ARC 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 937b3ed00..205dde288 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) + endif () + +-if (WTF_CPU_ARM) ++if (WTF_CPU_ARC) ++elseif (WTF_CPU_ARM) + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5717f3ea1..b327ed693 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -349,6 +349,14 @@ + + #endif /* ARM */ + ++/* CPU(ARC) - ARC */ ++#if defined(__arc__) ++#define WTF_CPU_ARC 1 ++#if defined(__BIG_ENDIAN__) ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++#endif ++ + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 889642cee..8f1e9933e 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +index ec6081de0..e1a5efc1e 100644 +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) + endif () + ++if (WTF_CPU_ARC) ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) ++endif () ++ + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) +-- +2.25.1 + From arnout at mind.be Tue Mar 15 21:28:06 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:06 +0100 Subject: [Buildroot] [git commit] package/libgcrypt: bump to version 1.10.0 Message-ID: <20220315214147.C0E5C8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d96b9ed0738bae270c479bdaf21eebd4c1f9930d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-configure.ac-add-an-option-to-disable-tests.patch | 2 +- package/libgcrypt/libgcrypt.hash | 6 ++---- package/libgcrypt/libgcrypt.mk | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index 4ef02fba65..e32f938634 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3230,6 +3230,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 23562d0ed3..2ea4d74c2e 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,5 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.0.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 +sha256 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 libgcrypt-1.10.0.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index e5fdfcfc8e..c6c88f6076 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.9.4 +LIBGCRYPT_VERSION = 1.10.0 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From arnout at mind.be Tue Mar 15 21:28:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Tue, 15 Mar 2022 22:28:04 +0100 Subject: [Buildroot] [git commit] package/azure-iot-sdk-c: bump to version LTS_01_2022_Ref01 Message-ID: <20220315214147.B74BF8412D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06bb3640c13191f7515f2140c2207f5b7a2cb7ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_01_2022_Ref01 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...hmac-c-fix-mismatching-function-prototype.patch | 35 ---------------------- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch deleted file mode 100644 index 0c262e6c46..0000000000 --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 -From: Francesco Giancane <30423178+fgiancane8 at users.noreply.github.com> -Date: Fri, 2 Jul 2021 20:47:38 +0200 -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) - -The reported function raises a warning when compilers assert the flag -`-Warray-parameter=`, signaling that an array-type argument was promoted -to a pointer-type argument. - -While in practice in most C implementations this is correct, fixing the -warning (and, in this case, indicating the maximum size for the array) -would represent a best-practice for finding out-of-bound accesses or -identifying wrongly-sized arrays passed in the function. - -Signed-off-by: Francesco Giancane -[Retrieved from: -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] -Signed-off-by: Fabrice Fontaine ---- - src/hmac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hmac.c b/src/hmac.c -index 53f2411f8..160af9d2f 100644 ---- a/c-utility/src/hmac.c -+++ b/c-utility/src/hmac.c -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, - * sha Error Code. - * - */ --int hmacResult(HMACContext *ctx, uint8_t *digest) -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) - { - if (!ctx) return shaNull; - diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index 72fa99c44d..5dbb530954 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz +sha256 082e41f7cdf06fec036b8cfa1793f03e81ba527b55ea13c66be0e4cf9f20ff7b azure-iot-sdk-c-LTS_01_2022_Ref01-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e6de8c851b..874646c445 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2021_Ref01 +AZURE_IOT_SDK_C_VERSION = LTS_01_2022_Ref01 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From fontaine.fabrice at gmail.com Tue Mar 15 22:03:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 23:03:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbluray: bump to version 1.3.1 Message-ID: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog Signed-off-by: Fabrice Fontaine --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c85866..6e62bb49a1 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38d..a9eb3c67c6 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 15 22:10:11 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 15 Mar 2022 23:10:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/dav1d: use official tarball Message-ID: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/dav1d/dav1d.hash | 3 ++- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae7..5e838b0951 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8..ecc4cc55c3 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -5,8 +5,8 @@ ################################################################################ DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES -- 2.35.1 From peter at korsgaard.com Tue Mar 15 22:17:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:17:56 +0100 Subject: [Buildroot] [PATCH 1/2] package/gdk-pixbuf-xlib: new package In-Reply-To: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:55 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> Message-ID: <87bky6vp0r.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Deprecated Xlib integration for GdkPixbuf. > gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since > version 2.42.0 and > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c > resulting in the following "hidden" warnings with xscreensaver since > commit a7b51ed3013c919b293deb95299e33363fb9df70: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 15 22:18:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:18:01 +0100 Subject: [Buildroot] [PATCH 2/2] package/xscreensaver: add gdk-pixbuf-xlib dependency In-Reply-To: <20220302174456.1641125-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 2 Mar 2022 18:44:56 +0100") References: <20220302174456.1641125-1-fontaine.fabrice@gmail.com> <20220302174456.1641125-2-fontaine.fabrice@gmail.com> Message-ID: <877d8uvp0m.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version > 2.42.0 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the > following "hidden" warnings: > Warning: GTK version 2.24.33 was found, but at least one supporting > library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. > Perhaps some of the development packages are not installed? > Warning: The GTK libraries do not seem to be available; the > `xscreensaver-demo' program requires them. > Warning: The GDK-Pixbuf library was not found. > The PNG library is being used instead. > Some of the demos will not use images as much as they could. > You should consider installing GDK-Pixbuf and re-running > configure. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 15 21:52:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:52:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gdk-pixbuf-xlib: new package Message-ID: <20220315220935.C2C7D8414C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d78d72d65cb1f6e7da4af2a2cc6defadb8d7b9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 559df4ef2888efda8a0142a9b61a1206e6ab0fff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1370495a84..fad5c13844 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -821,6 +821,7 @@ F: package/cairo/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index e420f02b37..d45e6d3a86 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1441,6 +1441,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) From peter at korsgaard.com Tue Mar 15 21:53:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:53:02 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/xscreensaver: add gdk-pixbuf-xlib dependency Message-ID: <20220315220935.CB7058414D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9f203281b346344d363a71a6e7b54da1c285120f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.2 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 35f02050be12b86cdd2220e09c72fd2586346068) Signed-off-by: Peter Korsgaard --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index d773c69913..c18f7cc7fd 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index c3c9ec89c3..7f38434eb5 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -14,6 +14,7 @@ XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ From peter at korsgaard.com Tue Mar 15 21:49:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:49:49 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdk-pixbuf-xlib: new package Message-ID: <20220315220952.A481B84156@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b71eb2b09041647a0fba2007c6b967535269c33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Deprecated Xlib integration for GdkPixbuf. gdk-pixbuf-xlib has been deprecated and split off of gdk-pixbuf since version 2.42.0 and https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/3362e94c2595440f322798dc4d15f1ed24a4c52c resulting in the following "hidden" warnings with xscreensaver since commit a7b51ed3013c919b293deb95299e33363fb9df70: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 559df4ef2888efda8a0142a9b61a1206e6ab0fff) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/gdk-pixbuf-xlib/Config.in | 17 +++++++++++++++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash | 5 +++++ package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk | 16 ++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8422fad579..91e28387bc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -848,6 +848,7 @@ F: package/daq3/ F: package/duktape/ F: package/expat/ F: package/flatbuffers/ +F: package/gdk-pixbuf-xlib/ F: package/gerbera/ F: package/gtksourceview/ F: package/gssdp/ diff --git a/package/Config.in b/package/Config.in index cb94e30be3..4b2db039c5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1477,6 +1477,7 @@ menu "Graphics" source "package/freetype/Config.in" source "package/gd/Config.in" source "package/gdk-pixbuf/Config.in" + source "package/gdk-pixbuf-xlib/Config.in" source "package/giblib/Config.in" source "package/giflib/Config.in" source "package/granite/Config.in" diff --git a/package/gdk-pixbuf-xlib/Config.in b/package/gdk-pixbuf-xlib/Config.in new file mode 100644 index 0000000000..2efc5d4d66 --- /dev/null +++ b/package/gdk-pixbuf-xlib/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_GDK_PIXBUF_XLIB + bool "gdk-pixbuf-xlib" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # gdk-pixbuf -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> glib2 + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_XLIB_LIBX11 + help + Deprecated Xlib integration for GdkPixbuf. + + https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib + +comment "gdk-pixbuf-xlib needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash new file mode 100644 index 0000000000..e7f74e2b4b --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -0,0 +1,5 @@ +# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk new file mode 100644 index 0000000000..3e61373b3a --- /dev/null +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# gdk-pixbuf-xlib +# +################################################################################ + +GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 +GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 +GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz +GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ +GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING +GDK_PIXBUF_XLIB_INSTALL_STAGING = YES +GDK_PIXBUF_XLIB_DEPENDENCIES = gdk-pixbuf xlib_libX11 + +$(eval $(meson-package)) From peter at korsgaard.com Tue Mar 15 21:53:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 22:53:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/xscreensaver: add gdk-pixbuf-xlib dependency Message-ID: <20220315220952.ADCED84157@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a1463d88f3c38d35d58c60c52d0627d9d45f94f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x gdk-pixbuf-xlib dependency is needed since bump of gdk-pixbuf to version 2.42.2 in commit a7b51ed3013c919b293deb95299e33363fb9df70 to avoid the following "hidden" warnings: Warning: GTK version 2.24.33 was found, but at least one supporting library (gdk-pixbuf-xlib-2.0) was not, so GTK can't be used. Perhaps some of the development packages are not installed? Warning: The GTK libraries do not seem to be available; the `xscreensaver-demo' program requires them. Warning: The GDK-Pixbuf library was not found. The PNG library is being used instead. Some of the demos will not use images as much as they could. You should consider installing GDK-Pixbuf and re-running configure. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 35f02050be12b86cdd2220e09c72fd2586346068) Signed-off-by: Peter Korsgaard --- package/xscreensaver/Config.in | 1 + package/xscreensaver/xscreensaver.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index d773c69913..c18f7cc7fd 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_GDK_PIXBUF_XLIB select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index f73a75bf14..46dedc3211 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -15,6 +15,7 @@ XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ + gdk-pixbuf-xlib \ jpeg \ libgtk2 \ libxml2 \ From peter at korsgaard.com Tue Mar 15 22:18:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:18:45 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/go: security bump to 1.17.8 Message-ID: <20220315221007.4946084159@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab6016db98ca869b23cab1d8f5b3f0a2a05ee1db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x go1.17.8 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. https://go.dev/doc/devel/release#go1.17.minor Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 1cd8faa8d3b525fc01c21bc03ddd617062516699) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index fdf342e602..85e6adfb8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz +sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 56a21dfe55..3df16c9a68 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.7 +GO_VERSION = 1.17.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Tue Mar 15 22:20:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 15 Mar 2022 23:20:05 +0100 Subject: [Buildroot] [git commit] package/go: security bump to 1.17.8 In-Reply-To: <20220304170333.BD28382A39@busybox.osuosl.org> (Peter Korsgaard's message of "Fri, 4 Mar 2022 18:11:36 +0100") References: <20220304170333.BD28382A39@busybox.osuosl.org> Message-ID: <8735jivox6.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: https://git.buildroot.net/buildroot/commit/?id=1cd8faa8d3b525fc01c21bc03ddd617062516699 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > go1.17.8 includes a security fix to the regexp/syntax package, as well as bug > fixes to the compiler, runtime, the go command, and the crypto/x509, and net > packages. > https://go.dev/doc/devel/release#go1.17.minor > Signed-off-by: Christian Stewart > Signed-off-by: Peter Korsgaard Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 1.16.15, which contains the same security fixes. -- Bye, Peter Korsgaard From avijitnsec at gmail.com Wed Mar 16 01:04:02 2022 From: avijitnsec at gmail.com (Avijit Das) Date: Tue, 15 Mar 2022 19:04:02 -0600 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: References: Message-ID: Hi, I am building Buildroot for an imx8mm board. The HDMI display is up. I validated the display using the fb-test. I am trying to enable a graphics library, either gtk3 or qt5. *gtk3 * When I am enabling the gtk3 library, if I run the demo application, I am getting the following error. # /usr/bin/gtk3-demo (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: # I have tried setting the display to localhost:0.0, did not work. *QT5* The widget library is not building. There is a compilation error: qkeyeventtransition.o .obj/qmouseeventtransition.o .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so -lpthread -lrt -lpthread -ldl ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 rm -f ../../lib/libQt5Widgets.so.5.15.8 mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 rm -f ../../lib/libQt5Widgets.so rm -f ../../lib/libQt5Widgets.so.5 rm -f ../../lib/libQt5Widgets.so.5.15 mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 make[2]: *** [Makefile:51: sub-src-make_first] Error 2 make[1]: *** [package/pkg-generic.mk:292: /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 I have attached the config file. Can you please suggest? Thanks, Avijit -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: freescale_imx8mmevk_defconfig Type: application/octet-stream Size: 2514 bytes Desc: not available URL: From james.hilliard1 at gmail.com Wed Mar 16 06:02:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Mar 2022 00:02:19 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220316060219.3448648-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. Signed-off-by: James Hilliard --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 23 +++---------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..ef677855b2 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From peter at korsgaard.com Wed Mar 16 07:03:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:03:54 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/go: security bump to 1.16.15 Message-ID: <20220316070128.EDA158414A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c72c5f36c798a357e98b7a1cbb9e5a8d73635158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x go1.16.15 includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and to the net package. https://go.dev/doc/devel/release#go1.16.minor Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index b4d4e05e3c..7b5eb529bc 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 467898cd3a216de54dcb9014f541efe77e9b79a7154dbc1fd2dd778b0c63fb56 go1.16.14.src.tar.gz +sha256 90a08c689279e35f3865ba510998c33a63255c36089b3ec206c912fc0568c3d3 go1.16.15.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index cc57d0d86d..b4c5886c3a 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.14 +GO_VERSION = 1.16.15 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Wed Mar 16 07:14:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:14:44 +0100 Subject: [Buildroot] [PATCH] package/gdb: bump 11.x version to 11.2 In-Reply-To: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni via buildroot's message of "Sun, 13 Feb 2022 23:01:15 +0100") References: <20220213220116.144141-1-thomas.petazzoni@bootlin.com> Message-ID: <87y21atlln.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > This is a minor corrective release over GDB 11.1, fixing the following issues: > PR sim/28302 (gdb fails to build with glibc 2.34) > PR build/28318 (std::thread support configure check does not use > CXX_DIALECT) > PR gdb/28405 (arm-none-eabi: internal-error: ptid_t > remote_target::select_thread_for_ambiguous_stop_reply(const > target_waitstatus*): Assertion `first_resumed_thread != nullptr' > failed) > PR tui/28483 ([gdb/tui] breakpoint creation not displayed) > PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) > PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) > PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) > PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) > Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was > merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. > Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as > commit df9ebc472a162306dee8ba6e02b99963c2babb7c? > Drop patch 0009-gdbserver-aarch64-support.patch, which was merged > upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. > Signed-off-by: Thomas Petazzoni Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:18:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:18:03 +0100 Subject: [Buildroot] [PATCH v1] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) In-Reply-To: <2c28b619-784f-6cf5-b2e1-6cae707051be@mind.be> (Arnout Vandecappelle's message of "Sat, 5 Mar 2022 15:51:20 +0100") References: <20220214154925.6014-1-ps.report@gmx.net> <2c28b619-784f-6cf5-b2e1-6cae707051be@mind.be> Message-ID: <87tubytlg4.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/02/2022 16:49, Peter Seiderer wrote: >> For details see [1] and [2]. >> [1] >> https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog >> [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes >> Signed-off-by: Peter Seiderer > Bugfix bump, so applied to master, thanks. Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:27:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:27:55 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual: remove override in conditional In-Reply-To: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:24:39 +0100") References: <20220304172440.3365435-1-fontaine.fabrice@gmail.com> Message-ID: <87pmmmtkzo.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:28:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:28:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvirt: fix build without libvirtd In-Reply-To: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 4 Mar 2022 18:38:51 +0100") References: <20220304173851.3566563-1-fontaine.fabrice@gmail.com> Message-ID: <87lexatkys.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without libvirtd raised since the > addition of the package in commit > ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and > https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: > ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem > encountered: Requested the Interface driver without netcf or udev and > libvirtd support > Fixes: > - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:29:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:29:27 +0100 Subject: [Buildroot] [PATCH] package/libxlst: security bump to version 1.1.35 In-Reply-To: <20220306120902.132254-1-francois.perrad@gadz.org> (Francois Perrad's message of "Sun, 6 Mar 2022 13:09:02 +0100") References: <20220306120902.132254-1-francois.perrad@gadz.org> Message-ID: <87h77ytkx4.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > - fix CVE-2021-30560 > - remove merged patch > - moved from xmlsoft.org to gnome.org > Signed-off-by: Francois Perrad Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 16 07:16:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:16:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220316072056.3E5F88418E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=04aa0138485c2016033f18a1e466ae2f0759316b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a586f0a283cd69f436bc6d0cff484460b412a1ce) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..748a36e0be 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 40fd518a58..7be721da45 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From peter at korsgaard.com Wed Mar 16 07:26:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:26:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220316072056.49E9B84194@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c6a9bb51fb32f9036edd5522a933c4668eec6ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard (cherry picked from commit 949aee637738341690b3a29a7dc2eb7572c164f1) [Peter: drop 5.15.x / 5.16.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 3f796b252b..da50a2ced5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.90" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.103" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index e22ac924bc..2589f43b1d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fb9867525c..2554d4aace 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Wed Mar 16 07:27:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:27:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: remove override in conditional Message-ID: <20220316072056.536F884196@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61796702964b500ec7548d142e2cbeef14dda544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3d7f852ac5afb09f0a9a0b5f441403a98bc0f410) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) From peter at korsgaard.com Wed Mar 16 07:29:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:29:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libxslt: security bump to version 1.1.35 Message-ID: <20220316072056.5EC4E8418E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caddd00d7b7ce4164c1a58811907867bf73a3f90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - fix CVE-2021-30560 - remove merged patch, drop autoreconf - moved from xmlsoft.org to gnome.org - spaces in hash file Signed-off-by: Francois Perrad [yann.morin.1998 at free.fr: - drop autoreconf as no longer patching - also switch home in Config.in ] Signed-off-by: Yann E. MORIN (cherry picked from commit acf5b437cc329a392f26e5367de1f64b3601b605) Signed-off-by: Peter Korsgaard --- ...Fix-xml2-config-check-in-configure-script.patch | 31 ---------------------- package/libxslt/Config.in | 2 +- package/libxslt/libxslt.hash | 6 ++--- package/libxslt/libxslt.mk | 7 +++-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb235..0000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index dfe5b99f04..643bce2a61 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://xmlsoft.org/xslt/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839e..39523a6953 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d2521..df0286e986 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft -# We're patching configure.ac -LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ From peter at korsgaard.com Wed Mar 16 07:27:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:27:37 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: remove override in conditional Message-ID: <20220316072123.3D712841D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c80e612f5eeeaccf3bdefb8192507da6ae4997f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Remove override of FOO_{CONF_OPTS,DEPENDENCIES} in conditional Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3d7f852ac5afb09f0a9a0b5f441403a98bc0f410) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-kernel-module.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt index b609ecc90a..1d4251333d 100644 --- a/docs/manual/adding-packages-kernel-module.txt +++ b/docs/manual/adding-packages-kernel-module.txt @@ -70,11 +70,11 @@ Let's look at a more complex example: 14: FOO_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) 15: 16: ifeq ($(BR2_PACKAGE_LIBBAR),y) -17: FOO_DEPENDENCIES = libbar -18: FOO_CONF_OPTS = --enable-bar +17: FOO_DEPENDENCIES += libbar +18: FOO_CONF_OPTS += --enable-bar 19: FOO_MODULE_SUBDIRS += driver/bar 20: else -21: FOO_CONF_OPTS = --disable-bar +21: FOO_CONF_OPTS += --disable-bar 22: endif 23: 24: $(eval $(kernel-module)) From peter at korsgaard.com Wed Mar 16 07:15:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:15:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/util-linux: bump version to 2.37.4 (fixes CVE-2022-0563) Message-ID: <20220316072123.292DE841D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6001c72e6fc6d6689ba98a18266a168c953dda81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x For details see [1] and [2]. [1] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ChangeLog [2] https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.4-ReleaseNotes Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a586f0a283cd69f436bc6d0cff484460b412a1ce) Signed-off-by: Peter Korsgaard --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 9c10a42dca..748a36e0be 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz +sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 40fd518a58..7be721da45 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From peter at korsgaard.com Wed Mar 16 07:25:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:25:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220316072123.34B69841CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec2eea8e7ba5938b703d719269839700eb7cb61b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard (cherry picked from commit 949aee637738341690b3a29a7dc2eb7572c164f1) [Peter: drop 5.16.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 0d7464d1da..75e0a62347 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 116d4af1d6..0d7489e679 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 0a131b6a2f9f5ee37ecb332b5459ab35a87f0bf2d4ec923988d0663646cf156a linux-5.15.13.tar.xz +sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz sha256 f41a259cb2002dd2e3286524b2bb4e803f4f982992d092706ecea613584023b3 linux-5.14.21.tar.xz -sha256 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725 linux-5.10.90.tar.xz -sha256 b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c linux-5.4.170.tar.xz +sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz +sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 86c9ed59b120fad14d207470446086ac46099cd7bb9e58682e368e721164a6e0 linux-4.4.298.tar.xz -sha256 fd4bdbc8be3472d6324fa0f5f57a17f5c3f509d5f5b4fa4f1a9797d982d0bca8 linux-4.9.296.tar.xz -sha256 bffaaa4c93ab4ed1de61f804c26c92b82dd80f92793e20194b62497d7b8b4723 linux-4.14.261.tar.xz -sha256 01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031 linux-4.19.224.tar.xz +sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz +sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz +sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz +sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 89307fdb99..53bfd0a2b3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -374,14 +374,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.298" if BR2_KERNEL_HEADERS_4_4 - default "4.9.296" if BR2_KERNEL_HEADERS_4_9 - default "4.14.261" if BR2_KERNEL_HEADERS_4_14 - default "4.19.224" if BR2_KERNEL_HEADERS_4_19 - default "5.4.170" if BR2_KERNEL_HEADERS_5_4 - default "5.10.90" if BR2_KERNEL_HEADERS_5_10 + default "4.4.302" if BR2_KERNEL_HEADERS_4_4 + default "4.9.304" if BR2_KERNEL_HEADERS_4_9 + default "4.14.269" if BR2_KERNEL_HEADERS_4_14 + default "4.19.232" if BR2_KERNEL_HEADERS_4_19 + default "5.4.182" if BR2_KERNEL_HEADERS_5_4 + default "5.10.103" if BR2_KERNEL_HEADERS_5_10 default "5.14.21" if BR2_KERNEL_HEADERS_5_14 - default "5.15.13" if BR2_KERNEL_HEADERS_5_15 + default "5.15.26" if BR2_KERNEL_HEADERS_5_15 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Wed Mar 16 07:28:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:28:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libvirt: fix build without libvirtd Message-ID: <20220316072123.47ADC841D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=50e83f59bd187c69e182b8034a34d11909f3c526 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix the following build failure without libvirtd raised since the addition of the package in commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and https://gitlab.com/libvirt/libvirt/-/commit/89064c9e378b99fea0a334199a524f13390d5fc3: ../output-1/build/libvirt-7.10.0/meson.build:1518:2: ERROR: Problem encountered: Requested the Interface driver without netcf or udev and libvirtd support Fixes: - http://autobuild.buildroot.org/results/e43101c6d7f626439ef800263b8f5dfa99ce850b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 87f1dd7b52deedb5a7f50a43e4b1dd1d23313395) Signed-off-by: Peter Korsgaard --- package/libvirt/libvirt.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index e7bfe6964d..5b6a451264 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -38,7 +38,6 @@ LIBVIRT_CONF_OPTS = \ -Ddriver_ch=disabled \ -Ddriver_esx=disabled \ -Ddriver_hyperv=disabled \ - -Ddriver_interface=enabled \ -Ddriver_libxl=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ @@ -195,7 +194,10 @@ endif ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) # Network is used by daemon, only -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=enabled -Ddriver_network=enabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=enabled \ + -Ddriver_libvirtd=enabled \ + -Ddriver_network=enabled ifeq ($(BR2_PACKAGE_LIBSSH),y) LIBVIRT_CONF_OPTS += -Dlibssh=enabled @@ -234,7 +236,10 @@ endif else # BR2_PACKAGE_LIBVIRT_DAEMON -LIBVIRT_CONF_OPTS += -Ddriver_libvirtd=disabled -Ddriver_network=disabled +LIBVIRT_CONF_OPTS += \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_network=disabled endif From peter at korsgaard.com Wed Mar 16 07:14:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:14:27 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdb: bump 11.x version to 11.2 Message-ID: <20220316072123.1EE07841CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8434bf32fa54ebb27d8384ee41a38bdb8ab0cf96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is a minor corrective release over GDB 11.1, fixing the following issues: PR sim/28302 (gdb fails to build with glibc 2.34) PR build/28318 (std::thread support configure check does not use CXX_DIALECT) PR gdb/28405 (arm-none-eabi: internal-error: ptid_t remote_target::select_thread_for_ambiguous_stop_reply(const target_waitstatus*): Assertion `first_resumed_thread != nullptr' failed) PR tui/28483 ([gdb/tui] breakpoint creation not displayed) PR build/28555 (uclibc compile failure since commit 4655f8509fd44e6efabefa373650d9982ff37fd6) PR rust/28637 (Rust characters will be encoded using DW_ATE_UTF) PR gdb/28758 (GDB 11 doesn't work correctly on binaries with a SHT_RELR (.relr.dyn) section) PR gdb/28785 (Support SHT_RELR (.relr.dyn) section) Drop patch 0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch, which was merged upstream as commit 17d6f2152b583cdc7defafa7813b727a304bac5b. Drop patch 0008-Fix-build-on-rhES5.patch, which was merged upstream as commit df9ebc472a162306dee8ba6e02b99963c2babb7c? Drop patch 0009-gdbserver-aarch64-support.patch, which was merged upstream as commit eb79b2318066cafb75ffdce310e3bbd44f7c79e3. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8cfbda109fc41d7567a67666f1f8a541ea1d1f61) Signed-off-by: Peter Korsgaard --- ...0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch | 110 ------- package/gdb/11.1/0008-Fix-build-on-rhES5.patch | 194 ------------- .../gdb/11.1/0010-gdbserver-aarch64-support.patch | 320 --------------------- ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...efine-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../{11.1 => 11.2}/0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-nat-fork-inferior-include-linux-ptrace.h.patch | 0 ...Fix-getrandom-compile-for-uclibc-v1.0.35.patch} | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...0008-gdbserver-Makefile.in-fix-NLS-build.patch} | 0 package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 13 files changed, 2 insertions(+), 626 deletions(-) diff --git a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch b/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch deleted file mode 100644 index d969d98831..0000000000 --- a/package/gdb/11.1/0006-sim-filter-out-SIGSTKSZ-PR-sim-28302.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 3 Oct 2021 12:02:53 -0400 -Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302] - -We map target signals to host signals so we can propagate signals -between the host & simulated worlds. That means we need to know -the symbolic names & values of all signals that might be sent. - -The tools that generate that list use signal.h and include all -symbols that start with "SIG" so as to automatically include any -new symbols that the C library might add. Unfortunately, this -also picks up "SIGSTKSZ" which is not actually a signal itself, -but a signal related setting -- it's the size of the stack when -a signal is handled. - -By itself this doesn't super matter as we will never see a signal -with that same value (since the range of valid signals tend to be -way less than 1024, and the size of the default signal stack will -never be that small). But with recent glibc changes that make this -into a dynamic value instead of a compile-time constant, some users -see build failures when building the sim. - -As suggested by Adam Sampson, update our scripts to ignore this -symbol to simplify everything and avoid the build failure. - -Bug: https://sourceware.org/PR28302 - -[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c] -Signed-off-by: Peter Seiderer ---- - sim/bfin/linux-targ-map.h | 5 +---- - sim/common/gennltvals.py | 6 ++++-- - sim/common/nltvals.def | 1 - - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h -index e9c8c8f..0340ed5 100644 ---- a/sim/bfin/linux-targ-map.h -+++ b/sim/bfin/linux-targ-map.h -@@ -30,6 +30,7 @@ echo - # XXX: nothing uses this ? - echo '#include ' | \ - bfin-uclinux-gcc -E -dD -P - | \ -+grep -v SIGSTKSZ | \ - sed -r -n \ - -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ - -e '$i\ \ { 0, -1, -1 }\n};' \ -@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = - #ifdef SIG_SETMASK - # define TARGET_LINUX_SIG_SETMASK 2 - { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, --#endif --#ifdef SIGSTKSZ --# define TARGET_LINUX_SIGSTKSZ 8192 -- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, - #endif - { 0, -1, -1 } - }; -diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py -index b3e558d..bd4d7e9 100755 ---- a/sim/common/gennltvals.py -+++ b/sim/common/gennltvals.py -@@ -67,6 +67,7 @@ FILE_HEADER = f"""\ - def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - headers: Iterable[str], - pattern: str, -+ filter: str = r'^$', - target: str = None): - """Extract constants from the specified files using a regular expression. - -@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, - srcfile = ''.join(f'#include <{x}>\n' for x in headers) - syms = set() - define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') -+ filter_pattern = re.compile(filter) - for header in headers: - with open(srcdir / header, 'r', encoding='utf-8') as fp: - data = fp.read() - for line in data.splitlines(): - m = define_pattern.match(line) -- if m: -+ if m and not filter_pattern.search(line): - syms.add(m.group(1)) - for sym in sorted(syms): - srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' -@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): - ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') - - gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', -- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') -+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') - - gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', - ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') -diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def -index 8ae8839..8bc6ae5 100644 ---- a/sim/common/nltvals.def -+++ b/sim/common/nltvals.def -@@ -116,7 +116,6 @@ - { "SIGPROF", 27 }, - { "SIGQUIT", 3 }, - { "SIGSEGV", 11 }, -- { "SIGSTKSZ", 8192 }, - { "SIGSTOP", 17 }, - { "SIGSYS", 12 }, - { "SIGTERM", 15 }, --- -2.33.1 - diff --git a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch b/package/gdb/11.1/0008-Fix-build-on-rhES5.patch deleted file mode 100644 index 2d4e30ffe1..0000000000 --- a/package/gdb/11.1/0008-Fix-build-on-rhES5.patch +++ /dev/null @@ -1,194 +0,0 @@ -From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Wed, 12 May 2021 12:39:22 -0600 -Subject: [PATCH] Fix build on rhES5 - -The rhES5 build failed due to an upstream import a while back. The -bug here is that, while the 'personality' function exists, -ADDR_NO_RANDOMIZE is only defined in , not -. - -However, does not declare the 'personality' -function, and and cannot -both be included. - -This patch restores one of the removed configure checks and updates -the code to check it. - -We had this as a local patch at AdaCore, because it seemed like there -was no interest upstream. However, now it turns out that this fixes -PR build/28555, so I'm sending it now. - -[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373] -Signed-off-by: Peter Seiderer ---- - gdb/config.in | 4 ++++ - gdb/configure | 16 ++++++++++++++++ - gdb/nat/linux-personality.c | 4 ++++ - gdbserver/config.in | 4 ++++ - gdbserver/configure | 16 ++++++++++++++++ - gdbsupport/common.m4 | 5 +++++ - gdbsupport/config.in | 4 ++++ - gdbsupport/configure | 16 ++++++++++++++++ - 8 files changed, 69 insertions(+) - -diff --git a/gdb/config.in b/gdb/config.in -index 2c30504..776bee9 100644 ---- a/gdb/config.in -+++ b/gdb/config.in -@@ -96,6 +96,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdb/configure b/gdb/configure -index 5d89635..27e3194 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -13838,6 +13838,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c -index 9ce345b..27999fd 100644 ---- a/gdb/nat/linux-personality.c -+++ b/gdb/nat/linux-personality.c -@@ -22,6 +22,10 @@ - - #include - -+# if !HAVE_DECL_ADDR_NO_RANDOMIZE -+# define ADDR_NO_RANDOMIZE 0x0040000 -+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -+ - /* See comment on nat/linux-personality.h. */ - - maybe_disable_address_space_randomization:: -diff --git a/gdbserver/config.in b/gdbserver/config.in -index cf06c56..c9258b3 100644 ---- a/gdbserver/config.in -+++ b/gdbserver/config.in -@@ -31,6 +31,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbserver/configure b/gdbserver/configure -index b227167..d399d71 100755 ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -7131,6 +7131,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 -index 901c454..56a355e 100644 ---- a/gdbsupport/common.m4 -+++ b/gdbsupport/common.m4 -@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait]) - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include ]) -+ - AC_CHECK_DECLS([strstr]) - - # ----------------------- # -diff --git a/gdbsupport/config.in b/gdbsupport/config.in -index f46e261..6945a62 100644 ---- a/gdbsupport/config.in -+++ b/gdbsupport/config.in -@@ -28,6 +28,10 @@ - /* define if the compiler supports basic C++11 syntax */ - #undef HAVE_CXX11 - -+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if -+ you don't. */ -+#undef HAVE_DECL_ADDR_NO_RANDOMIZE -+ - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you - don't. */ - #undef HAVE_DECL_ASPRINTF -diff --git a/gdbsupport/configure b/gdbsupport/configure -index a9dd02c..243a03f 100755 ---- a/gdbsupport/configure -+++ b/gdbsupport/configure -@@ -8144,6 +8144,22 @@ fi - done - - -+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39. -+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h, -+ # only in linux/personality.h. -+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include -+" -+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -+_ACEOF -+ -+ - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" - if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 --- -2.33.1 - diff --git a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch b/package/gdb/11.1/0010-gdbserver-aarch64-support.patch deleted file mode 100644 index 3718b1b6fd..0000000000 --- a/package/gdb/11.1/0010-gdbserver-aarch64-support.patch +++ /dev/null @@ -1,320 +0,0 @@ -From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001 -From: Luis Machado -Date: Fri, 29 Oct 2021 14:54:36 -0300 -Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic - -The current register set selection mechanism for AArch64 is static, based -on a pre-populated array of register sets. - -This means that we might potentially probe register sets that are not -available. This is OK if the kernel errors out during ptrace, but probing the -tag_ctl register, for example, does not result in a ptrace error if the kernel -supports the tagged address ABI but not MTE (PR 28355). - -Making the register set selection dynamic, based on feature checks, solves -this and simplifies the code a bit. It allows us to list all of the register -sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties. - -gdb/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * arch/aarch64.h (struct aarch64_features): New struct. - -gdbserver/ChangeLog: - -2021-11-03 Luis Machado - - PR gdb/28355 - - * linux-aarch64-low.cc (is_sve_tdesc): Remove. - (aarch64_target::low_arch_setup): Rework to adjust the register sets. - (aarch64_regsets): Update to list all register sets. - (aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr. - (aarch64_sve_regsets, aarch64_sve_regsets_info) - (regs_info_aarch64_sve): Remove. - (aarch64_adjust_register_sets): New. - (aarch64_target::get_regs_info): Remove references to removed structs. - (initialize_low_arch): Likewise. - -Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3 -Signed-off-by: Joachim Wiberg ---- - gdb/arch/aarch64.h | 9 ++ - gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++--------------- - 4 files changed, 130 insertions(+), 85 deletions(-) - -diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h -index 0eb702c5b5e..95edb664b55 100644 ---- a/gdb/arch/aarch64.h -+++ b/gdb/arch/aarch64.h -@@ -22,6 +22,15 @@ - - #include "gdbsupport/tdesc.h" - -+/* Holds information on what architectural features are available. This is -+ used to select register sets. */ -+struct aarch64_features -+{ -+ bool sve = false; -+ bool pauth = false; -+ bool mte = false; -+}; -+ - /* Create the aarch64 target description. A non zero VQ value indicates both - the presence of SVE and the Vector Quotient - the number of 128bit chunks in - an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH -diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc -index daccfef746e..9a8cb4169a7 100644 ---- a/gdbserver/linux-aarch64-low.cc -+++ b/gdbserver/linux-aarch64-low.cc -@@ -196,16 +196,6 @@ is_64bit_tdesc (void) - return register_size (regcache->tdesc, 0) == 8; - } - --/* Return true if the regcache contains the number of SVE registers. */ -- --static bool --is_sve_tdesc (void) --{ -- struct regcache *regcache = get_thread_regcache (current_thread, 0); -- -- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve"); --} -- - static void - aarch64_fill_gregset (struct regcache *regcache, void *buf) - { -@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent, - *child->priv->arch_private = *parent->priv->arch_private; - } - --/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ --#define AARCH64_HWCAP_PACA (1 << 30) -- --/* Implementation of linux target ops method "low_arch_setup". */ -- --void --aarch64_target::low_arch_setup () --{ -- unsigned int machine; -- int is_elf64; -- int tid; -- -- tid = lwpid_of (current_thread); -- -- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -- -- if (is_elf64) -- { -- uint64_t vq = aarch64_sve_get_vq (tid); -- unsigned long hwcap = linux_get_hwcap (8); -- unsigned long hwcap2 = linux_get_hwcap2 (8); -- bool pauth_p = hwcap & AARCH64_HWCAP_PACA; -- /* MTE is AArch64-only. */ -- bool mte_p = hwcap2 & HWCAP2_MTE; -- -- current_process ()->tdesc -- = aarch64_linux_read_description (vq, pauth_p, mte_p); -- } -- else -- current_process ()->tdesc = aarch32_linux_read_description (); -- -- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); --} -- - /* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */ - - static void -@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf) - return aarch64_sve_regs_copy_from_reg_buf (regcache, buf); - } - -+/* Array containing all the possible register sets for AArch64/Linux. During -+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for -+ validity and enabled/disabled accordingly. -+ -+ Their sizes are set to 0 here, but they will be adjusted later depending -+ on whether each register set is available or not. */ - static struct regset_info aarch64_regsets[] = - { -+ /* GPR registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -+ 0, GENERAL_REGS, - aarch64_fill_gregset, aarch64_store_gregset }, -+ /* Floating Point (FPU) registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET, -- sizeof (struct user_fpsimd_state), FP_REGS, -+ 0, FP_REGS, - aarch64_fill_fpregset, aarch64_store_fpregset - }, -+ /* Scalable Vector Extension (SVE) registers. */ -+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -+ 0, EXTENDED_REGS, -+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -+ }, -+ /* PAC registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -+ 0, OPTIONAL_REGS, -+ nullptr, aarch64_store_pauthregset }, -+ /* Tagged address control / MTE registers. */ - { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -+ 0, OPTIONAL_REGS, -+ aarch64_fill_mteregset, aarch64_store_mteregset }, - NULL_REGSET - }; - -@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info = - { - aarch64_regsets, /* regsets */ - 0, /* num_regsets */ -- NULL, /* disabled_regsets */ -+ nullptr, /* disabled_regsets */ - }; - - static struct regs_info regs_info_aarch64 = - { -- NULL, /* regset_bitmap */ -- NULL, /* usrregs */ -+ nullptr, /* regset_bitmap */ -+ nullptr, /* usrregs */ - &aarch64_regsets_info, - }; - --static struct regset_info aarch64_sve_regsets[] = -+/* Given FEATURES, adjust the available register sets by setting their -+ sizes. A size of 0 means the register set is disabled and won't be -+ used. */ -+ -+static void -+aarch64_adjust_register_sets (const struct aarch64_features &features) - { -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS, -- sizeof (struct user_pt_regs), GENERAL_REGS, -- aarch64_fill_gregset, aarch64_store_gregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE, -- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS, -- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache -- }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK, -- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS, -- NULL, aarch64_store_pauthregset }, -- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL, -- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset, -- aarch64_store_mteregset }, -- NULL_REGSET --}; -+ struct regset_info *regset; - --static struct regsets_info aarch64_sve_regsets_info = -- { -- aarch64_sve_regsets, /* regsets. */ -- 0, /* num_regsets. */ -- NULL, /* disabled_regsets. */ -- }; -+ for (regset = aarch64_regsets; regset->size >= 0; regset++) -+ { -+ switch (regset->nt_type) -+ { -+ case NT_PRSTATUS: -+ /* General purpose registers are always present. */ -+ regset->size = sizeof (struct user_pt_regs); -+ break; -+ case NT_FPREGSET: -+ /* This is unavailable when SVE is present. */ -+ if (!features.sve) -+ regset->size = sizeof (struct user_fpsimd_state); -+ break; -+ case NT_ARM_SVE: -+ if (features.sve) -+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE); -+ break; -+ case NT_ARM_PAC_MASK: -+ if (features.pauth) -+ regset->size = AARCH64_PAUTH_REGS_SIZE; -+ break; -+ case NT_ARM_TAGGED_ADDR_CTRL: -+ if (features.mte) -+ regset->size = AARCH64_LINUX_SIZEOF_MTE; -+ break; -+ default: -+ gdb_assert_not_reached ("Unknown register set found."); -+ } -+ } -+} - --static struct regs_info regs_info_aarch64_sve = -- { -- NULL, /* regset_bitmap. */ -- NULL, /* usrregs. */ -- &aarch64_sve_regsets_info, -- }; -+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */ -+#define AARCH64_HWCAP_PACA (1 << 30) -+ -+/* Implementation of linux target ops method "low_arch_setup". */ -+ -+void -+aarch64_target::low_arch_setup () -+{ -+ unsigned int machine; -+ int is_elf64; -+ int tid; -+ -+ tid = lwpid_of (current_thread); -+ -+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine); -+ -+ if (is_elf64) -+ { -+ struct aarch64_features features; -+ -+ uint64_t vq = aarch64_sve_get_vq (tid); -+ features.sve = (vq > 0); -+ /* A-profile PAC is 64-bit only. */ -+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA; -+ /* A-profile MTE is 64-bit only. */ -+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE; -+ -+ current_process ()->tdesc -+ = aarch64_linux_read_description (vq, features.pauth, features.mte); -+ -+ /* Adjust the register sets we should use for this particular set of -+ features. */ -+ aarch64_adjust_register_sets (features); -+ } -+ else -+ current_process ()->tdesc = aarch32_linux_read_description (); -+ -+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); -+} - - /* Implementation of linux target ops method "get_regs_info". */ - -@@ -802,9 +821,7 @@ aarch64_target::get_regs_info () - if (!is_64bit_tdesc ()) - return ®s_info_aarch32; - -- if (is_sve_tdesc ()) -- return ®s_info_aarch64_sve; -- -+ /* AArch64 64-bit registers. */ - return ®s_info_aarch64; - } - -@@ -3294,5 +3311,4 @@ initialize_low_arch (void) - initialize_low_arch_aarch32 (); - - initialize_regsets_info (&aarch64_regsets_info); -- initialize_regsets_info (&aarch64_sve_regsets_info); - } --- -2.27.0 - diff --git a/package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/11.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/11.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/11.1/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/11.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/11.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/11.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/11.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/11.1/0007-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/11.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/11.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/11.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/11.1/0009-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..1bb3c41beb 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -89,7 +89,7 @@ config BR2_GDB_VERSION default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "9.2" if BR2_GDB_VERSION_9_2 default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.1" if BR2_GDB_VERSION_11 + default "11.2" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB # recent gdb versions (>= 10) have gdbserver moved at the top-level, diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index d3e83af0b9..e7933374f1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz -sha512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 gdb-11.1.tar.xz +sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz From peter at korsgaard.com Wed Mar 16 07:28:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 08:28:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libxslt: security bump to version 1.1.35 Message-ID: <20220316072123.518C1841CF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=494611a172aeb503d53592f6b6cd61e6cf174938 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - fix CVE-2021-30560 - remove merged patch, drop autoreconf - moved from xmlsoft.org to gnome.org - spaces in hash file Signed-off-by: Francois Perrad [yann.morin.1998 at free.fr: - drop autoreconf as no longer patching - also switch home in Config.in ] Signed-off-by: Yann E. MORIN (cherry picked from commit acf5b437cc329a392f26e5367de1f64b3601b605) Signed-off-by: Peter Korsgaard --- ...Fix-xml2-config-check-in-configure-script.patch | 31 ---------------------- package/libxslt/Config.in | 2 +- package/libxslt/libxslt.hash | 6 ++--- package/libxslt/libxslt.mk | 7 +++-- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch deleted file mode 100644 index 3848dcb235..0000000000 --- a/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 15 Nov 2019 11:53:11 +0100 -Subject: [PATCH] Fix xml2-config check in configure script - -A 'print' option has never been supported. After a recent change to -libxml2, invalid options cause xml2-config to fail. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3da57b18..585b9d7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, - dnl test version and init our variables - dnl - --if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 -+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 - then - AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) - XMLVERS=`$XML_CONFIG --version` --- -GitLab - diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index dfe5b99f04..643bce2a61 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://xmlsoft.org/xslt/ + https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 25aa30839e..39523a6953 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking pgp signature -sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz +# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.35.sha256sum +sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz # Hash for license file: -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index d0f79d2521..df0286e986 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.34 -LIBXSLT_SITE = http://xmlsoft.org/sources +LIBXSLT_VERSION = 1.1.35 +LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz +LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft -# We're patching configure.ac -LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ From aperez at igalia.com Wed Mar 16 07:42:38 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 16 Mar 2022 09:42:38 +0200 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC In-Reply-To: <0fc0da93-ce87-7965-be20-f197d0825cbe@mind.be> References: <20220309132835.7251-1-abrodkin@synopsys.com> <0fc0da93-ce87-7965-be20-f197d0825cbe@mind.be> Message-ID: <20220316094238.GC1064341@momiji> Hi Alexey, Arnout, On Tue, 15 Mar 2022 22:47:10 +0100 Arnout Vandecappelle wrote: > > > On 09/03/2022 14:28, Alexey Brodkin via buildroot wrote: > > This patch adds support of ARC architecture in Qt's JS core and Webkit. > > The change itself is quite straight-forward: > > > > 1. Enable JS core for ARC > > 2. Make sure so-called "large memory model" is used, > > i.e. relocations with long jumps are being generated for global > > symbols, as otherwise insanely huge libqt5webkit.so fails to link > > because some symbols might be more than 32 MiB away from each other. > > 3. Make the original WebKit build system aware of yet another CPU > > architecture with explicitly disabled JIT in JS core for ARC. > > > > Obviously, this one depends on [1]. > > > > [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220221140628.2295-1-abrodkin at synopsys.com/ > > > > Signed-off-by: Alexey Brodkin > > Cc: Thomas Petazzoni > > Cc: Peter Seiderer > > --- > > package/qt5/Config.in | 2 +- > > package/qt5/qt5base/qt5base.mk | 13 +++ > > .../0005-Add-support-for-ARC-processors.patch | 93 +++++++++++++++++++ > > 3 files changed, 107 insertions(+), 1 deletion(-) > > create mode 100644 package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > > index f2b1ff4a19..cbb2e06a21 100644 > > --- a/package/qt5/Config.in > > +++ b/package/qt5/Config.in > > @@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > > bool > > default y > > # Javascript engine is only available on certain architectures > > - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel > > + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc > > # ARM needs BLX, so v5t+ > > depends on !BR2_ARM_CPU_ARMV4 > > > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > > index ef38d03253..b25e0f44b6 100644 > > --- a/package/qt5/qt5base/qt5base.mk > > +++ b/package/qt5/qt5base/qt5base.mk > > @@ -201,6 +201,19 @@ endif > > QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) > > QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) > > > > +ifeq ($(BR2_arc),y) > > +# In case of -Os (which is default in BR) gcc will use millicode implementation > > +# from libgcc. That along with performance degradation may lead to issues during > > +# linkage stage. In case of QtWebkit exactly that happens - millicode functions > > +# get put way too far from caller functions and so linker fails. > > +# To solve that problem we explicitly disable millicode call generation for Qt. > > +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) > > +# it's good to firce compiler to not assume short or even medium-length calls > > +# could be used. I.e. always use long jump instaructions. > > +# Otherwise there's a high risk of hitting link-time failures. > > +QT5BASE_CFLAGS += -mno-millicode -mlong-calls > > +endif > > + > > ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) > > QT5BASE_CONFIGURE_OPTS += -eglfs > > QT5BASE_DEPENDENCIES += libegl > > diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > new file mode 100644 > > index 0000000000..92f023eab6 > > --- /dev/null > > +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch > > @@ -0,0 +1,93 @@ > > +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 > > +From: Alexey Brodkin > > +Date: Mon, 21 Feb 2022 18:28:00 +0300 > > +Subject: [PATCH] Add support for ARC processors > > + > > +Signed-off-by: Alexey Brodkin > > Upstream status of this patch? I may have missed it, but as far as I know there has not been any activity in WebKit's Bugzilla regarding ARC support. While I am do now much about ARC, the changes do not look particularly low-level, so feel free to add me in CC in the relevant Bugzilla issues and I can try to help get them reviewed -- make sure to take a look at the contribution guide if you haven't already: https://webkit.org/contributing-code/ Cheers, -Adrian > > +--- > > + CMakeLists.txt | 4 +++- > > + Source/JavaScriptCore/CMakeLists.txt | 3 ++- > > + Source/WTF/wtf/Platform.h | 8 ++++++++ > > + Source/WTF/wtf/dtoa/utils.h | 2 +- > > + Source/cmake/OptionsQt.cmake | 4 ++++ > > + 5 files changed, 18 insertions(+), 3 deletions(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 31a2ea1fd..f0dfbda5b 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) > > + else () > > + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) > > + endif () > > +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > > ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") > > ++ set(WTF_CPU_ARC 1) > > ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") > > + set(WTF_CPU_ARM 1) > > + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") > > + set(WTF_CPU_ARM64 1) > > +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt > > +index 937b3ed00..205dde288 100644 > > +--- a/Source/JavaScriptCore/CMakeLists.txt > > ++++ b/Source/JavaScriptCore/CMakeLists.txt > > +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) > > + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) > > + endif () > > + > > +-if (WTF_CPU_ARM) > > ++if (WTF_CPU_ARC) > > ++elseif (WTF_CPU_ARM) > > + elseif (WTF_CPU_ARM64) > > + elseif (WTF_CPU_ALPHA) > > + elseif (WTF_CPU_HPPA) > > +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h > > +index 5717f3ea1..b327ed693 100644 > > +--- a/Source/WTF/wtf/Platform.h > > ++++ b/Source/WTF/wtf/Platform.h > > +@@ -349,6 +349,14 @@ > > + > > + #endif /* ARM */ > > + > > ++/* CPU(ARC) - ARC */ > > ++#if defined(__arc__) > > ++#define WTF_CPU_ARC 1 > > ++#if defined(__BIG_ENDIAN__) > > ++#define WTF_CPU_BIG_ENDIAN 1 > > ++#endif > > ++#endif > > ++ > > + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) > > + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 > > + #endif > > +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h > > +index 889642cee..8f1e9933e 100644 > > +--- a/Source/WTF/wtf/dtoa/utils.h > > ++++ b/Source/WTF/wtf/dtoa/utils.h > > +@@ -49,7 +49,7 @@ > > + defined(__ARMEL__) || \ > > + defined(_MIPS_ARCH_MIPS32R2) > > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > > +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) > > ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) > > + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 > > + #elif defined(_M_IX86) || defined(__i386__) > > + #if defined(_WIN32) > > +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake > > +index ec6081de0..e1a5efc1e 100644 > > +--- a/Source/cmake/OptionsQt.cmake > > ++++ b/Source/cmake/OptionsQt.cmake > > +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) > > + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > > + endif () > > + > > ++if (WTF_CPU_ARC) > > ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) > > ++endif () > > ++ > > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) > > + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) > > + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) > > +-- > > +2.25.1 > > + -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From Alexey.Brodkin at synopsys.com Wed Mar 16 08:18:55 2022 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Wed, 16 Mar 2022 08:18:55 +0000 Subject: [Buildroot] [PATCH] qt5: enable JS and WebKit for ARC Message-ID: Hi Arnout, Adrian, > On Tue, 15 Mar 2022 22:47:10 +0100 Arnout Vandecappelle wrote: > > > > > > On 09/03/2022 14:28, Alexey Brodkin via buildroot wrote: > > > This patch adds support of ARC architecture in Qt's JS core and Webkit. > > > The change itself is quite straight-forward: > > > > > > 1. Enable JS core for ARC > > > 2. Make sure so-called "large memory model" is used, > > > i.e. relocations with long jumps are being generated for global > > > symbols, as otherwise insanely huge libqt5webkit.so fails to link > > > because some symbols might be more than 32 MiB away from each other. > > > 3. Make the original WebKit build system aware of yet another CPU > > > architecture with explicitly disabled JIT in JS core for ARC. > > > [snip] > > > +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 > > > +From: Alexey Brodkin > > > +Date: Mon, 21 Feb 2022 18:28:00 +0300 > > > +Subject: [PATCH] Add support for ARC processors > > > + > > > +Signed-off-by: Alexey Brodkin > > > > Upstream status of this patch? > > I may have missed it, but as far as I know there has not been any activity in > WebKit's Bugzilla regarding ARC support. Correct, ARC changes for WebKit were never submitted upstream. And even though I realize how that would benefit us in a long run, given my primarily goal is in Qt's WebKit (which is one on downstream projects for upstream WebKit) I'm not sure how much time it will take for that change to become a part of Qt we build in Buildroot ;) Yet, I'll try to do that soonish now ;) > While I am do now much about ARC, the > changes do not look particularly low-level, so feel free to add me in CC in > the relevant Bugzilla issues and I can try to help get them reviewed -- make > sure to take a look at the contribution guide if you haven't already: > > https://webkit.org/contributing-code/ Thanks for the offer, will keep that in mind! And thanks for taking care, Arnout! -Alexey From theo.lebrun at bootlin.com Wed Mar 16 09:22:00 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Wed, 16 Mar 2022 10:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix default device behaviour Message-ID: <20220316092200.66623-1-theo.lebrun@bootlin.com> This patch has been applied upstream and is required to allow having default devices on non x86_64 platforms with WirePlumber v0.4.8. https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 Signed-off-by: Th?o Lebrun --- .../0001-fix-non-x86_64-architectures.patch | 212 ++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch new file mode 100644 index 0000000000..27b6f034b2 --- /dev/null +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch @@ -0,0 +1,212 @@ +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 9 Feb 2022 07:59:59 -0500 +Subject: [PATCH] spa-json: fix va_list APIs for different architectures + +The va_list type might not always be a pointer in some architectures, so we +cannot guarantee it will be modified after using it for a second time in another +function. This fixes the issue by using macros so args does not get copied, and +always gets modified when using it more than once. +--- + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- + 1 file changed, 80 insertions(+), 76 deletions(-) + +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c +index f14f395d..c5e59a3e 100644 +--- a/lib/wp/spa-json.c ++++ b/lib/wp/spa-json.c +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) + wp_spa_json_builder_new_formatted ("\"%s\"", value)); + } + +-static void +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- wp_spa_json_builder_add_null (self); +- break; +- case 'b': +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); +- break; +- case 'i': +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); +- break; +- case 'f': +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); +- break; +- case 's': +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); +- break; +- case 'J': +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); +- break; +- default: +- return; +- } +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_builder_add_value(self,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ wp_spa_json_builder_add_null (self); \ ++ break; \ ++ case 'b': \ ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ ++ break; \ ++ case 'i': \ ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ ++ break; \ ++ case 'f': \ ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ ++ break; \ ++ case 's': \ ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ ++ break; \ ++ case 'J': \ ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ ++ break; \ ++ default: \ ++ break; \ ++ } \ ++} while(false) + + /*! + * \brief Creates a spa json of type array +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) + return res; + } + +-static gboolean +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- if (!spa_json_is_null (data, len)) +- return FALSE; +- break; +- case 'b': +- if (!wp_spa_json_parse_boolean_internal (data, len, +- va_arg(args, gboolean *))) +- return FALSE; +- break; +- case 'i': +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) +- return FALSE; +- break; +- case 'f': +- if (spa_json_parse_float (data, len, +- (float *)va_arg(args, double *)) < 0) +- return FALSE; +- break; +- case 's': { +- gchar *str = wp_spa_json_parse_string_internal (data, len); +- if (!str) +- return FALSE; +- *va_arg(args, gchar **) = str; +- break; +- } +- case 'J': { +- WpSpaJson *j = wp_spa_json_new (data, len); +- if (!j) +- return FALSE; +- *va_arg(args, WpSpaJson **) = j; +- break; +- } +- default: +- return FALSE; +- } +- return TRUE; +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_parse_value(data,len,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ if (!spa_json_is_null (data, len)) \ ++ return FALSE; \ ++ break; \ ++ case 'b': \ ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ ++ va_arg(args, gboolean *))) \ ++ return FALSE; \ ++ break; \ ++ case 'i': \ ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 'f': \ ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 's': { \ ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ ++ if (!str) \ ++ return FALSE; \ ++ *va_arg(args, gchar **) = str; \ ++ break; \ ++ } \ ++ case 'J': { \ ++ WpSpaJson *j = wp_spa_json_new (data, len); \ ++ if (!j) \ ++ return FALSE; \ ++ *va_arg(args, WpSpaJson **) = j; \ ++ break; \ ++ } \ ++ default: \ ++ return FALSE; \ ++ } \ ++} while(false) + + /*! + * \brief Parses the object property values of a spa json object +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) + value = g_value_get_boxed (&item); + + if (g_strcmp0 (key_str, lookup_key) == 0) { +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) +- return FALSE; ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); + lookup_key = va_arg(args, const gchar *); + if (!lookup_key) + return TRUE; +@@ -1366,9 +1363,12 @@ gboolean + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, + va_list args) + { +- return wp_spa_json_parser_advance (self) && +- wp_spa_json_parse_value (self->curr.cur, +- self->curr.end - self->curr.cur, fmt, args); ++ if (wp_spa_json_parser_advance (self)) { ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ fmt, args); ++ return TRUE; ++ } ++ return FALSE; + } + + /*! +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) + if (!format) + return TRUE; + +- /* parse value */ +- if (!wp_spa_json_parser_get_value (self, format, args)) ++ /* advance */ ++ if (!wp_spa_json_parser_advance (self)) + return FALSE; ++ ++ /* parse value */ ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ format, args); + } while (TRUE); + + return FALSE; +-- +GitLab + -- 2.35.1 From theo.lebrun at bootlin.com Wed Mar 16 09:27:46 2022 From: theo.lebrun at bootlin.com (=?utf-8?q?Th=C3=A9o_Lebrun?=) Date: Wed, 16 Mar 2022 10:27:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: bump version to 0.4.8 In-Reply-To: <80b6dcef-8b08-5ee0-9c82-b10758a5af54@mind.be> References: <20220228161345.378966-1-theo.lebrun@bootlin.com> <80b6dcef-8b08-5ee0-9c82-b10758a5af54@mind.be> Message-ID: On Tue Mar 15, 2022 at 10:11 PM CET, Arnout Vandecappelle wrote: > On 28/02/2022 17:13, Th?o Lebrun via buildroot wrote: > > Changelog: > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/e14bb72dcc85e2130d0ea96768e5ae3b375a041e/NEWS.rst > > > > Signed-off-by: Th?o Lebrun > > Applied to master, thanks. Thanks. Sadly, this latest version is broken and requires a patch to support setting a default device in WirePlumber. I just sent a patch which is the commit that was sent upstream to fix it. It is required until upstream gets a new version (no date announced). Regards, Th?o > > Regards, > Arnout > > > --- > > package/wireplumber/wireplumber.hash | 2 +- > > package/wireplumber/wireplumber.mk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash > > index 561fcc2e5e..206d7d15af 100644 > > --- a/package/wireplumber/wireplumber.hash > > +++ b/package/wireplumber/wireplumber.hash > > @@ -1,3 +1,3 @@ > > # Locally calculated > > -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 > > +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 > > sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE > > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > > index 2dab6042ea..3bf7cece45 100644 > > --- a/package/wireplumber/wireplumber.mk > > +++ b/package/wireplumber/wireplumber.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -WIREPLUMBER_VERSION = 0.4.2 > > +WIREPLUMBER_VERSION = 0.4.8 > > WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 > > WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) > > WIREPLUMBER_LICENSE = MIT From rsassen at comecer.com Wed Mar 16 10:08:40 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 16 Mar 2022 10:08:40 +0000 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations. Signed-off-by: Rutger Sassen --- Changes v1 -> v2: - instead of always copying overlay_map.dtb, make it configurable (suggested by Peter Seiderer) - do not copy README since it a special case, only needed when installing overlays to a non-standard location (suggested by Peter Seiderer) package/rpi-firmware/Config.in | 9 +++++++++ package/rpi-firmware/rpi-firmware.mk | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 8070dc3019..13efa3dc87 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -93,6 +93,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS overlays, to support HATs (Hardware Attached on Top, add-on modules). +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + bool "Install DTB overlay map" + default n + depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + help + Say 'y' here if you need to support multiple hardware targets + and you need target dependent mapping of overlay names to one + of several overlay implementations. + config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG bool "vcdbg" depends on BR2_arm # prebuilt arm binary, rpi-userland diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..800b560070 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS endef endif +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ +endef +endif + # Install prebuilt libraries if RPI_USERLAND not enabled ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) define RPI_FIRMWARE_INSTALL_TARGET_LIB @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(RPI_FIRMWARE_INSTALL_CONFIG) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) endef $(eval $(generic-package)) -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From anssi.hannula at bitwise.fi Wed Mar 16 10:12:23 2022 From: anssi.hannula at bitwise.fi (Anssi Hannula) Date: Wed, 16 Mar 2022 12:12:23 +0200 Subject: [Buildroot] [PATCH] pkg-generic: fix rdepends and phony targets of virtual packages Message-ID: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> Virtual packages are not added to the _RDEPENDENCIES list of packages that they depend on (i.e. their provider). This causes -show-rdepends to not show the virtual package and -show-recursive-rdepends to miss all the packages that transitively depend on via the virtual package. The virtual make targets (e.g. -show-info) are also not marked as phony for virtual packages. To fix those issues, remove most of the special handling of virtual packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as well. This also allows removal of some duplicated code in pkg-generic.mk and a now unneeded special condition in CHECK_ONE_DEPENDENCY. Still keep the virtual package out of PACKAGES since there is e.g. no need to rsync per-package target dir to global target dir. I am not aware of any showstoppers preventing addition to PACKAGES as well, though, so it is probably just an optimization. Signed-off-by: Anssi Hannula --- I encountered this while using -show-recursive-rdepends to determine which packages to dirclean after modification of a (non-virtual) in per-package mode. The current virtual vs. real distinction didn't seem worth the risk of unintentional differences so I dropped it, but I'm not too familiar with the code so I could have missed something. In case I did and this is not a good idea, one less intrusive option would be to split the common-to-virtual-and-real-packages code to be under a new separate conditional block. Makefile | 2 -- package/pkg-generic.mk | 24 +++++------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 4f693d40a9..9e875dd8d8 100644 --- a/Makefile +++ b/Makefile @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) define CHECK_ONE_DEPENDENCY ifeq ($$($(2)_TYPE),target) -ifeq ($$($(2)_IS_VIRTUAL),) ifneq ($$($$($(2)_KCONFIG_VAR)),y) $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ has added it to its _DEPENDENCIES variable without selecting it or \ depending on it from Config.in) endif endif -endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..a0d6198edc 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1064,15 +1064,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the -# package being enabled. We handle three cases: the special Linux -# kernel case, the bootloaders case, and the normal packages case. -# Virtual packages are handled separately (see below). +# package being enabled. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) +else ifeq ($$($(2)_IS_VIRTUAL),YES) +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif @@ -1178,7 +1178,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) +ifneq ($$($(2)_IS_VIRTUAL),YES) PACKAGES += $(1) +endif ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) @@ -1268,22 +1270,6 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif -# Virtual packages are not built but it's useful to allow them to have -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR - -ifneq ($$($(2)_PERMISSIONS),) -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) -endif -ifneq ($$($(2)_DEVICES),) -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) -endif -ifneq ($$($(2)_USERS),) -PACKAGES_USERS += $$($(2)_USERS)$$(sep) -endif -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) - endif # $(2)_KCONFIG_VAR endef # inner-generic-package -- 2.34.1 From fperrad at gmail.com Wed Mar 16 10:57:53 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 16 Mar 2022 11:57:53 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to 3.4.3 Message-ID: <20220316105753.1134088-1-francois.perrad@gadz.org> see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda..e92399871 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda..0bb468ced 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING -- 2.32.0 From rsassen at comecer.com Wed Mar 16 11:09:20 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Wed, 16 Mar 2022 11:09:20 +0000 Subject: [Buildroot] package gdk-pixbuf relocatable issue Message-ID: Hello, A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). My configuration: Host: Debian 10 (buster) Buildroot version: 2022-02 Target: Aarch64 (raspberry pi cm3) Package: gdk-pixbuf The problematic snippets from gdk-pixbuf.mk: ============== HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ -Drelocatable=true \ -Dman=false ============== # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. # And since the cache file will contain absolute host directory names we # need to sanitize (strip) them. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE endif ============== Best regards, Rutger Sassen p.s. please ignore the email disclaimer that is automatically added to all my outgoing mail... This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From grant.b.edwards at gmail.com Wed Mar 16 16:22:54 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Wed, 16 Mar 2022 16:22:54 -0000 (UTC) Subject: [Buildroot] Can buildroot use existing host fakeroot? Message-ID: I maintain some firmware that uses buildroot 2016.11.2 (with some local package upgrades). Unfortunately, it seems I can no longer do builds because host-fakeroot won't compile (it's too old for my kernel/libc version of stat?). I tried updating the fakeroot package, but that won't build because it doesn't know how to build host-acl. [My target doesn't even support ACLs, so trying to get that installed and working seems a bit pointless.] My development hosts all have working versions of fakeroot already installed. Is there any way I can just tell buildroot to use the existing fakeroot instead of trying to build its own private copy? -- Grant From grant.b.edwards at gmail.com Wed Mar 16 18:10:01 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Wed, 16 Mar 2022 18:10:01 -0000 (UTC) Subject: [Buildroot] Can buildroot use existing host fakeroot? References: Message-ID: On 2022-03-16, Grant Edwards wrote: > I maintain some firmware that uses buildroot 2016.11.2 (with some > local package upgrades). Unfortunately, it seems I can no longer do > builds because host-fakeroot won't compile (it's too old for my > kernel/libc version of stat?). I've updated fakeroot, acl, and attr packages so that I can build again, but I'm still curious about whether you can tell buildroot to use pre-existing versions of host-side tools like fakeroot. -- Grant From yann.morin.1998 at free.fr Wed Mar 16 18:17:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 19:17:39 +0100 Subject: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package In-Reply-To: <20220315091041.015209a9@windsurf> References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-3-clement.leger@bootlin.com> <20220314203149.GW283544@scaer> <20220315091041.015209a9@windsurf> Message-ID: <20220316181739.GY283544@scaer> Thomas, Cl?ment, All, On 2022-03-15 09:10 +0100, Thomas Petazzoni spake thusly: > On Mon, 14 Mar 2022 21:31:49 +0100 > "Yann E. MORIN" wrote: > > > I think the host variant should automatically inherit that setting from > > the target variant. > > > > Afterall, it seems reasonable to expect that the download of the host > > and target variants should usually be exactly the same. > > I agree, but I thought this was really too much outside of what Cl?ment > is trying to achieve in this patch series (I helped Cl?ment internally > by reviewing/discussing this patch series, and indeed identified the > fact that those variables should be inherited between target/host). > > But of course if as a maintainer you think this is something that is > really needed as a pre-requisite to merge those patches, we can ask > Cl?ment to work on this :-) I think I even provided the patch in my review... ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Wed Mar 16 18:24:40 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 19:24:40 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix eglconvenience compile (missing QList include) Message-ID: <20220316182440.17393-1-ps.report@gmx.net> - add 0008-eglconvenience-add-missing-QList-include.patch to fix eglconvenience compile (missing QList include) Fixes: qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | ^ Signed-off-by: Peter Seiderer --- ...onvenience-add-missing-QList-include.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 0000000000..c7127291e4 --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + -- 2.35.1 From ps.report at gmx.net Wed Mar 16 18:35:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 19:35:58 +0100 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: References: Message-ID: <20220316193558.11caac5b@gmx.net> Hello Avijit, On Tue, 15 Mar 2022 19:04:02 -0600, Avijit Das wrote: > Hi, > > I am building Buildroot for an imx8mm board. The HDMI display is up. I > validated the display using the fb-test. I am trying to enable a graphics > library, either gtk3 or qt5. > > *gtk3 * > When I am enabling the gtk3 library, if I run the demo application, I am > getting the following error. > > # /usr/bin/gtk3-demo > > (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: > # > > I have tried setting the display to localhost:0.0, did not work. > > *QT5* > The widget library is not building. There is a compilation error: > > qkeyeventtransition.o .obj/qmouseeventtransition.o > .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o > .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o > .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o > .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so > -lpthread -lrt -lpthread -ldl > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 > rm -f ../../lib/libQt5Widgets.so.5.15.8 > mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 > rm -f ../../lib/libQt5Widgets.so > rm -f ../../lib/libQt5Widgets.so.5 > rm -f ../../lib/libQt5Widgets.so.5.15 > mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so > mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 > mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 > make[2]: *** [Makefile:51: sub-src-make_first] Error 2 > make[1]: *** [package/pkg-generic.mk:292: > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] > Error 2 > make: *** [Makefile:84: _all] Error 2 > > I have attached the config file. Can you please suggest? With your defconfig I get the following error (a lot of lines above in the log): qeglconvenience.cpp: In function ?bool q_hasEglExtension(EGLDisplay, const char*)?: qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | This can be (compile) fixed by this (buildroot) patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220316182440.17393-1-ps.report at gmx.net/ Despite of this error I get (with your provided defconfig): [4/5] Compiling C object src/libepoxy.so.0.0.0.p/dispatch_common.c.o FAILED: src/libepoxy.so.0.0.0.p/dispatch_common.c.o .../host/bin/aarch64-buildroot-linux-gnu-gcc -Isrc/libepoxy.so.0.0.0.p -Isrc -I../src -Iinclude -I../include -Iinclude/epoxy -fdiagnostics-color=always -Wall -Winvalid-pch -std=gnu99 -O3 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -fPIC -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -Wno-int-conversion -fvisibility=hidden -MD -MQ src/libepoxy.so.0.0.0.p/dispatch_common.c.o -MF src/libepoxy.so.0.0.0.p/dispatch_common.c.o.d -o src/libepoxy.so.0.0.0.p/dispatch_common.c.o -c ../src/dispatch_common.c In file included from include/epoxy/egl_generated.h:11, from ../include/epoxy/egl.h:46, from ../src/dispatch_common.h:59, from ../src/dispatch_common.c:174: .../host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:145:10: fatal error: X11/Xlib.h: No such file or directory 145 | #include | ^~~~~~~~~~~~ compilation terminated. ninja: build stopped: subcommand failed. make[1]: *** [package/pkg-generic.mk:292: /home/seiderer/Work/Buildroot/build_imx8mmevk_qt5_001/build/libepoxy-1.5.9/.stamp_built] Error 1 make: *** [Makefile:23: _all] Error 2 Regards, Peter > > Thanks, > Avijit From james.hilliard1 at gmail.com Wed Mar 16 19:05:45 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Mar 2022 13:05:45 -0600 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.25 In-Reply-To: <20220316190545.3618918-1-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> Message-ID: <20220316190545.3618918-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 1a58ec88e8..1c34aa0a90 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 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz +sha256 3f138e03301beb2afc7b385a62f56db17059137857ab579f269c4e441783e760 iwd-1.25.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 548b508edb..fc10c5f1d4 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.24 +IWD_VERSION = 1.25 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ -- 2.25.1 From james.hilliard1 at gmail.com Wed Mar 16 19:05:44 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 16 Mar 2022 13:05:44 -0600 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 Message-ID: <20220316190545.3618918-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 267b44e5f0..9735865eae 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.48 +ELL_VERSION = 0.49 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ -- 2.25.1 From ps.report at gmx.net Wed Mar 16 19:43:32 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 20:43:32 +0100 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 In-Reply-To: <20220316190545.3618918-1-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> Message-ID: <20220316204332.4cabeba1@gmx.net> Hello James, On Wed, 16 Mar 2022 13:05:44 -0600, James Hilliard wrote: > Signed-off-by: James Hilliard Thanks for the patch/update, one nitpick... An (upstream) change log entry would be nice, see [1] for an example... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/ell?id=c01a8397d9923c38b14a0d083ba1cf3ee3a3049a > --- > 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz > +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 267b44e5f0..9735865eae 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.48 > +ELL_VERSION = 0.49 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ From ps.report at gmx.net Wed Mar 16 19:44:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 20:44:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/iwd: bump to version 1.25 In-Reply-To: <20220316190545.3618918-2-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> <20220316190545.3618918-2-james.hilliard1@gmail.com> Message-ID: <20220316204446.7d203db4@gmx.net> Hello James, On Wed, 16 Mar 2022 13:05:45 -0600, James Hilliard wrote: > Signed-off-by: James Hilliard Thanks for the patch/update, one nitpick... An (upstream) change log entry would be nice, see [1] for an example... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/iw?id=ad0515252a25e94b85184102a66e93a17ad3c65e > --- > package/iwd/iwd.hash | 2 +- > package/iwd/iwd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash > index 1a58ec88e8..1c34aa0a90 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 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz > +sha256 3f138e03301beb2afc7b385a62f56db17059137857ab579f269c4e441783e760 iwd-1.25.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk > index 548b508edb..fc10c5f1d4 100644 > --- a/package/iwd/iwd.mk > +++ b/package/iwd/iwd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -IWD_VERSION = 1.24 > +IWD_VERSION = 1.25 > IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz > IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless > IWD_LICENSE = LGPL-2.1+ From ps.report at gmx.net Wed Mar 16 19:49:22 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 20:49:22 +0100 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: References: <20220316193558.11caac5b@gmx.net> Message-ID: <20220316204922.47f51090@gmx.net> Hello Avijit, please keep buildroot at busybox.net in CC On Wed, 16 Mar 2022 12:39:04 -0600, Avijit Das wrote: > Hi Peter, > > I have compiled the X11 library when I got this error. > > make xlib_libX11 && make So the gtk3 compile/test was from another defconfig? Did you start the X11 server before running the gtk3-demo? But not much run-time help/advice from my side as I have no suitable hardware for testing myself... Regards, Peter > > Thanks, > Avijit > > On Wed, Mar 16, 2022 at 12:36 PM Peter Seiderer wrote: > > > Hello Avijit, > > > > On Tue, 15 Mar 2022 19:04:02 -0600, Avijit Das > > wrote: > > > > > Hi, > > > > > > I am building Buildroot for an imx8mm board. The HDMI display is up. I > > > validated the display using the fb-test. I am trying to enable a graphics > > > library, either gtk3 or qt5. > > > > > > *gtk3 * > > > When I am enabling the gtk3 library, if I run the demo application, I am > > > getting the following error. > > > > > > # /usr/bin/gtk3-demo > > > > > > (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: > > > # > > > > > > I have tried setting the display to localhost:0.0, did not work. > > > > > > *QT5* > > > The widget library is not building. There is a compilation error: > > > > > > qkeyeventtransition.o .obj/qmouseeventtransition.o > > > .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o > > > .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o > > > .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o > > > .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so > > > -lpthread -lrt -lpthread -ldl > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 > > > rm -f ../../lib/libQt5Widgets.so.5.15.8 > > > mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 > > > rm -f ../../lib/libQt5Widgets.so > > > rm -f ../../lib/libQt5Widgets.so.5 > > > rm -f ../../lib/libQt5Widgets.so.5.15 > > > mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so > > > mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 > > > mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 > > > make[2]: *** [Makefile:51: sub-src-make_first] Error 2 > > > make[1]: *** [package/pkg-generic.mk:292: > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] > > > Error 2 > > > make: *** [Makefile:84: _all] Error 2 > > > > > > I have attached the config file. Can you please suggest? > > > > With your defconfig I get the following error (a lot of lines above in the > > log): > > > > qeglconvenience.cpp: In function ?bool q_hasEglExtension(EGLDisplay, > > const char*)?: > > qeglconvenience.cpp:418:23: error: variable ?QList > > extensions? has initializer but incomplete type > > 418 | QList extensions = > > | ^~~~~~~~~~ > > qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class > > QList? > > 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' > > '); > > | > > > > > > This can be (compile) fixed by this (buildroot) patch: > > > > > > https://patchwork.ozlabs.org/project/buildroot/patch/20220316182440.17393-1-ps.report at gmx.net/ > > > > > > Despite of this error I get (with your provided defconfig): > > > > [4/5] Compiling C object src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > FAILED: src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > .../host/bin/aarch64-buildroot-linux-gnu-gcc -Isrc/libepoxy.so.0.0.0.p > > -Isrc -I../src -Iinclude -I../include -Iinclude/epoxy > > -fdiagnostics-color=always -Wall -Winvalid-pch -std=gnu99 -O3 > > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 > > -fPIC -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes > > -Wmissing-prototypes -Wnested-externs -Wbad-function-cast > > -Wold-style-definition -Wdeclaration-after-statement -Wunused > > -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute > > -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull > > -Werror=init-self -Werror=main -Werror=missing-braces > > -Werror=sequence-point -Werror=return-type -Werror=trigraphs > > -Werror=array-bounds -Werror=write-strings -Werror=address > > -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast > > -fno-strict-aliasing -Wno-int-conversion -fvisibility=hidden -MD -MQ > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -MF > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o.d -o > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -c ../src/dispatch_common.c > > In file included from include/epoxy/egl_generated.h:11, > > from ../include/epoxy/egl.h:46, > > from ../src/dispatch_common.h:59, > > from ../src/dispatch_common.c:174: > > > > .../host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:145:10: > > fatal error: X11/Xlib.h: No such file or directory > > 145 | #include > > | ^~~~~~~~~~~~ > > compilation terminated. > > ninja: build stopped: subcommand failed. > > make[1]: *** [package/pkg-generic.mk:292: > > /home/seiderer/Work/Buildroot/build_imx8mmevk_qt5_001/build/libepoxy-1.5.9/.stamp_built] > > Error 1 > > make: *** [Makefile:23: _all] Error 2 > > > > Regards, > > Peter > > > > > > > > Thanks, > > > Avijit > > > > From avijitnsec at gmail.com Wed Mar 16 19:51:48 2022 From: avijitnsec at gmail.com (Avijit Das) Date: Wed, 16 Mar 2022 13:51:48 -0600 Subject: [Buildroot] Not able to enable GUI library on Buildroot In-Reply-To: <20220316204922.47f51090@gmx.net> References: <20220316193558.11caac5b@gmx.net> <20220316204922.47f51090@gmx.net> Message-ID: Hello Peter, Yes, I have tried X11 and Wayland both. Thanks for trying out. I'll keep trying. Will keep you posted. Thanks, Avijit On Wed, Mar 16, 2022 at 1:49 PM Peter Seiderer wrote: > Hello Avijit, > > please keep buildroot at busybox.net in CC > > On Wed, 16 Mar 2022 12:39:04 -0600, Avijit Das > wrote: > > > Hi Peter, > > > > I have compiled the X11 library when I got this error. > > > > make xlib_libX11 && make > > So the gtk3 compile/test was from another defconfig? > > Did you start the X11 server before running the gtk3-demo? > > But not much run-time help/advice from my side as I have no suitable > hardware > for testing myself... > > Regards, > Peter > > > > > > Thanks, > > Avijit > > > > On Wed, Mar 16, 2022 at 12:36 PM Peter Seiderer > wrote: > > > > > Hello Avijit, > > > > > > On Tue, 15 Mar 2022 19:04:02 -0600, Avijit Das > > > wrote: > > > > > > > Hi, > > > > > > > > I am building Buildroot for an imx8mm board. The HDMI display is up. > I > > > > validated the display using the fb-test. I am trying to enable a > graphics > > > > library, either gtk3 or qt5. > > > > > > > > *gtk3 * > > > > When I am enabling the gtk3 library, if I run the demo application, > I am > > > > getting the following error. > > > > > > > > # /usr/bin/gtk3-demo > > > > > > > > (gtk3-demo:350): Gtk-WARNING **: 01:21:03.518: cannot open display: > > > > # > > > > > > > > I have tried setting the display to localhost:0.0, did not work. > > > > > > > > *QT5* > > > > The widget library is not building. There is a compilation error: > > > > > > > > qkeyeventtransition.o .obj/qmouseeventtransition.o > > > > .obj/qbasickeyeventtransition.o .obj/qbasicmouseeventtransition.o > > > > .obj/qgraphicseffect.o .obj/qpixmapfilter.o .obj/qrc_qstyle.o > > > > .obj/qrc_qmessagebox.o .obj/moc_qwidgetrepaintmanager_p.o > > > > .obj/moc_qwidget_p.o .obj/moc_qpixmapstyle_p.o -latomic > > > > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Gui.so > > > > > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/lib/libQt5Core.so > > > > > -lpthread -lrt -lpthread -ldl > > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so > > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5 > > > > ln -s libQt5Widgets.so.5.15.8 libQt5Widgets.so.5.15 > > > > rm -f ../../lib/libQt5Widgets.so.5.15.8 > > > > mv -f libQt5Widgets.so.5.15.8 ../../lib/libQt5Widgets.so.5.15.8 > > > > rm -f ../../lib/libQt5Widgets.so > > > > rm -f ../../lib/libQt5Widgets.so.5 > > > > rm -f ../../lib/libQt5Widgets.so.5.15 > > > > mv -f libQt5Widgets.so ../../lib/libQt5Widgets.so > > > > mv -f libQt5Widgets.so.5 ../../lib/libQt5Widgets.so.5 > > > > mv -f libQt5Widgets.so.5.15 ../../lib/libQt5Widgets.so.5.15 > > > > make[2]: *** [Makefile:51: sub-src-make_first] Error 2 > > > > make[1]: *** [package/pkg-generic.mk:292: > > > > > > > > /home/avijit/buildroot/output/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/.stamp_built] > > > > > Error 2 > > > > make: *** [Makefile:84: _all] Error 2 > > > > > > > > I have attached the config file. Can you please suggest? > > > > > > With your defconfig I get the following error (a lot of lines above in > the > > > log): > > > > > > qeglconvenience.cpp: In function ?bool q_hasEglExtension(EGLDisplay, > > > const char*)?: > > > qeglconvenience.cpp:418:23: error: variable ?QList > > > extensions? has initializer but incomplete type > > > 418 | QList extensions = > > > | ^~~~~~~~~~ > > > qeglconvenience.cpp:420:65: error: invalid use of incomplete type > ?class > > > QList? > > > 420 | (eglQueryString(display, > EGL_EXTENSIONS))).split(' > > > '); > > > | > > > > > > > > > This can be (compile) fixed by this (buildroot) patch: > > > > > > > > > > https://patchwork.ozlabs.org/project/buildroot/patch/20220316182440.17393-1-ps.report at gmx.net/ > > > > > > > > > Despite of this error I get (with your provided defconfig): > > > > > > [4/5] Compiling C object src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > > FAILED: src/libepoxy.so.0.0.0.p/dispatch_common.c.o > > > .../host/bin/aarch64-buildroot-linux-gnu-gcc > -Isrc/libepoxy.so.0.0.0.p > > > -Isrc -I../src -Iinclude -I../include -Iinclude/epoxy > > > -fdiagnostics-color=always -Wall -Winvalid-pch -std=gnu99 -O3 > > > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os > -g0 > > > -fPIC -Wpointer-arith -Wmissing-declarations -Wformat=2 > -Wstrict-prototypes > > > -Wmissing-prototypes -Wnested-externs -Wbad-function-cast > > > -Wold-style-definition -Wdeclaration-after-statement -Wunused > > > -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute > > > -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull > > > -Werror=init-self -Werror=main -Werror=missing-braces > > > -Werror=sequence-point -Werror=return-type -Werror=trigraphs > > > -Werror=array-bounds -Werror=write-strings -Werror=address > > > -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast > > > -fno-strict-aliasing -Wno-int-conversion -fvisibility=hidden -MD -MQ > > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -MF > > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o.d -o > > > src/libepoxy.so.0.0.0.p/dispatch_common.c.o -c ../src/dispatch_common.c > > > In file included from include/epoxy/egl_generated.h:11, > > > from ../include/epoxy/egl.h:46, > > > from ../src/dispatch_common.h:59, > > > from ../src/dispatch_common.c:174: > > > > > > > .../host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:145:10: > > > fatal error: X11/Xlib.h: No such file or directory > > > 145 | #include > > > | ^~~~~~~~~~~~ > > > compilation terminated. > > > ninja: build stopped: subcommand failed. > > > make[1]: *** [package/pkg-generic.mk:292: > > > > /home/seiderer/Work/Buildroot/build_imx8mmevk_qt5_001/build/libepoxy-1.5.9/.stamp_built] > > > Error 1 > > > make: *** [Makefile:23: _all] Error 2 > > > > > > Regards, > > > Peter > > > > > > > > > > > Thanks, > > > > Avijit > > > > > > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Wed Mar 16 20:37:34 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 21:37:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgcrypt: fix musl build Message-ID: <20220316203734.3081600-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 1.10.0 in commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d: In file included from ./jitterentropy.h:98, from ./jitterentropy-base.c:32, from ./rndjent.c:88: ./jitterentropy-base-user.h: In function 'jent_get_cachesize': ./jitterentropy-base-user.h:191:8: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] 191 | fd = open(file, O_RDONLY); | ^~~~ | popen ./jitterentropy-base-user.h:191:19: error: 'O_RDONLY' undeclared (first use in this function) 191 | fd = open(file, O_RDONLY); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f6182fca6a4e2ba29a89f770f17df691d7861f8d Signed-off-by: Fabrice Fontaine --- ...entropy-Include-fcntl-h-and-limits-h.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch new file mode 100644 index 0000000000..8f76f24c64 --- /dev/null +++ b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch @@ -0,0 +1,38 @@ +From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 3 Feb 2022 22:46:41 +0000 +Subject: [PATCH] jitterentropy: Include and + +* random/jitterentropy-base-user.h: Include for O_RDONLY +* random/jitterentropy-base-user.h: Include for LONG_MAX + +-- + +Fixes the build with musl libc. + +Signed-off-by: Heiko Becker + +[Retrieved from: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] +Signed-off-by: Fabrice Fontaine +--- + random/jitterentropy-base-user.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h +index 326dfbed..389106ff 100644 +--- a/random/jitterentropy-base-user.h ++++ b/random/jitterentropy-base-user.h +@@ -39,6 +39,9 @@ + * DAMAGE. + */ + ++#include ++#include ++ + #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H + #define GCRYPT_JITTERENTROPY_BASE_USER_H + +-- +2.11.0 + -- 2.35.1 From ps.report at gmx.net Wed Mar 16 20:39:18 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 21:39:18 +0100 Subject: [Buildroot] [PATCH v1] package/wget: bump version to 1.21.3 In-Reply-To: <20220315220531.2bac9c2d@windsurf> References: <20220311065042.8687-1-ps.report@gmx.net> <20220315220531.2bac9c2d@windsurf> Message-ID: <20220316213918.67ea4d94@gmx.net> Hello Thomas, On Tue, 15 Mar 2022 22:05:31 +0100, Thomas Petazzoni wrote: > Hello Peter, > > On Fri, 11 Mar 2022 07:50:42 +0100 > Peter Seiderer wrote: > > > - explicit set some default options (--without-metalink, --enable-opie, > > --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, > > --disable-assert) > > > > - add optional libpsl dependency > > > > - remove legacy --with-libidn option (see [1]), replace with > > new --enable-iri option in case libiconv and libidn2 are available > > > > - use explicit --with-libuuid option > > > > - add optional c-ares dependency > > > > For details see [2]. > > > > [1] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > > [2] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > > > > Signed-off-by: Peter Seiderer > > You're mixing up a minor version bump with a significant rework of the > package, which is unrelated to the version bump. This really needs > separate commit. Also, see below. Started as a minor/patch-level version bump....and did take a look at the configure.ac changes ;-), will split up the patch on next iteration... > > > > +WGET_CONF_OPTS = \ > > + --without-metalink \ > > + --enable-opie \ > > + --enable-digest \ > > + --enable-ntlm \ > > So opie, digest and ntlm enabled is the default? Yes (this is what I wanted to express in the commit log by 'explicit set some default options')... > > > + --disable-debug \ > > + --disable-valgrind-tests \ > > + --disable-assert Same here... > > + > > +ifeq ($(BR2_PACKAGE_LIBPSL),y) > > +WGET_CONF_OPTS += --with-libpsl > > +WGET_DEPENDENCIES += libpsl > > +else > > +WGET_CONF_OPTS += --without-libpsl > > +endif > > + > > ifeq ($(BR2_PACKAGE_GNUTLS),y) > > WGET_CONF_OPTS += --with-ssl=gnutls > > WGET_DEPENDENCIES += gnutls > > @@ -22,19 +38,18 @@ else > > WGET_CONF_OPTS += --without-ssl > > endif > > > > -ifeq ($(BR2_PACKAGE_LIBICONV),y) > > -WGET_DEPENDENCIES += libiconv > > -endif > > - > > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > > -WGET_CONF_OPTS += --with-libidn > > -WGET_DEPENDENCIES += libidn2 > > +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) > > This is very likely wrong. Indeed BR2_PACKAGE_LIBICONV=y is only > possible when the toolchain does *not* have locale support. When the > toolchain has locale support, iconv support is provided by the > toolchain itself. Ups, did misread the following configure.ac part: 780 AS_IF([test "X$iri" != "Xno"],[ 781 if test "X$am_cv_func_iconv" != "Xyes"; then 782 iri=no 783 if test "X$force_iri" = "Xyes"; then 784 AC_MSG_ERROR([Libiconv is required for IRIs support]) 785 else 786 AC_MSG_NOTICE([disabling IRIs because libiconv wasn't found]) 787 fi 788 fi 789 ]) > > Could you revisit this, and also clarify the interaction between > --enable-iri/--disable-iri on one side and > --with-libidn/--without-libidn on the other side? The old 'with-libidn/without-libidn' option is gone, libidn2 is checked via pkg-config, the new option is 'enable-iri/disable-iri' (or auto-detect)... Will update the patch (soon)...., thanks for review! Regards, Peter > > Thanks! > > Thomas From fontaine.fabrice at gmail.com Wed Mar 16 20:39:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 21:39:21 +0100 Subject: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests Message-ID: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 20:39:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 21:39:22 +0100 Subject: [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies In-Reply-To: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Message-ID: <20220316203922.3081843-2-fontaine.fabrice@gmail.com> libminiupnpc can be statically built with or without binfmt flat since version 1.7 and https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d Signed-off-by: Fabrice Fontaine --- package/libminiupnpc/Config.in | 6 ------ package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ package/transmission/Config.in | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225..51f4b43bbb 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 0633ccd234..52fe9849f2 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif + $(eval $(cmake-package)) diff --git a/package/transmission/Config.in b/package/transmission/Config.in index aaed7ec111..eb51ccf862 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_TRANSMISSION bool "transmission" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on !BR2_BINFMT_FLAT # libminiupnpc, libnatpmp - depends on !BR2_STATIC_LIBS # libminiupnpc, libnatpmp + depends on !BR2_BINFMT_FLAT # libnatpmp + depends on !BR2_STATIC_LIBS # libnatpmp select BR2_PACKAGE_ZLIB select BR2_PACKAGE_DHT select BR2_PACKAGE_OPENSSL -- 2.35.1 From ps.report at gmx.net Wed Mar 16 20:45:38 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 21:45:38 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220316214538.1d7ff89f@gmx.net> Hello Rutger, On Wed, 16 Mar 2022 10:08:40 +0000, "Sassen, Rutger" wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > package/rpi-firmware/Config.in | 9 +++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 16 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index 8070dc3019..13efa3dc87 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). Would have expected +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + bool "Install DTB overlay map" > + default n instead of this 'depends' line > + depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need target dependent mapping of overlay names to one > + of several overlay implementations. > + And the endif here + +endif Maybe good to mention 'overlay_map.dtb' explicit in the help text like? + of several overlay implementations via overlay_map.dtb file. Regards, Peter > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) From fontaine.fabrice at gmail.com Wed Mar 16 21:22:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:15 +0100 Subject: [Buildroot] [PATCH 1/6] package/zynaddsubfx: fix PluginEnable option Message-ID: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Replace False by OFF when setting PluginEnable option Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede..c8d64f5ce8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:16 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:16 +0100 Subject: [Buildroot] [PATCH 2/6] package/zynaddsubfx: disable tests In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-2-fontaine.fabrice@gmail.com> Disable tests which are enabled by default since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index c8d64f5ce8..b2eb1921fa 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:17 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:17 +0100 Subject: [Buildroot] [PATCH 3/6] package/zynaddsubfx: fix atomic linking In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-3-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: libzynaddsubfx_core.a(Master.cpp.o): in function `.L1880': Master.cpp:(.text+0x7cc0): undefined reference to `__atomic_exchange_1' Fixes: - http://autobuild.buildroot.org/results/91b5959ca0eb136c1609462e71d109ff09cca5e5 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index b2eb1921fa..db0459ce62 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -14,7 +14,7 @@ ZYNADDSUBFX_LICENSE_FILES = COPYING ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:18 +0100 Subject: [Buildroot] [PATCH 4/6] package/zynaddsubfx: fix alsa-lib handling In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-4-fontaine.fabrice@gmail.com> alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:19 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:19 +0100 Subject: [Buildroot] [PATCH 5/6] package/zynaddsubfx: add jack{1, 2} optional dependency In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-5-fontaine.fabrice@gmail.com> jack{1,2} is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index aeeb0b6405..461146aae8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -30,4 +30,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF endif +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 16 21:22:20 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 16 Mar 2022 22:22:20 +0100 Subject: [Buildroot] [PATCH 6/6] package/zynaddsubfx: add portaudio optional dependency In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316212220.3437314-6-fontaine.fabrice@gmail.com> portaudio is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 461146aae8..aff9ac4bf4 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -37,4 +37,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:30:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:30:47 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-shark: bump version to 0.7.5 Message-ID: <20220316213047.16103-1-ps.report@gmx.net> Changelog ([1], [2]): - 0.7.5: Eclipse Plugin was removed - 0.7.4: Remove RidgeRun Licence from Eclipse Plugin Add README with warning on Eclipse Plugin future removal [1] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.4 [2] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.5 Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index be26050715..cfd72dd2a6 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 4e7801e920..17df001cef 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.3 +GST1_SHARK_VERSION = v0.7.5 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES -- 2.35.1 From yann.morin.1998 at free.fr Wed Mar 16 21:34:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:34:07 +0100 Subject: [Buildroot] [git commit] package/libopenssl: bump version to 1.1.1n Message-ID: <20220316212531.137C9841F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66868e9fab2806686fd08850a3e56185ef00b127 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From ps.report at gmx.net Wed Mar 16 21:36:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:04 +0100 Subject: [Buildroot] [PATCH v1 02/12] package/gst1-plugins-base: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-3-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cda..748d951966 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.1.tar.xz.sha256sum +sha256 96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 gst-plugins-base-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 08aac850cd..766af88e96 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.0 +GST1_PLUGINS_BASE_VERSION = 1.20.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:03 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:03 +0100 Subject: [Buildroot] [PATCH v1 01/12] package/gstreamer1: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-2-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f4a74a6125..128bb564d4 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.1.tar.xz.sha256sum +sha256 de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 gstreamer-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf6..995c5b118b 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.20.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:05 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:05 +0100 Subject: [Buildroot] [PATCH v1 03/12] package/gst1-plugins-good: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-4-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf46..cccd07dd2d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.1.tar.xz.sha256sum +sha256 3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa gst-plugins-good-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6298d578ed..1168feb293 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.20.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:06 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:06 +0100 Subject: [Buildroot] [PATCH v1 04/12] package/gst1-plugins-bad: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-5-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b94..2874d955f4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.1.tar.xz.sha256sum +sha256 09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 gst-plugins-bad-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 24fd9dd312..343a53a3c5 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.20.0 +GST1_PLUGINS_BAD_VERSION = 1.20.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:08 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:08 +0100 Subject: [Buildroot] [PATCH v1 06/12] package/gst1-devtools: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-7-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9c..7173dbe266 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.1.tar.xz.sha256sum +sha256 81f1c7ef105b8bdb63412638952f6320723b3161c96a80f113b020e2de554b2b gst-devtools-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index f72df9cf71..8c430800d2 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.20.0 +GST1_DEVTOOLS_VERSION = 1.20.1 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:11 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:11 +0100 Subject: [Buildroot] [PATCH v1 09/12] package/gst1-rtsp-server: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-10-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 00ff974c6e..1e66ed7246 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.1.tar.xz.sha256sum +sha256 4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509 gst-rtsp-server-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d22dd5e7cc..978f7b4491 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.20.0 +GST1_RTSP_SERVER_VERSION = 1.20.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:02 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:02 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.20.1 Message-ID: <20220316213614.16878-1-ps.report@gmx.net> For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-March/079724.html [2] https://gstreamer.freedesktop.org/releases/1.20/#1.20.1 Peter Seiderer (12): package/gstreamer1: bump version to 1.20.1 package/gst1-plugins-base: bump version to 1.20.1 package/gst1-plugins-good: bump version to 1.20.1 package/gst1-plugins-bad: bump version to 1.20.1 package/gst1-plugins-ugly: bump version to 1.20.1 package/gst1-devtools: bump version to 1.20.1 package/gst1-libav: bump version to 1.20.1 package/gst1-vaapi: bump version to 1.20.1 package/gst1-rtsp-server: bump version to 1.20.1 package/gstreamer1-editing-services: bump version to 1.20.1 package/gst-omx: bump version to 1.20.1 package/gst1-python: bump version to 1.20.1 package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 24 files changed, 36 insertions(+), 36 deletions(-) -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:07 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:07 +0100 Subject: [Buildroot] [PATCH v1 05/12] package/gst1-plugins-ugly: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-6-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24b..d022ba3180 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.1.tar.xz.sha256sum +sha256 42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 gst-plugins-ugly-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 05b1fab304..be45d183f3 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.20.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:09 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:09 +0100 Subject: [Buildroot] [PATCH v1 07/12] package/gst1-libav: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-8-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14..3f9c849729 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.1.tar.xz.sha256sum +sha256 91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 gst-libav-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4..4e99de45f9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.20.0 +GST1_LIBAV_VERSION = 1.20.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:12 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:12 +0100 Subject: [Buildroot] [PATCH v1 10/12] package/gstreamer1-editing-services: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-11-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb..5d77a9bb72 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.1.tar.xz.sha256sum +sha256 6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df gst-editing-services-1.20.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae7..dbdf2abca0 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:14 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:14 +0100 Subject: [Buildroot] [PATCH v1 12/12] package/gst1-python: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-13-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fd..fe1e2068b1 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.1.tar.xz.sha256sum +sha256 ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 gst-python-1.20.1.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d7..3fd8059bee 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.20.0 +GST1_PYTHON_VERSION = 1.20.1 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:10 +0100 Subject: [Buildroot] [PATCH v1 08/12] package/gst1-vaapi: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-9-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e2..26a1f52ba0 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.1.tar.xz.sha256sum +sha256 87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 gstreamer-vaapi-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 19ee625703..e0502914b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.20.0 +GST1_VAAPI_VERSION = 1.20.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ -- 2.35.1 From ps.report at gmx.net Wed Mar 16 21:36:13 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 16 Mar 2022 22:36:13 +0100 Subject: [Buildroot] [PATCH v1 11/12] package/gst-omx: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316213614.16878-12-ps.report@gmx.net> Signed-off-by: Peter Seiderer --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f..33c20defbc 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.1.tar.xz.sha256sum +sha256 86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c gst-omx-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff..462c88765b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.20.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx -- 2.35.1 From yann.morin.1998 at free.fr Wed Mar 16 21:36:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:36:26 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220315205405.9291-1-ps.report@gmx.net> References: <20220315205405.9291-1-ps.report@gmx.net> Message-ID: <20220316213626.GZ283544@scaer> Peter, All, +Peter K.: candidate to be backported, that's a security fix. On 2022-03-15 21:54 +0100, Peter Seiderer spake thusly: > Changes between 1.1.1m and 1.1.1n [15 Mar 2022] > > *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever > for non-prime moduli. > > Internally this function is used when parsing certificates that contain > elliptic curve public keys in compressed form or explicit elliptic curve > parameters with a base point encoded in compressed form. > > It is possible to trigger the infinite loop by crafting a certificate that > has invalid explicit curve parameters. > > Since certificate parsing happens prior to verification of the certificate > signature, any process that parses an externally supplied certificate may > thus be subject to a denial of service attack. The infinite loop can also > be reached when parsing crafted private keys as they can contain explicit > elliptic curve parameters. > > Thus vulnerable situations include: > > - TLS clients consuming server certificates > - TLS servers consuming client certificates > - Hosting providers taking certificates or private keys from customers > - Certificate authorities parsing certification requests from subscribers > - Anything else which parses ASN.1 elliptic curve parameters > > Also any other applications that use the BN_mod_sqrt() where the attacker > can control the parameter values are vulnerable to this DoS issue. > (CVE-2022-0778) > [Tom?? Mr?z] > > *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) > to the list of ciphersuites providing Perfect Forward Secrecy as > required by SECLEVEL >= 3. > > [Dmitry Belyavskiy, Nicola Tuveri] > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libopenssl/libopenssl.hash | 4 ++-- > package/libopenssl/libopenssl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash > index a055cbc270..22bb365bcc 100644 > --- a/package/libopenssl/libopenssl.hash > +++ b/package/libopenssl/libopenssl.hash > @@ -1,5 +1,5 @@ > -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 > -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz > +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 > +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz > > # License files > sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE > diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk > index bd8ef6141a..ae6658ed40 100644 > --- a/package/libopenssl/libopenssl.mk > +++ b/package/libopenssl/libopenssl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOPENSSL_VERSION = 1.1.1m > +LIBOPENSSL_VERSION = 1.1.1n > LIBOPENSSL_SITE = https://www.openssl.org/source > LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz > LIBOPENSSL_LICENSE = OpenSSL or SSLeay > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 21:38:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:38:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgcrypt: fix musl build In-Reply-To: <20220316203734.3081600-1-fontaine.fabrice@gmail.com> References: <20220316203734.3081600-1-fontaine.fabrice@gmail.com> Message-ID: <20220316213824.GA283544@scaer> Fabrice, All, On 2022-03-16 21:37 +0100, Fabrice Fontaine spake thusly: > Fix the following musl build failure raised since bump to version 1.10.0 > in commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d: > > In file included from ./jitterentropy.h:98, > from ./jitterentropy-base.c:32, > from ./rndjent.c:88: > ./jitterentropy-base-user.h: In function 'jent_get_cachesize': > ./jitterentropy-base-user.h:191:8: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] > 191 | fd = open(file, O_RDONLY); > | ^~~~ > | popen > ./jitterentropy-base-user.h:191:19: error: 'O_RDONLY' undeclared (first use in this function) > 191 | fd = open(file, O_RDONLY); > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/f6182fca6a4e2ba29a89f770f17df691d7861f8d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...entropy-Include-fcntl-h-and-limits-h.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch > > diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch > new file mode 100644 > index 0000000000..8f76f24c64 > --- /dev/null > +++ b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch > @@ -0,0 +1,38 @@ > +From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 > +From: Heiko Becker > +Date: Thu, 3 Feb 2022 22:46:41 +0000 > +Subject: [PATCH] jitterentropy: Include and > + > +* random/jitterentropy-base-user.h: Include for O_RDONLY > +* random/jitterentropy-base-user.h: Include for LONG_MAX > + > +-- > + > +Fixes the build with musl libc. > + > +Signed-off-by: Heiko Becker > + > +[Retrieved from: > +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] > +Signed-off-by: Fabrice Fontaine > +--- > + random/jitterentropy-base-user.h | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h > +index 326dfbed..389106ff 100644 > +--- a/random/jitterentropy-base-user.h > ++++ b/random/jitterentropy-base-user.h > +@@ -39,6 +39,9 @@ > + * DAMAGE. > + */ > + > ++#include > ++#include > ++ > + #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H > + #define GCRYPT_JITTERENTROPY_BASE_USER_H > + > +-- > +2.11.0 > + > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 21:37:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:37:45 +0100 Subject: [Buildroot] [git commit] package/libgcrypt: fix musl build Message-ID: <20220316212944.E3AE3841F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b6b4729522090b5f20560e249b5898950d7c298 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since bump to version 1.10.0 in commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d: In file included from ./jitterentropy.h:98, from ./jitterentropy-base.c:32, from ./rndjent.c:88: ./jitterentropy-base-user.h: In function 'jent_get_cachesize': ./jitterentropy-base-user.h:191:8: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] 191 | fd = open(file, O_RDONLY); | ^~~~ | popen ./jitterentropy-base-user.h:191:19: error: 'O_RDONLY' undeclared (first use in this function) 191 | fd = open(file, O_RDONLY); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f6182fca6a4e2ba29a89f770f17df691d7861f8d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...itterentropy-Include-fcntl-h-and-limits-h.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch new file mode 100644 index 0000000000..8f76f24c64 --- /dev/null +++ b/package/libgcrypt/0002-jitterentropy-Include-fcntl-h-and-limits-h.patch @@ -0,0 +1,38 @@ +From ffaef0be613121d3ee37867d82932a7a30c2bc6d Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 3 Feb 2022 22:46:41 +0000 +Subject: [PATCH] jitterentropy: Include and + +* random/jitterentropy-base-user.h: Include for O_RDONLY +* random/jitterentropy-base-user.h: Include for LONG_MAX + +-- + +Fixes the build with musl libc. + +Signed-off-by: Heiko Becker + +[Retrieved from: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d] +Signed-off-by: Fabrice Fontaine +--- + random/jitterentropy-base-user.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h +index 326dfbed..389106ff 100644 +--- a/random/jitterentropy-base-user.h ++++ b/random/jitterentropy-base-user.h +@@ -39,6 +39,9 @@ + * DAMAGE. + */ + ++#include ++#include ++ + #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H + #define GCRYPT_JITTERENTROPY_BASE_USER_H + +-- +2.11.0 + From yann.morin.1998 at free.fr Wed Mar 16 21:41:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:10 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: fix atomic linking Message-ID: <20220316213525.2C73D84249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba7319a06e1b98524fde1384dc570a7f34870881 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: libzynaddsubfx_core.a(Master.cpp.o): in function `.L1880': Master.cpp:(.text+0x7cc0): undefined reference to `__atomic_exchange_1' Fixes: - http://autobuild.buildroot.org/results/91b5959ca0eb136c1609462e71d109ff09cca5e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index b2eb1921fa..db0459ce62 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -14,7 +14,7 @@ ZYNADDSUBFX_LICENSE_FILES = COPYING ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ From yann.morin.1998 at free.fr Wed Mar 16 21:41:05 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:05 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: fix PluginEnable option Message-ID: <20220316213525.0801D84249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2e1a86e95091b69ad043c33aadf7220866a45f29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace False by OFF when setting PluginEnable option Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede..c8d64f5ce8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From yann.morin.1998 at free.fr Wed Mar 16 21:43:48 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:43:48 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: add jack{1, 2} optional dependency Message-ID: <20220316213525.4E73884249@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3bcedaa732b539e4ad32776e867ef9626ffca5b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master jack{1,2} is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index aeeb0b6405..461146aae8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -30,4 +30,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF endif +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 21:41:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:08 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: disable tests Message-ID: <20220316213525.1C29A8424A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=886629bf64d8093fc847ebbbed779a09722843da branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable tests which are enabled by default since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index c8d64f5ce8..b2eb1921fa 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From yann.morin.1998 at free.fr Wed Mar 16 21:41:12 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:41:12 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: fix alsa-lib handling Message-ID: <20220316213525.3F6568424A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fc2191845799ae2358b752fa29839817d33ad82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 21:43:50 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:43:50 +0100 Subject: [Buildroot] [git commit] package/zynaddsubfx: add portaudio optional dependency Message-ID: <20220316213525.5D8128424A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e820feba362a29a310ed3a93c8ad5546ceb8a2ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master portaudio is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 461146aae8..aff9ac4bf4 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -37,4 +37,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 21:44:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 22:44:41 +0100 Subject: [Buildroot] [PATCH 1/6] package/zynaddsubfx: fix PluginEnable option In-Reply-To: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> Message-ID: <20220316214441.GB283544@scaer> Fabrice, All, On 2022-03-16 22:22 +0100, Fabrice Fontaine spake thusly: > Replace False by OFF when setting PluginEnable option > > Signed-off-by: Fabrice Fontaine Series of 6 patches applied to master, thanks. Regards, Yann E. MORIN. > --- > package/zynaddsubfx/zynaddsubfx.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk > index 158b5b4ede..c8d64f5ce8 100644 > --- a/package/zynaddsubfx/zynaddsubfx.mk > +++ b/package/zynaddsubfx/zynaddsubfx.mk > @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ > ZYNADDSUBFX_LICENSE_FILES = COPYING > > # There is no package in buildroot using LV2 plugins: disabling > -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False > +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Mar 16 21:47:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 16 Mar 2022 22:47:21 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220316213626.GZ283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 22:36:26 +0100") References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> Message-ID: <87cziltvrq.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > +Peter K.: candidate to be backported, that's a security fix. Indeed. Why it is not marked as such ("security bump to version 1.1.1n")? -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Wed Mar 16 21:48:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 16 Mar 2022 22:48:46 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d99407..f57041cee4 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and len(data['stable_versions']) > 0: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, -- 2.35.1 From yann.morin.1998 at free.fr Wed Mar 16 22:04:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:04:46 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220316215654.8E8188424D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c72f3f2b43f4607ed94d51a21abe5e3d909efb36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d99407..8cc64a54d1 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From yann.morin.1998 at free.fr Wed Mar 16 22:06:57 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:06:57 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> References: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> Message-ID: <20220316220657.GC283544@scaer> Thomas, All, On 2022-03-16 22:48 +0100, Thomas Petazzoni spake thusly: > The check_package_get_latest_version_by_distro() function analyzes the > data returned by release-monitoring.org. For two of our > packages (bento4 and qextserialport), release-monitoring.org returns > something that is a bit odd: it returns an entry with a > "stable_versions" field that contains an empty array. Our code was > ready to have or not have a "stable_versions" entry, but when it is > present, we assumed it was not an empty array. These two packages, for > some reason, break this assumption. > > In order to solve this problem, this commit is more careful, and uses > the stable_versions field only if it exists and it has at least one > entry. The code is also reworked as a sequence of "if...elif...else" > to be more readable. > > This fixes the following exception when running pkg-stats on the full > package set: > > Task exception was never retrieved > future: exception=IndexError('list index out of range')> > Traceback (most recent call last): > File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get > if await check_package_get_latest_version_by_distro(session, pkg): > File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro > version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > IndexError: list index out of range > > Signed-off-by: Thomas Petazzoni > --- > support/scripts/pkg-stats | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index c235d99407..f57041cee4 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): > return False > > data = await resp.json() > - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > + if 'stable_versions' in data and len(data['stable_versions']) > 0: PEP8 says that we can just test the sequence to test for emptyness: https://pep8.org/#programming-recommendations (toward the end). Applied to master with that fixed, thanks. Regards, Yann E. MORIN. > + version = data['stable_versions'][0] > + elif 'version' in data: > + version = data['version'] > + else: > + version = None > check_package_latest_version_set_status(pkg, > RM_API_STATUS_FOUND_BY_DISTRO, > version, > -- > 2.35.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:10:46 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:10:46 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.20.1 In-Reply-To: <20220316213614.16878-1-ps.report@gmx.net> References: <20220316213614.16878-1-ps.report@gmx.net> Message-ID: <20220316221046.GD283544@scaer> Peter, All, On 2022-03-16 22:36 +0100, Peter Seiderer spake thusly: > For details see [1] and [2]. > > [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-March/079724.html > [2] https://gstreamer.freedesktop.org/releases/1.20/#1.20.1 > > Peter Seiderer (12): > package/gstreamer1: bump version to 1.20.1 > package/gst1-plugins-base: bump version to 1.20.1 > package/gst1-plugins-good: bump version to 1.20.1 > package/gst1-plugins-bad: bump version to 1.20.1 > package/gst1-plugins-ugly: bump version to 1.20.1 > package/gst1-devtools: bump version to 1.20.1 > package/gst1-libav: bump version to 1.20.1 > package/gst1-vaapi: bump version to 1.20.1 > package/gst1-rtsp-server: bump version to 1.20.1 > package/gstreamer1-editing-services: bump version to 1.20.1 > package/gst-omx: bump version to 1.20.1 > package/gst1-python: bump version to 1.20.1 Whole series applied to master, thanks. Regards, Yann E. MORIN. > package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- > package/gstreamer1/gst-omx/gst-omx.mk | 2 +- > package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- > package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- > package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- > package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- > package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- > package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- > package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- > package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- > package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- > package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- > package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- > package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- > package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- > package/gstreamer1/gst1-python/gst1-python.mk | 2 +- > package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- > package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- > package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- > package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- > .../gstreamer1-editing-services.hash | 4 ++-- > .../gstreamer1-editing-services.mk | 2 +- > package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- > package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- > 24 files changed, 36 insertions(+), 36 deletions(-) > > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:12:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:12:42 +0100 Subject: [Buildroot] [PATCH v1] package/gst1-shark: bump version to 0.7.5 In-Reply-To: <20220316213047.16103-1-ps.report@gmx.net> References: <20220316213047.16103-1-ps.report@gmx.net> Message-ID: <20220316221242.GE283544@scaer> Peter, All, On 2022-03-16 22:30 +0100, Peter Seiderer spake thusly: > Changelog ([1], [2]): > > - 0.7.5: Eclipse Plugin was removed > - 0.7.4: Remove RidgeRun Licence from Eclipse Plugin > Add README with warning on Eclipse Plugin future removal > > [1] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.4 > [2] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.5 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- > package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash > index be26050715..cfd72dd2a6 100644 > --- a/package/gstreamer1/gst1-shark/gst1-shark.hash > +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash > @@ -1,5 +1,5 @@ > # locally computed hash > -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz > +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz > > # Hashes for license files: > sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING > diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk > index 4e7801e920..17df001cef 100644 > --- a/package/gstreamer1/gst1-shark/gst1-shark.mk > +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GST1_SHARK_VERSION = v0.7.3 > +GST1_SHARK_VERSION = v0.7.5 > GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git > GST1_SHARK_SITE_METHOD = git > GST1_SHARK_GIT_SUBMODULES = YES > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:07:11 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:11 +0100 Subject: [Buildroot] [git commit] package/gstreamer1: bump version to 1.20.1 Message-ID: <20220316220441.2508E8431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05b0f785cec573092b5292237a03dc756c6b9d5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f4a74a6125..128bb564d4 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.1.tar.xz.sha256sum +sha256 de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 gstreamer-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf6..995c5b118b 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.20.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:15 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-good: bump version to 1.20.1 Message-ID: <20220316220441.3721A8431F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69b7c008fa154b5174d8c67006002f48a686086b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf46..cccd07dd2d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.1.tar.xz.sha256sum +sha256 3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa gst-plugins-good-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6298d578ed..1168feb293 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.20.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Mar 16 22:07:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:20 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-ugly: bump version to 1.20.1 Message-ID: <20220316220441.4A5848431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd865dc6fcd049cf0c20bdbc5b26ab2acf055ecb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24b..d022ba3180 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.1.tar.xz.sha256sum +sha256 42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 gst-plugins-ugly-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 05b1fab304..be45d183f3 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.20.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Mar 16 22:07:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:25 +0100 Subject: [Buildroot] [git commit] package/gst1-libav: bump version to 1.20.1 Message-ID: <20220316220441.5D5D18431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9763aab6a0bd9f53343b3ecd37d00efef777379a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14..3f9c849729 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.1.tar.xz.sha256sum +sha256 91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 gst-libav-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4..4e99de45f9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.20.0 +GST1_LIBAV_VERSION = 1.20.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:41 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:41 +0100 Subject: [Buildroot] [git commit] package/gst1-shark: bump version to 0.7.5 Message-ID: <20220316220441.953B88431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09d568a6b4b7c57d7d41bc5540b8f706f78e4375 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog ([1], [2]): - 0.7.5: Eclipse Plugin was removed - 0.7.4: Remove RidgeRun Licence from Eclipse Plugin Add README with warning on Eclipse Plugin future removal [1] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.4 [2] https://github.com/RidgeRun/gst-shark/releases/tag/v0.7.5 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-shark/gst1-shark.hash | 2 +- package/gstreamer1/gst1-shark/gst1-shark.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index be26050715..cfd72dd2a6 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 4e7801e920..17df001cef 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.3 +GST1_SHARK_VERSION = v0.7.5 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:29 +0100 Subject: [Buildroot] [git commit] package/gst1-rtsp-server: bump version to 1.20.1 Message-ID: <20220316220441.6F1668431F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb3a4e313a8ff70644f0702ac84d2ba877e1ca08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 00ff974c6e..1e66ed7246 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.1.tar.xz.sha256sum +sha256 4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509 gst-rtsp-server-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d22dd5e7cc..978f7b4491 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.20.0 +GST1_RTSP_SERVER_VERSION = 1.20.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:22 +0100 Subject: [Buildroot] [git commit] package/gst1-devtools: bump version to 1.20.1 Message-ID: <20220316220441.537728431F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a70131455b59487864358eadc9ff34263f6670ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9c..7173dbe266 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.1.tar.xz.sha256sum +sha256 81f1c7ef105b8bdb63412638952f6320723b3161c96a80f113b020e2de554b2b gst-devtools-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index f72df9cf71..8c430800d2 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.20.0 +GST1_DEVTOOLS_VERSION = 1.20.1 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:34 +0100 Subject: [Buildroot] [git commit] package/gst-omx: bump version to 1.20.1 Message-ID: <20220316220441.81E1B8431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f62284487af114fdf2cb4069d62c8b6a7f90268c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f..33c20defbc 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.1.tar.xz.sha256sum +sha256 86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c gst-omx-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff..462c88765b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.20.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From yann.morin.1998 at free.fr Wed Mar 16 22:07:13 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:13 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-base: bump version to 1.20.1 Message-ID: <20220316220441.2DEF18424C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1f0a550b6d8dedc04fbcd94df0c45effbec6ec1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cda..748d951966 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.1.tar.xz.sha256sum +sha256 96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 gst-plugins-base-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 08aac850cd..766af88e96 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.0 +GST1_PLUGINS_BASE_VERSION = 1.20.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:27 +0100 Subject: [Buildroot] [git commit] package/gst1-vaapi: bump version to 1.20.1 Message-ID: <20220316220441.6628E8431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4d0a14b039c4c073baae5b0d4f88c3ed4b7d00d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e2..26a1f52ba0 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.1.tar.xz.sha256sum +sha256 87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 gstreamer-vaapi-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 19ee625703..e0502914b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.20.0 +GST1_VAAPI_VERSION = 1.20.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Wed Mar 16 22:08:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:08:40 +0100 Subject: [Buildroot] [git commit] package/libressl: security bump to 3.4.3 Message-ID: <20220316220441.9E7458431C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b92210ce36588038aa728e48f3826f6b32d471c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda8..e923998713 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda9..0bb468cedb 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From yann.morin.1998 at free.fr Wed Mar 16 22:07:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:18 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: bump version to 1.20.1 Message-ID: <20220316220441.40A948431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e3971565263385a4d2947bf74e20386838f3094 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b94..2874d955f4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.1.tar.xz.sha256sum +sha256 09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 gst-plugins-bad-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 24fd9dd312..343a53a3c5 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.20.0 +GST1_PLUGINS_BAD_VERSION = 1.20.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:07:32 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:32 +0100 Subject: [Buildroot] [git commit] package/gstreamer1-editing-services: bump version to 1.20.1 Message-ID: <20220316220441.782238431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eed6566513fd17950a11b06db15477860e42353e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb..5d77a9bb72 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.1.tar.xz.sha256sum +sha256 6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df gst-editing-services-1.20.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae7..dbdf2abca0 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From yann.morin.1998 at free.fr Wed Mar 16 22:07:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:07:36 +0100 Subject: [Buildroot] [git commit] package/gst1-python: bump version to 1.20.1 Message-ID: <20220316220441.8B8FF8431A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd7ebd2ca426aeacd0e509461d1d94962e65a8bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fd..fe1e2068b1 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.1.tar.xz.sha256sum +sha256 ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 gst-python-1.20.1.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d7..3fd8059bee 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.20.0 +GST1_PYTHON_VERSION = 1.20.1 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Mar 16 22:13:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:13:26 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to 3.4.3 In-Reply-To: <20220316105753.1134088-1-francois.perrad@gadz.org> References: <20220316105753.1134088-1-francois.perrad@gadz.org> Message-ID: <20220316221326.GF283544@scaer> Fran?ois, All, On 2022-03-16 11:57 +0100, Francois Perrad spake thusly: > see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 > > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libressl/libressl.hash | 2 +- > package/libressl/libressl.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash > index 990ec8bda..e92399871 100644 > --- a/package/libressl/libressl.hash > +++ b/package/libressl/libressl.hash > @@ -1,4 +1,4 @@ > # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 > -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz > +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz > # Locally computed > sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING > diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk > index 6eee86dda..0bb468ced 100644 > --- a/package/libressl/libressl.mk > +++ b/package/libressl/libressl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBRESSL_VERSION = 3.4.2 > +LIBRESSL_VERSION = 3.4.3 > LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL > LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) > LIBRESSL_LICENSE_FILES = COPYING > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:16:18 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:16:18 +0100 Subject: [Buildroot] [git commit] package/libminiupnpc: disable sample and tests Message-ID: <20220316220950.A14A584323@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1d0ac062cd65794a39e90b5f7abae354aa69be9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From yann.morin.1998 at free.fr Wed Mar 16 22:19:08 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:19:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests In-Reply-To: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Message-ID: <20220316221908.GG283544@scaer> Fabrice, All, On 2022-03-16 21:39 +0100, Fabrice Fontaine spake thusly: > Disable sample and tests (which are built by default since version 2.1: > https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libminiupnpc/libminiupnpc.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk > index 551a6767cf..0633ccd234 100644 > --- a/package/libminiupnpc/libminiupnpc.mk > +++ b/package/libminiupnpc/libminiupnpc.mk > @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project > LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc > LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) > LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) > +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF > > $(eval $(cmake-package)) > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 16 22:20:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 16 Mar 2022 23:20:07 +0100 Subject: [Buildroot] [PATCH 2/2] package/libminiupnpc: drop dependencies In-Reply-To: <20220316203922.3081843-2-fontaine.fabrice@gmail.com> References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> <20220316203922.3081843-2-fontaine.fabrice@gmail.com> Message-ID: <20220316222007.GH283544@scaer> Fabrice, All, On 2022-03-16 21:39 +0100, Fabrice Fontaine spake thusly: > libminiupnpc can be statically built with or without binfmt flat since > version 1.7 and > https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d > > Signed-off-by: Fabrice Fontaine > --- [--SNIP--] > diff --git a/package/transmission/Config.in b/package/transmission/Config.in > index aaed7ec111..eb51ccf862 100644 > --- a/package/transmission/Config.in > +++ b/package/transmission/Config.in > @@ -2,8 +2,8 @@ config BR2_PACKAGE_TRANSMISSION > bool "transmission" > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU # fork() > - depends on !BR2_BINFMT_FLAT # libminiupnpc, libnatpmp > - depends on !BR2_STATIC_LIBS # libminiupnpc, libnatpmp > + depends on !BR2_BINFMT_FLAT # libnatpmp > + depends on !BR2_STATIC_LIBS # libnatpmp This does not apply to current master; error: patch failed: package/transmission/Config.in:2 error: package/transmission/Config.in: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Applying: package/libminiupnpc: drop dependencies Patch failed at 0001 package/libminiupnpc: drop dependencies When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Care to have a look and respin, please? Regards, Yann E. MORIN. > select BR2_PACKAGE_ZLIB > select BR2_PACKAGE_DHT > select BR2_PACKAGE_OPENSSL > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From hrsourabh011 at gmail.com Wed Mar 16 22:25:04 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 16 Mar 2022 23:25:04 +0100 Subject: [Buildroot] How to connect to Wifi on start-up using Buildroot? In-Reply-To: <20220315213347.09ddc034@gmx.net> References: <20220315213347.09ddc034@gmx.net> Message-ID: Hello Peter, In my local Buildroot package folder I don't have "0001-build-re-enable-options-for-libwpa_client.so-and-.patch" file. Can you please let me know how to include this file? This is my first time applying patches in Buildroot. I have downloaded patch file(tar.bz2). I assume copying patch file to wpa_supplicant dir and running "make clean && make" will apply this patch. Please correct me if I am wrong. And also I tried below to assign IP address to my board (RPi CM4) wpa_supplicant -B -Dnl80211 -iwlan0 -cwpa_supplicant.conf udhcpc -i wlan0 But this gives: udhcpc: started, v1.35.0 udhcpc: broadcasting discover udhcpc: broadcasting discover udhcpc: broadcasting discover udhcpc: broadcasting discover . . . Is there any other way to assign IP address to the board? Your help will be much appreciated. Thanks in advance On Tue, 15 Mar 2022 at 21:33, Peter Seiderer wrote: > On Tue, 15 Mar 2022 21:00:54 +0100, Arnout Vandecappelle > wrote: > > > On 15/03/2022 14:05, Sourabh Hegde wrote: > > > Helllo Jan, > > > > > > Thanks for the answer. > > > > > > From Buildroot 2021 release "ctrl_interface" is disabled and so I > have > > > > It's disabled unless BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > > > > > commented out below line in etc/wpa_supplicant.conf file > > > > > > # |ctrl_interface=/var/run/wpa_supplicant| > > > > This shouldn't be needed. AFAIK wpa_supplicant ignores the option if > > CTRL_IFACE is not enabled. > > > > > | > > > | > > > |And also in my rootfs, there is no "|/var/run/wpa_supplicant|" file. > > > > The file (actually, named pipe) is created when wpa_supplicants starts > up. > > /var/run is a tmpfs so it can only be created at runtime. > > > > > | > > > | > > > | > > > |I have set below options in menuconfig| > > > | > > > | > > > menuconfig.PNG > > > > > > Then doing make clean & make results in below errors: > > > > > > >>> wpa_supplicant 2.10 Installing to staging directory > > > /usr/bin/install -m 0644 -D > > > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so > > > > > /root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libwpa_client.so > > > /usr/bin/install: cannot stat > > > > '/root/raspcm4/sources/output/build/wpa_supplicant-2.10/wpa_supplicant/libwpa_client.so': > > > > No such file or directory > > > make[1]: *** [package/pkg-generic.mk:331 : > > > > /root/raspcm4/sources/output/build/wpa_supplicant-2.10/.stamp_staging_installed] > > > > Error 1 > > > make: *** [Makefile:23: _all] Error 2 > > > > > > Can you please let me know what could be the issue and how to resolve > it? > > > > I've tried to build the same configuration (with current git master) > and it > > builds without problems. > > Problem introduced on buildroot git master with wpa_supplicant version > bump [1] and > fixed with [2]... > > Regards, > Peter > > [1] > https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=39381a467cd2cfc15f77d3f9adbf329d2f92e312 > [2] > https://git.buildroot.net/buildroot/commit/package/wpa_supplicant?id=c4eebf191c781a3ea6b5eb1811cc17ae92ea2fb2 > > > > > Please supply the defconfig and also the full build log (by uploading > to a > > pastebin). > > > > Regards, > > Arnout > > > > > > > > > > Thanks in advance > > > || > > > > > > On Thu, 10 Mar 2022 at 19:03, Jan Havran > > > wrote: > > > > > > Hi Sourabh, > > > > > > after enabling RPi firmware you must load the Wifi driver - since > you are using > > > systemd, it should by handled by udev on start I think. > > > > > > So you probably just need to configure /etc/network/interfaces to > start > > > wpa_supplicant > > > on wlan0 with /etc/wpa_supplicant.conf file, where you can put > your credentials. > > > Or at least that is what I have done, but I am not using systemd. > > > > > > I did something similar some time ago, you can check it here: > > > > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > < > https://gitlab.com/sonicpp/gnss-pi/-/commit/caf0317c024e51fc7e322deacd09ec9346d47e26 > > > > > > > > (note that to make "my" credentials public in that commit was an > intention). > > > > > > P.S.: if you want to have any modifications to be part of your > image with > > > filesystem, > > > you can do it by using rootfs overlays for example: > > > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > > > > > > > Regards, > > > > > > Jan Havran > > > > > > V Thu, Mar 10, 2022 at 05:43:27PM +0100, Sourabh Hegde napsal(a): > > > > Hello All, > > > > > > > > I am trying to connect my Raspberry Pi CM4 to Wifi > automatically after > > > > start-up. I am using Buildroot based Linux distribution. I have > worked with > > > > Yocto before and it provides systemd-networkd and > wpa_supplicant feature to > > > > connect to wifi on boot. I am lloking something similar in > Buildroot but > > > > couldn't find any notes online. > > > > > > > > So far, I think I have enabled the necessary config/driver > using "make > > > > menuconfig" : > > > > [image: wpa_supplicant.png] > > > > [image: firmware.png] > > > > > > > > But now, how can I set-up wpa_supplicant.conf? Any link to > notes or > > > > suggestion would be helpful. > > > > > > > > Can anyone please let me know how to proceed further with it? > > > > > > > > Your help will be much appreciated. > > > > > > > > Thanks in advance. > > > > > > > > P.S: I am using Buildroot 2022.02 release and also using > systemd feature > > > > and let me know if any info is missing here. > > > > > > > > Regards, > > > > > > > > Sourabh > > > > > > > > > > > > > > > > _______________________________________________ > > > > buildroot mailing list > > > > buildroot at buildroot.org > > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > > > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Thu Mar 17 07:13:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:13:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/azure-iot-sdk-c: drop custom install rules In-Reply-To: <20220305204446.823802-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Mar 2022 21:44:46 +0100") References: <20220305204446.823802-1-fontaine.fabrice@gmail.com> Message-ID: <878rt9t5kr.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop custom install rules which have been added since the addition of > the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are > now resulting in a broken installion > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14636 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:32:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:32:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 2.4.13 In-Reply-To: <87o82i834r.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Mon, 07 Mar 2022 11:32:04 +0100") References: <20220222204601.3150365-1-fontaine.fabrice@gmail.com> <87o82i834r.fsf@dell.be.48ers.dk> Message-ID: <874k3xt4ob.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Fabrice" == Fabrice Fontaine writes: >> https://www.mail-archive.com/haproxy at formilux.org/msg41834.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41698.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41685.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41618.html >> https://www.mail-archive.com/haproxy at formilux.org/msg41512.html >> Signed-off-by: Fabrice Fontaine > Committed given the bugfixes, thanks. Committed to 2021.11.x, thanks. For 2021.02.x I will instead bump to 2.2.22. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:47:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:47:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: bump to version 2.4.7 In-Reply-To: <20220305173913.229445-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 5 Mar 2022 18:39:13 +0100") References: <20220305173913.229445-1-fontaine.fabrice@gmail.com> Message-ID: <87zglprpfs.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This release relaxes the fix to CVE-2022-25236 (introduced with release > 2.4.5) which some of you have been waiting for, due to related > incompatibilities. > https://blog.hartwork.org/posts/expat-2-4-7-released > https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:48:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:48:36 +0100 Subject: [Buildroot] [PATCH 2/2] docs: fix links to AsciiDoc In-Reply-To: <20220228163238.405627-1-theo.lebrun@bootlin.com> (=?utf-8?Q?=22Th=C3=A9o?= Lebrun via buildroot"'s message of "Mon, 28 Feb 2022 17:32:38 +0100") References: <20220228163238.405627-1-theo.lebrun@bootlin.com> Message-ID: <87v8wdrpd7.fsf@dell.be.48ers.dk> >>>>> "Th?o" == Th?o Lebrun via buildroot writes: > Links were aimed at the methods.co.nz domain, which is now returning > 404s. The current situation of AsciiDoc is unclear to me: the Fedora > package points to this website, they own asciidoc.org, Wikipedia points > to this project as well but their Git repo's README includes the > following paragraph: >> AsciiDoc.py is a legacy processor for this syntax, handling an older >> rendition of AsciiDoc. As such, this will not properly handle the >> current AsciiDoc specification. It is suggested that unless you >> specifically require the AsciiDoc.py toolchain, you should find a >> processor that handles the modern AsciiDoc syntax. > --- https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md > "AsciiDoc specification" pointing towards: > https://projects.eclipse.org/projects/asciidoc.asciidoc-lang > Signed-off-by: Th?o Lebrun Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 07:46:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:46:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/expat: bump to version 2.4.7 Message-ID: <20220317074006.E83F483EAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26c678a3c60c012a0c09deadea5a58b37f563a00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 402d85ef4e3d5161869d5da918ec679a9571c417) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 17 07:12:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:12:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220317074006.D42AD83E73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=434773e57842e0fd5801830b2143a28592f7626b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d1debbb4c7eb205d3ccddaa7849e3121a4929c6c) Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index c664ad83a4..a8f42a25bc 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) From peter at korsgaard.com Thu Mar 17 07:31:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:31:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/haproxy: bump to version 2.2.22 Message-ID: <20220317074006.DD4C283E7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bcc9f2bca146dc2668d22f1833bfb8775a0312c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://www.haproxy.org/download/2.2/src/CHANGELOG Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 92f155581f..23b4db7ef2 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.17.tar.gz.sha256 -sha256 68af4aa3807d9c9f29b976d0ed57fb2e06acf7a185979059584862cc20d85be0 haproxy-2.2.17.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.22.tar.gz.sha256 +sha256 823a12fdab61a4a547770e29ad3418de2d7d4a5542a51fb3277f74a6321eccfc haproxy-2.2.22.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 0b38995810..8dd875ce0b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.2 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).17 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).22 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Thu Mar 17 07:48:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:48:22 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs: fix links to AsciiDoc Message-ID: <20220317074006.F19BE83E73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe61f3e1db154bd37a44bcc9b050075e1d400a90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th??o Lebrun Signed-off-by: Peter Korsgaard (cherry picked from commit efcb7eeabc22df47ca09e69c99f73e9183ed6cf3) Signed-off-by: Peter Korsgaard --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 3b809d5c48..77497d6d7b 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -139,10 +139,10 @@ endif === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts From bugzilla at busybox.net Thu Mar 17 08:08:45 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 17 Mar 2022 08:08:45 +0000 Subject: [Buildroot] [Bug 13971] ip6tables-nft build does not include MASQUERADE target options In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=13971 mbuil at suse.com changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #11 from mbuil at suse.com --- Hey, thanks! A colleague of mine fixed this some months ago. -- You are receiving this mail because: You are on the CC list for the bug. From johannes.agricola at work-microwave.com Thu Mar 17 07:59:10 2022 From: johannes.agricola at work-microwave.com (Johannes Agricola) Date: Thu, 17 Mar 2022 08:59:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: bump to version 4.3.1 Message-ID: <20220317075909.3705760-1-johannes.agricola@work-microwave.com> Signed-off-by: Johannes Agricola --- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 1761a7658a..f92c66018f 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz +sha256 8fdb1454a1b34cd9a6351beaab237a485e6853806101de7e62bd2bc250bb50af libwebsockets-4.3.1.tar.gz sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index c25686d385..152659cee6 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.0.21 +LIBWEBSOCKETS_VERSION = 4.3.1 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE -- 2.25.1 From fontaine.fabrice at gmail.com Thu Mar 17 10:06:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 11:06:09 +0100 Subject: [Buildroot] package gdk-pixbuf relocatable issue In-Reply-To: References: Message-ID: Hello, Le mer. 16 mars 2022 ? 12:09, Sassen, Rutger a ?crit : > > Hello, > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). Thanks for spotting this issue, I think the best approach is to: - set relocatable to true for the target (see https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) Can you confirm that this approach is working? In this case, can you send a patch to the mailing list? > > My configuration: > Host: Debian 10 (buster) > Buildroot version: 2022-02 > Target: Aarch64 (raspberry pi cm3) > Package: gdk-pixbuf > > The problematic snippets from gdk-pixbuf.mk: > > ============== > HOST_GDK_PIXBUF_CONF_OPTS = \ > -Dgio_sniffing=false \ > -Dinstalled_tests=false \ > -Dintrospection=disabled \ > -Drelocatable=true \ > -Dman=false > ============== > # gdk-pixbuf requires the loaders.cache file populated to work properly > # Rather than doing so at runtime, since the fs can be read-only, do so > # here after building and installing to target. > # And since the cache file will contain absolute host directory names we > # need to sanitize (strip) them. > ifeq ($(BR2_STATIC_LIBS),) > define GDK_PIXBUF_UPDATE_CACHE > GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ > $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > endef > GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE > endif > ============== > > Best regards, > > Rutger Sassen > > p.s. please ignore the email disclaimer that is automatically added to all my outgoing mail... > > > Disclaimer > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. Best Regards, Fabrice From fontaine.fabrice at gmail.com Thu Mar 17 10:17:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 11:17:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: update site link In-Reply-To: <20220317095027.8939-1-bruno.seifert@3brain.com> References: <20220317095027.8939-1-bruno.seifert@3brain.com> Message-ID: Hello, Le jeu. 17 mars 2022 ? 10:51, bruno seifert a ?crit : > > expat is currently in the process of changing the file hosting site from > sourceforge to github. This adjusts the site URL to the new github > location. Old versions are already not available on sourceforge anymore. > > Signed-off-by: bruno seifert > --- > Backport to: all versions > I think the hashes don't need to be changed, but someone who actually > knows stuff should confirm that. Indeed, the hash is the same. > Feel free to adjust the name and syntax. I've just started working a month a go and really don't know what I'm doing. > > Signed-off-by: bruno seifert > --- > package/expat/expat.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/expat/expat.mk b/package/expat/expat.mk > index b29b0e1d26..3dba920083 100644 > --- a/package/expat/expat.mk > +++ b/package/expat/expat.mk > @@ -5,7 +5,8 @@ > ################################################################################ > > EXPAT_VERSION = 2.4.7 > -EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) > +EXPAT_VERSION_TO_URL = $(subst .,_,$(EXPAT_VERSION)) > +EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(EXPAT_VERSION_TO_URL) A single liner would be better: EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION)) However, I don't understand why we have to update the URL now? Can't we wait for the next expat bump? > EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz > EXPAT_INSTALL_STAGING = YES > EXPAT_DEPENDENCIES = host-pkgconf > -- > 2.25.1 > > > -- > > 3Brain AG > Einsiedlerstrasse 30 > 8820 W?denswil > Switzerland > +41 81 322 70 86 > > www.3brain.com > > > > > > > > > > > > > Best Regards, Fabrice From rsassen at comecer.com Thu Mar 17 11:06:22 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Thu, 17 Mar 2022 11:06:22 +0000 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays Message-ID: When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations. Signed-off-by: Rutger Sassen --- Changes v2 -> v3: - in Config.in use if statement instead of depends (suggested by Peter Seiderer) - mention the filename overlay_map.dtb in the help text (suggested by Peter Seiderer) Changes v1 -> v2: - instead of always copying overlay_map.dtb, make it configurable (suggested by Peter Seiderer) - do not copy README since it a special case, only needed when installing overlays to a non-standard location (suggested by Peter Seiderer) When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations. Signed-off-by: Rutger Sassen --- package/rpi-firmware/Config.in | 12 ++++++++++++ package/rpi-firmware/rpi-firmware.mk | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 8070dc3019..36054353f8 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS overlays, to support HATs (Hardware Attached on Top, add-on modules). +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + bool "Install DTB overlay map" + default n + help + Say 'y' here if you need to support multiple hardware targets + and you need overlay_map.dtb for target dependent mapping of + overlay names to one of several overlay implementations. + +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS + config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG bool "vcdbg" depends on BR2_arm # prebuilt arm binary, rpi-userland diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..800b560070 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS endef endif +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ +endef +endif + # Install prebuilt libraries if RPI_USERLAND not enabled ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) define RPI_FIRMWARE_INSTALL_TARGET_LIB @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(RPI_FIRMWARE_INSTALL_CONFIG) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) endef $(eval $(generic-package)) -- 2.20.1 This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Thu Mar 17 07:19:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:19:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/haproxy: bump to version 2.4.13 Message-ID: <20220317120131.A7E9684371@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef91c95dafa91b4b685a13acda616544fafb8c5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://www.mail-archive.com/haproxy at formilux.org/msg41834.html https://www.mail-archive.com/haproxy at formilux.org/msg41698.html https://www.mail-archive.com/haproxy at formilux.org/msg41685.html https://www.mail-archive.com/haproxy at formilux.org/msg41618.html https://www.mail-archive.com/haproxy at formilux.org/msg41512.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0e60d4f11cd56544d6c23a1f7c3c8bbd98edbec3) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index c29857cd9c..e3120b521f 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 -sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 +sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 33a2e92777..83d9cfee37 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Thu Mar 17 07:19:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:19:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/haproxy: bump to version 2.4.8 Message-ID: <20220317120131.9C127841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d9071b4781505489930d1136001ebd56ee93901 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is a bug fix release which addresses quite a number of issues https://www.mail-archive.com/haproxy at formilux.org/msg41404.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f82a83582520fa5bf5a05c9308da91ee20639710) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 2e39fb4aa5..c29857cd9c 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.7.tar.gz.sha256 -sha256 52af97f72f22ffd8a7a995fafc696291d37818feda50a23caef7dc0622421845 haproxy-2.4.7.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 +sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 0434c73348..33a2e92777 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).7 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From peter at korsgaard.com Thu Mar 17 07:48:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:48:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs: fix links to AsciiDoc Message-ID: <20220317120131.BC14084370@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cdfaeebab3b89ca22352ec1706c44c35adf85ff9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Links were aimed at the methods.co.nz domain, which is now returning 404s. The current situation of AsciiDoc is unclear to me: the Fedora package points to this website, they own asciidoc.org, Wikipedia points to this project as well but their Git repo's README includes the following paragraph: > AsciiDoc.py is a legacy processor for this syntax, handling an older > rendition of AsciiDoc. As such, this will not properly handle the > current AsciiDoc specification. It is suggested that unless you > specifically require the AsciiDoc.py toolchain, you should find a > processor that handles the modern AsciiDoc syntax. https://github.com/asciidoc-py/asciidoc-py/blob/10.1.3/README.md "AsciiDoc specification" pointing towards: https://projects.eclipse.org/projects/asciidoc.asciidoc-lang Signed-off-by: Th??o Lebrun Signed-off-by: Peter Korsgaard (cherry picked from commit efcb7eeabc22df47ca09e69c99f73e9183ed6cf3) Signed-off-by: Peter Korsgaard --- docs/conf/asciidoc-text.conf | 2 +- docs/manual/writing-rules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf/asciidoc-text.conf b/docs/conf/asciidoc-text.conf index 470bdecfc2..bb614b9d85 100644 --- a/docs/conf/asciidoc-text.conf +++ b/docs/conf/asciidoc-text.conf @@ -1,5 +1,5 @@ # Refer to following asciidoc documentation: -# http://www.methods.co.nz/asciidoc/userguide.html +# https://asciidoc-py.github.io/userguide.html # In particular sections "Macros" and "Attribute References" # # For hyperlinks, show 'link text [URL]' (if link text provided) or 'URL' diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 7e2b5f909c..e01e3f02a1 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -201,10 +201,10 @@ https://github.com/pengutronix/genimage/blob/master/README.rst[]. === The documentation The documentation uses the -http://www.methods.co.nz/asciidoc/[asciidoc] format. +https://asciidoc-py.github.io/[asciidoc] format. For further details about the asciidoc syntax, refer to -http://www.methods.co.nz/asciidoc/userguide.html[]. +https://asciidoc-py.github.io/userguide.html[]. === Support scripts From peter at korsgaard.com Thu Mar 17 07:46:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:46:19 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/expat: bump to version 2.4.7 Message-ID: <20220317120131.B3423841CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f22eb3abec86226135141c31374e8a19c7bdb2b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This release relaxes the fix to CVE-2022-25236 (introduced with release 2.4.5) which some of you have been waiting for, due to related incompatibilities. https://blog.hartwork.org/posts/expat-2-4-7-released https://github.com/libexpat/libexpat/blob/R_2_4_7/expat/Changes Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 402d85ef4e3d5161869d5da918ec679a9571c417) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 0d9f60931f..26f1098b7a 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.6/ -md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz -sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ +md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz +sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz # Locally calculated -sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz +sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c481b5c225..b29b0e1d26 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.4.6 +EXPAT_VERSION = 2.4.7 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Mar 17 07:12:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 08:12:34 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/azure-iot-sdk-c: drop custom install rules Message-ID: <20220317120131.8E81C84357@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65b769f72725f0c1c8154b31774469fc3047dc1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop custom install rules which have been added since the addition of the package in commit 2d837933e55216dc31a2206b063689cfd04a4c01 but are now resulting in a broken installion Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14636 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d1debbb4c7eb205d3ccddaa7849e3121a4929c6c) Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 3f00db3ff4..e6de8c851b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,62 +14,4 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON -# The project only supports building one kind of library. -# Further the install target installs the wrong files, so we do it here: -ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.a \ - c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a \ - iothub_client/libiothub_client_mqtt_ws_transport.a \ - iothub_client/libiothub_client_amqp_ws_transport.a \ - iothub_client/libiothub_client_http_transport.a \ - iothub_client/libiothub_client_amqp_transport.a \ - iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a \ - serializer/libserializer.a \ - umqtt/libumqtt.a \ - deps/uhttp/libuhttp.a \ - deps/umock-c/libumock_c.a \ - libparson.a -else -AZURE_IOT_SDK_C_LIBS += \ - uamqp/libuamqp.so \ - c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so \ - iothub_client/libiothub_client_mqtt_ws_transport.so \ - iothub_client/libiothub_client_amqp_ws_transport.so \ - iothub_client/libiothub_client_http_transport.so \ - iothub_client/libiothub_client_amqp_transport.so \ - iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so \ - serializer/libserializer.so \ - umqtt/libumqtt.so.1.1.12 \ - deps/uhttp/libuhttp.so \ - deps/umock-c/libumock_c.so \ - libparson.so - -define AZURE_IOT_SDK_C_CREATE_SYMLINKS - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so.1 - ln -sf libumqtt.so.1.1.12 $(1)/usr/lib/libumqtt.so -endef -endif - -define AZURE_IOT_SDK_C_INSTALL_LIBS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) - ) - $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) -endef - -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) - cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ - cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ -endef - -define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) -endef - $(eval $(cmake-package)) From peter at korsgaard.com Thu Mar 17 12:11:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:11:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/directfb: change upstream site In-Reply-To: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> (Andrei Gherghescu via buildroot's message of "Thu, 24 Feb 2022 21:36:33 +0000") References: <20220224213620.5899-1-andrei.gherghescu@protonmail.com> Message-ID: <87r170srqz.fsf@dell.be.48ers.dk> >>>>> "Andrei" == Andrei Gherghescu via buildroot writes: > The http://www.directfb.org/ has been down since 2015. > Use the Buildroot backup download site. > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=13731 > Signed-off-by: Andrei Gherghescu Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:12:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:12:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/docker-engine: remove unused sqlite In-Reply-To: <20220221120657.4095013-1-tianyuanhao3@163.com> (TIAN Yuanhao's message of "Mon, 21 Feb 2022 04:06:57 -0800") References: <20220221120657.4095013-1-tianyuanhao3@163.com> Message-ID: <87mthosrpk.fsf@dell.be.48ers.dk> >>>>> "TIAN" == TIAN Yuanhao writes: > Dependency on sqlite has been removed since v17.04.0-ce. > See: https://github.com/moby/moby/pull/30208 > Signed-off-by: TIAN Yuanhao Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:13:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:13:59 +0100 Subject: [Buildroot] [PATCH] docs/manual: Document Kconfig requirements for uboot In-Reply-To: <20220307141321.307200-1-dopsi@dopsi.ch> (Simon Doppler's message of "Mon, 7 Mar 2022 15:13:21 +0100") References: <20220307141321.307200-1-dopsi@dopsi.ch> Message-ID: <87ilscsrnc.fsf@dell.be.48ers.dk> >>>>> "Simon" == Simon Doppler writes: > When using uboot's legacy build system, the 'make uboot-menuconfig' > and 'make uboot-savedefconfig' targets are not available as they > are created by 'kconfig-package'. > Signed-off-by: Simon Doppler Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:18:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:18:41 +0100 Subject: [Buildroot] [PATCH] package/gdb: fix when gmp is installed on the host machine In-Reply-To: <20220219154350.1552021-1-john@metanate.com> (John Keeping's message of "Sat, 19 Feb 2022 15:43:50 +0000") References: <20220219154350.1552021-1-john@metanate.com> Message-ID: <87ee30srfi.fsf@dell.be.48ers.dk> >>>>> "John" == John Keeping writes: > gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with > /usr/lib/ which can lead to libgmp from the wrong architecture with the > result that the test fails. Even if a libgmp is found there it is now > the one that should be used. > This is the same macro used for expat and lzma for which there are > already specific CONF_OPTS flags added here. Add the same flag for > libgmp and move the handling down so that it is logically grouped with > the other similar options. > Note that there is no --with(out)-gmp flag to configure, as the > dependency is mandatory, so only the --with-libgmp-prefix option is > specified. > Signed-off-by: John Keeping Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 12:11:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:11:17 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/directfb: change upstream site Message-ID: <20220317121041.7F3CE84387@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=926a6bec3d95f570217f012aeb49d876015a2cdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13126 Signed-off-by: Andrei Gherghescu Signed-off-by: Peter Korsgaard (cherry picked from commit 89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c) Signed-off-by: Peter Korsgaard --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 17 12:13:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:13:31 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220317121041.93F458438C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1da4b588b8cf6db6b2ecc64213131e855e3bb6ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler Signed-off-by: Peter Korsgaard (cherry picked from commit ca9e55ad11271cb26b0bffba336cf5a0d74ba378) Signed-off-by: Peter Korsgaard --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: From peter at korsgaard.com Thu Mar 17 12:12:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:12:22 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/docker-engine: remove unused sqlite Message-ID: <20220317121041.89CFD84389@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=812e7952b4e117bd7b160d1969bda19d30059d99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard (cherry picked from commit 6105ad3f72fcb98a7d9aba543c6bb7311827c1d4) Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 911cbfe428..1f0efb8fcc 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. From peter at korsgaard.com Thu Mar 17 12:18:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:18:13 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gdb: fix when gmp is installed on the host machine Message-ID: <20220317121041.9F02584387@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=991f09134f3d88ff39a1f8fc5dacc77c3bb894a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x gdb's AC_LIB_HAVE_LINKFLAGS macro hardcodes a search starting with /usr/lib/ which can lead to libgmp from the wrong architecture with the result that the test fails. Even if a libgmp is found there it is now the one that should be used. This is the same macro used for expat and lzma for which there are already specific CONF_OPTS flags added here. Add the same flag for libgmp and move the handling down so that it is logically grouped with the other similar options. Note that there is no --with(out)-gmp flag to configure, as the dependency is mandatory, so only the --with-libgmp-prefix option is specified. Signed-off-by: John Keeping Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9fa5d641ac4951087bb007e091a799101d294527) Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..8fb5f0ef5c 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -77,14 +77,6 @@ ifeq ($(BR2_GDB_VERSION_11),y) HOST_GDB_DEPENDENCIES += host-gmp endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) -GDB_DEPENDENCIES += gmp -endif - # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, # so we disable it (additionally the option --disable-install-libbfd @@ -169,6 +161,16 @@ GDB_CONF_OPTS += \ --without-curses endif +# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and +# we're building the full gdb for the target, we need gmp as a +# dependency. For now the default gdb version in Buildroot doesn't +# require gmp. +ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_CONF_OPTS += \ + --with-libgmp-prefix=$(STAGING_DIR)/usr +GDB_DEPENDENCIES += gmp +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) From peter at korsgaard.com Thu Mar 17 12:11:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:11:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/directfb: change upstream site Message-ID: <20220317121107.46F5984398@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ead853e5b7c8371c65f32bcaf0507ab5cc05af6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The http://www.directfb.org/ has been down since 2015. Use the Buildroot backup download site. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13126 Signed-off-by: Andrei Gherghescu Signed-off-by: Peter Korsgaard (cherry picked from commit 89ab2a5a3f4588891ab1e9e76feb8c3f69402d5c) Signed-off-by: Peter Korsgaard --- package/directfb-examples/Config.in | 6 ++++-- package/directfb-examples/directfb-examples.mk | 2 +- package/directfb/directfb.mk | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in index 216e036577..4d5de03068 100644 --- a/package/directfb-examples/Config.in +++ b/package/directfb-examples/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES help The DirectFB-examples package contains a set of simple DirectFB applications that can be used to test and demonstrate - various DirectFB features. + various DirectFB features. As of 4 October 2015, DirectFB's + website http://www.directfb.org/ is down. See alternative site + listed below. - http://directfb.org/downloads/Extras/README.DirectFB-examples + http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk index 46263da733..c8d09b3e33 100644 --- a/package/directfb-examples/directfb-examples.mk +++ b/package/directfb-examples/directfb-examples.mk @@ -5,7 +5,7 @@ ################################################################################ DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras +DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz DIRECTFB_EXAMPLES_LICENSE = MIT DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0b32162d8f..56a396ab99 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -6,7 +6,7 @@ DIRECTFB_VERSION_MAJOR = 1.7 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) +DIRECTFB_SITE = http://sources.buildroot.net/directfb DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPL-2.1+ DIRECTFB_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 17 12:12:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:12:27 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/docker-engine: remove unused sqlite Message-ID: <20220317121107.501DC8439A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56c9ec58d08cbe88f421c69e7e658e374f92c8cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Dependency on sqlite has been removed since v17.04.0-ce. See: https://github.com/moby/moby/pull/30208 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard (cherry picked from commit 6105ad3f72fcb98a7d9aba543c6bb7311827c1d4) Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 4fa3b5a8c3..e99b2504c5 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_DOCKER_ENGINE select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency help Docker is a platform to build, ship, and run applications as lightweight containers. From peter at korsgaard.com Thu Mar 17 12:13:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 13:13:04 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: Document Kconfig requirements for uboot Message-ID: <20220317121107.5923E84398@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4d21fda051b78af74e446d32937ff0e9d612b20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When using uboot's legacy build system, the 'make uboot-menuconfig' and 'make uboot-savedefconfig' targets are not available as they are created by 'kconfig-package'. Signed-off-by: Simon Doppler Signed-off-by: Peter Korsgaard (cherry picked from commit ca9e55ad11271cb26b0bffba336cf5a0d74ba378) Signed-off-by: Peter Korsgaard --- docs/manual/make-tips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 869b6807dd..df3b888c25 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -35,7 +35,8 @@ some settings in the +.config+ file may hide some targets: * +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the +barebox+ bootloader is enabled. * +uboot-menuconfig+ and +uboot-savedefconfig+ only work when the - +U-Boot+ bootloader is enabled. + +U-Boot+ bootloader is enabled and the +uboot+ build system is set + to +Kconfig+. .Cleaning: From rsassen at comecer.com Thu Mar 17 13:19:52 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Thu, 17 Mar 2022 13:19:52 +0000 Subject: [Buildroot] package gdk-pixbuf relocatable issue Message-ID: Hello Fabrice, > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-> 2.0/2.10.0/loaders/libpixbufloader-*". > > > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). > > Thanks for spotting this issue, I think the best approach is to: > - set relocatable to true for the target (see > https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) > - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) > > Can you confirm that this approach is working? Unfortunately this is not working. Without the GDK_PIXBUF_UPDATE_CACHE, the target ends up with no loaders.cache at all. It?s also not possible to run gdk-pixbuf-query-loaders in the target directory because the architecture might differ from the host. Best regards, Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Mar 17 13:35:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 14:35:29 +0100 Subject: [Buildroot] package gdk-pixbuf relocatable issue In-Reply-To: References: Message-ID: Le jeu. 17 mars 2022 ? 14:19, Sassen, Rutger a ?crit : > > Hello Fabrice, > > > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > > > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > > > > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf-> 2.0/2.10.0/loaders/libpixbufloader-*". > > > > > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). > > > > Thanks for spotting this issue, I think the best approach is to: > > - set relocatable to true for the target (see > > https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) > > - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) > > > > Can you confirm that this approach is working? > > Unfortunately this is not working. Without the GDK_PIXBUF_UPDATE_CACHE, the target ends up with no loaders.cache at all. Indeed, good catch, then we can only drop the SED command. However, can you confirm that setting relocatable to true doesn't fix the issue? >From my understanding, if relocatable is true, gdk-pixbuf should prepend the toplevel dir: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/gdk-pixbuf/gdk-pixbuf-io.c#L352 If this doesn't work (because the toplevel dir is not correct), then the better option would be to update the SED command to prepend /usr/ to all lib paths. > It?s also not possible to run gdk-pixbuf-query-loaders in the target directory because the architecture might differ from the host. > > Best regards, > > Rutger > > > Disclaimer > > This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. Best Regards, Fabrice From hrsourabh011 at gmail.com Thu Mar 17 14:45:18 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 17 Mar 2022 15:45:18 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? Message-ID: Hello All, I am facing an issue while running OpenSSH demon in Buildroot 2022 release. The output of "systemctl status sshd" results in sshd.service - OpenSSH server daemon Loaded: loaded (/usr/lib/systemd/system/sshd.service; enabled; vendor prese Active: failed (Result: exit-code) since Tue 2022-01-18 13:16:03 UTC; 9min Process: 1703 ExecStartPre=/usr/bin/ssh-keygen -A (code=exited, status=0/SUC Process: 1704 ExecStart=/usr/sbin/sshd -D -e (code=exited, status=1/FAILURE) Main PID: 1704 (code=exited, status=1/FAILURE) CPU: 27ms Jan 18 13:16:02 br2rauc systemd[1]: Starting OpenSSH server daemon... Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: Jan 18 13:16:03 br2rauc systemd[1]: Started OpenSSH server daemon. Jan 18 13:16:03 br2rauc sshd[1704]: sshd: no hostkeys available -- exiting. Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Main process exited, code=exit Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Failed with result 'exit-code' # ps aux | grep ssh 253 root grep ssh So, there is not sshd deamon running. And also no key files present in /etc/ssh/ I ran "/usr/bin/ssh-keygen -A" manually but this gives: ssh-keygen: generating new host keys: RSA Could not save your private key in /etc/ssh/ssh_host_rsa_key.XXXXUBHAIv: Read-only file system ssh-keygen: generating new host keys: DSA Could not save your private key in /etc/ssh/ssh_host_dsa_key.XXXXq0KiIl: Read-only file system ssh-keygen: generating new host keys: ECDSA Could not save your private key in /etc/ssh/ssh_host_ecdsa_key.XXXXibybTV: Read-only file system ssh-keygen: generating new host keys: ED25519 Could not save your private key in /etc/ssh/ssh_host_ed25519_key.XXXXzI2JnB: Read-only file system Yes, I do have a Read-only file system. But is it not possible to work with a read-only filesystem and ssh? In the menuconfig I have: [image: OpenSSH.PNG] Can anyone please let me know if there is a workaround? Is changing rootfs to r/w is the only solution? Does selecting "System Configuration"-->"remount root filesystem read-write during boot" will do the trick? Your help will be much appreciated. Thanks in advance, -Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenSSH.PNG Type: image/png Size: 47291 bytes Desc: not available URL: From rsassen at comecer.com Thu Mar 17 15:28:38 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Thu, 17 Mar 2022 15:28:38 +0000 Subject: [Buildroot] package gdk-pixbuf relocatable issue Message-ID: > > > > A recent patch for package gdk-pixbuf to enable the relocatable option for the host package has introduced a problem for the target package. > > > > > > > The loaders.cache for the target currently is generated by copying the loaders.cache from the host package and editing it using a sed command to replace the host paths with target paths. The sed command is no longer correct, since the host loaders.cache does not contain absolute paths anymore. > > > > > > > > The consequence is, that the target loaders.cache now contains entries like "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*". These paths are incorrect, and applications using gdk-pixbuf will crash because they are no longer able to load images. Before the patch, it would contain absolute paths like "/usr/lib/gdk-pixbuf- > > 2.0/2.10.0/loaders/libpixbufloader-*". > > > > > > > > I'm not sure what the best approach would be to fix this issue. Either by modifying the SED statement, or by modifying the way the target loaders.cache is generated (i.e. by not using the host loaders.cache as a base). > > > > > > Thanks for spotting this issue, I think the best approach is to: > > > - set relocatable to true for the target (see > > > https://patchwork.ozlabs.org/project/buildroot/patch/20220219122526.2954354-1-fontaine.fabrice at gmail.com) > > > - drop GDK_PIXBUF_UPDATE_CACHE (which has no effect anymore) > > > > > > Can you confirm that this approach is working? > > > > Unfortunately this is not working. Without the GDK_PIXBUF_UPDATE_CACHE, the target ends up with no loaders.cache at all. > Indeed, good catch, then we can only drop the SED command. > However, can you confirm that setting relocatable to true doesn't fix the issue? > From my understanding, if relocatable is true, gdk-pixbuf should > prepend the toplevel dir: > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/blob/master/gdk-pixbuf/gdk-pixbuf-io.c#L352 It tested it, and it does not work. From my understanding this toplevel dir is one directory up relative to the path of the executable, so if the executable is /foo/bar/my_executable , the toplevel dir will be /foo . > If this doesn't work (because the toplevel dir is not correct), then > the better option would be to update the SED command to prepend /usr/ > to all lib paths. I agree. Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From angelo at amarulasolutions.com Thu Mar 17 15:55:33 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Thu, 17 Mar 2022 16:55:33 +0100 Subject: [Buildroot] [PATCH] package/libdill: new package Message-ID: <20220317155533.1906663-1-angelo@amarulasolutions.com> Libdill is a C library that makes writing structured concurrent programs easy. Signed-off-by: Angelo Compagnucci --- DEVELOPERS | 1 + package/Config.in | 1 + package/libdill/Config.in | 8 ++++++++ package/libdill/libdill.hash | 3 +++ package/libdill/libdill.mk | 16 ++++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/libdill/Config.in create mode 100644 package/libdill/libdill.hash create mode 100644 package/libdill/libdill.mk diff --git a/DEVELOPERS b/DEVELOPERS index 70d71186ed..9410944584 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -167,6 +167,7 @@ F: package/i2c-tools/ F: package/jq/ F: package/libapparmor/ F: package/libb64/ +F: package/libdill/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..47f84a08dc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdill/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdill/Config.in b/package/libdill/Config.in new file mode 100644 index 0000000000..17bec04db7 --- /dev/null +++ b/package/libdill/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBDILL + bool "libdill" + select BR2_PACKAGE_OPENSSL + help + Libdill is a C library that makes writing structured concurrent + programs easy. + + http://libdill.org diff --git a/package/libdill/libdill.hash b/package/libdill/libdill.hash new file mode 100644 index 0000000000..4a1fb91a57 --- /dev/null +++ b/package/libdill/libdill.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 6df7527e8f1e91f5106c21c5bfeaa69eee470bec476c74585143e3e439864404 libdill-fa01648cf2a8d06e53c965b45eeacfb3ac57bd04.tar.gz +sha256 3f78d9c42c8919cb6dc63e51de17b9eb40a49d9cdd876ce59e77392721e8c2c6 COPYING diff --git a/package/libdill/libdill.mk b/package/libdill/libdill.mk new file mode 100644 index 0000000000..036c73f33a --- /dev/null +++ b/package/libdill/libdill.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libdill +# +################################################################################ + +LIBDILL_VERSION = fa01648cf2a8d06e53c965b45eeacfb3ac57bd04 +LIBDILL_SITE = $(call github,sustrik,libdill,$(LIBDILL_VERSION)) +LIBDILL_LICENSE = MIT +LIBDILL_LICENSE_FILES = COPYING +LIBDILL_CPE_ID_VENDOR = libdill +LIBDILL_CPE_ID_PRODUCT = libdill +LIBDILL_DEPENDENCIES = openssl +LIBDILL_INSTALL_STAGING = YES + +$(eval $(cmake-package)) -- 2.25.1 From kyle at balena.io Thu Mar 17 16:25:30 2022 From: kyle at balena.io (Kyle Harding) Date: Thu, 17 Mar 2022 12:25:30 -0400 Subject: [Buildroot] [PATCH] package/unbound: use system libevent Message-ID: <20220317162530.427876-1-kyle@balena.io> The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Signed-off-by: Kyle Harding --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 1e6e0d99d7..782ed2b049 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr -- 2.30.2 From foss+buildroot at 0leil.net Thu Mar 17 16:38:21 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 17 Mar 2022 17:38:21 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5base: security bump Message-ID: <20220317163823.2913753-1-foss+buildroot@0leil.net> From: Quentin Schulz This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef02edfc1d..8fd5800822 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -15,6 +15,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at -- 2.35.1 From quentin.schulz at theobroma-systems.com Thu Mar 17 16:40:50 2022 From: quentin.schulz at theobroma-systems.com (Quentin Schulz) Date: Thu, 17 Mar 2022 17:40:50 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> <20220310215914.3d26c317@gmx.net> <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> Message-ID: <008dcac4-aa59-0311-9e86-fef7bc80cdca@theobroma-systems.com> Hi all, Please ignore this patch because it is superseded by: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html Thanks, Quentin From foss+buildroot at 0leil.net Thu Mar 17 16:38:23 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 17 Mar 2022 17:38:23 +0100 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <20220317163823.2913753-3-foss+buildroot@0leil.net> From: Quentin Schulz The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- package/qt5/qt5base/qt5base.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 8fd5800822..972d217ef1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,8 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 -- 2.35.1 From foss+buildroot at 0leil.net Thu Mar 17 16:38:22 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 17 Mar 2022 17:38:22 +0100 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5base: remove leftover patch In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <20220317163823.2913753-2-foss+buildroot@0leil.net> From: Quentin Schulz CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert L?hning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - -- 2.35.1 From theo.lebrun at bootlin.com Thu Mar 17 17:03:17 2022 From: theo.lebrun at bootlin.com (=?UTF-8?q?Th=C3=A9o=20Lebrun?=) Date: Thu, 17 Mar 2022 18:03:17 +0100 Subject: [Buildroot] [PATCH] package/signal-estimator: add new package Message-ID: <20220317170317.308827-1-theo.lebrun@bootlin.com> Measure characteristics of a looped back signal. https://github.com/gavv/signal-estimator Signed-off-by: Th?o Lebrun --- package/Config.in | 1 + .../0001-fix-nanosecond-type-size.patch | 33 +++++++++++++++++++ package/signal-estimator/Config.in | 14 ++++++++ .../signal-estimator/signal-estimator.hash | 3 ++ package/signal-estimator/signal-estimator.mk | 19 +++++++++++ 5 files changed, 70 insertions(+) create mode 100644 package/signal-estimator/0001-fix-nanosecond-type-size.patch create mode 100644 package/signal-estimator/Config.in create mode 100644 package/signal-estimator/signal-estimator.hash create mode 100644 package/signal-estimator/signal-estimator.mk diff --git a/package/Config.in b/package/Config.in index 7ed075ae19..971b238831 100644 --- a/package/Config.in +++ b/package/Config.in @@ -139,6 +139,7 @@ menu "Debugging, profiling and benchmark" source "package/rt-tests/Config.in" source "package/rwmem/Config.in" source "package/sentry-native/Config.in" + source "package/signal-estimator/Config.in" source "package/spidev_test/Config.in" source "package/strace/Config.in" source "package/stress/Config.in" diff --git a/package/signal-estimator/0001-fix-nanosecond-type-size.patch b/package/signal-estimator/0001-fix-nanosecond-type-size.patch new file mode 100644 index 0000000000..6807fc296b --- /dev/null +++ b/package/signal-estimator/0001-fix-nanosecond-type-size.patch @@ -0,0 +1,33 @@ +From be8443db76c691eb1a8ee07760a801a530752d0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9o=20Lebrun?= +Date: Thu, 17 Mar 2022 11:42:24 +0100 +Subject: [PATCH] fix nanosecond type size +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous type was long, it got replaced by long long to ensure being +capable of storing big enough durations/times. 2**31-1 could only +represent about ~2.15s which was conflicting with the minute constant. + +Signed-off-by: Th?o Lebrun +--- + src/cli/Time.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cli/Time.hpp b/src/cli/Time.hpp +index befd521..638413e 100644 +--- a/src/cli/Time.hpp ++++ b/src/cli/Time.hpp +@@ -8,7 +8,7 @@ + namespace signal_estimator { + + //! Nanoseconds type. +-using nanoseconds_t = long; ++using nanoseconds_t = long long; + + //! One nanosecond represented in nanoseconds. + inline constexpr nanoseconds_t Nanosecond = 1; +-- +2.35.1 + diff --git a/package/signal-estimator/Config.in b/package/signal-estimator/Config.in new file mode 100644 index 0000000000..9a40b66612 --- /dev/null +++ b/package/signal-estimator/Config.in @@ -0,0 +1,14 @@ +comment "signal-estimator needs a toochain w/ C++, threads, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + +config BR2_PACKAGE_SIGNAL_ESTIMATOR + bool "signal-estimator" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + select BR2_PACKAGE_ALSA_LIB + help + Measure characteristics of a looped back signal. + + https://github.com/gavv/signal-estimator diff --git a/package/signal-estimator/signal-estimator.hash b/package/signal-estimator/signal-estimator.hash new file mode 100644 index 0000000000..444f73099e --- /dev/null +++ b/package/signal-estimator/signal-estimator.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 bead8b5eac5a7d4172a9272cc0b618252a747685ee6de2349cb2c235c18627f7 signal-estimator-v0.0.3-br1.tar.gz +sha256 825f572a6a7ca7389e5bddbebe45c839e23a6cf0b63fab6c9e0c6ed018056204 LICENSE diff --git a/package/signal-estimator/signal-estimator.mk b/package/signal-estimator/signal-estimator.mk new file mode 100644 index 0000000000..24120b36da --- /dev/null +++ b/package/signal-estimator/signal-estimator.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# signal-estimator +# +################################################################################ + +SIGNAL_ESTIMATOR_VERSION = v0.0.3 +# Using Git as the package depends on a submodule (an old version of cxxopt). +SIGNAL_ESTIMATOR_SITE_METHOD = git +SIGNAL_ESTIMATOR_SITE = https://github.com/gavv/signal-estimator +SIGNAL_ESTIMATOR_GIT_SUBMODULES = YES +SIGNAL_ESTIMATOR_LICENSE = MIT +SIGNAL_ESTIMATOR_LICENSE_FILES = LICENSE + +SIGNAL_ESTIMATOR_DEPENDENCIES = alsa-lib + +SIGNAL_ESTIMATOR_CONF_OPTS += -DBUILD_GUI=OFF + +$(eval $(cmake-package)) -- 2.35.1 From ps.report at gmx.net Thu Mar 17 18:03:06 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 17 Mar 2022 19:03:06 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220317190306.1e427303@gmx.net> Hello Rutger, On Thu, 17 Mar 2022 11:06:22 +0000, "Sassen, Rutger" wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen Thanks for new patch iteration... Reviewed-by: Peter Seiderer Regards, Peter > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/Config.in | 12 ++++++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 19 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index 8070dc3019..36054353f8 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + bool "Install DTB overlay map" > + default n > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need overlay_map.dtb for target dependent mapping of > + overlay names to one of several overlay implementations. > + > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) From ps.report at gmx.net Thu Mar 17 18:15:10 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 17 Mar 2022 19:15:10 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <87cziltvrq.fsf@dell.be.48ers.dk> References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> <87cziltvrq.fsf@dell.be.48ers.dk> Message-ID: <20220317191510.1b3b85d5@gmx.net> Hello *, On Wed, 16 Mar 2022 22:47:21 +0100, Peter Korsgaard wrote: > >>>>> "Yann" == Yann E MORIN writes: > > > Peter, All, > > +Peter K.: candidate to be backported, that's a security fix. > > Indeed. Why it is not marked as such ("security bump to version > 1.1.1n")? > Sorry, missed it ;-), did only look at the last version bump ([1]): package/libopenssl: bump version to 1.1.1m not marked as security bump, but according to [2] is one fixing CVE-2021-4160... The security advisory for 1.1.1n is found here [3], fixing CVE-2022-0778... Regards, Peter [1] https://git.buildroot.net/buildroot/commit/package/libopenssl?id=2b906b975a956bd2b6352b2eec6c3c697317bbbe [2] https://www.openssl.org/news/secadv/20220128.txt [3] https://www.openssl.org/news/secadv/20220315.txt From arnout at mind.be Thu Mar 17 18:42:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 19:42:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix default device behaviour In-Reply-To: <20220316092200.66623-1-theo.lebrun@bootlin.com> References: <20220316092200.66623-1-theo.lebrun@bootlin.com> Message-ID: Hi The?o, On 16/03/2022 10:22, Th?o Lebrun wrote: > This patch has been applied upstream and is required to allow having > default devices on non x86_64 platforms with WirePlumber v0.4.8. > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 It's better to put this link in the patch itself. > > Signed-off-by: Th?o Lebrun > --- > .../0001-fix-non-x86_64-architectures.patch | 212 ++++++++++++++++++ > 1 file changed, 212 insertions(+) > create mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch > > diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > new file mode 100644 > index 0000000000..27b6f034b2 > --- /dev/null > +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > @@ -0,0 +1,212 @@ > +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 > +From: Julian Bouzas > +Date: Wed, 9 Feb 2022 07:59:59 -0500 > +Subject: [PATCH] spa-json: fix va_list APIs for different architectures > + > +The va_list type might not always be a pointer in some architectures, so we > +cannot guarantee it will be modified after using it for a second time in another > +function. This fixes the issue by using macros so args does not get copied, and > +always gets modified when using it more than once. You need to add a Signed-off-by line for yourself, in addition to the one in the commit itself. This is a short way for you to assert that you are entitled to contribute the patch under the package's license. See http://elinux.org/Developer_Certificate_Of_Origin for more details. So it would be: always gets modified when using it more than once. Signed-off-by: The?o ... Upstream: https://... Regards, Arnout > +--- > + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- > + 1 file changed, 80 insertions(+), 76 deletions(-) > + > +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c > +index f14f395d..c5e59a3e 100644 > +--- a/lib/wp/spa-json.c > ++++ b/lib/wp/spa-json.c > +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) > + wp_spa_json_builder_new_formatted ("\"%s\"", value)); > + } > + > +-static void > +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- wp_spa_json_builder_add_null (self); > +- break; > +- case 'b': > +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); > +- break; > +- case 'i': > +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); > +- break; > +- case 'f': > +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); > +- break; > +- case 's': > +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); > +- break; > +- case 'J': > +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); > +- break; > +- default: > +- return; > +- } > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_builder_add_value(self,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ wp_spa_json_builder_add_null (self); \ > ++ break; \ > ++ case 'b': \ > ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ > ++ break; \ > ++ case 'i': \ > ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ > ++ break; \ > ++ case 'f': \ > ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ > ++ break; \ > ++ case 's': \ > ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ > ++ break; \ > ++ case 'J': \ > ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ > ++ break; \ > ++ default: \ > ++ break; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Creates a spa json of type array > +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) > + return res; > + } > + > +-static gboolean > +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- if (!spa_json_is_null (data, len)) > +- return FALSE; > +- break; > +- case 'b': > +- if (!wp_spa_json_parse_boolean_internal (data, len, > +- va_arg(args, gboolean *))) > +- return FALSE; > +- break; > +- case 'i': > +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) > +- return FALSE; > +- break; > +- case 'f': > +- if (spa_json_parse_float (data, len, > +- (float *)va_arg(args, double *)) < 0) > +- return FALSE; > +- break; > +- case 's': { > +- gchar *str = wp_spa_json_parse_string_internal (data, len); > +- if (!str) > +- return FALSE; > +- *va_arg(args, gchar **) = str; > +- break; > +- } > +- case 'J': { > +- WpSpaJson *j = wp_spa_json_new (data, len); > +- if (!j) > +- return FALSE; > +- *va_arg(args, WpSpaJson **) = j; > +- break; > +- } > +- default: > +- return FALSE; > +- } > +- return TRUE; > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_parse_value(data,len,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ if (!spa_json_is_null (data, len)) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'b': \ > ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ > ++ va_arg(args, gboolean *))) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'i': \ > ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'f': \ > ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 's': { \ > ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ > ++ if (!str) \ > ++ return FALSE; \ > ++ *va_arg(args, gchar **) = str; \ > ++ break; \ > ++ } \ > ++ case 'J': { \ > ++ WpSpaJson *j = wp_spa_json_new (data, len); \ > ++ if (!j) \ > ++ return FALSE; \ > ++ *va_arg(args, WpSpaJson **) = j; \ > ++ break; \ > ++ } \ > ++ default: \ > ++ return FALSE; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Parses the object property values of a spa json object > +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) > + value = g_value_get_boxed (&item); > + > + if (g_strcmp0 (key_str, lookup_key) == 0) { > +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) > +- return FALSE; > ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); > + lookup_key = va_arg(args, const gchar *); > + if (!lookup_key) > + return TRUE; > +@@ -1366,9 +1363,12 @@ gboolean > + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, > + va_list args) > + { > +- return wp_spa_json_parser_advance (self) && > +- wp_spa_json_parse_value (self->curr.cur, > +- self->curr.end - self->curr.cur, fmt, args); > ++ if (wp_spa_json_parser_advance (self)) { > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ fmt, args); > ++ return TRUE; > ++ } > ++ return FALSE; > + } > + > + /*! > +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) > + if (!format) > + return TRUE; > + > +- /* parse value */ > +- if (!wp_spa_json_parser_get_value (self, format, args)) > ++ /* advance */ > ++ if (!wp_spa_json_parser_advance (self)) > + return FALSE; > ++ > ++ /* parse value */ > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ format, args); > + } while (TRUE); > + > + return FALSE; > +-- > +GitLab > + From fontaine.fabrice at gmail.com Thu Mar 17 18:56:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 19:56:15 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/libminiupnpc: drop dependencies Message-ID: <20220317185615.179351-1-fontaine.fabrice@gmail.com> libminiupnpc can be statically built with or without binfmt flat since version 1.7 and https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Rebase patch on current master package/libminiupnpc/Config.in | 6 ------ package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225..51f4b43bbb 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 0633ccd234..52fe9849f2 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif + $(eval $(cmake-package)) -- 2.35.1 From fontaine.fabrice at gmail.com Thu Mar 17 18:58:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 19:58:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: usbpro needs gcc >= 4.9 Message-ID: <20220317185842.183700-1-fontaine.fabrice@gmail.com> Fix the following build failure with usbpro raised since re-introduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: compiler with C11 support is required to build libusb Fixes: - http://autobuild.buildroot.org/results/e9239403bb13d3468db01a952da8c695c0e5ea30 Signed-off-by: Fabrice Fontaine --- package/ola/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ola/Config.in b/package/ola/Config.in index 36b175138f..e59637b57f 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -164,8 +164,12 @@ config BR2_PACKAGE_OLA_PLUGIN_USBDMX config BR2_PACKAGE_OLA_PLUGIN_USBPRO bool "usbpro" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Build UsbPro plugin for OLA. +comment "usbpro needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + endif -- 2.35.1 From fontaine.fabrice at gmail.com Thu Mar 17 19:00:27 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 20:00:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgee: needs gcc >= 4.9 Message-ID: <20220317190027.183976-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 0.20.5 in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: task.c:59:1: error: initializer element is not constant static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; ^ Fixes: - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a Signed-off-by: Fabrice Fontaine --- package/granite/Config.in | 6 ++++-- package/libgee/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d..9519e16d45 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985..cb33ec9ec2 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.35.1 From b.bilas at grinn-global.com Thu Mar 17 19:02:54 2022 From: b.bilas at grinn-global.com (Bartosz Bilas) Date: Thu, 17 Mar 2022 20:02:54 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: Hello, On 17.03.2022 12:06, Sassen, Rutger wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/Config.in | 12 ++++++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 19 insertions(+) > > diff --git a/package/rpi-firmware/Config.in > b/package/rpi-firmware/Config.in > index 8070dc3019..36054353f8 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + bool "Install DTB overlay map" > + default n bool symbols implicitly default to n. Best Bartek > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need overlay_map.dtb for target dependent mapping of > + overlay names to one of several overlay implementations. > + > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk > b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > $(BINARIES_DIR)/rpi-firmware/overlays/ > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) > -- > 2.20.1 > > > *Disclaimer* > > This email communication is CONFIDENTIAL. If you are not the intended > recipient, you may not use, copy or disclose to anyone the message or > any information contained in the message and I ask that you please > notify me by return email and delete this communication immediately. > Thank you. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas at ruschival.de Thu Mar 17 19:23:01 2022 From: thomas at ruschival.de (Thomas Ruschival) Date: Thu, 17 Mar 2022 20:23:01 +0100 Subject: [Buildroot] RFC: Patch "Gallium VC4 driver depends on NEON"? Message-ID: <8735jgs7sa.fsf@ruschival.de> Hi Arnout, the Patch "package/mesa3d: Gallium VC4 driver depends on NEON" commit a5cdb54ed78b136c83dd44aebfa27f715cda5ea3 prevents using VC4 and hence OpenGL on Raspberry Pi Zero. >From the referenced autobuild logs I gathered that the build that failed used the bootlin-armv5-uclibc toolchain. Since I wanted to use OpenGL for Qt on a Raspberry Pi Zero I reverted the commit. The package compiled without errors and the system works as expected. Since my build is using a buildroot toolchain arm-buildroot-linux-gnueabihf (gcc 10, glibc) I guess the assembler errors are due to the toolchain. I am not sure how to proceed in this case. Should I investigate further on a more elaborate dependency logic to allow for usage of VC4 on Raspberry Pi Zero that doesn't break autobuild with bootlin-armv5-uclibc? Best regards Thomas From peter at korsgaard.com Thu Mar 17 19:28:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 20:28:40 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220317191510.1b3b85d5@gmx.net> (Peter Seiderer's message of "Thu, 17 Mar 2022 19:15:10 +0100") References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> <87cziltvrq.fsf@dell.be.48ers.dk> <20220317191510.1b3b85d5@gmx.net> Message-ID: <87a6dos7iv.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: Hi, >> Indeed. Why it is not marked as such ("security bump to version >> 1.1.1n")? >> > Sorry, missed it ;-), did only look at the last version bump ([1]): > package/libopenssl: bump version to 1.1.1m > not marked as security bump, but according to [2] is one fixing > CVE-2021-4160... Yes, but that was not known when 1.1.1m was released, E.G. the release is from December (and so is the bump in Buildroot) but the advisory was only made on January 28th: https://www.openssl.org/news/secadv/20220128.txt -- Bye, Peter Korsgaard From arnout at mind.be Thu Mar 17 20:39:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 21:39:14 +0100 Subject: [Buildroot] [PATCH] package/qt5/qt5base: fix CVE-2022-25255 In-Reply-To: <008dcac4-aa59-0311-9e86-fef7bc80cdca@theobroma-systems.com> References: <20220309142913.2102898-1-foss+buildroot@0leil.net> <20220310215914.3d26c317@gmx.net> <639cd3a7-bcdc-4720-e587-bc22b431bb2e@theobroma-systems.com> <008dcac4-aa59-0311-9e86-fef7bc80cdca@theobroma-systems.com> Message-ID: <49a4511f-7111-5065-c04e-513426eab73d@mind.be> On 17/03/2022 17:40, Quentin Schulz wrote: > Hi all, > > Please ignore this patch because it is superseded by: > http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html Instead of replying to the list, it's nicer if you create an account on patchwork [1] and update the patch state to Superseded yourself. Also, in the future please add the version in the subject of the new patch (series) using the -v2 option to git format-patch, and add a patch changelog below the --- line. See [2]. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/list/ [2] https://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog > > Thanks, > Quentin From arnout at mind.be Thu Mar 17 20:53:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 21:53:24 +0100 Subject: [Buildroot] RFC: Patch "Gallium VC4 driver depends on NEON"? In-Reply-To: <8735jgs7sa.fsf@ruschival.de> References: <8735jgs7sa.fsf@ruschival.de> Message-ID: <5feaf128-d85d-9d40-7708-80e2bf5f88a9@mind.be> On 17/03/2022 20:23, Thomas Ruschival wrote: > Hi Arnout, > > the Patch "package/mesa3d: Gallium VC4 driver depends on NEON" > commit a5cdb54ed78b136c83dd44aebfa27f715cda5ea3 prevents using VC4 and > hence OpenGL on Raspberry Pi Zero. > > From the referenced autobuild logs I gathered that the build that failed > used the bootlin-armv5-uclibc toolchain. > > Since I wanted to use OpenGL for Qt on a Raspberry Pi Zero I reverted > the commit. The package compiled without errors and the system works as > expected. Since my build is using a buildroot toolchain > arm-buildroot-linux-gnueabihf (gcc 10, glibc) I guess the assembler > errors are due to the toolchain. > > I am not sure how to proceed in this case. > > Should I investigate further on a more elaborate dependency logic to > allow for usage of VC4 on Raspberry Pi Zero that doesn't break > autobuild with bootlin-armv5-uclibc? The easiest is to test if it still fails with the bootlin toolchain (you can select it from the external toolchains list). If it doesn't, then it's probably something that got fixed by a mesa3d bump. Ideally you should investigate what changed exactly to fix this - I had a quick look, nothing changed in the files using NEON instructions themselves, so it must be that the V3D_BUILD_NEON or PIPE_ARCH_ARM macros are defined differently (they determine whether or not the NEON instructions are used). If it builds now for the bootlin toolchain, please send a revert patch with an explanation why it works - ideally referring to the upstream commit that fixed it. And a reference to the version in which it was fixed, so we know if the revert can be backported to the stable branches. If the build still fails with the bootlin toolchain, then yes ideally find out why it behaves differently with the two toolchains. Again, the NEON instructions are still there in the code, so the difference must be with the V3D_BUILD_NEON or PIPE_ARCH_ARM macros. The only other explanation (I can think of) is a difference in binutils, where your binutils accepts the NEON instructions even on an architecture that doesn't support NEON. Seems pretty unlikely. Regards, Arnout From peter at korsgaard.com Thu Mar 17 20:54:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:54:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/mariadb: fix mysql.service failing to create log directory In-Reply-To: <20220222213202.642708-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 22 Feb 2022 22:32:02 +0100") References: <20220222213202.642708-1-ju.o@free.fr> Message-ID: <875yocs3ke.fsf@dell.be.48ers.dk> >>>>> "Julien" == Julien Olivain writes: > When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd > (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start > with a permission error. See output of command: > journalctl --unit=mysqld > Which shows: > systemd[1]: Starting MySQL database server... > install[102]: install: can't create directory '/var/log/mysql': Permission denied > systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE > Since the service file includes the "User=mysql" directive, the > "ExecStartPre=" is executed as this user, which does not have > permission to create a directory in "/var/log". > This commit fixes this issue by adding the "!" prefix, which will > execute the command with full privileges. See the systemd.service manual > page entry for "ExecStart=", table "Special executable prefixes": > https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= > or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 > Moreover, the "mysql_install_db" invocation does not need this special > prefix, as the "/var/lib/mysql" directory on target is already owned > by the "mysql" user. The "chown" command is also useless and is > removed in this commit. > Reported-by: Gilles Talis > Signed-off-by: Julien Olivain Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 20:57:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:57:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/oprofile: drop custom install rules In-Reply-To: <20220307223355.945328-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 7 Mar 2022 23:33:55 +0100") References: <20220307223355.945328-1-fontaine.fabrice@gmail.com> Message-ID: <871qz0s3f5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop custom install rules which have added since commit > 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a > broken installation. Especially, they are trying to "guess" what must > be installed based on BR2_ARCH but oprofile has its own logic. For > example, goldmont microarchitecture files must be installed in i386 > directory even if this architecture is 64 bits: > https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a > This will result in the following runtime failure: > oprofile: could not open unit mask description file > /usr/share/oprofile//i386/goldmont/unit_masks > Unable to find info for event cpu_clk_unhalted > Fixes: > - https://bugs.buildroot.org/show_bug.cgi?id=14641 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 20:59:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:59:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: bump to version 2.4.2 In-Reply-To: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 19:00:56 +0100") References: <20220308180056.1558155-1-fontaine.fabrice@gmail.com> Message-ID: <87wngsqoqm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This is a patch release for version 2 & 2.4, fixing a regression > introduced in 2.4.1. > https://github.com/cisco/libsrtp/releases/tag/v2.4.2 > Signed-off-by: Fabrice Fontaine Committed to 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 21:01:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:01:40 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220317205338.895C9843AC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fa2a8d554e6cb0c3db2d86eda57ec4bfd321415 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain Tested-By: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit fd03d4f057bdbd343f78360bd732df1b47d774a0) Signed-off-by: Peter Korsgaard --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql From peter at korsgaard.com Thu Mar 17 21:01:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:01:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libsrtp: bump to version 2.4.2 Message-ID: <20220317205338.9F6C1843B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2e163ad4e83e565d683ccc05cef101c864b99f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This is a patch release for version 2 & 2.4, fixing a regression introduced in 2.4.1. https://github.com/cisco/libsrtp/releases/tag/v2.4.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 232868ffd3ef76f060711adf5ea1e5001e21ef9d) Signed-off-by: Peter Korsgaard --- package/libsrtp/libsrtp.hash | 2 +- package/libsrtp/libsrtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index 3de0130f4c..8e51e68ac2 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 3b1bcb14ebda572b04b9bdf07574a449c84cb924905414e4d94e62837d22b628 libsrtp-2.4.2.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 885f05a33c..f2ba600dd6 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.4.1 +LIBSRTP_VERSION = 2.4.2 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause From peter at korsgaard.com Thu Mar 17 21:01:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:01:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/oprofile: drop custom install rules Message-ID: <20220317205338.93A88843AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6a980e372cf406e4e3a7c388a1c60a1d63dd345 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Drop custom install rules which were added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5259807318699646a7bb9cbc24fb137983bc5270) Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) From peter at korsgaard.com Thu Mar 17 20:53:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:53:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/mariadb: fix mysql.service failing to create log directory Message-ID: <20220317205358.26099843BA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c6ab290d67105e432448563979d81e3c395c80d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When enabling MariaDB (BR2_PACKAGE_MARIADB=y) and systemd (BR2_INIT_SYSTEMD=y) in buildroot, the mysqld.service fail to start with a permission error. See output of command: journalctl --unit=mysqld Which shows: systemd[1]: Starting MySQL database server... install[102]: install: can't create directory '/var/log/mysql': Permission denied systemd[1]: mysqld.service: Control process exited, code=exited, status=1/FAILURE Since the service file includes the "User=mysql" directive, the "ExecStartPre=" is executed as this user, which does not have permission to create a directory in "/var/log". This commit fixes this issue by adding the "!" prefix, which will execute the command with full privileges. See the systemd.service manual page entry for "ExecStart=", table "Special executable prefixes": https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= or https://github.com/systemd/systemd/blob/v250/man/systemd.service.xml#L339 Moreover, the "mysql_install_db" invocation does not need this special prefix, as the "/var/lib/mysql" directory on target is already owned by the "mysql" user. The "chown" command is also useless and is removed in this commit. Reported-by: Gilles Talis Signed-off-by: Julien Olivain Tested-By: Gilles Talis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit fd03d4f057bdbd343f78360bd732df1b47d774a0) Signed-off-by: Peter Korsgaard --- package/mariadb/mysqld.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index d9ea74ebc3..537430e9a2 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -2,8 +2,8 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' -ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStartPre=!install -d -o mysql -g root -m 0755 /var/log/mysql ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql From peter at korsgaard.com Thu Mar 17 20:57:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 21:57:05 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/oprofile: drop custom install rules Message-ID: <20220317205358.2EBAC843BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01776e107ff140dfa5ada94821884a7106a714cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Drop custom install rules which were added since commit 676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a broken installation. Especially, they are trying to "guess" what must be installed based on BR2_ARCH but oprofile has its own logic. For example, goldmont microarchitecture files must be installed in i386 directory even if this architecture is 64 bits: https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a This will result in the following runtime failure: oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks Unable to find info for event cpu_clk_unhalted Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14641 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5259807318699646a7bb9cbc24fb137983bc5270) Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 85bc4efa9b..265d6ebd18 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \ --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - OPROFILE_DEPENDENCIES = popt binutils host-pkgconf ifeq ($(BR2_PACKAGE_LIBPFM4),y) OPROFILE_DEPENDENCIES += libpfm4 endif -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - $(eval $(autotools-package)) From arnout at mind.be Thu Mar 17 21:04:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:04:59 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? In-Reply-To: References: Message-ID: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> On 17/03/2022 15:45, Sourabh Hegde wrote: > Hello All, > > I am facing an issue while running OpenSSH demon?in Buildroot 2022 release. > > The output of "systemctl status sshd" results in > > sshd.service - OpenSSH server daemon > ? ? ?Loaded: loaded (/usr/lib/systemd/system/sshd.service; enabled; vendor prese > ? ? ?Active: failed (Result: exit-code) since Tue 2022-01-18 13:16:03 UTC; 9min > ? ? Process: 1703 ExecStartPre=/usr/bin/ssh-keygen -A (code=exited, status=0/SUC > ? ? Process: 1704 ExecStart=/usr/sbin/sshd -D -e (code=exited, status=1/FAILURE) > ? ?Main PID: 1704 (code=exited, status=1/FAILURE) > ? ? ? ? CPU: 27ms > > Jan 18 13:16:02 br2rauc systemd[1]: Starting OpenSSH server daemon... > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new host keys: > Jan 18 13:16:03 br2rauc systemd[1]: Started OpenSSH server daemon. > Jan 18 13:16:03 br2rauc sshd[1704]: sshd: no hostkeys available -- exiting. > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Main process exited, code=exit > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Failed with result 'exit-code' > > # ps aux | grep ssh > ? 253 root ? ? grep ssh > > So, there is not sshd deamon?running. And also no key files present in /etc/ssh/ > > I ran "/usr/bin/ssh-keygen -A" manually but this gives: > > ssh-keygen: generating new host keys: RSA Could not save your private key in > /etc/ssh/ssh_host_rsa_key.XXXXUBHAIv: Read-only file system > ssh-keygen: generating new host keys: DSA Could not save your private key in > /etc/ssh/ssh_host_dsa_key.XXXXq0KiIl: Read-only file system > ssh-keygen: generating new host keys: ECDSA Could not save your private key in > /etc/ssh/ssh_host_ecdsa_key.XXXXibybTV: Read-only file system > ssh-keygen: generating new host keys: ED25519 Could not save your private key in > /etc/ssh/ssh_host_ed25519_key.XXXXzI2JnB: Read-only file system > > Yes, I do have a Read-only file system. But is it not possible to work with a > read-only filesystem and ssh? Indeed, ssh daemon with readonly rootfs requires special treatment. Someone has gone through the effort for dropbear, but not for openssh. Basically, how it is solved for dropbear is: - build time, create a symlink from /etc/dropbear to /var/run/dropbear (/var/run is a writeable tmpfs). - runtime, in the init script and in the systemd service file, check if /etc/dropbear is a symlink to tmpfs. If yes, try to remove the symlink. If that succeeds, the rootfs is writeable and the keys can be generated there. If the remove failed, the symlink is still there, and the key generation succeeds. If it's not a symlink, the rootfs was modified so either it's writeable, or the keys are already there (or they're not and there's nothing we can do about it). For openssh it will be even more complicated, because /etc/sshd contains the config file as well as the keys. So you probably need to change the config to put the keys in a different place before you can use the same trick. If you manage to solve this, please send a patch to the list for others to enjoy! Oh, and the usual solution is that you have a different partition that is writeable, and make /etc/sshd a symlink to that in the rootfs overlay. But you still have to make sure then that the directory is created if it doesn't exist yet, and you still have the problem of the config file being in the same directory as the keys. Regards, Arnout > > In the menuconfig I have: > > OpenSSH.PNG > > Can anyone please let me know if there is a workaround? Is changing?rootfs to > r/w is the only solution? > > Does selecting "System Configuration"-->"remount root filesystem read-write > during boot" will do the trick? > > Your help will be much appreciated. > > Thanks in advance, > > -Sourabh > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Mar 17 21:08:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:08:37 +0100 Subject: [Buildroot] Can buildroot use existing host fakeroot? In-Reply-To: References: Message-ID: <2af0a832-8418-1837-ce41-aedebb52cbf1@mind.be> On 16/03/2022 19:10, Grant Edwards wrote: > On 2022-03-16, Grant Edwards wrote: > >> I maintain some firmware that uses buildroot 2016.11.2 (with some >> local package upgrades). Unfortunately, it seems I can no longer do >> builds because host-fakeroot won't compile (it's too old for my >> kernel/libc version of stat?). > > I've updated fakeroot, acl, and attr packages so that I can build > again, but I'm still curious about whether you can tell buildroot > to use pre-existing versions of host-side tools like fakeroot. Not as is. If you want to support that, you have to add a fakeroot handler so support/dependencies/, and you have to update all places that use fakeroot to use $(FAKEROOT) instead of $(HOST_DIR)/bin/fakeroot. (Or actually, what we should do is to create a symlink from $(HOST_DIR)/bin to `which fakeroot` in the check-host-fakeroot.sh script. We don't do that for all the other dependencies, but it would be a nice approach I think.) Regards, Arnout From arnout at mind.be Thu Mar 17 21:27:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:27:53 +0100 Subject: [Buildroot] [PATCH] pkg-generic: fix rdepends and phony targets of virtual packages In-Reply-To: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> References: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> Message-ID: <9470ba2b-e40f-322d-b37a-f0daea8f5059@mind.be> On 16/03/2022 11:12, Anssi Hannula wrote: > Virtual packages are not added to the _RDEPENDENCIES list of packages > that they depend on (i.e. their provider). > > This causes -show-rdepends to not show the virtual package > and -show-recursive-rdepends to miss all the packages that > transitively depend on via the virtual package. > > The virtual make targets (e.g. -show-info) are also not marked as > phony for virtual packages. > > To fix those issues, remove most of the special handling of virtual > packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as > well. > > This also allows removal of some duplicated code in pkg-generic.mk and a > now unneeded special condition in CHECK_ONE_DEPENDENCY. > > Still keep the virtual package out of PACKAGES since there is e.g. no > need to rsync per-package target dir to global target dir. I am not > aware of any showstoppers preventing addition to PACKAGES as well, > though, so it is probably just an optimization. > > Signed-off-by: Anssi Hannula > --- > > I encountered this while using -show-recursive-rdepends to > determine which packages to dirclean after modification of a > (non-virtual) in per-package mode. > > The current virtual vs. real distinction didn't seem worth the risk of Well, I guess there *was* a reason that we introduced this distinction way back when, and that all the build targets are skipped for virtual packages. However, I can't remember the reason. Maybe Yann (the instigator of this feature) still remembers? Looking at the history, in particular e.g. commit c5d546450fc1 that converts libgles from generic infrastructure to virtual, it looks like it really *should* be OK to keep the full build targets. And in that case, this patch is a really nice simplification! So, unless Yann objects, I'd say: let's try it and let the autobuilders complain! Regards, Arnout > unintentional differences so I dropped it, but I'm not too familiar with > the code so I could have missed something. > In case I did and this is not a good idea, one less intrusive option > would be to split the common-to-virtual-and-real-packages code to be > under a new separate conditional block. > > > Makefile | 2 -- > package/pkg-generic.mk | 24 +++++------------------- > 2 files changed, 5 insertions(+), 21 deletions(-) > > diff --git a/Makefile b/Makefile > index 4f693d40a9..9e875dd8d8 100644 > --- a/Makefile > +++ b/Makefile > @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) > > define CHECK_ONE_DEPENDENCY > ifeq ($$($(2)_TYPE),target) > -ifeq ($$($(2)_IS_VIRTUAL),) > ifneq ($$($$($(2)_KCONFIG_VAR)),y) > $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ > has added it to its _DEPENDENCIES variable without selecting it or \ > depending on it from Config.in) > endif > endif > -endif > endef > > $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b3a7e1d60e..a0d6198edc 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -1064,15 +1064,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > $$($(2)_TARGET_DIRCLEAN): NAME=$(1) > > # Compute the name of the Kconfig option that correspond to the > -# package being enabled. We handle three cases: the special Linux > -# kernel case, the bootloaders case, and the normal packages case. > -# Virtual packages are handled separately (see below). > +# package being enabled. > ifeq ($(1),linux) > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > $(2)_KCONFIG_VAR = BR2_TARGET_$(2) > else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) > $(2)_KCONFIG_VAR = BR2_$(2) > +else ifeq ($$($(2)_IS_VIRTUAL),YES) > +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) > else > $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) > endif > @@ -1178,7 +1178,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) > $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) > $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) > > +ifneq ($$($(2)_IS_VIRTUAL),YES) > PACKAGES += $(1) > +endif > > ifneq ($$($(2)_PERMISSIONS),) > PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > @@ -1268,22 +1270,6 @@ ifneq ($$($(2)_HELP_CMDS),) > HELP_PACKAGES += $(2) > endif > > -# Virtual packages are not built but it's useful to allow them to have > -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR > - > -ifneq ($$($(2)_PERMISSIONS),) > -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > -endif > -ifneq ($$($(2)_DEVICES),) > -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) > -endif > -ifneq ($$($(2)_USERS),) > -PACKAGES_USERS += $$($(2)_USERS)$$(sep) > -endif > -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) > -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) > - > endif # $(2)_KCONFIG_VAR > endef # inner-generic-package > From arnout at mind.be Thu Mar 17 21:36:20 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:36:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/moby-buildkit: bump to version 0.10.0 In-Reply-To: <20220311041821.3078930-1-christian@paral.in> References: <20220311041821.3078930-1-christian@paral.in> Message-ID: On 11/03/2022 05:18, Christian Stewart via buildroot wrote: > https://github.com/moby/buildkit/releases/tag/v0.10.0 > > Signed-off-by: Christian Stewart > --- > package/moby-buildkit/moby-buildkit.hash | 4 ++-- > package/moby-buildkit/moby-buildkit.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > index 3015e479f6..e22e97cb3a 100644 > --- a/package/moby-buildkit/moby-buildkit.hash > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > +sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz > +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE If the license hash changes, you *have* to explain why in the commit message (in particular, you have to explain why the license hasn't changed). Also, as reported by check-package: two spaces. However, the license file is actually still the same, this hash shouldn't have changed. So applied to master after restoring the original license hash, thanks. Regards, Arnout > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > index 3f0df351ef..d34ff96252 100644 > --- a/package/moby-buildkit/moby-buildkit.mk > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_VERSION = 0.10.0 > MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > MOBY_BUILDKIT_LICENSE = Apache-2.0 > MOBY_BUILDKIT_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 17 21:38:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:38:07 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/kvm-unit-tests: bump to version 2022-03-08 In-Reply-To: <20220310221908.30588-1-fontaine.fabrice@gmail.com> References: <20220310221908.30588-1-fontaine.fabrice@gmail.com> Message-ID: <61249287-eed1-34a0-3b8f-d5615a23027f@mind.be> On 10/03/2022 23:19, Fabrice Fontaine wrote: > - Switch site: > https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 > - Update first patch > - Drop second patch (binutils < 2.23 is not supported by buildroot > anymore) > - Drop third and fourth patches (already in version) > - This bump will fix the following build failure with powerpc and gcc 11 > thanks to > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 > > /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian > > Fixes: > - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2 (after review of Thomas Huth): > - Drop second patch > > ...emove-Werror-to-avoid-build-failures.patch | 17 +-- > ...vm-unit-tests-test-for-rdseed-rdrand.patch | 110 ------------------ > ...3-Makefile-fix-stack-protector-tests.patch | 36 ------ > ...issue-with-the-linker-from-Fedora-32.patch | 61 ---------- > package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- > package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- > 6 files changed, 14 insertions(+), 218 deletions(-) > delete mode 100644 package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > delete mode 100644 package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > delete mode 100644 package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > > diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > index cbfa3a87e6..d07b9b6912 100644 > --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch > @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures > Signed-off-by: Thomas Petazzoni > [Matthew: Refactoring of Thomas Petazzoni's original.] > Signed-off-by: Matthew Weber > +[Fabrice: updated for 2022-03-08] > +Signed-off-by: Fabrice Fontaine > --- > Makefile | 1 - > 1 file changed, 1 deletion(-) > @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile > index 7231334..d9ad42b 100644 > --- a/Makefile > +++ b/Makefile > -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > - COMMON_CFLAGS += -g $(autodepend-flags) > - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized > - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter > --COMMON_CFLAGS += -Werror > +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > + > + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common > + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized > +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces > ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces > + > frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") > - fnostack_protector := $(call cc-option, -fno-stack-protector, "") > --- > +- > 2.14.2 > > diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > deleted file mode 100644 > index 1a1a90ce99..0000000000 > --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch > +++ /dev/null > @@ -1,110 +0,0 @@ > -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 > -From: Matt Weber > -Date: Fri, 12 Jan 2018 19:07:27 -0600 > -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand > - > -The build fails when the host binutils isn't at least 2.23 > -(2.22.x introduced RDSEED). > - > -Fixes: > -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ > - > -Upstream: > -https://marc.info/?l=kvm&m=151580743523259&w=2 > - > -Signed-off-by: Matthew Weber > ---- > - Makefile | 2 +- > - configure | 18 ++++++++++++++++++ > - x86/vmx_tests.c | 6 ++++++ > - 3 files changed, 25 insertions(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index d9ad42b..799e9b5 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile > - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ > - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) > - > --COMMON_CFLAGS += -g $(autodepend-flags) > -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) > - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized > - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter > - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > -diff --git a/configure b/configure > -index dd9d361..21c0219 100755 > ---- a/configure > -+++ b/configure > -@@ -171,6 +171,23 @@ mkdir -p lib > - ln -sf "$asm" lib/asm > - > - > -+cat > rd_test.c < -+#include > -+int main() { > -+ uint16_t seed=0; > -+ unsigned char ok; > -+ asm volatile ("rdseed %0; setc %1" > -+ : "=r" (seed), "=qm" (ok)); > -+ return ok; > -+} > -+EOF > -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then > -+ echo "Checking for rdseed/rdrand... Yes." > -+else > -+ echo "Checking for rdseed/rdrand... No." > -+ extra_cflags="-DNO_RDSEEDRAND" > -+fi > -+ > - # create the config > - cat < config.mak > - SRCDIR=$srcdir > -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name > - PROCESSOR=$processor > - CC=$cross_prefix$cc > - CXX=$cross_prefix$cxx > -+EXTRA_CFLAGS=$extra_cflags > - LD=$cross_prefix$ld > - OBJCOPY=$cross_prefix$objcopy > - OBJDUMP=$cross_prefix$objdump > -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c > -index 4a3e94b..2cbe3eb 100644 > ---- a/x86/vmx_tests.c > -+++ b/x86/vmx_tests.c > -@@ -770,8 +770,10 @@ asm( > - "insn_sldt: sldt %ax;ret\n\t" > - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" > - "insn_str: str %ax;ret\n\t" > -+#ifndef NO_RDSEEDRAND > - "insn_rdrand: rdrand %rax;ret\n\t" > - "insn_rdseed: rdseed %rax;ret\n\t" > -+#endif > - ); > - extern void insn_hlt(); > - extern void insn_invlpg(); > -@@ -796,8 +798,10 @@ extern void insn_lldt(); > - extern void insn_str(); > - extern void insn_cpuid(); > - extern void insn_invd(); > -+#ifndef NO_RDSEEDRAND > - extern void insn_rdrand(); > - extern void insn_rdseed(); > -+#endif > - > - u32 cur_insn; > - u64 cr3; > -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { > - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, > - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, > - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ > -+#ifndef NO_RDSEEDRAND > - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, > - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, > -+#endif > - // Instructions always trap > - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, > - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, > --- > -1.9.1 > - > diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > deleted file mode 100644 > index be819f27c6..0000000000 > --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Mon, 24 Feb 2020 00:04:06 +0100 > -Subject: [PATCH] Makefile: fix stack-protector tests > - > -Rename fnostack_protector into fno_stack_protector and > -fnostack_protector_all into fnostack_protector_all otherwise build will > -fail if -fstack-protector is passed by the toolchain > - > -Fixes: > - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: sent to kvm at vger.kernel.org] > ---- > - Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 767b6c6..754ed65 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror > - > - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer > - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") > --fnostack_protector := $(call cc-option, -fno-stack-protector, "") > --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") > -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") > -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") > - wno_frame_address := $(call cc-option, -Wno-frame-address, "") > - fno_pic := $(call cc-option, -fno-pic, "") > - no_pie := $(call cc-option, -no-pie, "") > --- > -2.25.0 > - > diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > deleted file mode 100644 > index 1768c668b7..0000000000 > --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch > +++ /dev/null > @@ -1,61 +0,0 @@ > -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 > -From: Thomas Huth > -Date: Wed, 13 May 2020 13:14:46 +0200 > -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 > - > -The linker from Fedora 32 complains: > - > -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not > - covered by LOAD segment > - > -Let's introduce some fake PHDRs to the linker script to get this > -working again. > - > -Message-Id: <20200514192626.9950-7-thuth at redhat.com> > -Signed-off-by: Thomas Huth > -Signed-off-by: Matthew Weber > ---- > - powerpc/flat.lds | 19 ++++++++++++++++--- > - 1 file changed, 16 insertions(+), 3 deletions(-) > - > -diff --git a/powerpc/flat.lds b/powerpc/flat.lds > -index 53221e8..5eed368 100644 > ---- a/powerpc/flat.lds > -+++ b/powerpc/flat.lds > -@@ -1,7 +1,17 @@ > - > -+PHDRS > -+{ > -+ text PT_LOAD FLAGS(5); > -+ data PT_LOAD FLAGS(6); > -+} > -+ > - SECTIONS > - { > -- .text : { *(.init) *(.text) *(.text.*) } > -+ .text : { > -+ *(.init) > -+ *(.text) > -+ *(.text.*) > -+ } :text > - . = ALIGN(64K); > - etext = .; > - .opd : { *(.opd) } > -@@ -19,9 +29,12 @@ SECTIONS > - .data : { > - *(.data) > - *(.data.rel*) > -- } > -+ } :data > - . = ALIGN(16); > -- .rodata : { *(.rodata) *(.rodata.*) } > -+ .rodata : { > -+ *(.rodata) > -+ *(.rodata.*) > -+ } :data > - . = ALIGN(16); > - .bss : { *(.bss) } > - . = ALIGN(256); > --- > -2.17.1 > - > diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash > index ad500d04f2..42c3b4a241 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.hash > +++ b/package/kvm-unit-tests/kvm-unit-tests.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz > +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 > sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index a972602fb9..d610442e03 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 > -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git > -KVM_UNIT_TESTS_SITE_METHOD = git > +KVM_UNIT_TESTS_VERSION = 2022-03-08 > +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 > +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) > KVM_UNIT_TESTS_LICENSE = LGPL-2.0 > KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT > From arnout at mind.be Thu Mar 17 21:38:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:38:25 +0100 Subject: [Buildroot] [PATCH] package/webp: bump to version 1.2.2 In-Reply-To: <20220310114220.920056-1-francois.perrad@gadz.org> References: <20220310114220.920056-1-francois.perrad@gadz.org> Message-ID: On 10/03/2022 12:42, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/webp/webp.hash | 2 +- > package/webp/webp.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/webp/webp.hash b/package/webp/webp.hash > index cf7b1dc9d..a95086e81 100644 > --- a/package/webp/webp.hash > +++ b/package/webp/webp.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz > +sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz > sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING > diff --git a/package/webp/webp.mk b/package/webp/webp.mk > index f23e1c92e..670a7b801 100644 > --- a/package/webp/webp.mk > +++ b/package/webp/webp.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBP_VERSION = 1.2.1 > +WEBP_VERSION = 1.2.2 > WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz > WEBP_SITE = http://downloads.webmproject.org/releases/webp > WEBP_LICENSE = BSD-3-Clause From arnout at mind.be Thu Mar 17 21:38:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 17 Mar 2022 22:38:41 +0100 Subject: [Buildroot] [PATCH] package/pango: bump to version 1.50.5 In-Reply-To: <20220310114211.920001-1-francois.perrad@gadz.org> References: <20220310114211.920001-1-francois.perrad@gadz.org> Message-ID: <122db5b6-14cf-a4aa-e9e1-ad2d4749c0eb@mind.be> On 10/03/2022 12:42, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/pango/pango.hash | 4 ++-- > package/pango/pango.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/pango/pango.hash b/package/pango/pango.hash > index a6c924a8c..319d9778c 100644 > --- a/package/pango/pango.hash > +++ b/package/pango/pango.hash > @@ -1,5 +1,5 @@ > -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum > -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz > +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum > +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz > > # Locally computed > sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING > diff --git a/package/pango/pango.mk b/package/pango/pango.mk > index 684407228..69ec5bb49 100644 > --- a/package/pango/pango.mk > +++ b/package/pango/pango.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > PANGO_VERSION_MAJOR = 1.50 > -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 > +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 > PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz > PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) > PANGO_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 17 21:30:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:30:55 +0100 Subject: [Buildroot] [git commit] package/pango: bump to version 1.50.5 Message-ID: <20220317213005.80292843FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68b0efbae49a42d0e14d6040e5e7e573d382ff75 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c9..319d9778c1 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228f..69ec5bb490 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 17 21:30:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:30:58 +0100 Subject: [Buildroot] [git commit] package/webp: bump to version 1.2.2 Message-ID: <20220317213005.8BC13843FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2eb5838f89cf7f07e3f3cc98558ae12da11236cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/webp/webp.hash | 2 +- package/webp/webp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index cf7b1dc9de..a95086e81c 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz +sha256 7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 libwebp-1.2.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index f23e1c92e1..670a7b8012 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.1 +WEBP_VERSION = 1.2.2 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause From arnout at mind.be Thu Mar 17 21:36:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:36:01 +0100 Subject: [Buildroot] [git commit] package/moby-buildkit: bump to version 0.10.0 Message-ID: <20220317213005.9E7E4843FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05507efd1a791948a23036eb28eb7be0f4d1f4ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/moby/buildkit/releases/tag/v0.10.0 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/moby-buildkit/moby-buildkit.hash | 2 +- package/moby-buildkit/moby-buildkit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index 3015e479f6..cfd1c0c946 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 5877faf02cbddfb6c988f44b5b373739fed87f4aeb8802c6777fe7be2f772506 moby-buildkit-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef..d34ff96252 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_VERSION = 0.10.0 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 17 21:31:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 17 Mar 2022 22:31:01 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: bump to version 2022-03-08 Message-ID: <20220317213005.94D3B843FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fed7ed02858749641dbf21c645fcf44ce752b396 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch site: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/commit/?id=f271e1b630a1b8b5f4eae2331654fc1e70abfd66 - Update first patch - Drop second patch (binutils < 2.23 is not supported by buildroot anymore) - Drop third and fourth patches (already in version) - This bump will fix the following build failure with powerpc and gcc 11 thanks to https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/0c111b370ad3c5a89e11caee79bc93a66fd004f2 /tmp/ccSlivNE.s:348: Error: `lswx' invalid when little-endian Fixes: - http://autobuild.buildroot.org/results/746e87892ac545e8fb97c17d4bfd7bd7bbc9d8be Signed-off-by: Fabrice Fontaine Reviewed-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ile-remove-Werror-to-avoid-build-failures.patch | 17 ++-- ...002-kvm-unit-tests-test-for-rdseed-rdrand.patch | 110 --------------------- .../0003-Makefile-fix-stack-protector-tests.patch | 36 ------- ...erpc-issue-with-the-linker-from-Fedora-32.patch | 61 ------------ package/kvm-unit-tests/kvm-unit-tests.hash | 2 +- package/kvm-unit-tests/kvm-unit-tests.mk | 6 +- 6 files changed, 14 insertions(+), 218 deletions(-) diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch index cbfa3a87e6..d07b9b6912 100644 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Makefile: remove -Werror to avoid build failures Signed-off-by: Thomas Petazzoni [Matthew: Refactoring of Thomas Petazzoni's original.] Signed-off-by: Matthew Weber +[Fabrice: updated for 2022-03-08] +Signed-off-by: Fabrice Fontaine --- Makefile | 1 - 1 file changed, 1 deletion(-) @@ -14,14 +16,15 @@ diff --git a/Makefile b/Makefile index 7231334..d9ad42b 100644 --- a/Makefile +++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror +@@ -53,7 +53,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + + COMMON_CFLAGS += -g $(autodepend-flags) -fno-strict-aliasing -fno-common + COMMON_CFLAGS += -Wall -Wwrite-strings -Wempty-body -Wuninitialized +-COMMON_CFLAGS += -Wignored-qualifiers -Werror -Wno-missing-braces ++COMMON_CFLAGS += -Wignored-qualifiers -Wno-missing-braces + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- +- 2.14.2 diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch deleted file mode 100644 index 1a1a90ce99..0000000000 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 12 Jan 2018 19:07:27 -0600 -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand - -The build fails when the host binutils isn't at least 2.23 -(2.22.x introduced RDSEED). - -Fixes: -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ - -Upstream: -https://marc.info/?l=kvm&m=151580743523259&w=2 - -Signed-off-by: Matthew Weber ---- - Makefile | 2 +- - configure | 18 ++++++++++++++++++ - x86/vmx_tests.c | 6 ++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d9ad42b..799e9b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer -diff --git a/configure b/configure -index dd9d361..21c0219 100755 ---- a/configure -+++ b/configure -@@ -171,6 +171,23 @@ mkdir -p lib - ln -sf "$asm" lib/asm - - -+cat > rd_test.c < -+int main() { -+ uint16_t seed=0; -+ unsigned char ok; -+ asm volatile ("rdseed %0; setc %1" -+ : "=r" (seed), "=qm" (ok)); -+ return ok; -+} -+EOF -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then -+ echo "Checking for rdseed/rdrand... Yes." -+else -+ echo "Checking for rdseed/rdrand... No." -+ extra_cflags="-DNO_RDSEEDRAND" -+fi -+ - # create the config - cat < config.mak - SRCDIR=$srcdir -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name - PROCESSOR=$processor - CC=$cross_prefix$cc - CXX=$cross_prefix$cxx -+EXTRA_CFLAGS=$extra_cflags - LD=$cross_prefix$ld - OBJCOPY=$cross_prefix$objcopy - OBJDUMP=$cross_prefix$objdump -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c -index 4a3e94b..2cbe3eb 100644 ---- a/x86/vmx_tests.c -+++ b/x86/vmx_tests.c -@@ -770,8 +770,10 @@ asm( - "insn_sldt: sldt %ax;ret\n\t" - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" - "insn_str: str %ax;ret\n\t" -+#ifndef NO_RDSEEDRAND - "insn_rdrand: rdrand %rax;ret\n\t" - "insn_rdseed: rdseed %rax;ret\n\t" -+#endif - ); - extern void insn_hlt(); - extern void insn_invlpg(); -@@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); -+#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); -+#endif - - u32 cur_insn; - u64 cr3; -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ -+#ifndef NO_RDSEEDRAND - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, -+#endif - // Instructions always trap - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, --- -1.9.1 - diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c6..0000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm at vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7..0000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth at redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2..42c3b4a241 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 c2edf2b188033a5d634150ecc797c797a85e5af8e3ef4ac3e583f60b2ee7bcf3 kvm-unit-tests-v2022-03-08.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb9..d610442e03 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,9 +4,9 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_VERSION = 2022-03-08 +KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 +KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT From fontaine.fabrice at gmail.com Thu Mar 17 21:42:03 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 22:42:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix CVE-2022-25051 Message-ID: <20220317214203.258736-1-fontaine.fabrice@gmail.com> An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when decoding a crafted file. Signed-off-by: Fabrice Fontaine --- ...low-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 +++++++++++++++++++ package/rtl_433/rtl_433.mk | 3 + 2 files changed, 61 insertions(+) create mode 100644 package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch new file mode 100644 index 0000000000..e2088b29e7 --- /dev/null +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch @@ -0,0 +1,58 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] +Signed-off-by: Fabrice Fontaine +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index a5139ddae6..d1c28adbf5 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +RTL_433_IGNORE_CVES += CVE-2022-25051 + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON -- 2.35.1 From peter at korsgaard.com Thu Mar 17 21:46:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:46:01 +0100 Subject: [Buildroot] [PATCH 1/1] fix links to Technologic Systems web resources In-Reply-To: <20220307211455.9630-1-kris@embeddedTS.com> (Kris Bahnsen via buildroot's message of "Mon, 7 Mar 2022 13:14:55 -0800") References: <20220307211455.9630-1-kris@embeddedTS.com> Message-ID: <87sfrgqmli.fsf@dell.be.48ers.dk> >>>>> "Kris" == Kris Bahnsen via buildroot writes: > Technologic Systems has rebranded as embeddedTS with the current > domain eventually going offline. Update web/doc URLs to correct > resource locations. > Signed-off-by: Kris Bahnsen > --- > RESEND: > - Was not subscribed to Buildroot list with this email Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 17 21:32:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:32:15 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] fix links to Technologic Systems web resources Message-ID: <20220317213735.A4C63843FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a172b9511d4322c9e4533d03c8c9ee4efe13c3a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 0b058e15f5334dac93f42b92ea31525afdc2c27c) Signed-off-by: Peter Korsgaard --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From hrsourabh011 at gmail.com Thu Mar 17 22:00:45 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 17 Mar 2022 23:00:45 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? In-Reply-To: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> References: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> Message-ID: Hello Arnout, Thanks for the answer. I will try to implement the above solution. But I wanted ssh connection to transfer files to board. I tried with "scp" but I get: ssh: connect to host 192.168.x.xxx port 22: Connection refused lost connection Since there is no sshd running, scp won't be an option I think. Is there any other way to copy files to board? On Thu, 17 Mar 2022 at 22:05, Arnout Vandecappelle wrote: > > > On 17/03/2022 15:45, Sourabh Hegde wrote: > > Hello All, > > > > I am facing an issue while running OpenSSH demon in Buildroot 2022 > release. > > > > The output of "systemctl status sshd" results in > > > > sshd.service - OpenSSH server daemon > > Loaded: loaded (/usr/lib/systemd/system/sshd.service; enabled; > vendor prese > > Active: failed (Result: exit-code) since Tue 2022-01-18 13:16:03 > UTC; 9min > > Process: 1703 ExecStartPre=/usr/bin/ssh-keygen -A (code=exited, > status=0/SUC > > Process: 1704 ExecStart=/usr/sbin/sshd -D -e (code=exited, > status=1/FAILURE) > > Main PID: 1704 (code=exited, status=1/FAILURE) > > CPU: 27ms > > > > Jan 18 13:16:02 br2rauc systemd[1]: Starting OpenSSH server daemon... > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc ssh-keygen[1703]: ssh-keygen: generating new > host keys: > > Jan 18 13:16:03 br2rauc systemd[1]: Started OpenSSH server daemon. > > Jan 18 13:16:03 br2rauc sshd[1704]: sshd: no hostkeys available -- > exiting. > > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Main process exited, > code=exit > > Jan 18 13:16:03 br2rauc systemd[1]: sshd.service: Failed with result > 'exit-code' > > > > # ps aux | grep ssh > > 253 root grep ssh > > > > So, there is not sshd deamon running. And also no key files present in > /etc/ssh/ > > > > I ran "/usr/bin/ssh-keygen -A" manually but this gives: > > > > ssh-keygen: generating new host keys: RSA Could not save your private > key in > > /etc/ssh/ssh_host_rsa_key.XXXXUBHAIv: Read-only file system > > ssh-keygen: generating new host keys: DSA Could not save your private > key in > > /etc/ssh/ssh_host_dsa_key.XXXXq0KiIl: Read-only file system > > ssh-keygen: generating new host keys: ECDSA Could not save your private > key in > > /etc/ssh/ssh_host_ecdsa_key.XXXXibybTV: Read-only file system > > ssh-keygen: generating new host keys: ED25519 Could not save your > private key in > > /etc/ssh/ssh_host_ed25519_key.XXXXzI2JnB: Read-only file system > > > > Yes, I do have a Read-only file system. But is it not possible to work > with a > > read-only filesystem and ssh? > > Indeed, ssh daemon with readonly rootfs requires special treatment. > Someone > has gone through the effort for dropbear, but not for openssh. > > Basically, how it is solved for dropbear is: > > - build time, create a symlink from /etc/dropbear to /var/run/dropbear > (/var/run > is a writeable tmpfs). > - runtime, in the init script and in the systemd service file, check if > /etc/dropbear is a symlink to tmpfs. If yes, try to remove the symlink. If > that > succeeds, the rootfs is writeable and the keys can be generated there. If > the > remove failed, the symlink is still there, and the key generation > succeeds. If > it's not a symlink, the rootfs was modified so either it's writeable, or > the > keys are already there (or they're not and there's nothing we can do about > it). > > For openssh it will be even more complicated, because /etc/sshd contains > the > config file as well as the keys. So you probably need to change the config > to > put the keys in a different place before you can use the same trick. > > If you manage to solve this, please send a patch to the list for others > to enjoy! > > > Oh, and the usual solution is that you have a different partition that > is > writeable, and make /etc/sshd a symlink to that in the rootfs overlay. But > you > still have to make sure then that the directory is created if it doesn't > exist > yet, and you still have the problem of the config file being in the same > directory as the keys. > > > Regards, > Arnout > > > > > > In the menuconfig I have: > > > > OpenSSH.PNG > > > > Can anyone please let me know if there is a workaround? Is > changing rootfs to > > r/w is the only solution? > > > > Does selecting "System Configuration"-->"remount root filesystem > read-write > > during boot" will do the trick? > > > > Your help will be much appreciated. > > > > Thanks in advance, > > > > -Sourabh > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From ju.o at free.fr Thu Mar 17 22:01:21 2022 From: ju.o at free.fr (Julien Olivain) Date: Thu, 17 Mar 2022 23:01:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220317220121.21498-1-ju.o@free.fr> cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 608c2f24ea..085d32acc3 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) -- 2.35.1 From peter at korsgaard.com Thu Mar 17 21:31:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:31:15 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] fix links to Technologic Systems web resources Message-ID: <20220317222200.D1CE284426@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71eff36e0eb762e4a8b3080a2b9beb2076019758 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 0b058e15f5334dac93f42b92ea31525afdc2c27c) Signed-off-by: Peter Korsgaard --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From peter at korsgaard.com Thu Mar 17 21:31:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 17 Mar 2022 22:31:38 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] fix links to Technologic Systems web resources Message-ID: <20220317222208.50FFA84440@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e74c9f35bb428f0ac8cacc1ea64a2976910f2861 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Technologic Systems has rebranded as embeddedTS with the current domain eventually going offline. Update web/doc URLs to correct resource locations. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 0b058e15f5334dac93f42b92ea31525afdc2c27c) Signed-off-by: Peter Korsgaard --- board/technologic/ts4900/readme.txt | 4 ++-- board/technologic/ts5500/readme.txt | 4 ++-- board/technologic/ts7680/readme.txt | 4 ++-- configs/ts7680_defconfig | 2 +- package/ts4900-fpga/Config.in | 2 +- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb..121e639749 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea1..1fe384faae 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e8..3f703330bf 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c5..e4f5c1aabd 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f2..9f704fbc8c 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2..9ffff643af 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a3984..a3e42c0812 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -6,9 +6,9 @@ TS4900_FPGA_VERSION = 20150930 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) From fontaine.fabrice at gmail.com Thu Mar 17 22:39:28 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 17 Mar 2022 23:39:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add s390x support Message-ID: <20220317223928.508338-1-fontaine.fabrice@gmail.com> s390x is supported since https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a Signed-off-by: Fabrice Fontaine --- package/kvm-unit-tests/Config.in | 1 + package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157..a3d6756fb9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS BR2_cortex_a17 || BR2_cortex_a17_a7 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d610442e03..2d05d08067 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 +else ifeq ($(BR2_s390x),y) +KVM_UNIT_TESTS_ARCH = s390x else ifeq ($(BR2_x86_64),y) KVM_UNIT_TESTS_ARCH = x86_64 endif -- 2.35.1 From thomas.petazzoni at bootlin.com Fri Mar 18 08:17:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 18 Mar 2022 08:17:53 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-17 Message-ID: <20220318081758.E95B184745@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-03-17 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 49 | 7 | 0 | 56 | 2021.11.x | 12 | 1 | 0 | 13 | 2022.02.x | 21 | 7 | 0 | 28 | master | 52 | 25 | 1 | 78 | Classification of failures by reason for master ----------------------------------------------- bind-9.16.26 | 6 unknown | 4 libnetfilter_conntrack-1.0.9 | 3 dhcp-4.4.2-P1 | 1 exempi-2.6.1 | 1 grpc-1.44.0 | 1 host-delve-1.8.0 | 1 libcamera-apps-2d1009e3badc... | 1 libgee-0.20.5 | 1 librtlsdr-ed0317e6a58c09887... | 1 libuwsc | 1 mesa3d-21.3.7 | 1 ola-0.10.8 | 1 rabbitmq-server-3.8.2 | 1 tree-2.0.2 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/ea8862c7caa96ec9d7bc8665a390f64c6c11be27 | ORPH mips64el | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/71ae24ad1a1de18d4fd4a1e3b2e4876269ea72ed | ORPH microblazeel | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/6b6024c3e0e9788975a4b9206bc7312c49e6ff0e | ORPH nios2 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/87808f07a8d0f57947b51a3242ec0533725b25d2 | ORPH riscv64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/84a2418fbf54bbe0a25eddd2d7a0c29fcfd17436 | ORPH sh4 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/742e67a74412df42f2419add7984727e3421c9a2 | ORPH sparc64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/82382f4180ff2145ededfeb4a86cec45084b4439 | ORPH arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/7a3bdef7c8df52b748f8ae69946a1e8d5966e7a6 | arm | grpc-1.44.0 | NOK | http://autobuild.buildroot.net/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/c9b552172660895a46b87d9743cebdf5f040869c | arm | libcamera-apps-2d1009e3badc... | NOK | http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e | arm | libgee-0.20.5 | NOK | http://autobuild.buildroot.net/results/972a02911e5589a3dc21e77760084caaf2251860 | arm | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/8f6debbe240642e9857812b021bbc3650624905c | xtensa | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/1f40162020d8e70cbe669a3896bcc79fca36f562 | powerpc | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/9d0b93d5ca28657dd8818df15f7a1a6c56b67574 | microblazeel | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/0d525628b29781561acd0443e8773a8947d90500 | aarch64 | libuwsc | TIM | http://autobuild.buildroot.net/results/c987b45d617a861b3bfee53e2d572dc236315d76 | i686 | mesa3d-21.3.7 | NOK | http://autobuild.buildroot.net/results/7b24c041e6d2c4f6f99d40dae0c8e2a66933f400 | riscv64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/9b476cf0688932e42e2629b8458b243fe640200d | arm | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/e1f6cd4a4e902d58ebd13a3d70e1213cc0a0d379 | arm | tree-2.0.2 | NOK | http://autobuild.buildroot.net/results/364457e1c2a367b3bb13d28adcc1be045523c855 | riscv64 | unknown | NOK | http://autobuild.buildroot.net/results/b24d72244a10d318784b4f4a4585c4dbc97d9618 | arm | unknown | NOK | http://autobuild.buildroot.net/results/573782ede2204840742d8ab97c263e4f19ceab0f | arm | unknown | NOK | http://autobuild.buildroot.net/results/1016f1ae1704c8fa0a0eb506c76fff535a4baf46 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/ca80c2ab873216128e4e660cc7e68fb0609df943 | sparc | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d40a1414b1084b3b17cc1c9e5966da6431840933 | Classification of failures by reason for 2021.02.x -------------------------------------------------- python-twisted-22.1.0 | 2 docker-cli-20.10.12 | 1 gerbera-1.6.4 | 1 host-sentry-cli-1.57.0 | 1 opencv3-3.4.13 | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i586 | docker-cli-20.10.12 | NOK | http://autobuild.buildroot.net/results/b33827724515625fc970b4397badf4a131103036 | arm | gerbera-1.6.4 | NOK | http://autobuild.buildroot.net/results/a40a15c3ddd37a23b1dfc5b8d085e55e869ed026 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/99d58ae6694ee868959ed9acb6ee727bc14dec0e | arm | opencv3-3.4.13 | NOK | http://autobuild.buildroot.net/results/4c2a8d43d16fa04fc2e5b5171d02e36be96a7fe5 | x86_64 | python-twisted-22.1.0 | NOK | http://autobuild.buildroot.net/results/0dee250637a6da29c3df54e9f36d240e94e170bd | nios2 | python-twisted-22.1.0 | NOK | http://autobuild.buildroot.net/results/8507d74f6860b1b510dc1525928f5f21593d36fa | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/76251acba437c86b93e5a4d2b201139831bf3050 | Classification of failures by reason for 2021.11.x -------------------------------------------------- apcupsd-3.14.14 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/dfe5f474ca0bc3c58b1c5ae426cb28055a4f09c1 | Classification of failures by reason for 2022.02.x -------------------------------------------------- bluez5_utils-5.63 | 3 host-delve-1.8.0 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 suricata-6.0.4 | 1 unknown | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv64 | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/6a2800f0d73e584326eaa24a388da082081bcfa8 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3142b2d2a8f89ed63ea2dab14ffd51a8044f1427 | arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/3e5a7a96cd46265990aea4e976a5965a228341de | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/c8dd333970847c74cd24b4eee0f4b30050cac723 | aarch64 | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/851b3efb8b7de97034491320b63a34a896b92602 | x86_64 | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/62bfc3c213bf10ba0acce641392956c5260b966f | arm | unknown | NOK | http://autobuild.buildroot.net/results/322c3d7a7609d62dae49d0e2ac37eb2fc17b6bf8 | Gitlab CI results for 2022-03-17 ================================ -- http://autobuild.buildroot.net From ps.report at gmx.net Fri Mar 18 08:24:45 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 09:24:45 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220318082446.18552-1-ps.report@gmx.net> - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..2f3fcf4090 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. -- 2.35.1 From ps.report at gmx.net Fri Mar 18 08:24:46 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 09:24:46 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/spidev_test: bump to version in Linux 5.8 In-Reply-To: <20220318082446.18552-1-ps.report@gmx.net> References: <20220318082446.18552-1-ps.report@gmx.net> Message-ID: <20220318082446.18552-2-ps.report@gmx.net> - bump to version in Linux 5.8 (depends on SPI_TX_OCTAL/SPI_RX_OCTAL available since Linux 5.0) Changelog (since 4.10): 9006a7b3220e spi: spidev_test: add option to continuously transfer data 35386dfd13b7 spi: spidev_test: Improve decoded text part of hex dump 84a14ae8c44f treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178 020bd6c48ebd spi: spidev_test: Remove break after exit statement 1f3c36328a48 spi: spidev_test: Check input_tx and input_file first after parse options 470a072e1220 spi: spidev_test: Use perror() only if errno is not 0 896fa735084e spi: spidev_test: Add support for Octal mode data transfers 9ec8ade81224 spi: spidev_test: Use %u to format unsigned numbers bd2077915bfe spi: tools: Make default_tx/rx and input_tx static - update Config.in help text - indent hashes by 2 spaces Signed-off-by: Peter Seiderer --- package/spidev_test/Config.in | 4 ++-- package/spidev_test/spidev_test.hash | 5 +++-- package/spidev_test/spidev_test.mk | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 2f3fcf4090..81386adf7a 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 4.10 - is used. + if it's older than 3.15 then 3.0 is used, up to headers 4.20 + version 4.10 is used and otherwise version 5.8. This means you won't have quad-pumped SPI support if your toolchain is too old. diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash index 7bc4a27e45..867920fc78 100644 --- a/package/spidev_test/spidev_test.hash +++ b/package/spidev_test/spidev_test.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 -sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 +sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 87329094ea3010eae9e65ad7ea2d2309e044845942414aa0ca8f1a7095b80178 spidev_test.c?id=v5.8 diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk index bd2fcf6db3..6c5a9495a4 100644 --- a/package/spidev_test/spidev_test.mk +++ b/package/spidev_test/spidev_test.mk @@ -10,7 +10,10 @@ # If you need quad-pumped spi support you need to upgrade your toolchain. # Note that the location of spidev_test.c changes from v4.5 onwards. -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y) +SPIDEV_TEST_VERSION = 5.8 +SPIDEV_TEST_PATH = tools/spi +else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) SPIDEV_TEST_VERSION = 4.10 SPIDEV_TEST_PATH = tools/spi else -- 2.35.1 From peter at korsgaard.com Fri Mar 18 08:31:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:31:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/pppd: fix CPE ID In-Reply-To: <20220309173710.527496-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 18:37:10 +0100") References: <20220309173710.527496-1-fontaine.fabrice@gmail.com> Message-ID: <87o823r7ah.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has > been deprecated in February 2020: > > > cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the > correct CPE identifier for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 18 08:31:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:31:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnutls: fix build without threads In-Reply-To: <20220309173503.527227-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 18:35:03 +0100") References: <20220309173503.527227-1-fontaine.fabrice@gmail.com> Message-ID: <87k0crr79q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without threads raised since bump to > version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: > kx.c: In function '_gnutls_nss_keylog_write': > kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? > 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { > | ^~~~~~~~~~~~ > | keylog_once > Fixes: > - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 18 08:42:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:42:47 +0100 Subject: [Buildroot] [PATCH] package/openssh: backport upstream fix for 32-bit In-Reply-To: <20220310140350.1955655-1-john@metanate.com> (John Keeping's message of "Thu, 10 Mar 2022 14:03:50 +0000") References: <20220310140350.1955655-1-john@metanate.com> Message-ID: <87czijr6rc.fsf@dell.be.48ers.dk> >>>>> "John" == John Keeping writes: > sshd is broken on 32-bit systems because ppoll_time64 is used by the > application although it is not allowed by the seccomp filter. > Apply the upstream patch to fix this. > Signed-off-by: John Keeping Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 18 08:28:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:28:39 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/pppd: fix CPE ID Message-ID: <20220318083729.59B3B84406@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40ede2956aa949040b69d27ea31992bb02dd55e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9051a6322187129ba65249b5ee2228e045a4fa8c) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 098c6a8e6f..efc72276fa 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp # 0001-pppd-Fix-bounds-check.patch From peter at korsgaard.com Fri Mar 18 08:27:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:27:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/pppd: fix CPE ID Message-ID: <20220318083735.2B67884486@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb2ae01ba8600e5cc81ebccf271d1664f32d14f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9051a6322187129ba65249b5ee2228e045a4fa8c) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 08560090b5..6de501a5b7 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol # 0001-pppd-Fix-bounds-check.patch PPPD_IGNORE_CVES += CVE-2020-8597 From peter at korsgaard.com Fri Mar 18 08:39:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:39:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openssh: add upstream patch to add seccomp ppoll_time64 support Message-ID: <20220318083759.53A2C8448E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=316abbf862a41d12986632ca6144945774e517f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x sshd is broken on 32-bit systems because ppoll_time64 is used by the application although it is not allowed by the seccomp filter. Apply the upstream patch to fix this. Signed-off-by: John Keeping Reviewed-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 10c1d887d6082d8806b38b86097c212c4c3ec8f9) Signed-off-by: Peter Korsgaard --- ...001-Allow-ppoll_time64-in-seccomp-sandbox.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch new file mode 100644 index 0000000000..16eb6eaba2 --- /dev/null +++ b/package/openssh/0001-Allow-ppoll_time64-in-seccomp-sandbox.patch @@ -0,0 +1,32 @@ +From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 +From: Darren Tucker +Date: Sat, 26 Feb 2022 14:06:14 +1100 +Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. + +Should fix sandbox violations on (some? at least i386 and armhf) 32bit +Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at +debian.org via bz#3396. + +[Upstream: https://github.com/openssh/openssh-portable/commit/284b6e5394652d519e31782e3b3cdfd7b21d1a81.patch] +Signed-off-by: John Keeping +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif +-- +2.35.1 + From peter at korsgaard.com Fri Mar 18 08:26:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:26:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pppd: fix CPE ID Message-ID: <20220318083759.435998448B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba6b4cd392cb3834b04979a2e4dc6d5f5a067d6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x samba:ppp, added by commit 63332c33aa0771532807fd2684d4eee4eb952435, has been deprecated in February 2020: cpe:2.3:a:point-to-point_protocol_project:point-to-point_protocol is the correct CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Apoint-to-point_protocol_project%3Apoint-to-point_protocol Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9051a6322187129ba65249b5ee2228e045a4fa8c) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce..d9d6244f10 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y From peter at korsgaard.com Fri Mar 18 08:30:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:30:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gnutls: fix build without threads Message-ID: <20220318083759.4B7C08448C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bfd2b118706876a7a0faf9c364b464f64bbf1544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure without threads raised since bump to version 3.7.3 in commit 212b020bb43f13121d6cde464f871d5d1cf6cfbe: kx.c: In function '_gnutls_nss_keylog_write': kx.c:164:33: error: 'keylog_mutex' undeclared (first use in this function); did you mean 'keylog_once'? 164 | if (gnutls_static_mutex_lock(&keylog_mutex) < 0) { | ^~~~~~~~~~~~ | keylog_once Fixes: - http://autobuild.buildroot.org/results/e092bc11ce4b5908cb6285aa77a3594b8626eeec Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2f4f57b62b371252425bde4440cedcac45fcaebd) Signed-off-by: Peter Korsgaard --- ...01-locks-define-lock-functions-as-a-macro.patch | 179 +++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch new file mode 100644 index 0000000000..52965c051d --- /dev/null +++ b/package/gnutls/0001-locks-define-lock-functions-as-a-macro.patch @@ -0,0 +1,179 @@ +From 5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 9 Mar 2022 08:07:58 +0100 +Subject: [PATCH] locks: define lock functions as a macro + +When threads are not supported, glthread_* functions are defined as +no-op and thus dereferencing lock variables in inline functions will +cause compilation error. This change fixes it by redefining our lock +functions as a macro so it will also be compiled out. + +Reported by Fabrice Fontaine in: +https://gitlab.com/gnutls/gnutls/-/issues/1330 + +Signed-off-by: Daiki Ueno + +[Retrieved from: +https://gitlab.com/gnutls/gnutls/-/commit/5803bfa3d4febdcf32494e2c2c8f4731cb8be7cd] +Signed-off-by: Fabrice Fontaine +--- + lib/locks.c | 54 ----------------------------------------------- + lib/locks.h | 28 ++++++++++++++++++------ + lib/pkcs11.c | 2 +- + lib/priority.c | 2 +- + lib/verify-tofu.c | 2 +- + 5 files changed, 25 insertions(+), 63 deletions(-) + +diff --git a/lib/locks.c b/lib/locks.c +index d61504e077..8888ed6b12 100644 +--- a/lib/locks.c ++++ b/lib/locks.c +@@ -63,57 +63,3 @@ gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, + gnutls_mutex_lock = lock; + gnutls_mutex_unlock = unlock; + } +- +-int +-gnutls_static_mutex_lock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_lock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_static_mutex_unlock(gnutls_static_mutex_t lock) +-{ +- if (unlikely(glthread_lock_unlock(lock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_rdlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_wrlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_rwlock_unlock(gnutls_rwlock_t rwlock) +-{ +- if (unlikely(glthread_rwlock_unlock(rwlock))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +- +-int +-gnutls_once(gnutls_once_t once, void (*init_func) (void)) +-{ +- if (unlikely(glthread_once(once, init_func))) { +- return gnutls_assert_val(GNUTLS_E_LOCKING_ERROR); +- } +- return 0; +-} +diff --git a/lib/locks.h b/lib/locks.h +index a1ff0fa9d7..907adfc134 100644 +--- a/lib/locks.h ++++ b/lib/locks.h +@@ -40,8 +40,14 @@ extern mutex_unlock_func gnutls_mutex_unlock; + */ + #define GNUTLS_STATIC_MUTEX(lock) gl_lock_define_initialized(static, lock) + typedef gl_lock_t *gnutls_static_mutex_t; +-int gnutls_static_mutex_lock(gnutls_static_mutex_t lock); +-int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); ++ ++#define gnutls_static_mutex_lock(LOCK) \ ++ (unlikely(glthread_lock_lock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_static_mutex_unlock(LOCK) \ ++ (unlikely(glthread_lock_unlock(LOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + /* Unlike static mutexes, static rwlocks can be locked/unlocked with + * the functions defined below, because there is no way to replace +@@ -50,13 +56,23 @@ int gnutls_static_mutex_unlock(gnutls_static_mutex_t lock); + #define GNUTLS_RWLOCK(rwlock) gl_rwlock_define_initialized(static, rwlock) + typedef gl_rwlock_t *gnutls_rwlock_t; + +-int gnutls_rwlock_rdlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_wrlock(gnutls_rwlock_t rwlock); +-int gnutls_rwlock_unlock(gnutls_rwlock_t rwlock); ++#define gnutls_rwlock_rdlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_rdlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_wrlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_wrlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) ++ ++#define gnutls_rwlock_unlock(RWLOCK) \ ++ (unlikely(glthread_rwlock_unlock(RWLOCK)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #define GNUTLS_ONCE(once) gl_once_define(static, once) + typedef gl_once_t *gnutls_once_t; + +-int gnutls_once(gnutls_once_t once, void (*init_func) (void)); ++#define gnutls_once(ONCE, INIT_FUNC) \ ++ (unlikely(glthread_once(ONCE, INIT_FUNC)) ? \ ++ gnutls_assert_val(GNUTLS_E_LOCKING_ERROR) : 0) + + #endif /* GNUTLS_LIB_LOCKS_H */ +diff --git a/lib/pkcs11.c b/lib/pkcs11.c +index 8dda0f07c9..ba8ac0c375 100644 +--- a/lib/pkcs11.c ++++ b/lib/pkcs11.c +@@ -351,7 +351,7 @@ int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_ + ret = sret; + + cleanup: +- gnutls_static_mutex_unlock(&pkcs11_mutex); ++ (void)gnutls_static_mutex_unlock(&pkcs11_mutex); + + return ret; + } +diff --git a/lib/priority.c b/lib/priority.c +index d17a923318..55ae185c1f 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2505,7 +2505,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + + out: +- gnutls_rwlock_unlock(&system_wide_config_rwlock); ++ (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); + return ret; + } + +diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c +index 40b7acdc8a..97f47385e6 100644 +--- a/lib/verify-tofu.c ++++ b/lib/verify-tofu.c +@@ -434,7 +434,7 @@ int store_pubkey(const char *db_name, const char *host, + if (fp != NULL) + fclose(fp); + +- gnutls_static_mutex_unlock(&file_mutex); ++ (void)gnutls_static_mutex_unlock(&file_mutex); + gnutls_free(b64key.data); + + return ret; +-- +GitLab + From peter at korsgaard.com Fri Mar 18 08:51:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:51:43 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ell: bump version to 0.48 Message-ID: <20220318084334.71C138449F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb41375c2fcb7b56cce1b186b72c3eb4fd33833 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Changelog (since 0.47, from [1]): ver 0.48: Fix issue with memory leaking from ICMPv6 RA. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c01a8397d9923c38b14a0d083ba1cf3ee3a3049a) Signed-off-by: Peter Korsgaard --- 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 cd724eae2d..4bde1ab677 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f..267b44e5f0 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.48 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From peter at korsgaard.com Fri Mar 18 08:51:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:51:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/iwd: bump version to 1.24 Message-ID: <20220318084334.7AAAC844A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=079e1510bbe534d3ef75cfe7e4f5b01c0f5af166 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - remove 001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch (upstream applied [1]) - Changelog (since 1.21, from [2]): ver 1.24: Fix issue with handshake and missing rekeying support. Fix issue with BSS ranking and zero signal strength. Fix issue with setting OWE IE length correctly. ver 1.23: Fix issue with handling handshake offloading. Fix issue with at_console and D-Bus policy. ver 1.22: Fix issue with handling periodic scanning. Fix issue with handling scanning completion. Fix issue with handling scanning for OWE auto-connect. Add support for additional DPP features. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=6ce41f621154eff0145dab41308bc145c0440f16 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92e0fe71de85d0d7647aefbcab843e66f9bcca99) Signed-off-by: Peter Korsgaard --- ...licit-declaration-of-function-explicit_bz.patch | 41 ---------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch deleted file mode 100644 index 3e808deb88..0000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero - warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add missing src/missing.h include for explicit_bzero, fixes uclibc - compile/linking - -Fixes: - - src/dpp.c:166:2: warning: implicit declaration of function ???explicit_bzero??? [-Wimplicit-function-declaration] - 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); - | ^~~~~~~~~~~~~~ - -[backport from upstream] -Signed-off-by: Peter Seiderer -[yann.morin.1998 at free.fr: actual backport now upstreamn applied] -Signed-off-by: Yann E. MORIN ---- - src/dpp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dpp.c b/src/dpp.c -index 84e89f6c..8091ded1 100644 ---- a/src/dpp.c -+++ b/src/dpp.c -@@ -30,6 +30,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/dbus.h" - #include "src/netdev.h" - #include "src/module.h" --- -2.34.1 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 8e34d2983f..1a58ec88e8 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc..548b508edb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 1.24 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From peter at korsgaard.com Fri Mar 18 08:52:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 18 Mar 2022 09:52:16 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/ell: bump version to 0.48 In-Reply-To: <66a1b135-aeca-d245-f209-ce52a8e507c4@mind.be> (Arnout Vandecappelle's message of "Thu, 10 Mar 2022 22:23:55 +0100") References: <20220214211051.22421-1-ps.report@gmx.net> <66a1b135-aeca-d245-f209-ce52a8e507c4@mind.be> Message-ID: <878rt7r6bj.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 14/02/2022 22:10, Peter Seiderer wrote: >> - Changelog (since 0.47, from [1]): >> ver 0.48: >> Fix issue with memory leaking from ICMPv6 RA. >> [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog >> Signed-off-by: Peter Seiderer > Both applied to master, thanks. And to 2022.02.x, thanks. -- Bye, Peter Korsgaard From yairba at protonmail.com Fri Mar 18 09:03:37 2022 From: yairba at protonmail.com (Yair Ben-Avraham) Date: Fri, 18 Mar 2022 09:03:37 +0000 Subject: [Buildroot] [PATCH 1/1] package/tpm2-tss: bump version to 3.2.0 Message-ID: Signed-off-by: Yair Ben-Avraham --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f97..db6b3b7ad0 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377..568ac35c8f 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE -- 2.30.2 From heiko.thiery at gmail.com Fri Mar 18 11:01:01 2022 From: heiko.thiery at gmail.com (Heiko Thiery) Date: Fri, 18 Mar 2022 12:01:01 +0100 Subject: [Buildroot] How to run sshd deamon with read-only fs? In-Reply-To: References: <9fd77043-72b7-d337-d871-76918570ef35@mind.be> Message-ID: Hi, Am Do., 17. M?rz 2022 um 23:01 Uhr schrieb Sourabh Hegde : > > Hello Arnout, > > Thanks for the answer. I will try to implement the above solution. > > But I wanted ssh connection to transfer files to board. I tried with "scp" but I get: > > ssh: connect to host 192.168.x.xxx port 22: Connection refused > lost connection > > Since there is no sshd running, scp won't be an option I think. > > Is there any other way to copy files to board? why don't you use scp the other way around and copy the file from another computer, e.g. your work computer to your board? scp : Another solution would be using netcat: https://nakkaya.com/2009/04/15/using-netcat-for-file-transfers/ [snip] -- Heiko From ps.report at gmx.net Fri Mar 18 13:10:57 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 14:10:57 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/libcamera-apps: X11 support needs libdrm Message-ID: <20220318131058.32240-1-ps.report@gmx.net> - X11 support needs libdrm (optional libdrm dependency already present in libcamera-apps.mk) Fixes: http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer --- package/libcamera-apps/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d23..492a99cf55 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 -- 2.35.1 From ps.report at gmx.net Fri Mar 18 13:10:58 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 14:10:58 +0100 Subject: [Buildroot] [PATCH v1 2/2] package/libcamera-apps: add '-fpermissive' (fixes X11 preview compile) In-Reply-To: <20220318131058.32240-1-ps.report@gmx.net> References: <20220318131058.32240-1-ps.report@gmx.net> Message-ID: <20220318131058.32240-2-ps.report@gmx.net> - add patch to add '-fpermissive' compiler command line option to fix egl_preview.cpp compile Fixes: .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); | ^~~~~~~ | | | Window {aka long unsigned int} Signed-off-by: Peter Seiderer --- ...missive-compiler-command-line-option.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch diff --git a/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch new file mode 100644 index 0000000000..0bfc7e1ad4 --- /dev/null +++ b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch @@ -0,0 +1,37 @@ +From b04777e6b386ed0c6b1036d4c1178b4b8a1c88d5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 18 Mar 2022 12:39:27 +0100 +Subject: [PATCH] cmake: add -fpermissive compiler command line option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes (with bootlin arm toolchain): + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); + | ^~~~~~~ + | | + | Window {aka long unsigned int} + +Signed-off-by: Peter Seiderer +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ca1e39..eddda1f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ endif() + + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) + set (CMAKE_CXX_STANDARD 17) +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -fpermissive) + add_definitions(-D_FILE_OFFSET_BITS=64) + + if (CMAKE_COMPILER_IS_GNUCXX) +-- +2.35.1 + -- 2.35.1 From clement.leger at bootlin.com Fri Mar 18 13:24:21 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:21 +0100 Subject: [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-3-clement.leger@bootlin.com> Enable host package and add needed variables. Host POST_PROCESS and DOWNLOAD_DEPENDENCIES variables are inherited from target ones. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/python-cryptography/python-cryptography.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..872ede9b89 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:25 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:25 +0100 Subject: [Buildroot] [PATCH v5 6/8] package/optee-examples: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-7-clement.leger@bootlin.com> Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..afd50afea0 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:24 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:24 +0100 Subject: [Buildroot] [PATCH v5 5/8] package/optee-test: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-6-clement.leger@bootlin.com> Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..7806d9a1af 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:26 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:26 +0100 Subject: [Buildroot] [PATCH v5 7/8] package/optee-client: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-8-clement.leger@bootlin.com> Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..26b0a6ced4 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:20 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:20 +0100 Subject: [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-2-clement.leger@bootlin.com> From: "Yann E. MORIN" It seems reasonable to expect that the download of the host and target variants should usually be exactly the same and thus reuse the target package values for the host package. This commits add support to inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and _DOwNLOAD_POST_PROCESS variables from target ones. These variables can still be overriden if necessary for the host package. Signed-off-by: Yann E. MORIN Signed-off-by: Cl?ment L?ger --- package/pkg-generic.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:19 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:19 +0100 Subject: [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Message-ID: <20220318132427.48737-1-clement.leger@bootlin.com> Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead of python-pycryptodomex to build. This series adds support to build host-python-cryptography and uses it in optee-os package to build the 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples and optee-test which needs to be aligned with optee-os version. ---- Changes in v5: - Add Yann patch for host variable inheritance - Move BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option - Remove host inherited variables from python-cryptography package Changes in v4: - Add missing variables for python host package - Found a missing DTC dependency while testing build in docker container - Fix BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY title - Change the logic to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY - optee-os now depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS Changes in v3: - Fix authorship for commits that were copied from Etienne ones. - Fix package URL for optee-os - Added Acked-by Etienne Carriere Changes in v2: - Bump optee-client, optee-benchmark, optee-examples and optee-test Cl?ment L?ger (7): package/python-cryptography: enable host package boot/optee-os: add support to build with python-cryptography boot/optee-os: bump to version 3.16.0 package/optee-test: bump to version 3.16.0 package/optee-examples: bump to version 3.16.0 package/optee-client: bump to version 3.16.0 package/optee-benchmark: bump to version 3.16.0 Yann E. MORIN (1): package/pkg-generic: host variant inherits target download settings boot/optee-os/Config.in | 14 +++++++++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 8 ++++++- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- package/pkg-generic.mk | 24 +++++++++++++++++++ .../python-cryptography.mk | 12 ++++++++++ 13 files changed, 69 insertions(+), 17 deletions(-) -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:23 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:23 +0100 Subject: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-5-clement.leger@bootlin.com> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_LATEST to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 02b5d7c86f..811937e025 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -19,7 +19,8 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -51,7 +52,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..b9b0e5b43f 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:27 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:27 +0100 Subject: [Buildroot] [PATCH v5 8/8] package/optee-benchmark: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-9-clement.leger@bootlin.com> Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..f36e074eec 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE -- 2.34.1 From clement.leger at bootlin.com Fri Mar 18 13:24:22 2022 From: clement.leger at bootlin.com (=?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?=) Date: Fri, 18 Mar 2022 14:24:22 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318132427.48737-4-clement.leger@bootlin.com> Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl?ment L?ger --- boot/optee-os/Config.in | 9 +++++++++ boot/optee-os/optee-os.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index ea16550b72..02b5d7c86f 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_OPTEE_OS bool "optee_os" depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help OP-TEE OS provides the secure world boot image and the trust application development kit of the OP-TEE project. OP-TEE OS @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 9f76d8450e..5313a1badc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,13 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc -- 2.34.1 From grant.b.edwards at gmail.com Fri Mar 18 14:38:21 2022 From: grant.b.edwards at gmail.com (Grant Edwards) Date: Fri, 18 Mar 2022 14:38:21 -0000 (UTC) Subject: [Buildroot] openssl-1.1.1n build failure (with older buildroot) Message-ID: I tried upgrading my openssl package from 1.1.1d to 1.1.1n, and the newer version won't build. My base buildroot version is rather old at 2016.11.2, but many of the packages are fairly recent. The configure step appears to be failing because no OS/compiler was specified (see output below). I assume this is because my buildroot is old. I'm hoping that a simple hack on the libopenssl.mk file will allow me to add the missing os/compiler info. Can somebody point me towards a clue? Upgrading to a newer version of buildroot is only an option if I can keep all of existing package versions (is that feasible)? Thanks... ======================================================================== openssl-1.1.1n.tar.gz: OK (sha256: 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a) >>> libopenssl 1.1.1n Extracting gzip -d -c /home/nextgen/buildroot/downloads/openssl-1.1.1n.tar.gz | tar --strip-components=1 -C /home/nextgen/buildroot/output/build/libopenssl-1.1.1n -xf - >>> libopenssl 1.1.1n Patching Applying 0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch using patch: patching file Configurations/unix-Makefile.tmpl Applying 0002-Reproducible-build-do-not-leak-compiler-path.patch using patch: patching file crypto/build.info Applying 0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch using patch: patching file crypto/mem_sec.c Hunk #1 succeeded at 491 (offset 6 lines). Applying 0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch using patch: patching file Configure Hunk #1 succeeded at 1424 (offset 7 lines). Applying 0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch using patch: patching file crypto/perlasm/ppc-xlate.pl Applying 0006-Add-support-for-io_pgetevents_time64-syscall.patch using patch: patching file engines/e_afalg.c Applying 0007-Fixup-support-for-io_pgetevents_time64-syscall.patch using patch: patching file engines/e_afalg.c Hunk #1 succeeded at 121 (offset -3 lines). >>> libopenssl 1.1.1n Configuring (cd /home/nextgen/buildroot/output/build/libopenssl-1.1.1n; ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no PATH="/home/nextgen/buildroot/output/host/bin:/home/nextgen/buildroot/output/host/sbin:/home/nextgen/buildroot/output/host/usr/bin:/home/nextgen/buildroot/output/host/usr/sbin:/home/grante/bin:/home/grante/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/13/bin:/sbin:/opt/ecos:/opt/ecos/gnutools/arm-elf/bin:/opt/ecos/gnutools/arm-eabi/bin" AR="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ar" AS="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" LD="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueab i-ld" NM="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-nm" CC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" GCC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" CPP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-cpp" CXX="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-g++" FC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" F77="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" RANLIB="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ranlib" READELF="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-readelf" STRIP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-strip" OBJCOPY="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objcopy" OBJDUMP="/hom e/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objdump" AR_FOR_BUILD="/usr/bin/ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/bin/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUILD="-I/home/nextgen/buildroot/output/host/usr/include" CFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" CXXFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" LDFLAGS_FOR_BUILD="-L/home/nextgen/buildroot/output/host/lib -L/home/nextgen/buildroot/output/host/usr/lib -Wl,-rpath,/home/nextgen/buildroot/output/host/usr/lib" FCFLAGS_FOR_BUILD="" DEFAULT_ASSEMBLER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" DEFAULT_LINKER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - Os " CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os " LDFLAGS="" FCFLAGS=" -Os " FFLAGS=" -Os " PKG_CONFIG="/home/nextgen/buildroot/output/host/usr/bin/pkg-config" STAGING_DIR="/home/nextgen/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot" INTLTOOL_PERL=/usr/bin/perl ./Configure --prefix=/usr --openssldir=/etc/ssl threads shared no-rc5 enable-camellia enable-mdc2 no-tests no-fuzz-libfuzzer no-fuzz-afl no-chacha no-rc5 no-rc2 no-rc4 no-md2 no-md4 no-mdc2 no-blake2 no-idea no-seed no-des no-rmd160 no-whirlpool no-bf no-ssl no-ssl2 no-ssl3 no-weak-ssl-ciphers no-psk no-cast no-unit-test no-crypto-mdebug-backtrace no-crypto-mdebug no-autoerrinit no-dynamic-engine no-comp zlib-dynamic ) Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] pick os/compiler from: BS2000-OSD BSD-generic32 BSD-generic64 BSD-ia64 BSD-riscv64 BSD-sparc64 BSD-sparcv8 BSD-x86 BSD-x86-elf BSD-x86_64 Cygwin Cygwin-i386 Cygwin-i486 Cygwin-i586 Cygwin-i686 Cygwin-x86 Cygwin-x86_64 DJGPP MPE/iX-gcc UEFI UWIN VC-CE VC-WIN32 VC-WIN32-ARM VC-WIN32-ONECORE VC-WIN64-ARM VC-WIN64A VC-WIN64A-ONECORE VC-WIN64A-masm VC-WIN64I aix-cc aix-gcc aix64-cc aix64-gcc android-arm android-arm64 android-armeabi android-mips android-mips64 android-x86 android-x86_64 android64 android64-aarch64 android64-mips64 android64-x86_64 bsdi-elf-gcc cc darwin-i386-cc darwin-ppc-cc darwin64-arm64-cc darwin64-ppc-cc darwin64-x86_64-cc gcc haiku-x86 haiku-x86_64 hpux-ia64-cc hpux-ia64-gcc hpux-parisc-cc hpux-parisc-gcc hpux-parisc1_1-cc hpux-parisc1_1-gcc hpux64-ia64-cc hpux64-ia64-gcc hpux64-parisc2-cc hpux64-parisc2-gcc hurd-x86 ios-cross ios-xcrun ios64-cross ios64-xcrun iossimulator-xcrun iphoneos-cross irix-mips3-cc irix-mips3-gcc irix64-mips4-cc irix64-mips4-gcc linux-aarch64 linux-alpha-gcc linux-aout linux-arm64ilp32 linux-armv4 linux-c64xplus linux-elf linux-generic32 linux-generic64 linux-ia64 linux-mips32 linux-mips64 linux-ppc linux-ppc64 linux-ppc64le linux-sparcv8 linux-sparcv9 linux-x32 linux-x86 linux-x86-clang linux-x86_64 linux-x86_64-clang linux32-s390x linux64-mips64 linux64-riscv64 linux64-s390x linux64-sparcv9 mingw mingw64 nextstep nextstep3.3 sco5-cc sco5-gcc solaris-sparcv7-cc solaris-sparcv7-gcc solaris-sparcv8-cc solaris-sparcv8-gcc solaris-sparcv9-cc solaris-sparcv9-gcc solaris-x86-gcc solaris64-sparcv9-cc solaris64-sparcv9-gcc solaris64-x86_64-cc solaris64-x86_64-gcc tru64-alpha-cc tru64-alpha-gcc uClinux-dist uClinux-dist64 unixware-2.0 unixware-2.1 unixware-7 unixware-7-gcc vms-alpha vms-alpha-p32 vms-alpha-p64 vms-ia64 vms-ia64-p32 vms-ia64-p64 vos-gcc vxworks-mips vxworks-ppc405 vxworks-ppc60x vxworks-ppc750 vxworks-ppc750-debug vxworks-ppc860 vxworks-ppcgen vxworks-simlinux NOTE: If in doubt, on Unix-ish systems use './config'. Configuring OpenSSL version 1.1.1n (0x101010efL) for Using os-specific seed configuration make: *** [package/pkg-generic.mk:209: /home/nextgen/buildroot/output/build/libopenssl-1.1.1n/.stamp_configured] Error 1 make: Leaving directory '/home/nextgen/buildroot/buildroot-2016.11.2' ***** finished build FAIL at Fri Mar 18 09:22:16 AM CDT 2022 ***** ***** elapsed time 0:04:53 ***** From ps.report at gmx.net Fri Mar 18 15:18:30 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 16:18:30 +0100 Subject: [Buildroot] openssl-1.1.1n build failure (with older buildroot) In-Reply-To: References: Message-ID: <20220318161830.49f60486@gmx.net> Hello Edwards, On Fri, 18 Mar 2022 14:38:21 -0000 (UTC), Grant Edwards wrote: > I tried upgrading my openssl package from 1.1.1d to 1.1.1n, and the > newer version won't build. My base buildroot version is rather old at > 2016.11.2, but many of the packages are fairly recent. The configure > step appears to be failing because no OS/compiler was specified (see > output below). I assume this is because my buildroot is old. I'm > hoping that a simple hack on the libopenssl.mk file will allow me to > add the missing os/compiler info. > > Can somebody point me towards a clue? > > Upgrading to a newer version of buildroot is only an option if I can > keep all of existing package versions (is that feasible)? > > Thanks... > > > > ======================================================================== > > openssl-1.1.1n.tar.gz: OK (sha256: 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a) > > >>> libopenssl 1.1.1n Extracting > gzip -d -c /home/nextgen/buildroot/downloads/openssl-1.1.1n.tar.gz | tar --strip-components=1 -C /home/nextgen/buildroot/output/build/libopenssl-1.1.1n -xf - > > >>> libopenssl 1.1.1n Patching > > Applying 0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch using patch: > patching file Configurations/unix-Makefile.tmpl > > Applying 0002-Reproducible-build-do-not-leak-compiler-path.patch using patch: > patching file crypto/build.info > > Applying 0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch using patch: > patching file crypto/mem_sec.c > Hunk #1 succeeded at 491 (offset 6 lines). > > Applying 0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch using patch: > patching file Configure > Hunk #1 succeeded at 1424 (offset 7 lines). > > Applying 0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch using patch: > patching file crypto/perlasm/ppc-xlate.pl > > Applying 0006-Add-support-for-io_pgetevents_time64-syscall.patch using patch: > patching file engines/e_afalg.c > > Applying 0007-Fixup-support-for-io_pgetevents_time64-syscall.patch using patch: > patching file engines/e_afalg.c > Hunk #1 succeeded at 121 (offset -3 lines). > > >>> libopenssl 1.1.1n Configuring > (cd /home/nextgen/buildroot/output/build/libopenssl-1.1.1n; ac_cv_lbl_unaligned_fail=yes ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes lt_cv_sys_lib_search_path_spec="" ac_cv_c_bigendian=no PATH="/home/nextgen/buildroot/output/host/bin:/home/nextgen/buildroot/output/host/sbin:/home/nextgen/buildroot/output/host/usr/bin:/home/nextgen/buildroot/output/host/usr/sbin:/home/grante/bin:/home/grante/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/13/bin:/sbin:/opt/ecos:/opt/ecos/gnutools/arm-elf/bin:/opt/ecos/gnutools/arm-eabi/bin" AR="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ar" AS="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" LD="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueab > i-ld" NM="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-nm" CC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" GCC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc" CPP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-cpp" CXX="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-g++" FC="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" F77="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-gfortran" RANLIB="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ranlib" READELF="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-readelf" STRIP="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-strip" OBJCOPY="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objcopy" OBJDUMP="/hom > e/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-objdump" AR_FOR_BUILD="/usr/bin/ar" AS_FOR_BUILD="/usr/bin/as" CC_FOR_BUILD="/usr/bin/gcc" GCC_FOR_BUILD="/usr/bin/gcc" CXX_FOR_BUILD="/usr/bin/g++" LD_FOR_BUILD="/usr/bin/ld" CPPFLAGS_FOR_BUILD="-I/home/nextgen/buildroot/output/host/usr/include" CFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" CXXFLAGS_FOR_BUILD="-O2 -I/home/nextgen/buildroot/output/host/usr/include" LDFLAGS_FOR_BUILD="-L/home/nextgen/buildroot/output/host/lib -L/home/nextgen/buildroot/output/host/usr/lib -Wl,-rpath,/home/nextgen/buildroot/output/host/usr/lib" FCFLAGS_FOR_BUILD="" DEFAULT_ASSEMBLER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-as" DEFAULT_LINKER="/home/nextgen/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-ld" CPPFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - > Os " CXXFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os " LDFLAGS="" FCFLAGS=" -Os " FFLAGS=" -Os " PKG_CONFIG="/home/nextgen/buildroot/output/host/usr/bin/pkg-config" STAGING_DIR="/home/nextgen/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot" INTLTOOL_PERL=/usr/bin/perl ./Configure --prefix=/usr --openssldir=/etc/ssl threads shared no-rc5 enable-camellia enable-mdc2 no-tests no-fuzz-libfuzzer no-fuzz-afl no-chacha no-rc5 no-rc2 no-rc4 no-md2 no-md4 no-mdc2 no-blake2 no-idea no-seed no-des no-rmd160 no-whirlpool no-bf no-ssl no-ssl2 no-ssl3 no-weak-ssl-ciphers no-psk no-cast no-unit-test no-crypto-mdebug-backtrace no-crypto-mdebug no-autoerrinit no-dynamic-engine no-comp zlib-dynamic ) > Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags] > > pick os/compiler from: > BS2000-OSD BSD-generic32 BSD-generic64 BSD-ia64 BSD-riscv64 BSD-sparc64 > BSD-sparcv8 BSD-x86 BSD-x86-elf BSD-x86_64 Cygwin Cygwin-i386 Cygwin-i486 > Cygwin-i586 Cygwin-i686 Cygwin-x86 Cygwin-x86_64 DJGPP MPE/iX-gcc UEFI UWIN > VC-CE VC-WIN32 VC-WIN32-ARM VC-WIN32-ONECORE VC-WIN64-ARM VC-WIN64A > VC-WIN64A-ONECORE VC-WIN64A-masm VC-WIN64I aix-cc aix-gcc aix64-cc aix64-gcc > android-arm android-arm64 android-armeabi android-mips android-mips64 > android-x86 android-x86_64 android64 android64-aarch64 android64-mips64 > android64-x86_64 bsdi-elf-gcc cc darwin-i386-cc darwin-ppc-cc > darwin64-arm64-cc darwin64-ppc-cc darwin64-x86_64-cc gcc haiku-x86 > haiku-x86_64 hpux-ia64-cc hpux-ia64-gcc hpux-parisc-cc hpux-parisc-gcc > hpux-parisc1_1-cc hpux-parisc1_1-gcc hpux64-ia64-cc hpux64-ia64-gcc > hpux64-parisc2-cc hpux64-parisc2-gcc hurd-x86 ios-cross ios-xcrun ios64-cross > ios64-xcrun iossimulator-xcrun iphoneos-cross irix-mips3-cc irix-mips3-gcc > irix64-mips4-cc irix64-mips4-gcc linux-aarch64 linux-alpha-gcc linux-aout > linux-arm64ilp32 linux-armv4 linux-c64xplus linux-elf linux-generic32 > linux-generic64 linux-ia64 linux-mips32 linux-mips64 linux-ppc linux-ppc64 > linux-ppc64le linux-sparcv8 linux-sparcv9 linux-x32 linux-x86 linux-x86-clang > linux-x86_64 linux-x86_64-clang linux32-s390x linux64-mips64 linux64-riscv64 > linux64-s390x linux64-sparcv9 mingw mingw64 nextstep nextstep3.3 sco5-cc > sco5-gcc solaris-sparcv7-cc solaris-sparcv7-gcc solaris-sparcv8-cc > solaris-sparcv8-gcc solaris-sparcv9-cc solaris-sparcv9-gcc solaris-x86-gcc > solaris64-sparcv9-cc solaris64-sparcv9-gcc solaris64-x86_64-cc > solaris64-x86_64-gcc tru64-alpha-cc tru64-alpha-gcc uClinux-dist > uClinux-dist64 unixware-2.0 unixware-2.1 unixware-7 unixware-7-gcc vms-alpha > vms-alpha-p32 vms-alpha-p64 vms-ia64 vms-ia64-p32 vms-ia64-p64 vos-gcc > vxworks-mips vxworks-ppc405 vxworks-ppc60x vxworks-ppc750 vxworks-ppc750-debug > vxworks-ppc860 vxworks-ppcgen vxworks-simlinux > > NOTE: If in doubt, on Unix-ish systems use './config'. > Configuring OpenSSL version 1.1.1n (0x101010efL) for > Using os-specific seed configuration > make: *** [package/pkg-generic.mk:209: /home/nextgen/buildroot/output/build/libopenssl-1.1.1n/.stamp_configured] Error 1 > make: Leaving directory '/home/nextgen/buildroot/buildroot-2016.11.2' > ***** finished build FAIL at Fri Mar 18 09:22:16 AM CDT 2022 ***** > ***** elapsed time 0:04:53 ***** Seems your BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH/LIBOPENSSL_TARGET_ARCH variable is empty, the Configure line should look (something) like the following: [...] ./Configure linux-armv4 --prefix=/usr [...] Yours: [...] ./Configure --prefix=/usr [...] See [1] for a starting point of the handling in buildroot git mainline... Regards, Peter [1] https://git.buildroot.net/buildroot/tree/package/libopenssl/libopenssl.mk#n73 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From joerg.krause at embedded.rocks Fri Mar 18 17:33:47 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Fri, 18 Mar 2022 17:33:47 +0000 Subject: [Buildroot] [PATCH 1/1] package/luv: bump to version 1.43.0-0 Message-ID: <20220318173347.68409-1-joerg.krause@embedded.rocks> Signed-off-by: J?rg Krause --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 2fb2b5c4fc..4cdb91729f 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 2dc9af3b7a..36fcdc742e 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.42.0-1 +LUV_VERSION = 1.43.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt -- 2.35.1 From joerg.krause at embedded.rocks Fri Mar 18 17:34:27 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Fri, 18 Mar 2022 17:34:27 +0000 Subject: [Buildroot] [PATCH 1/1] package/luvi: bump to version 2.13.0 Message-ID: <20220318173427.68776-1-joerg.krause@embedded.rocks> Signed-off-by: J?rg Krause --- package/luvi/luvi.hash | 2 +- package/luvi/luvi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index fcc81430db..9621ef4d03 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5daa3c1793..5266281ffc 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.12.0 +LUVI_VERSION = 2.13.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 17:35:07 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 18:35:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libscrypt: fix CFLAGS Message-ID: <20220318173507.10160-1-fontaine.fabrice@gmail.com> Don't pass TARGET_CONFIGURE_OPTS in LIBSCRYPT_MAKE_OPTS to avoid overriding CFLAGS (and so loossing -fPIC). This will fix the following build failure raised since bump to version 1.22 in commit 4542c6714d3951070c31739d24e4bd42b446fbae: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.36.1 assertion fail elf32-microblaze.c:1534 /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: sha256.o: probably compiled without -fPIC? /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value Fixes: - http://autobuild.buildroot.org/results/ba4234ad305badb5ce815080ddcad6727e8d51c4 Signed-off-by: Fabrice Fontaine --- package/libscrypt/libscrypt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index d28bd4e900..193c963f76 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -11,7 +11,7 @@ LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES LIBSCRYPT_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) \ CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ PREFIX=/usr -- 2.35.1 From joerg.krause at embedded.rocks Fri Mar 18 17:51:56 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Fri, 18 Mar 2022 17:51:56 +0000 Subject: [Buildroot] [PATCH 1/1] package/pugixml: bump to version 1.12.1 Message-ID: <20220318175156.186854-1-joerg.krause@embedded.rocks> The license file has updated the copyright year to 2022, therefore update the hash of the license file as well. Signed-off-by: J?rg Krause --- package/pugixml/pugixml.hash | 4 ++-- package/pugixml/pugixml.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 5c629ac66f..190dfb6a6e 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md +sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef..9137f04630 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.11.4 +PUGIXML_VERSION = 1.12.1 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 18:07:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 19:07:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body Message-ID: <20220318180713.19051-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.50.5 in commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75: ../utils/viewer-cairo.c: In function 'cairo_vector_view_create': ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] ; ^ Fixes: - http://autobuild.buildroot.org/results/dee/dee3d631474f83b345f22eb26c59a305c32258f8/build-end.log Signed-off-by: Fabrice Fontaine --- ...1-meson.build-drop-Werror-empty-body.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/pango/0001-meson.build-drop-Werror-empty-body.patch diff --git a/package/pango/0001-meson.build-drop-Werror-empty-body.patch b/package/pango/0001-meson.build-drop-Werror-empty-body.patch new file mode 100644 index 0000000000..98b6828a63 --- /dev/null +++ b/package/pango/0001-meson.build-drop-Werror-empty-body.patch @@ -0,0 +1,47 @@ +From 1d0f3a8abcb2bb8931d02c136ae957ee2d60094e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 18 Mar 2022 18:55:56 +0100 +Subject: [PATCH] meson.build: drop -Werror=empty-body + +Drop -Werror=empty-body to avoid the following build failure raised +since version 1.50.5 and +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e: + +../utils/viewer-cairo.c: In function 'cairo_vector_view_create': +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] + ; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/pango/-/merge_requests/604] +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 0f79bff7..c48fe01f 100644 +--- a/meson.build ++++ b/meson.build +@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Wunused', + '-Werror=address', + '-Werror=array-bounds', +- '-Werror=empty-body', + '-Werror=implicit', + '-Werror=implicit-fallthrough', + '-Werror=init-self', +@@ -135,7 +134,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Werror=write-strings', + '-Werror=address', + '-Werror=int-to-pointer-cast', +- '-Werror=empty-body', + '-Werror=write-strings', + '-Werror=unused-but-set-variable', + '-Wundef', # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=792481 +-- +2.35.1 + -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 19:33:10 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 20:33:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build Message-ID: <20220318193310.752282-1-fontaine.fabrice@gmail.com> introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 3bf7cece45..327138391d 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 18 19:40:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 20:40:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/wavpack: fix CVE-2021-44269 Message-ID: <20220318194058.760799-1-fontaine.fabrice@gmail.com> An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine --- ...e-DSD-file-types-for-invalid-lengths.patch | 42 +++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) create mode 100644 package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:42 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:42 +0100 Subject: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-3-ps.report@gmx.net> - add optional libpsl dependency Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 7fda36f1f5..d0556e323c 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -21,6 +21,13 @@ WGET_CONF_OPTS = \ --disable-valgrind-tests \ --disable-assert +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:40 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:40 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/wget: explicit set some default options Message-ID: <20220318202044.10413-1-ps.report@gmx.net> - explicit set some default options (--without-metalink, --enable-opie, --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, --disable-assert) Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..d100a59eae 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,6 +12,15 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +WGET_CONF_OPTS = \ + --without-metalink \ + --enable-opie \ + --enable-digest \ + --enable-ntlm \ + --disable-debug \ + --disable-valgrind-tests \ + --disable-assert + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:41 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:41 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-2-ps.report@gmx.net> - use explicit --with/without-libuuid option Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d100a59eae..7fda36f1f5 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -43,7 +43,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:43 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:43 +0100 Subject: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-4-ps.report@gmx.net> - add optional c-ares dependency Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d0556e323c..69ca8f261c 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -63,6 +63,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:20:44 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:20:44 +0100 Subject: [Buildroot] [PATCH v2 5/5] package/wget: bump version to 1.21.3 In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318202044.10413-5-ps.report@gmx.net> - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch - fix iri option enable dependency --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 69ca8f261c..079afbee48 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -38,15 +38,13 @@ else WGET_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WGET_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 +WGET_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -- 2.35.1 From ps.report at gmx.net Fri Mar 18 20:50:22 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 18 Mar 2022 21:50:22 +0100 Subject: [Buildroot] [PATCH v2 5/5] package/wget: bump version to 1.21.3 In-Reply-To: <20220318202044.10413-5-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-5-ps.report@gmx.net> Message-ID: <20220318215022.31a913e5@gmx.net> Hello *, On Fri, 18 Mar 2022 21:20:44 +0100, Peter Seiderer wrote: > - bump version to 1.21.3 (for details see [1]) > > - remove legacy --with-libidn option (see [2]), replace with > --enable-iri option in case locale support and libidn2 are available > > [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch > - fix iri option enable dependency > --- > package/wget/wget.hash | 4 ++-- > package/wget/wget.mk | 14 ++++++-------- > 2 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/package/wget/wget.hash b/package/wget/wget.hash > index 7f89bedb88..22674650a2 100644 > --- a/package/wget/wget.hash > +++ b/package/wget/wget.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig > +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig > # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 > -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz > +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz > # Locally calculated > sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 69ca8f261c..079afbee48 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WGET_VERSION = 1.21.2 > +WGET_VERSION = 1.21.3 > WGET_SOURCE = wget-$(WGET_VERSION).tar.lz > WGET_SITE = $(BR2_GNU_MIRROR)/wget > WGET_DEPENDENCIES = host-pkgconf > @@ -38,15 +38,13 @@ else > WGET_CONF_OPTS += --without-ssl > endif > > -ifeq ($(BR2_PACKAGE_LIBICONV),y) > -WGET_DEPENDENCIES += libiconv > -endif The above code one should be kept as there is at least one other location in the source using iconv (protexted by '#ifdef HAVE_ICONV', see src/url.c)... > - > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > -WGET_CONF_OPTS += --with-libidn > +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive > +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) > +WGET_CONF_OPTS += --enable-iri > WGET_DEPENDENCIES += libidn2 > +WGET_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) And so the above line can be removed... Will send an updated patch set... Regards, Peter > else > -WGET_CONF_OPTS += --without-libidn > +WGET_CONF_OPTS += --disable-iri > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From yann.morin.1998 at free.fr Fri Mar 18 21:25:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:25:53 +0100 Subject: [Buildroot] [PATCH v2 1/5] package/wget: explicit set some default options In-Reply-To: <20220318202044.10413-1-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> Message-ID: <20220318212553.GI283544@scaer> Peter, All, On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - explicit set some default options (--without-metalink, --enable-opie, > --enable-digest, --enable-ntlm, --disable-debug, --disable-valgrind-tests, > --disable-assert) Repeating the title and the code in the commit message is not very helpful. What would be more intertesting, is to explain why you did need to set those options, and just those, among all the others that are available, like attr, iri... (I think that is basically what Thomas asked for in his review of your v1). I see that your series will also introduces some optional support (libpsl, c-ares), but if just this first patch is applied, then that also leaves those options unset, so this first patch should really add defaults to all options. Regards, Yann E. MORIN. > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index f30fa39917..d100a59eae 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -12,6 +12,15 @@ WGET_LICENSE = GPL-3.0+ > WGET_LICENSE_FILES = COPYING > WGET_CPE_ID_VENDOR = gnu > > +WGET_CONF_OPTS = \ > + --without-metalink \ > + --enable-opie \ > + --enable-digest \ > + --enable-ntlm \ > + --disable-debug \ > + --disable-valgrind-tests \ > + --disable-assert > + > ifeq ($(BR2_PACKAGE_GNUTLS),y) > WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:26:53 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:26:53 +0100 Subject: [Buildroot] [git commit] package/wget: use explicit --with/without-libuuid option Message-ID: <20220318211911.2C1E9844B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b0fc0a811ba198288a3aef8413466d9a61d1dfd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This has been like tht for ages (probably an implicit dependency check in older versions), but now wget has explicit flags, so let's use them. Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: expand commit log] Signed-off-by: Yann E. MORIN --- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..58e04e3040 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -34,7 +34,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) From yann.morin.1998 at free.fr Fri Mar 18 21:27:59 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:27:59 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option In-Reply-To: <20220318202044.10413-2-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-2-ps.report@gmx.net> Message-ID: <20220318212759.GJ283544@scaer> On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - use explicit --with/without-libuuid option Repeating the commit title in the commit log is not very helpul... Applied to master with that fixed, thanks. Regards, Yann E. MORIN. > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index d100a59eae..7fda36f1f5 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -43,7 +43,10 @@ WGET_CONF_OPTS += --without-libidn > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) > +WGET_CONF_OPTS += --with-libuuid > WGET_DEPENDENCIES += util-linux > +else > +WGET_CONF_OPTS += --without-libuuid > endif > > ifeq ($(BR2_PACKAGE_ZLIB),y) > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:30:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:30:25 +0100 Subject: [Buildroot] [git commit] package/wget: add optional libpsl dependency Message-ID: <20220318212252.F12C8844BD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0554aa59d7a27193f5b39f96ae0dbe6987723c1d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 58e04e3040..795c2a2ccd 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,6 +12,13 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls From yann.morin.1998 at free.fr Fri Mar 18 21:30:27 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:30:27 +0100 Subject: [Buildroot] [git commit] package/wget: add optional c-ares dependency Message-ID: <20220318212253.08CCC844BE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f2eb453321d227a9965a459c33a8fcbca4b2b4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 795c2a2ccd..8a73c33699 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -54,6 +54,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 From yann.morin.1998 at free.fr Fri Mar 18 21:33:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:33:44 +0100 Subject: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency In-Reply-To: <20220318202044.10413-4-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-4-ps.report@gmx.net> Message-ID: <20220318213344.GK283544@scaer> Peter, All, On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - add optional c-ares dependency Again, not very usefull... But there isn't much to say in this commit, the title is far sufficient, so an empty commit log is OK. (Who would have guessed I would ever say that? Who'd have bet? ;-) ) > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index d0556e323c..69ca8f261c 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -63,6 +63,13 @@ else > WGET_CONF_OPTS += --without-zlib > endif > > +ifeq ($(BR2_PACKAGE_C_ARES),y) > +WGET_CONF_OPTS += --with-cares > +WGET_DEPENDENCIES += c-ares > +else > +WGET_CONF_OPTS += --without-cares > +endif > + > ifeq ($(BR2_PACKAGE_PCRE2),y) > WGET_CONF_OPTS += --disable-pcre --enable-pcre2 > WGET_DEPENDENCIES += pcre2 > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:34:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:34:20 +0100 Subject: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency In-Reply-To: <20220318202044.10413-3-ps.report@gmx.net> References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-3-ps.report@gmx.net> Message-ID: <20220318213420.GL283544@scaer> On 2022-03-18 21:20 +0100, Peter Seiderer spake thusly: > - add optional libpsl dependency > > Signed-off-by: Peter Seiderer Applied to master, commit elided, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - split out from original patch > --- > package/wget/wget.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 7fda36f1f5..d0556e323c 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -21,6 +21,13 @@ WGET_CONF_OPTS = \ > --disable-valgrind-tests \ > --disable-assert > > +ifeq ($(BR2_PACKAGE_LIBPSL),y) > +WGET_CONF_OPTS += --with-libpsl > +WGET_DEPENDENCIES += libpsl > +else > +WGET_CONF_OPTS += --without-libpsl > +endif > + > ifeq ($(BR2_PACKAGE_GNUTLS),y) > WGET_CONF_OPTS += --with-ssl=gnutls > WGET_DEPENDENCIES += gnutls > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:38:07 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:38:07 +0100 Subject: [Buildroot] [git commit] package/wavpack: fix CVE-2021-44269 Message-ID: <20220318212930.37A06844C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From yann.morin.1998 at free.fr Fri Mar 18 21:38:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:38:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/wavpack: fix CVE-2021-44269 In-Reply-To: <20220318194058.760799-1-fontaine.fabrice@gmail.com> References: <20220318194058.760799-1-fontaine.fabrice@gmail.com> Message-ID: <20220318213830.GM283544@scaer> Fabrice, All, On 2022-03-18 20:40 +0100, Fabrice Fontaine spake thusly: > An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV > files. This issue triggered in function WavpackPackSamples of file > src/pack_utils.c, tainted variable cnt is too large, that makes pointer > sptr read beyond heap bound. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...e-DSD-file-types-for-invalid-lengths.patch | 42 +++++++++++++++++++ > package/wavpack/wavpack.mk | 3 ++ > 2 files changed, 45 insertions(+) > create mode 100644 package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > > diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > new file mode 100644 > index 0000000000..76c1e81674 > --- /dev/null > +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > @@ -0,0 +1,42 @@ > +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 > +From: David Bryant > +Date: Tue, 23 Nov 2021 13:14:35 -0800 > +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths > + > +[Retrieved from: > +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] > +Signed-off-by: Fabrice Fontaine > +--- > + cli/dsdiff.c | 6 ++++++ > + cli/dsf.c | 1 + > + 2 files changed, 7 insertions(+) > + > +diff --git a/cli/dsdiff.c b/cli/dsdiff.c > +index d7adb6a..5bdcae3 100644 > +--- a/cli/dsdiff.c > ++++ b/cli/dsdiff.c > +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa > + } > + > + total_samples = dff_chunk_header.ckDataSize / config->num_channels; > ++ > ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { > ++ error_line ("%s is not a valid .DFF file!", infilename); > ++ return WAVPACK_SOFT_ERROR; > ++ } > ++ > + break; > + } > + else { // just copy unknown chunks to output file > +diff --git a/cli/dsf.c b/cli/dsf.c > +index e1d7973..dddd488 100644 > +--- a/cli/dsf.c > ++++ b/cli/dsf.c > +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC > + > + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || > + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || > ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || > + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || > + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || > + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { > diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk > index 485ab9b2ae..2e0438ac80 100644 > --- a/package/wavpack/wavpack.mk > +++ b/package/wavpack/wavpack.mk > @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause > WAVPACK_LICENSE_FILES = COPYING > WAVPACK_CPE_ID_VENDOR = wavpack > > +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch > +WAVPACK_IGNORE_CVES += CVE-2021-44269 > + > ifeq ($(BR2_PACKAGE_LIBICONV),y) > WAVPACK_CONF_OPTS += LIBS=-liconv > endif > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:50:25 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: <20220318193310.752282-1-fontaine.fabrice@gmail.com> References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> Message-ID: <20220318215025.GN283544@scaer> Fabrice, All, On 2022-03-18 20:33 +0100, Fabrice Fontaine spake thusly: > introspection needs host-doxygen and host-python-lxml since the addition > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 As per that diff, it seems doxygen is only needed when actually building the documentation: https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa doxygen_p = find_program('doxygen', required: get_option('doc')) But we are alredy passing -Ddoc=disabled, so why is it still trying to build the documentation? That's because the option is only a hint to not care when doxygen is missing, but if doxygen is present, then the documentation is still built. -Ddoc=disabled should really disable building the documentation, e.g. in ./meson.build: if get_option('doc') subdir('doc') endif or, at the top of ./doc/meson.build: if not get_option('doc') subdir_done() fi I think the former is better, as they already have conditional subdir() in the top-level meson.build. Regards, Yann E. MORIN. > ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml > > Fixes: > - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 > > Signed-off-by: Fabrice Fontaine > --- > package/wireplumber/wireplumber.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > index 3bf7cece45..327138391d 100644 > --- a/package/wireplumber/wireplumber.mk > +++ b/package/wireplumber/wireplumber.mk > @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ > -Dsystem-lua-version= > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -WIREPLUMBER_DEPENDENCIES += gobject-introspection > +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection > WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled > else > WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 21:59:10 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:59:10 +0100 Subject: [Buildroot] [git commit] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220318215039.1A9CF814C4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e41f883b800846435cd13081fa86abbc4e330d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 608c2f24ea..085d32acc3 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From yann.morin.1998 at free.fr Fri Mar 18 21:59:37 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 22:59:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: add OPENBLAS_CPE_ID_VENDOR In-Reply-To: <20220317220121.21498-1-ju.o@free.fr> References: <20220317220121.21498-1-ju.o@free.fr> Message-ID: <20220318215937.GO283544@scaer> Julien, All, On 2022-03-17 23:01 +0100, Julien Olivain spake thusly: > cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/openblas/openblas.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk > index 608c2f24ea..085d32acc3 100644 > --- a/package/openblas/openblas.mk > +++ b/package/openblas/openblas.mk > @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS > OPENBLAS_LICENSE = BSD-3-Clause > OPENBLAS_LICENSE_FILES = LICENSE > OPENBLAS_INSTALL_STAGING = YES > +OPENBLAS_CPE_ID_VENDOR = openblas_project > > # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) > OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Fri Mar 18 21:58:42 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 18 Mar 2022 22:58:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: <20220318215025.GN283544@scaer> References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> <20220318215025.GN283544@scaer> Message-ID: Yann, Le ven. 18 mars 2022 ? 22:50, Yann E. MORIN a ?crit : > > Fabrice, All, > > On 2022-03-18 20:33 +0100, Fabrice Fontaine spake thusly: > > introspection needs host-doxygen and host-python-lxml since the addition > > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 > > As per that diff, it seems doxygen is only needed when actually building > the documentation: > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa As written in the commit title, wireplumber "build gobject introspection from xml files generated by Doxygen" > > doxygen_p = find_program('doxygen', required: get_option('doc')) Indeed, this is what is done in this commit. But the next one (i.e. https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374) adds the following: if get_option('doc').enabled() or get_option('introspection').enabled() doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: true) elif get_option('doc').auto() or get_option('introspection').auto() doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: false) else doxygen_p = disabler() > > But we are alredy passing -Ddoc=disabled, so why is it still trying to > build the documentation? It's not building the "full" documentation (which depends on sphinx, etc.), only the file that is needed for gobject-introspection. > > That's because the option is only a hint to not care when doxygen is > missing, but if doxygen is present, then the documentation is still > built. > > -Ddoc=disabled should really disable building the documentation, e.g. > in ./meson.build: > > if get_option('doc') > subdir('doc') > endif > > or, at the top of ./doc/meson.build: > > if not get_option('doc') > subdir_done() > fi > > I think the former is better, as they already have conditional subdir() > in the top-level meson.build. > > Regards, > Yann E. MORIN. > > > ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml > > > > Fixes: > > - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/wireplumber/wireplumber.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk > > index 3bf7cece45..327138391d 100644 > > --- a/package/wireplumber/wireplumber.mk > > +++ b/package/wireplumber/wireplumber.mk > > @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ > > -Dsystem-lua-version= > > > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > > -WIREPLUMBER_DEPENDENCIES += gobject-introspection > > +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection > > WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled > > else > > WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled > > -- > > 2.35.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From yann.morin.1998 at free.fr Fri Mar 18 22:10:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:10:31 +0100 Subject: [Buildroot] [git commit] package/wireplumber: fix introspection build Message-ID: <20220318220330.839DD82287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e1de2ef067575ee33b55cfe02ffed09f7e3fe6b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Doxygen is required to build just the bare minimal (not the full documentation) since https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374 Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 3bf7cece45..327138391d 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled From yann.morin.1998 at free.fr Fri Mar 18 22:12:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:12:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> <20220318215025.GN283544@scaer> Message-ID: <20220318221221.GP283544@scaer> Fabrice, All, On 2022-03-18 22:58 +0100, Fabrice Fontaine spake thusly: > Le ven. 18 mars 2022 ? 22:50, Yann E. MORIN a ?crit : > > On 2022-03-18 20:33 +0100, Fabrice Fontaine spake thusly: > > > introspection needs host-doxygen and host-python-lxml since the addition > > > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 > > > > As per that diff, it seems doxygen is only needed when actually building > > the documentation: > > > > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa > As written in the commit title, wireplumber "build gobject > introspection from xml files generated by Doxygen" Yes, but still, by itself, it does not make sense to do that if documentation is not built. I.e.: no doc => no files generated by doxygen => no introspection on those files. (but see below). > > doxygen_p = find_program('doxygen', required: get_option('doc')) > > Indeed, this is what is done in this commit. > But the next one (i.e. > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374) > adds the following: > > if get_option('doc').enabled() or get_option('introspection').enabled() > doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: true) > elif get_option('doc').auto() or get_option('introspection').auto() > doxygen_p = find_program('doxygen', version: '>= 1.9.0', required: false) > else > doxygen_p = disabler() That commiyt should have also been mentioned, or at least the following... > > But we are alredy passing -Ddoc=disabled, so why is it still trying to > > build the documentation? > It's not building the "full" documentation (which depends on sphinx, > etc.), only the file that is needed for gobject-introspection. ... here shjould have been mentioned. Applied to master with those explanations added, thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:13:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:13:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix CVE-2022-25051 In-Reply-To: <20220317214203.258736-1-fontaine.fabrice@gmail.com> References: <20220317214203.258736-1-fontaine.fabrice@gmail.com> Message-ID: <20220318221331.GQ283544@scaer> Fabrice, All, On 2022-03-17 22:42 +0100, Fabrice Fontaine spake thusly: > An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when > decoding a crafted file. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...low-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 +++++++++++++++++++ > package/rtl_433/rtl_433.mk | 3 + > 2 files changed, 61 insertions(+) > create mode 100644 package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > > diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > new file mode 100644 > index 0000000000..e2088b29e7 > --- /dev/null > +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > @@ -0,0 +1,58 @@ > +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 > +From: "Christian W. Zuckschwerdt" > +Date: Mon, 24 Jan 2022 15:53:20 +0100 > +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported > + by aug5t7 > + > +[Retrieved from: > +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] > +Signed-off-by: Fabrice Fontaine > +--- > + src/devices/cmr113.c | 4 ++-- > + src/devices/somfy_iohc.c | 9 +++++---- > + 2 files changed, 7 insertions(+), 6 deletions(-) > + > +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c > +index c85dfac56..19ec5d421 100644 > +--- a/src/devices/cmr113.c > ++++ b/src/devices/cmr113.c > +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: > + > + */ > + > +-#define COMPARE_BITS 83 > +-#define COMPARE_BYTES (COMPARE_BITS/8) > ++#define COMPARE_BITS 83 > ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) > + > + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) > + { > +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c > +index 906cae53e..2c88067b5 100644 > +--- a/src/devices/somfy_iohc.c > ++++ b/src/devices/somfy_iohc.c > +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) > + if (bitbuffer->num_rows != 1) > + return DECODE_ABORT_EARLY; > + > +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; > +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) > ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; > ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) > + return DECODE_ABORT_EARLY; > + > +- int num_bits = bitbuffer->bits_per_row[0] - offset; > ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; > ++ num_bits = MIN(num_bits, sizeof (b) * 8); > + > + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); > + if (len < 19) > +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) > + // calculate and verify checksum > + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 > + return DECODE_FAIL_MIC; > +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); > ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); > + > + int msg_type = (b[0]); > + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian > diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk > index a5139ddae6..d1c28adbf5 100644 > --- a/package/rtl_433/rtl_433.mk > +++ b/package/rtl_433/rtl_433.mk > @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ > -DBUILD_TESTING_ANALYZER=OFF \ > -DENABLE_SOAPYSDR=OFF > > +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch > +RTL_433_IGNORE_CVES += CVE-2022-25051 > + > ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) > RTL_433_DEPENDENCIES += librtlsdr > RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:12:54 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:12:54 +0100 Subject: [Buildroot] [git commit] package/rtl_433: fix CVE-2022-25051 Message-ID: <20220318220449.AF7B4826E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0368e0abd00529bd6af0f22c2b52abc3f53a5779 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when decoding a crafted file. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ++++++++++++++++++++++ package/rtl_433/rtl_433.mk | 3 ++ 2 files changed, 61 insertions(+) diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch new file mode 100644 index 0000000000..e2088b29e7 --- /dev/null +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch @@ -0,0 +1,58 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] +Signed-off-by: Fabrice Fontaine +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index a5139ddae6..d1c28adbf5 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +RTL_433_IGNORE_CVES += CVE-2022-25051 + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON From yann.morin.1998 at free.fr Fri Mar 18 22:16:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:16:47 +0100 Subject: [Buildroot] [git commit] package/minidlna: fix CVE-2022-26505 Message-ID: <20220318220805.7811E8283B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7520b7ea1d4276fa762fa3be971155fcf2b2d01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From yann.morin.1998 at free.fr Fri Mar 18 22:17:30 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:17:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/minidlna: fix CVE-2022-26505 In-Reply-To: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> References: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> Message-ID: <20220318221730.GR283544@scaer> Fabrice, All, On 2022-03-13 12:41 +0100, Fabrice Fontaine spake thusly: > A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 > allows a remote web server to exfiltrate media files. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...rotect-against-DNS-rebinding-attacks.patch | 66 +++++++++++++++++++ > package/minidlna/minidlna.mk | 3 + > 2 files changed, 69 insertions(+) > create mode 100644 package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > > diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > new file mode 100644 > index 0000000000..6d601f53b9 > --- /dev/null > +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > @@ -0,0 +1,66 @@ > +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 > +From: Justin Maggard > +Date: Wed, 9 Feb 2022 18:32:50 -0800 > +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks > + > +Validate HTTP requests to protect against DNS rebinding. > + > +[Retrieved from: > +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] > +Signed-off-by: Fabrice Fontaine > +--- > + upnphttp.c | 17 +++++++++++++++++ > + upnphttp.h | 2 ++ > + 2 files changed, 19 insertions(+) > + > +diff --git a/upnphttp.c b/upnphttp.c > +index c8b5e99..62db89a 100644 > +--- a/upnphttp.c > ++++ b/upnphttp.c > +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) > + p = colon + 1; > + while(isspace(*p)) > + p++; > ++ n = 0; > ++ while(p[n] >= ' ') > ++ n++; > ++ h->req_Host = p; > ++ h->req_HostLen = n; > + for(n = 0; n < n_lan_addr; n++) > + { > + for(i = 0; lan_addr[n].str[i]; i++) > +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) > + } > + > + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); > ++ if(h->req_Host && h->req_HostLen > 0) { > ++ const char *ptr = h->req_Host; > ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); > ++ for(i = 0; i < h->req_HostLen; i++) { > ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { > ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); > ++ Send404(h);/* 403 */ > ++ return; > ++ } > ++ ptr++; > ++ } > ++ } > + if(strcmp("POST", HttpCommand) == 0) > + { > + h->req_command = EPost; > +diff --git a/upnphttp.h b/upnphttp.h > +index e28a943..57eb2bb 100644 > +--- a/upnphttp.h > ++++ b/upnphttp.h > +@@ -89,6 +89,8 @@ struct upnphttp { > + struct client_cache_s * req_client; > + const char * req_soapAction; > + int req_soapActionLen; > ++ const char * req_Host; /* Host: header */ > ++ int req_HostLen; > + const char * req_Callback; /* For SUBSCRIBE */ > + int req_CallbackLen; > + const char * req_NT; > +-- > +2.34.1 > + > diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk > index adea200f4f..01ee8d0028 100644 > --- a/package/minidlna/minidlna.mk > +++ b/package/minidlna/minidlna.mk > @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project > MINIDLNA_CPE_ID_PRODUCT = readymedia > MINIDLNA_SELINUX_MODULES = minidlna > > +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch > +MINIDLNA_IGNORE_CVES += CVE-2022-26505 > + > MINIDLNA_DEPENDENCIES = \ > $(TARGET_NLS_DEPENDENCIES) \ > ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:32:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:32:21 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220318132427.48737-4-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-4-clement.leger@bootlin.com> Message-ID: <20220318223221.GS283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Newer version of optee-os (>= 3.16) uses python-cryptography instead of > python-pycryptodomex in python scripts. Add support to build these > newer versions by adding a new > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will > select host-python-cryptography dependency when building optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 9 +++++++++ > boot/optee-os/optee-os.mk | 8 +++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index ea16550b72..02b5d7c86f 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -1,6 +1,7 @@ > config BR2_TARGET_OPTEE_OS > bool "optee_os" > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS That's wrong: 3.15.0 still does not need host-python-cryptography. Furthermore, even after we bump to 3.16.0, since we can choose an arbitrary git tree at an arbitrary commit, it is still possible to point to a version of optee-os that does not require it either. So, that dependency only really belongs... > help > OP-TEE OS provides the secure world boot image and the trust > application development kit of the OP-TEE project. OP-TEE OS > @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > Select this option if your OP-TEE OS platform configuration > requires the Device Tree compiler to be available. > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "OP-TEE OS needs host-python-cryptography" ... here. Applied to master with this fixed, mraou. Regards, Yann E. MORIN. > + help > + OP-TEE OS version below 3.16 used python-pycryptodomex > + package in python scripts. Newer version uses > + python-cryptography. Select this option if optee-os needs > + python-cryptography to be built. > + > config BR2_TARGET_OPTEE_OS_CORE > bool "Build core" > default y > diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk > index 9f76d8450e..5313a1badc 100644 > --- a/boot/optee-os/optee-os.mk > +++ b/boot/optee-os/optee-os.mk > @@ -21,7 +21,13 @@ else > OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) > endif > > -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools > +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools > + > +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) > +OPTEE_OS_DEPENDENCIES += host-python-cryptography > +else > +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex > +endif > > ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) > OPTEE_OS_DEPENDENCIES += host-dtc > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:32:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:32:35 +0100 Subject: [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package In-Reply-To: <20220318132427.48737-3-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-3-clement.leger@bootlin.com> Message-ID: <20220318223235.GT283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Enable host package and add needed variables. Host POST_PROCESS and > DOWNLOAD_DEPENDENCIES variables are inherited from target ones. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-cryptography/python-cryptography.mk | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk > index a524f729c8..872ede9b89 100644 > --- a/package/python-cryptography/python-cryptography.mk > +++ b/package/python-cryptography/python-cryptography.mk > @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > host-python-cffi \ > host-rustc \ > openssl > +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ > + host-python-setuptools-rust \ > + host-python-cffi \ > + host-rustc \ > + host-openssl > PYTHON_CRYPTOGRAPHY_ENV = \ > $(PKG_CARGO_ENV) \ > PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" > # We need to vendor the Cargo crates at download time > PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo > PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc > PYTHON_CRYPTOGRAPHY_DL_ENV = \ > $(PKG_CARGO_ENV) \ > BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ > + $(HOST_PKG_CARGO_ENV) \ > + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml > > $(eval $(python-package)) > +$(eval $(host-python-package)) > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:33:15 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:33:15 +0100 Subject: [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings In-Reply-To: <20220318132427.48737-2-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-2-clement.leger@bootlin.com> Message-ID: <20220318223315.GU283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > From: "Yann E. MORIN" > > It seems reasonable to expect that the download of the host and target > variants should usually be exactly the same and thus reuse the target > package values for the host package. This commits add support to > inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and > _DOwNLOAD_POST_PROCESS variables from target ones. These variables can > still be overriden if necessary for the host package. > > Signed-off-by: Yann E. MORIN > Signed-off-by: Cl?ment L?ger As Thomas also hinted he agreed on the principle: applied to master, thanks. Regards, Yann E. MORIN. > --- > package/pkg-generic.mk | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index b3a7e1d60e..79fcf603d3 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR > endif > endif > > +ifndef $(2)_DL_SUBDIR > + ifdef $(3)_DL_SUBDIR > + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) > + endif > +endif > + > +ifndef $(2)_DOWNLOAD_DEPENDENCIES > + ifdef $(3)_DOWNLOAD_DEPENDENCIES > + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) > + endif > +endif > + > +ifndef $(2)_DL_ENV > + ifdef $(3)_DL_ENV > + $(2)_DL_ENV = $$($(3)_DL_ENV) > + endif > +endif > + > +ifndef $(2)_DOWNLOAD_POST_PROCESS > + ifdef $(3)_DOWNLOAD_POST_PROCESS > + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) > + endif > +endif > + > ifndef $(2)_STRIP_COMPONENTS > ifdef $(3)_STRIP_COMPONENTS > $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:40:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:40:31 +0100 Subject: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220318132427.48737-5-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-5-clement.leger@bootlin.com> Message-ID: <20220318224031.GV283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set > BR2_TARGET_OPTEE_OS_LATEST to select > BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY since > python-cryptography is now needed to build optee-os. > > Acked-by: Etienne Carriere > Signed-off-by: Cl?ment L?ger > --- > boot/optee-os/Config.in | 5 +++-- > boot/optee-os/optee-os.hash | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 02b5d7c86f..811937e025 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -19,7 +19,8 @@ choice > Select the version of OP-TEE OS you want to use > > config BR2_TARGET_OPTEE_OS_LATEST > - bool "3.15.0" > + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > + bool "3.16.0" 3.16.0 now needs the dependency on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS, so if that is not met, there will only be the custom git as a fallback. This is not so nice that the latest has to, well, be the latest, and that we don;t keep 3.15.0 around for those that can't have a host rustc compiler. But then, who are we kidding? Builds on non-x86 are pretty rare yet; even if some people might be on PPC or AArch64, they still are to be no much more than two-handful (1023). Also, check-package whines; $ make check-package boot/optee-os/Config.in:22: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files) And a hidden one: boot/optee-os/optee-os.hash:4: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Applied to master with those fixed, thanks. Regards, Yann E. MORIN. > help > Use the latest release tag from the OP-TEE OS official Git > repository. > @@ -51,7 +52,7 @@ endif > > config BR2_TARGET_OPTEE_OS_VERSION > string > - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST > + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST > default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ > if BR2_TARGET_OPTEE_OS_CUSTOM_GIT > > diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash > index 3c32e25b36..b9b0e5b43f 100644 > --- a/boot/optee-os/optee-os.hash > +++ b/boot/optee-os/optee-os.hash > @@ -1,4 +1,4 @@ > -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz > -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz > +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz > +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz > # Locally computed > sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Fri Mar 18 22:21:44 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:21:44 +0100 Subject: [Buildroot] [git commit] package/pkg-generic: host variant inherits target download settings Message-ID: <20220318223159.059C983944@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa7712b092950c92f994e2ee30c120a64e5451b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It seems reasonable to expect that the download of the host and target variants should usually be exactly the same and thus reuse the target package values for the host package. This commits add support to inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and _DOwNLOAD_POST_PROCESS variables from target ones. These variables can still be overriden if necessary for the host package. Signed-off-by: Yann E. MORIN Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) From yann.morin.1998 at free.fr Fri Mar 18 22:22:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:22:51 +0100 Subject: [Buildroot] [git commit] package/python-cryptography: enable host package Message-ID: <20220318223159.0E69A83A69@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1b25c32a2b46fb74bec3818248379513b7d788b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable host package and add needed variables. Host POST_PROCESS and DOWNLOAD_DEPENDENCIES variables are inherited from target ones. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/python-cryptography/python-cryptography.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8..872ede9b89 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) From yann.morin.1998 at free.fr Fri Mar 18 22:26:34 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:26:34 +0100 Subject: [Buildroot] [git commit] boot/optee-os: add support to build with python-cryptography Message-ID: <20220318223159.167AB83AA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=752f478affb5eba6364f44abccdb77ad60e5f000 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Newer version of optee-os (>= 3.16) uses python-cryptography instead of python-pycryptodomex in python scripts. Add support to build these newer versions by adding a new BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will select host-python-cryptography dependency when building optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger [yann.morin.1998 at free.fr: - move the _ARCH_DEPENDS option from the main symbol to thus new symbol ] Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 9 +++++++++ boot/optee-os/optee-os.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index ea16550b72..b998228121 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -61,6 +61,15 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC Select this option if your OP-TEE OS platform configuration requires the Device Tree compiler to be available. +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 9f76d8450e..5313a1badc 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -21,7 +21,13 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) OPTEE_OS_DEPENDENCIES += host-dtc From yann.morin.1998 at free.fr Fri Mar 18 22:39:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:39:45 +0100 Subject: [Buildroot] [git commit] boot/optee-os: bump to version 3.16.0 Message-ID: <20220318223159.1F3FF83944@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5d441b7f2ee822112bd73643370b902ee22f9de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set BR2_TARGET_OPTEE_OS_LATEST to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY since python-cryptography is now needed to build optee-os. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- boot/optee-os/Config.in | 6 ++++-- boot/optee-os/optee-os.hash | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index b998228121..18e1efee55 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,9 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +52,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.16.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b36..d3a2637a4e 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed -sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE +sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:44:00 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:44:00 +0100 Subject: [Buildroot] [git commit] package/optee-examples: bump to version 3.16.0 Message-ID: <20220318223653.60A2D83E3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6631e1f70897c4e83feeeb33396034f0daadba86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE Examples package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-examples/optee-examples.hash | 6 +++--- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795..9228fb39d2 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz +sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969 optee-examples-3.16.0.tar.gz # Locally computed -sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE +sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1eb..31e5f260df 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.16.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:44:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:44:39 +0100 Subject: [Buildroot] [git commit] package/optee-client: bump to version 3.16.0 Message-ID: <20220318223653.6B55C83E7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91f8e51217d295d6249d8a3945406ea5546129e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE Client package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.hash | 6 +++--- package/optee-client/optee-client.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb..ff90f6d2a8 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz +sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064 optee-client-3.16.0.tar.gz # Locally computed -sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d..2cadc564f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.16.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:43:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:43:31 +0100 Subject: [Buildroot] [git commit] package/optee-test: bump to version 3.16.0 Message-ID: <20220318223653.55CAC83D37@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc6cbab1d3f050df66945711a8c5d22c473defa8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE test package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-test/optee-test.hash | 6 +++--- package/optee-test/optee-test.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbd..c42e922d90 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz +sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba optee-test-3.16.0.tar.gz # Locally computed -sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md +sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d00..7b27558b36 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.16.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md From yann.morin.1998 at free.fr Fri Mar 18 22:45:21 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:45:21 +0100 Subject: [Buildroot] [git commit] package/optee-benchmark: bump to version 3.16.0 Message-ID: <20220318223653.7C0E183D37@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00c51867756180883e197b676723feb14c7934a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0. Acked-by: Etienne Carriere Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN --- package/optee-benchmark/optee-benchmark.hash | 6 +++--- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35..2e75b4ff8e 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz +sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz # Locally computed -sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE +sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f270..493f407a44 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.16.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Fri Mar 18 22:46:22 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Fri, 18 Mar 2022 23:46:22 +0100 Subject: [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies In-Reply-To: <20220318132427.48737-1-clement.leger@bootlin.com> References: <20220318132427.48737-1-clement.leger@bootlin.com> Message-ID: <20220318224622.GW283544@scaer> Cl?ment, All, On 2022-03-18 14:24 +0100, Cl?ment L?ger spake thusly: > Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead > of python-pycryptodomex to build. This series adds support to build > host-python-cryptography and uses it in optee-os package to build the > 3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples > and optee-test which needs to be aligned with optee-os version. [--SNIP--] > Cl?ment L?ger (7): > package/python-cryptography: enable host package > boot/optee-os: add support to build with python-cryptography > boot/optee-os: bump to version 3.16.0 > package/optee-test: bump to version 3.16.0 > package/optee-examples: bump to version 3.16.0 > package/optee-client: bump to version 3.16.0 > package/optee-benchmark: bump to version 3.16.0 Whole series applied to master, thanks. Regards, Yann E. MORIN. > Yann E. MORIN (1): > package/pkg-generic: host variant inherits target download settings > > boot/optee-os/Config.in | 14 +++++++++-- > boot/optee-os/optee-os.hash | 4 ++-- > boot/optee-os/optee-os.mk | 8 ++++++- > package/optee-benchmark/optee-benchmark.hash | 4 ++-- > package/optee-benchmark/optee-benchmark.mk | 2 +- > package/optee-client/optee-client.hash | 4 ++-- > package/optee-client/optee-client.mk | 2 +- > package/optee-examples/optee-examples.hash | 4 ++-- > package/optee-examples/optee-examples.mk | 2 +- > package/optee-test/optee-test.hash | 4 ++-- > package/optee-test/optee-test.mk | 2 +- > package/pkg-generic.mk | 24 +++++++++++++++++++ > .../python-cryptography.mk | 12 ++++++++++ > 13 files changed, 69 insertions(+), 17 deletions(-) > > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From br015 at umbiko.net Sat Mar 19 06:11:15 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Sat, 19 Mar 2022 07:11:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpd: update to version 0.23.6 Message-ID: <20220319061115.1641-1-br015@umbiko.net> Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part of this release Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS Signed-off-by: Andreas Ziegler --- ...2-lib-alsa-Error-add-missing-include.patch | 25 ------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 package/mpd/0002-lib-alsa-Error-add-missing-include.patch diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54..0000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf..b09140abf5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..12da36098f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt -- 2.34.1 From thomas.petazzoni at bootlin.com Sat Mar 19 09:17:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 19 Mar 2022 10:17:49 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220318223221.GS283544@scaer> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-4-clement.leger@bootlin.com> <20220318223221.GS283544@scaer> Message-ID: <20220319101749.265ebceb@windsurf> On Fri, 18 Mar 2022 23:32:21 +0100 "Yann E. MORIN" wrote: > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > > index ea16550b72..02b5d7c86f 100644 > > --- a/boot/optee-os/Config.in > > +++ b/boot/optee-os/Config.in > > @@ -1,6 +1,7 @@ > > config BR2_TARGET_OPTEE_OS > > bool "optee_os" > > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > > That's wrong: 3.15.0 still does not need host-python-cryptography. > > Furthermore, even after we bump to 3.16.0, since we can choose an > arbitrary git tree at an arbitrary commit, it is still possible to > point to a version of optee-os that does not require it either. > > So, that dependency only really belongs... > > > help > > OP-TEE OS provides the secure world boot image and the trust > > application development kit of the OP-TEE project. OP-TEE OS > > @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > > Select this option if your OP-TEE OS platform configuration > > requires the Device Tree compiler to be available. > > > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > > + bool "OP-TEE OS needs host-python-cryptography" > > ... here. Yes and no. Because as soon as the BR2_TARGET_OPTEE_OS_LATEST gets bumped to 3.16.0, then our default selection for OP-TEE (unless you chose a custom Git version) will require python-cryptography. So to keep things simple, I asked Cl?ment to add this dependency to the whole package. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Sat Mar 19 09:46:51 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 10:46:51 +0100 Subject: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography In-Reply-To: <20220319101749.265ebceb@windsurf> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-4-clement.leger@bootlin.com> <20220318223221.GS283544@scaer> <20220319101749.265ebceb@windsurf> Message-ID: <20220319094651.GA1566358@scaer> Thomas, All, On 2022-03-19 10:17 +0100, Thomas Petazzoni spake thusly: > On Fri, 18 Mar 2022 23:32:21 +0100 > "Yann E. MORIN" wrote: > > > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > > > index ea16550b72..02b5d7c86f 100644 > > > --- a/boot/optee-os/Config.in > > > +++ b/boot/optee-os/Config.in > > > @@ -1,6 +1,7 @@ > > > config BR2_TARGET_OPTEE_OS > > > bool "optee_os" > > > depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A > > > + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > > > > That's wrong: 3.15.0 still does not need host-python-cryptography. > > > > Furthermore, even after we bump to 3.16.0, since we can choose an > > arbitrary git tree at an arbitrary commit, it is still possible to > > point to a version of optee-os that does not require it either. > > > > So, that dependency only really belongs... > > > > > help > > > OP-TEE OS provides the secure world boot image and the trust > > > application development kit of the OP-TEE project. OP-TEE OS > > > @@ -61,6 +62,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC > > > Select this option if your OP-TEE OS platform configuration > > > requires the Device Tree compiler to be available. > > > > > > +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY > > > + bool "OP-TEE OS needs host-python-cryptography" > > > > ... here. > > Yes and no. Because as soon as the BR2_TARGET_OPTEE_OS_LATEST gets > bumped to 3.16.0, then our default selection for OP-TEE (unless you > chose a custom Git version) will require python-cryptography. So to > keep things simple, I asked Cl?ment to add this dependency to the > whole package. But that's the point: you can still choose a custom git tree that points to an earlier, pre-3.16.0 tree, which will still be buildable without pytho-cryptography. But yes, you got a point: I forgot to guard the default clause in the choice, with the same dependency. I'll submit a patch. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 19 09:49:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 10:49:39 +0100 Subject: [Buildroot] [PATCH] boot/optee-os: fix version choice Message-ID: <20220319094939.1588302-1-yann.morin.1998@free.fr> Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to propagate the rustc arch dependency from the new version, to the default clause of the choice. This leaves only the custom git tree as a posible source for building OP-TEE OS in case the host can't have a rustc compiler. Signed-off-by: Yann E. MORIN Reported-by: Thomas Petazzoni Cc: Cl?ment L?ger Cc: Etienne Carriere --- boot/optee-os/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 18e1efee55..30b6f62434 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS choice prompt "OP-TEE OS version" - default BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of OP-TEE OS you want to use -- 2.25.1 From romain.naour at gmail.com Sat Mar 19 14:30:16 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Mar 2022 15:30:16 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <08edbbcf-8be3-4554-0d54-0dd349caa2ff@mind.be> References: <20220224154513.220976-1-romain.naour@gmail.com> <20220224154513.220976-2-romain.naour@gmail.com> <08edbbcf-8be3-4554-0d54-0dd349caa2ff@mind.be> Message-ID: <5902b319-5984-c453-09d3-e0db284f8048@gmail.com> Hello Arnout, Le 12/03/2022 ? 21:34, Arnout Vandecappelle a ?crit?: > > > On 24/02/2022 16:45, Romain Naour wrote: >> The test TestRust is currently broken with ripgrep package with >> the following error: >> >> error[E0514]: found crate `core` compiled by an incompatible version of rustc >> ?? | >> ?? = help: please recompile that crate using this compiler (rustc 1.58.1) >> (consider running `cargo clean` first) >> ?? = note: the following crate versions were found: >> ?????????? crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): >> TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib >> >> >> error[E0514]: found crate `std` compiled by an incompatible version of rustc >> >> The problem is not really a cross-compilation issue (we are building >> for an armv7 target on x86_64 host) but a problem with rust-std libraries >> (rlib). >> >> We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same >> version as the prebuilt rustc used to bootstrap the build: >> >> TestRust/host/bin/rustc --version >> rustc 1.58.1 >> >> TestRustBin/host/bin/rustc --version >> rustc 1.58.1 (db9d1b20b 2022-01-20) >> >> Indeed we are using host-rust-bin to bootstrap the host-rust compiler >> package built by Buildroot. The problem is that the >> libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) >> and is not removed before installing host-rust built by Buildroot. >> >> We actually spent a lot of time to build host-rust with rust-std >> and forget to install this important library HOST_DIR. >> >> Looking at the host-rust build directory we can notice two installer >> script "install.sh" (the same scripts used to install host-rust-bin): >> >> TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh >> >> TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh >> >> >> The "tarball" directory is generated by the "python x.py dist" during >> the install step, we have to keep it. >> >> Replace "python x.py install" by theses two install scripts. >> Installing rust-std with the install.sh script replace the rust-std >> libraries installed by host-rust-bin. > > ?Excellent description, thanks. It's almost Yann-level :-) Why "almost"? you meant Yann-level but without typos (kidding) :) Thank you for your comment, It's highly appreciated. > >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 >> >> Signed-off-by: Romain Naour >> Cc: Eric Le Bihan >> --- >> ? package/rust/rust.mk | 23 ++++++++++++++++++++++- >> ? 1 file changed, 22 insertions(+), 1 deletion(-) >> >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk >> index 46487fe4b7..4a6b04dc8c 100644 >> --- a/package/rust/rust.mk >> +++ b/package/rust/rust.mk >> @@ -67,9 +67,30 @@ define HOST_RUST_BUILD_CMDS >> ????? cd $(@D); $(HOST_MAKE_ENV) >> $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build >> ? endef >> ? +HOST_RUST_INSTALL_COMMON_OPTS = \ >> +??? --prefix=$(HOST_DIR) \ >> +??? --disable-ldconfig >> + >> +HOST_RUST_INSTALL_OPTS = \ > > ?This variable is used only once, which makes it not very useful. I instead > added the --components directly in HOST_RUST_INSTALL_RUSTC. I also renamend the > INSTALL_COMMON_OPTS to INSTALL_OPTS since there's only one variable now. > >> +??? $(HOST_RUST_INSTALL_COMMON_OPTS) \ >> +??? --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) >> + >> +define HOST_RUST_INSTALL_RUSTC >> +??? (cd >> $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); >> \ > > ?The parenthesis are not necessary - make already starts a sub-shell for every > line, there's no need to add another shell level. We still have them in a lot of > .mk files, but we try to avoid adding them. Ok > > > ?Applied to master with those two changes, thanks. Thanks! Best regards, Romain > > ?Regards, > ?Arnout > >> +??????? ./install.sh $(HOST_RUST_INSTALL_OPTS)) >> +endef >> + >> +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) >> +define HOST_RUST_INSTALL_LIBSTD_TARGET >> +??? (cd >> $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); >> \ >> +??????? ./install.sh $(HOST_RUST_INSTALL_COMMON_OPTS)) >> +endef >> +endif >> + >> ? define HOST_RUST_INSTALL_CMDS >> ????? cd $(@D); $(HOST_MAKE_ENV) >> $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist >> -??? cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) >> x.py install >> +??? $(HOST_RUST_INSTALL_RUSTC) >> +??? $(HOST_RUST_INSTALL_LIBSTD_TARGET) >> ? endef >> ? ? $(eval $(host-generic-package)) From romain.naour at gmail.com Sat Mar 19 14:33:57 2022 From: romain.naour at gmail.com (Romain Naour) Date: Sat, 19 Mar 2022 15:33:57 +0100 Subject: [Buildroot] [PATCHv2 1/2] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <3897f71d-5622-b118-09a7-b23da8eb87c7@mind.be> References: <20220224154513.220976-1-romain.naour@gmail.com> <3897f71d-5622-b118-09a7-b23da8eb87c7@mind.be> Message-ID: <81bdd0ce-f8e6-4ad0-409f-5ba40a568bbe@gmail.com> Le 15/03/2022 ? 22:13, Arnout Vandecappelle a ?crit?: > > On 24/02/2022 16:45, Romain Naour wrote: >> TestRust and TestRustBin has been introduced at the time when there was >> no cargo package infrastructure or any package using rust compiler >> (Buildroot 2018.02). >> >> Since then the ripgrep package has been introduced, initially using >> the generic package infrastructure and converted later to the cargo >> package infrastructure. >> >> Due a recent change in rust/cargo removing the cargo config file [1] >> the test TestRust and TestRustBin now fail to compile since they build >> an hello-world crate outside of the cargo package infrastructure >> without the correct environment for cross-compiling. >> >> Replace the 'hello-world' crate by ripgrep package and check if it >> can run properly in Qemu. >> >> Fixes tests.package.test_rust.TestRustBin: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 >> >> But doesn't fixes tests.package.test_rust.TestRust due another bug: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 >> >> [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 >> >> Signed-off-by: Romain Naour >> Cc: Eric Le Bihan > > ?This introduced a few flake8 errors, which I fixed now. In the future: run > flake8! (I also always forget :-)) This is completely unexpected, sorry for that. Best regards, Romain > > > ?Regards, > ?Arnout > From fontaine.fabrice at gmail.com Sat Mar 19 16:21:09 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Mar 2022 17:21:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add gl dependency Message-ID: <20220319162109.1088457-1-fontaine.fabrice@gmail.com> Fix the following build failure without gl raised since bump to version 6.03 in commit cbcbd66b0f241184288232972d9cd9d03c9f0ce1: Note: The OpenGL 3D library is not being used. Those demos which use 3D will not be built or installed. That is most of them. make: *** [package/pkg-generic.mk:282: /home/peko/autobuild/instance-0/output-1/build/xscreensaver-6.03/.stamp_configured] Error 1 A patch was sent to Jamie Zawinski to fix this failure and he replied: "Why would you do that? I pretty much consider that an unsupported configuration, since that's more than half of the savers at this point." I told him that some embedded devices don't have gl and he replied: "Such as? Just about every modern "embedded device" I'm aware of is more performant than the desktop computers on which I developed many of those GL hacks..." So just add a dependency on gl. Fixes: - http://autobuild.buildroot.org/results/b76743a48d75b5b7539712318fa0b2937a157f88 Signed-off-by: Fabrice Fontaine --- package/xscreensaver/Config.in | 7 ++++--- package/xscreensaver/xscreensaver.mk | 9 ++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 48eefdfa70..ba259274d1 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 @@ -9,7 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_GDK_PIXBUF_XLIB - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG @@ -28,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 0a91d22d14..0f21fc0e9f 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -17,6 +17,8 @@ XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ gdk-pixbuf-xlib \ jpeg \ + libgl \ + libglu \ libgtk2 \ libxml2 \ xlib_libX11 \ @@ -32,13 +34,6 @@ XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ --libdir=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -XSCREENSAVER_CONF_OPTS += --with-gl=yes -XSCREENSAVER_DEPENDENCIES += libgl libglu -else -XSCREENSAVER_CONF_OPTS += --with-gl=no -endif - ifeq ($(BR2_PACKAGE_LIBPNG),y) XSCREENSAVER_CONF_OPTS += --with-png=yes XSCREENSAVER_DEPENDENCIES += libpng -- 2.35.1 From yann.morin.1998 at free.fr Sat Mar 19 17:54:56 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 18:54:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/xscreensaver: add gl dependency In-Reply-To: <20220319162109.1088457-1-fontaine.fabrice@gmail.com> References: <20220319162109.1088457-1-fontaine.fabrice@gmail.com> Message-ID: <20220319175456.GB1566358@scaer> Fabrice, All, On 2022-03-19 17:21 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure without gl raised since bump to version > 6.03 in commit cbcbd66b0f241184288232972d9cd9d03c9f0ce1: > > Note: The OpenGL 3D library is not being used. > > Those demos which use 3D will not be built or installed. > That is most of them. > > make: *** [package/pkg-generic.mk:282: /home/peko/autobuild/instance-0/output-1/build/xscreensaver-6.03/.stamp_configured] Error 1 > > A patch was sent to Jamie Zawinski to fix this failure and he replied: > > "Why would you do that? I pretty much consider that an unsupported > configuration, since that's more than half of the savers at this point." > > I told him that some embedded devices don't have gl and he replied: > > "Such as? Just about every modern "embedded device" I'm aware of is more > performant than the desktop computers on which I developed many of those > GL hacks..." > > So just add a dependency on gl. > > Fixes: > - http://autobuild.buildroot.org/results/b76743a48d75b5b7539712318fa0b2937a157f88 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/xscreensaver/Config.in | 7 ++++--- > package/xscreensaver/xscreensaver.mk | 9 ++------- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in > index 48eefdfa70..ba259274d1 100644 > --- a/package/xscreensaver/Config.in > +++ b/package/xscreensaver/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_XSCREENSAVER > bool "xscreensaver" > depends on BR2_PACKAGE_XORG7 > + depends on BR2_PACKAGE_HAS_LIBGL # libglu > depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango > depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 > depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 > @@ -9,7 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz > select BR2_PACKAGE_GDK_PIXBUF > select BR2_PACKAGE_GDK_PIXBUF_XLIB > - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL > + select BR2_PACKAGE_LIBGLU > select BR2_PACKAGE_LIBGTK2 > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_JPEG > @@ -28,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER > > http://www.jwz.org/xscreensaver/ > > -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" > +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" > depends on BR2_PACKAGE_XORG7 > depends on BR2_USE_MMU > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ > - !BR2_USE_WCHAR > + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL > diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk > index 0a91d22d14..0f21fc0e9f 100644 > --- a/package/xscreensaver/xscreensaver.mk > +++ b/package/xscreensaver/xscreensaver.mk > @@ -17,6 +17,8 @@ XSCREENSAVER_DEPENDENCIES = \ > gdk-pixbuf \ > gdk-pixbuf-xlib \ > jpeg \ > + libgl \ > + libglu \ > libgtk2 \ > libxml2 \ > xlib_libX11 \ > @@ -32,13 +34,6 @@ XSCREENSAVER_CONF_OPTS = \ > --includedir=$(STAGING_DIR)/usr/include \ > --libdir=$(STAGING_DIR)/usr/lib > > -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > -XSCREENSAVER_CONF_OPTS += --with-gl=yes > -XSCREENSAVER_DEPENDENCIES += libgl libglu > -else > -XSCREENSAVER_CONF_OPTS += --with-gl=no > -endif > - > ifeq ($(BR2_PACKAGE_LIBPNG),y) > XSCREENSAVER_CONF_OPTS += --with-png=yes > XSCREENSAVER_DEPENDENCIES += libpng > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Mar 19 17:54:20 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 19 Mar 2022 18:54:20 +0100 Subject: [Buildroot] [git commit] package/xscreensaver: add gl dependency Message-ID: <20220319174615.43AD982B4F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1bb495e8caa3f15bab8ddb059f07d6ad56634f42 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without gl raised since bump to version 6.03 in commit cbcbd66b0f241184288232972d9cd9d03c9f0ce1: Note: The OpenGL 3D library is not being used. Those demos which use 3D will not be built or installed. That is most of them. make: *** [package/pkg-generic.mk:282: /home/peko/autobuild/instance-0/output-1/build/xscreensaver-6.03/.stamp_configured] Error 1 A patch was sent to Jamie Zawinski to fix this failure and he replied: "Why would you do that? I pretty much consider that an unsupported configuration, since that's more than half of the savers at this point." I told him that some embedded devices don't have gl and he replied: "Such as? Just about every modern "embedded device" I'm aware of is more performant than the desktop computers on which I developed many of those GL hacks..." So just add a dependency on gl. Fixes: - http://autobuild.buildroot.org/results/b76743a48d75b5b7539712318fa0b2937a157f88 Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: keep --with-gl=yes] Signed-off-by: Yann E. MORIN --- package/xscreensaver/Config.in | 7 ++++--- package/xscreensaver/xscreensaver.mk | 12 ++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 48eefdfa70..ba259274d1 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL # libglu depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 @@ -9,7 +10,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_GDK_PIXBUF_XLIB - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG @@ -28,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 0a91d22d14..6cc7e8febe 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -17,6 +17,8 @@ XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ gdk-pixbuf-xlib \ jpeg \ + libgl \ + libglu \ libgtk2 \ libxml2 \ xlib_libX11 \ @@ -30,14 +32,8 @@ XSCREENSAVER_DEPENDENCIES = \ # compiler/linker XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ - --libdir=$(STAGING_DIR)/usr/lib - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -XSCREENSAVER_CONF_OPTS += --with-gl=yes -XSCREENSAVER_DEPENDENCIES += libgl libglu -else -XSCREENSAVER_CONF_OPTS += --with-gl=no -endif + --libdir=$(STAGING_DIR)/usr/lib \ + --with-gl=yes ifeq ($(BR2_PACKAGE_LIBPNG),y) XSCREENSAVER_CONF_OPTS += --with-png=yes From peter at korsgaard.com Sat Mar 19 19:01:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:01:03 +0100 Subject: [Buildroot] [PATCH 1/1] fs/common.mk: use find instead of shell glob patterns In-Reply-To: <20220310101826.GA2353@parad0x.org> (Mathieu Mirmont via buildroot's message of "Thu, 10 Mar 2022 11:18:26 +0100") References: <20220310101826.GA2353@parad0x.org> Message-ID: <87zgllpy1c.fsf@dell.be.48ers.dk> >>>>> "Mathieu" == Mathieu Mirmont via buildroot writes: > Different shells can have different behaviours when it comes to > globbing patterns. The dash shell (/bin/sh) on Debian testing switched > to a different fnmatch/glob implementation that results in this new > behaviour: > Using bash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.[^.]* > Using dash: > $ mkdir /tmp/foo > $ echo /tmp/foo/.[^.]* > /tmp/foo/.. > The current FAKEROOT script uses this shell glob pattern which now > fails on recent Debian testing systems: > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' > rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' > It seems safer to use `find | xargs rm` here instead of relying on > shell globbing patterns. > Signed-off-by: Mathieu Mirmont Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:04:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/lxc: bump to version 4.0.12 In-Reply-To: (Arnout Vandecappelle's message of "Sat, 12 Mar 2022 17:58:25 +0100") References: <20220218105924.738666-1-fontaine.fabrice@gmail.com> Message-ID: <87v8w9pxux.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 18/02/2022 11:59, Fabrice Fontaine wrote: >> https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released >> Signed-off-by: Fabrice Fontaine > Applied to master, thanks. Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:11:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:11:30 +0100 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 In-Reply-To: <20220222113336.2608916-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 22 Feb 2022 12:33:36 +0100") References: <20220222113336.2608916-1-angelo@amarulasolutions.com> Message-ID: <87r16xpxjx.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Looking at the changelog, 9.0.1 seems to be a security fix release fixing two CVEs: https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst Please mark such version bumps as security related so I don't miss them. Committed with that fixed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:04:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/lxc: bump to version 4.0.12 Message-ID: <20220319190521.CBA0682EAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f720577998f15f229221063088e0a7a1839f413d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f7b4ddd54d9d5dbeaa3646de3863f160c1504200) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..94c6b9ffee 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Sat Mar 19 19:04:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/lxc: bump to version 4.0.12 Message-ID: <20220319190526.9509D83794@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aae7c1ec1e278582f6984e27054ddb70dadd96fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f7b4ddd54d9d5dbeaa3646de3863f160c1504200) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4d63fc14cb..94c6b9ffee 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Sat Mar 19 19:04:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:04:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/lxc: bump to version 4.0.12 Message-ID: <20220319190531.A131583D2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a8139a361a7aabd4ae2a2e54b46e2c1be677c8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x https://discuss.linuxcontainers.org/t/lxc-4-0-12-has-been-released Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f7b4ddd54d9d5dbeaa3646de3863f160c1504200) Signed-off-by: Peter Korsgaard --- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d..d460bc6a01 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef lxc-4.0.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7..9311dc8775 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 4.0.12 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 From peter at korsgaard.com Sat Mar 19 18:57:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 19:57:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] fs/common.mk: use find instead of shell glob patterns Message-ID: <20220319190531.975B183CB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=063ee76d294cf1bdc79f9b90a75ab6f70ed32d9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Different shells can have different behaviours when it comes to globbing patterns. The dash shell (/bin/sh) on Debian testing switched to a different fnmatch/glob implementation that results in this new behaviour: Using bash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.[^.]* Using dash: $ mkdir /tmp/foo $ echo /tmp/foo/.[^.]* /tmp/foo/.. The current FAKEROOT script uses this shell glob pattern which now fails on recent Debian testing systems: rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/run/..' rm: refusing to remove '.' or '..' directory: skipping '/build/buildroot-fs/cpio/target/tmp/..' Additionally, the glob will miss files which have at least two leading dots, like ..foo ...bar or ......buz (highly improbable, but still). It seems safer to use `find | xargs rm` here instead of relying on shell globbing patterns. Signed-off-by: Mathieu Mirmont Signed-off-by: Yann E. MORIN (cherry picked from commit 38c4f6b807e9b519922172089915559fb8642046) Signed-off-by: Peter Korsgaard --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b..37eafac4f7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) From peter at korsgaard.com Sat Mar 19 19:09:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:09:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-pillow: security bump to version 9.0.1 Message-ID: <20220319190531.AA66283CB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c602fcfd2422705fec134281d99f3db8c9dc84e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes the following security issues: - CVE-2022-24303: In show_file, use os.remove to remove temporary images - CVE-2022-22817: Restrict builtins within lambdas for ImageMath.eval Signed-off-by: Angelo Compagnucci Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 07b070be39f9c51592c85fb76cd7af00539abc19) [Peter: mention security fixes] Signed-off-by: Peter Korsgaard --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e6014..88a5d7cada 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 8deffccb4f402df154fd2fd504d8487c Pillow-9.0.1.tar.gz +sha256 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa Pillow-9.0.1.tar.gz # Locally computed sha256 checksums sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882..901876e0ee 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/03/a3/f61a9a7ff7969cdef2a6e0383a346eb327495d20d25a2de5a088dbb543a6 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Mar 19 19:33:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:33:41 +0100 Subject: [Buildroot] [RFC][PATCH 1/1] package/bind: bump to version 9.16.26 In-Reply-To: <48945229-3116-363f-f61f-89d495695cc1@mind.be> (Arnout Vandecappelle's message of "Sat, 12 Mar 2022 20:43:40 +0100") References: <20220222220255.22327-1-petr.vorel@gmail.com> <48945229-3116-363f-f61f-89d495695cc1@mind.be> Message-ID: <87mthlpwiy.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 22/02/2022 23:02, Petr Vorel wrote: >> BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. >> Changes: >> * libuv (new dependency) >> * openssl is now mandatory >> * zlib must be detected with PKG_CONFIG_PATH (specifying zlib >> installation path is not supported) >> * bind9-config and isc-config.sh removed >> * updated COPYRIGHT hash >> Signed-off-by: Petr Vorel > Applied to master, thanks. > I guess we'll get complaints if it doesn't work :-) Committed to 2022.02.x given the immediate EOL of 9.11. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 19:32:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 20:32:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bind: bump to version 9.16.26 Message-ID: <20220319192628.05ECF83D35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=696eb52d74206beaa55f67bf32dcc89c887cc9ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x BIND 9.11 EOL in March, 2022. BIND 9.16 is current Stable/ESV version. Changes: * libuv (new dependency) * openssl is now mandatory * zlib must be detected with PKG_CONFIG_PATH (specifying zlib installation path is not supported) * bind9-config and isc-config.sh removed * updated COPYRIGHT hash Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8adeaec8afacbc680edebae91524f6144926ac92) Signed-off-by: Peter Korsgaard --- package/bind/Config.in | 12 +++++++++++- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 15 +++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb304..9887403ed9 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -24,6 +29,11 @@ config BR2_PACKAGE_BIND https://www.isc.org/bind/ +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677..401e389e49 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.26/bind-9.16.26.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 70b39a5eb71650358ec9ba41da3050d32aeac0aeb4a466684b23f35affa7fb45 bind-9.16.26.tar.xz +sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a3..5b4c60b14c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,12 +4,12 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.26 +BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc @@ -32,15 +32,18 @@ BIND_CONF_ENV = \ BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ - --with-libjson=no \ + --with-json-c=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ --disable-backtrace +BIND_DEPENDENCIES = libuv + ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib +BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -66,7 +69,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ --with-openssl=$(STAGING_DIR)/usr \ @@ -80,9 +82,6 @@ BIND_CONF_OPTS += --with-gost=yes else BIND_CONF_OPTS += --with-gost=no endif -else -BIND_CONF_OPTS += --with-openssl=no -endif # Used by dnssec-keymgr ifeq ($(BR2_PACKAGE_PYTHON_PLY),y) From fontaine.fabrice at gmail.com Sat Mar 19 19:34:22 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 19 Mar 2022 20:34:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: bump to version 1.1.1 Message-ID: <20220319193422.1148509-1-fontaine.fabrice@gmail.com> - This bump fixes unauthorized access via D-Bus (CVE-2019-25058): https://github.com/advisories/GHSA-p5wh-m4gj-x2mr but dbus is disabled on buildroot - musl is supported since https://github.com/USBGuard/usbguard/commit/b04e8deacac4f3f4a82a10b219c2d555e1b2aa24 - C++17 is now mandatory: https://github.com/USBGuard/usbguard/commit/8c86264986685bf646c65228abce2432e08e3c4c - Update hash of license file (use license file from gnu.org: https://github.com/USBGuard/usbguard/commit/3292511ab164ce0bdf6d58f0369ce3993dded9ad) https://github.com/USBGuard/usbguard/blob/usbguard-1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine --- package/usbguard/Config.in | 8 +++----- package/usbguard/usbguard.hash | 6 ++++-- package/usbguard/usbguard.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index e97d0e729c..4c3dc7f2c2 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,9 +3,8 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on !BR2_STATIC_LIBS # libqb, protobuf - depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD https://usbguard.github.io/ -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS comment "usbguard needs a toolchain not affected by GCC bug 64735" diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash index fd77acc75a..a69240b3f9 100644 --- a/package/usbguard/usbguard.hash +++ b/package/usbguard/usbguard.hash @@ -1,3 +1,5 @@ +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.1/usbguard-1.1.1.tar.gz.sum +sha256 460ebfb4ffc5609739a202a3a1d9fda1c30de033b634845b8baa136352bfb432 usbguard-1.1.1.tar.gz + # Locally calculated -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 54a4031056..614b7d655d 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBGUARD_VERSION = 1.0.0 +USBGUARD_VERSION = 1.1.1 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE -- 2.35.1 From juanrgar at gmail.com Sat Mar 19 21:45:35 2022 From: juanrgar at gmail.com (Juan Garcia Blanco) Date: Sat, 19 Mar 2022 22:45:35 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: fix check for CWD in env vars Message-ID: <20220319214536.2417-1-juanrgar@gmail.com> The previous pattern incorrectly matches against path lists that don't contain CWD, but end with ':', e.g., exported like VAR=<...>:$VAR where $VAR is empty. Now the pattern explicitly checks for $PWD in the path list. Signed-off-by: Juan Garcia Blanco --- support/dependencies/dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index c604a9efcc..d1fe94c9b9 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -16,7 +16,7 @@ fi # Sanity check for CWD in LD_LIBRARY_PATH case ":${LD_LIBRARY_PATH:-unset}:" in -(*::*|*:.:*) +(*:$PWD:*|*:.:*) echo echo "You seem to have the current working directory in your" echo "LD_LIBRARY_PATH environment variable. This doesn't work." @@ -32,7 +32,7 @@ esac # An empty PATH is technically possible, but in practice we would not # even arrive here if that was the case. case ":${PATH:-unset}:" in -(*::*|*:.:*) +(*:$PWD:*|*:.:*) echo echo "You seem to have the current working directory in your" echo "PATH environment variable. This doesn't work." -- 2.25.1 From bugzilla at busybox.net Sat Mar 19 21:50:13 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Sat, 19 Mar 2022 21:50:13 +0000 Subject: [Buildroot] [Bug 14651] OpenSSH 8.9p1 compiler error under ARM In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14651 Peter Korsgaard changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|NEW |RESOLVED -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Sat Mar 19 21:50:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 22:50:58 +0100 Subject: [Buildroot] [PATCH v2] package/openssh: fix '-fzero-call-used-regs' option support detection In-Reply-To: <20220311065511.14015-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 11 Mar 2022 07:55:11 +0100") References: <20220311065511.14015-1-ps.report@gmx.net> Message-ID: <87ils9pq65.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option > support detection > - add autoreconf as the patch touches m4/openssh.m4 > Fixes: > - https://bugs.busybox.net/show_bug.cgi?id=14651 > bitmap.c: In function ?reserve?: > bitmap.c:98:1: sorry, unimplemented: ?-fzero-call-used-regs? not supported on this target > 98 | } > | ^ > [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - rebased and renumbered patch from 0001-Improve-detection-of-fzero-call-used-regs-all-suppor.patch > to 0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 19 21:49:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 19 Mar 2022 22:49:54 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openssh: fix '-fzero-call-used-regs' option support detection Message-ID: <20220319214213.073DF83EE8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23fb7bbc00e22e90cf65997f4aae4a28c1ba4f6d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - add upstream patch ([1]) to fix '-fzero-call-used-regs' gcc compiler option support detection - add autoreconf as the patch touches m4/openssh.m4 Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14651 bitmap.c: In function ???reserve???: bitmap.c:98:1: sorry, unimplemented: ???-fzero-call-used-regs??? not supported on this target 98 | } | ^ [1] https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66fd92a4ce0599ee8c59b9ba95bf0f2c6ec74c43) Signed-off-by: Peter Korsgaard --- ...ection-of-fzero-call-used-regs-all-suppor.patch | 38 ++++++++++++++++++++++ package/openssh/openssh.mk | 4 +++ 2 files changed, 42 insertions(+) diff --git a/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch new file mode 100644 index 0000000000..ce5c5539ff --- /dev/null +++ b/package/openssh/0002-Improve-detection-of-fzero-call-used-regs-all-suppor.patch @@ -0,0 +1,38 @@ +From b5fee5fe98f708c1dc61a1564db35eacadbfe8b3 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. + +[Upstream: https://github.com/openssh/openssh-portable/commit/f107467179428a0e3ea9e4aa9738ac12ff02822d.patch] +Signed-off-by: Peter Seiderer +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c379..8c33c70 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + #include ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +-- +2.35.1 + diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6ab..84add9563d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -12,6 +12,10 @@ OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + +# patch touching m4/openssh.m4 +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From james.hilliard1 at gmail.com Sat Mar 19 23:47:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sat, 19 Mar 2022 17:47:14 -0600 Subject: [Buildroot] [PATCH] package/python-pillow: bump to version 9.0.1 In-Reply-To: <87r16xpxjx.fsf@dell.be.48ers.dk> References: <20220222113336.2608916-1-angelo@amarulasolutions.com> <87r16xpxjx.fsf@dell.be.48ers.dk> Message-ID: On Sat, Mar 19, 2022 at 1:11 PM Peter Korsgaard wrote: > > >>>>> "Angelo" == Angelo Compagnucci writes: > > > Signed-off-by: Angelo Compagnucci > > Looking at the changelog, 9.0.1 seems to be a security fix release > fixing two CVEs: > > https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst > > Please mark such version bumps as security related so I don't miss them. > > Committed with that fixed to 2022.02.x, thanks. FYI there might be a regression, 9.0.1 is broken on master at least, this should fix it: https://patchwork.ozlabs.org/project/buildroot/patch/20220316060219.3448648-1-james.hilliard1 at gmail.com/ > > -- > Bye, Peter Korsgaard > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Sun Mar 20 08:21:56 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 08:21:56 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-19 Message-ID: <20220320082201.6612060B1F@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-03-19 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 50 | 10 | 0 | 60 | 2021.11.x | 21 | 3 | 0 | 24 | 2022.02.x | 15 | 6 | 0 | 21 | master | 49 | 37 | 2 | 88 | Classification of failures by reason for master ----------------------------------------------- bind-9.16.26 | 10 pango-1.50.5 | 6 ola-0.10.8 | 4 libnetfilter_conntrack-1.0.9 | 2 libscrypt-1.22 | 2 libuwsc | 2 ruby-3.1.0 | 2 wavemon-0.9.4 | 2 bird-2.0.8 | 1 frr-8.1 | 1 host-pango-1.50.5 | 1 libiio-0.23 | 1 librtlsdr-ed0317e6a58c09887... | 1 nodejs-14.18.3 | 1 protozero-1.7.1 | 1 qt5webkit-5.212.0-alpha4 | 1 unknown | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- i686 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/f73421f8494b7336ab065d14a649027e5ec81b97 | ORPH x86_64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/b03de9fc644fdd43e1a288fea4caf9e9e45c0f18 | ORPH sparc64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/5049b91b1449bfcf15786da78f177a3025907a3e | ORPH x86_64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/37aa63069cb8b40a195d784d62e69da72408abb2 | ORPH aarch64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/4059a9b5150d076a5263bdbae2ded5a46e15bea0 | ORPH nios2 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/99ab62b09f07b0c6d20a6cacb67c515eb3460c5f | ORPH microblazeel | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/88783438b5033ce799d57ac8bd1c1be30d51fc72 | ORPH sparc64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/9a6afa236590ef26487dec83428224851f46acaf | ORPH arm | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/a1187b65d05985052f20fdcfc02d651d63f7746b | ORPH aarch64 | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/43acf642540997c3500d417398f1062cda62ada6 | ORPH mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/ee48850228f0a47b477edceee26c23fbdd318479 | mips64el | frr-8.1 | NOK | http://autobuild.buildroot.net/results/1180cfe0aca4f74fe9a8e925da7d2c8283f57967 | arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/9ac311ca0df3a12fd44b112e9e2db50b7ae43780 | ORPH arm | libiio-0.23 | NOK | http://autobuild.buildroot.net/results/3efe03f86d27dcfa49f9f2e94c9872396196305a | microblazeel | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/f060093f15ee5fe21a31a632e9539ed46c95f8ef | powerpc | libnetfilter_conntrack-1.0.9 | NOK | http://autobuild.buildroot.net/results/a807364c9fd6b6a3c71ec867be4594bb0bf984ab | arm | librtlsdr-ed0317e6a58c09887... | NOK | http://autobuild.buildroot.net/results/457fae9a8b60905e11e2a2d10b4961c7266a07e9 | xtensa | libscrypt-1.22 | NOK | http://autobuild.buildroot.net/results/c5c18abc977300c83c267562b572007bc60f3a6c | microblazeel | libscrypt-1.22 | NOK | http://autobuild.buildroot.net/results/3d9ccb572a9edc947edf1c9a593f460cd9501dba | riscv64 | libuwsc | TIM | http://autobuild.buildroot.net/results/b3c846038c86c6680b6b640628a3a29169177326 | riscv32 | libuwsc | TIM | http://autobuild.buildroot.net/results/d0fb3e1414561f6ab5ab991c17078bf127d46118 | x86_64 | nodejs-14.18.3 | NOK | http://autobuild.buildroot.net/results/ec2ca9be9303b2b2a8e4da1462e627875e36d9b2 | riscv64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/e83022b76666f62ea4da2e536c46b8d519a1becc | aarch64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/23db74786717b20363019bf3d8f13b5a5e7c8896 | x86_64 | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/bba3d0ccc115d5be96c0b58167ef28e0aec1a473 | sparc | ola-0.10.8 | NOK | http://autobuild.buildroot.net/results/5f1c16bbecc6766867449f9ad3aeca1b20e33261 | riscv64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/1a671295d8a5e383eb086d5898f689263c17221b | ORPH powerpc | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/59d7e29cbc545c4c8f85ea332f5aace4b3c22580 | ORPH mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/8835d9372a43a51711432bfeb4e3d7dcb71fe5bd | ORPH aarch64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/35b5f26bbefa89be0d2a4c3d8c21f372998016ee | ORPH sparc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/243156f3572981fab67cf41515482023c12da677 | ORPH arc | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/345aa406e6cbf394197b0ae539716206497d271c | ORPH mips64el | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/f5d8f23072ac36fcc43045ad5a1956e93cb5da74 | i686 | qt5webkit-5.212.0-alpha4 | NOK | http://autobuild.buildroot.net/results/d5f025aa42499d2f59ba66a883a0a31eca9ffe4a | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/9cd3ae68e0fd4457f6a525d21739e868407aad73 | riscv64 | ruby-3.1.0 | NOK | http://autobuild.buildroot.net/results/3ed37eaf9ee59a7c85d2aca76c2b62e129e8dfa5 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/8fa2da87e4de76240f888c021ec007aa9250f7ea | sparc64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/2786645f766ea2f92479dfc31615ae84e2a21e14 | mipsel | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/a9c974998ee80ab2f580e72c5ac3f64d541d6cbd | Classification of failures by reason for 2021.02.x -------------------------------------------------- unknown | 3 host-sentry-cli-1.57.0 | 2 apcupsd-3.14.14 | 1 asterisk-16.21.1 | 1 proftpd-1.3.6e | 1 python-twisted-22.1.0 | 1 rabbitmq-server-3.8.2 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/59944118a546782032134636cfb8081b4164f471 | x86_64 | asterisk-16.21.1 | NOK | http://autobuild.buildroot.net/results/7ced5faa5f8c6edf7b4d080a0cda56e4b41b0ea6 | powerpc64le | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/f0f845029558e0b9022bac51caefb84235b7ad51 | x86_64 | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/447cf3c73d08a843c9e0b9b91d66a5d2afe88d1c | sparc | proftpd-1.3.6e | NOK | http://autobuild.buildroot.net/results/aeac1f9c897ed70486620c4610143d1d01d6a711 | arm | python-twisted-22.1.0 | NOK | http://autobuild.buildroot.net/results/c4e1144344865be25ca54b8d0e24c4aa14373891 | aarch64 | rabbitmq-server-3.8.2 | NOK | http://autobuild.buildroot.net/results/395c9dd86f079b613e48633e44f741b319aa8d17 | aarch64_be | unknown | NOK | http://autobuild.buildroot.net/results/f6aa641f37482d6f036b29e5fb3aa12413a31423 | arc | unknown | NOK | http://autobuild.buildroot.net/results/b3bc33268530b8ddd5c8b7bc71bd712fec4710c8 | x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/17995038f396104c0285c28d323fa544a3ba8351 | Classification of failures by reason for 2021.11.x -------------------------------------------------- apcupsd-3.14.14 | 1 suricata-6.0.4 | 1 wavemon-0.9.4 | 1 Detail of failures for 2021.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sparc | apcupsd-3.14.14 | NOK | http://autobuild.buildroot.net/results/8ede1a96e8dbb37771319c103d1ed786b0016eba | arm | suricata-6.0.4 | NOK | http://autobuild.buildroot.net/results/0737d9f39dac2675ec977cf56d168e8e674b84d9 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/54f84971e6b5a7c5423d9e4b8ba0aa40ca44a4f0 | Classification of failures by reason for 2022.02.x -------------------------------------------------- bird-2.0.8 | 1 mongodb-4.2.18 | 1 mpd-0.23.5 | 1 poppler-21.12.0 | 1 unknown | 1 wavemon-0.9.4 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | bird-2.0.8 | NOK | http://autobuild.buildroot.net/results/4b25ced9ecea36a296231c5cab1cf7a5c00cbd00 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/e96b9773b518efdad1d1ae9638dff3df1d8d646a | sh4 | mpd-0.23.5 | NOK | http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 | xtensa | poppler-21.12.0 | NOK | http://autobuild.buildroot.net/results/ee689e79e7c0199bb3590fc6a4173e538493f8fc | or1k | unknown | NOK | http://autobuild.buildroot.net/results/8a917c11ab370274d564315db4e728ec45de8ed6 | arm | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/4d2d30553fea30c5020558b672aa1db5a4885cd0 | -- http://autobuild.buildroot.net From yann.morin.1998 at free.fr Sun Mar 20 08:46:42 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 09:46:42 +0100 Subject: [Buildroot] [PATCH] support/dependencies/dependencies.sh: fix check for CWD in env vars In-Reply-To: <20220319214536.2417-1-juanrgar@gmail.com> References: <20220319214536.2417-1-juanrgar@gmail.com> Message-ID: <20220320084642.GC1566358@scaer> Juan, All, Thanks for following up on our earlier discussion on IRC. On 2022-03-19 22:45 +0100, Juan Garcia Blanco spake thusly: > The previous pattern incorrectly matches against path lists that don't > contain CWD, but end with ':', e.g., exported like VAR=<...>:$VAR where > $VAR is empty. > > Now the pattern explicitly checks for $PWD in the path list. > > Signed-off-by: Juan Garcia Blanco > --- > support/dependencies/dependencies.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh > index c604a9efcc..d1fe94c9b9 100755 > --- a/support/dependencies/dependencies.sh > +++ b/support/dependencies/dependencies.sh > @@ -16,7 +16,7 @@ fi > > # Sanity check for CWD in LD_LIBRARY_PATH > case ":${LD_LIBRARY_PATH:-unset}:" in > -(*::*|*:.:*) > +(*:$PWD:*|*:.:*) Nope, that is not correct. This checks that indeed PWD *at time of check* is not in LD_LIBRARY_PATH (the following applies equally to PATH and LD_LIBRARY_PATH) However, what we want to check for, is that PWD *at time of use* is not in LD_LIBRARY_PATH. Consider a package build system that would do something like (cross-gcc is linked to libgmp.so): cd src cross-gcc -shared -o libgmp.so my-gmp.c cross-gcc -o foo foo.c When gcc is called, PWD is no longer the same as it was when Buildroot checked for it, so when running cross-gcc, the dynamic linker will try to load libgmp.so from the current direc tory, and as it exists, it will load the incorrect libgmp.so. And this is exactly what we want to avoid and what we want to check for. For PATH, an empty entry is explicitly documented [0] as the same as '.', but for LD_LIBRARY_PATH, it is not explicitly documented what an empty entry would do, so when I wrote the code above, I erred on the safe side and also considered an empty entry to be equivalent to '.' for LD_LIBRARY_PATH too. So we really, really need to keep a check for an empty entry. However, as we discussed on IRC, the checks really have an issue, in that they do not test for a '.' or an empty entrey at the beginnning or the end of PATH or LD_LIBRARY_PATH. So both test patterns must be changed to: *::*|:*|*:|*:.:*|.:*|*:. Could you send an updated patch, please? [0] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03 A zero-length prefix is a legacy feature that indicates the current working directory. It appears as two adjacent characters ( "::" ), as an initial preceding the rest of the list, or as a trailing following the rest of the list. Regards, Yann E. MORIN. > echo > echo "You seem to have the current working directory in your" > echo "LD_LIBRARY_PATH environment variable. This doesn't work." > @@ -32,7 +32,7 @@ esac > # An empty PATH is technically possible, but in practice we would not > # even arrive here if that was the case. > case ":${PATH:-unset}:" in > -(*::*|*:.:*) > +(*:$PWD:*|*:.:*) > echo > echo "You seem to have the current working directory in your" > echo "PATH environment variable. This doesn't work." > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Mar 20 09:51:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:51:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libsrtp: drop shared library dependency from openssl In-Reply-To: <20220312181249.7288-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 12 Mar 2022 19:12:49 +0100") References: <20220312181249.7288-1-fontaine.fabrice@gmail.com> Message-ID: <87ee2xossq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > openssl handling needs shared library support since commit > 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed > since version 2 and > https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 09:49:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:49:11 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220320094741.B4466841F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7355863f64dccba8860ad4e94ca86286e232746d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 6852a13559..643371834b 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -246,7 +246,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 5cbd97957a..212d1b1749 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -25,8 +25,7 @@ endif # host-pkgconf to make sure pkg-config is installed. LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --enable-openssl else From peter at korsgaard.com Sun Mar 20 09:49:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:49:02 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220320094746.27BE284349@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=330d79828dcd97b955c6dec2740955a15332817f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) From peter at korsgaard.com Sun Mar 20 09:48:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 10:48:22 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libsrtp: drop shared library dependency from openssl Message-ID: <20220320094752.45C22843FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52bdcde13c736091e7876d4f31fb9b6ed2d3635a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87) Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) From thomas.petazzoni at bootlin.com Sun Mar 20 10:35:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 11:35:53 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220316215654.8E8188424D@busybox.osuosl.org> References: <20220316215654.8E8188424D@busybox.osuosl.org> Message-ID: <20220320113553.43bf3c6f@windsurf> Hello Peter, Could you cherry-pick this commit into the currently maintained stable branches? Thanks a lot! Thomas Petazzoni On Wed, 16 Mar 2022 23:04:46 +0100 Yann E. MORIN wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=c72f3f2b43f4607ed94d51a21abe5e3d909efb36 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > The check_package_get_latest_version_by_distro() function analyzes the > data returned by release-monitoring.org. For two of our > packages (bento4 and qextserialport), release-monitoring.org returns > something that is a bit odd: it returns an entry with a > "stable_versions" field that contains an empty array. Our code was > ready to have or not have a "stable_versions" entry, but when it is > present, we assumed it was not an empty array. These two packages, for > some reason, break this assumption. > > In order to solve this problem, this commit is more careful, and uses > the stable_versions field only if it exists and it has at least one > entry. The code is also reworked as a sequence of "if...elif...else" > to be more readable. > > This fixes the following exception when running pkg-stats on the full > package set: > > Task exception was never retrieved > future: exception=IndexError('list index out of range')> > Traceback (most recent call last): > File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get > if await check_package_get_latest_version_by_distro(session, pkg): > File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro > version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > IndexError: list index out of range > > Signed-off-by: Thomas Petazzoni > [yann.morin.1998 at free.fr: non-sequence tests as True] > Signed-off-by: Yann E. MORIN > --- > support/scripts/pkg-stats | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index c235d99407..8cc64a54d1 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): > return False > > data = await resp.json() > - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > + if 'stable_versions' in data and data['stable_versions']: > + version = data['stable_versions'][0] > + elif 'version' in data: > + version = data['version'] > + else: > + version = None > check_package_latest_version_set_status(pkg, > RM_API_STATUS_FOUND_BY_DISTRO, > version, > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From br015 at umbiko.net Sun Mar 20 11:41:38 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Sun, 20 Mar 2022 12:41:38 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd In-Reply-To: <20211227074056.13882-1-br015@umbiko.net> References: <20211227074056.13882-1-br015@umbiko.net> Message-ID: <20220320114138.433796-1-br015@umbiko.net> The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - extract link creation from commit 0e8d35f Changes v2 -> v3: - update failure list ...-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..50380861bc --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,78 @@ +Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389. + +Signed-off-by: Andreas Ziegler + +--- +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") -- 2.34.1 From bernd.kuhls at t-online.de Sun Mar 20 11:54:01 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 12:54:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64 Message-ID: <20220320115401.3214796-1-bernd.kuhls@t-online.de> Removed all patches after being applied upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a Signed-off-by: Bernd Kuhls --- .../bluez5_utils-headers.mk | 2 +- ...-tools-mesh-cfgtest-include-limits.h.patch | 33 - ...til-Rename-btd_malloc-to-util_malloc.patch | 67 - .../0003-shared-util-Add-util_memdup.patch | 57 - ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 ----------------- ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ---- ...rc-shared-util.h-include-sys-types.h.patch | 39 - package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +- 9 files changed, 3 insertions(+), 1924 deletions(-) delete mode 100644 package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch delete mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch delete mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch delete mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch delete mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch delete mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 5bfc652355..2f3a290ea8 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.63 +BLUEZ5_UTILS_HEADERS_VERSION = 5.64 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch deleted file mode 100644 index 7f1197357f..0000000000 --- a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5158827fded7cb4daf550a5956aff0c74f6c38fc Mon Sep 17 00:00:00 2001 -From: Michael Nosthoff -Date: Thu, 22 Jul 2021 21:36:13 +0200 -Subject: [PATCH] tools/mesh-cfgtest: include limits.h - -mesh-cfgtest.c uses PATH_MAX so it should include limits.h. - -fixes compilation error when enabling mesh support with musl-based -toolchains observed in buildroot autobuilders. - -http://autobuild.buildroot.net/results/20cc47f54de0b0d4bdf108c3715c590ae8ab476f/ -http://autobuild.buildroot.net/results/003968b25906579dbcf5a95d1e43fec0ab504ef5/ - -Signed-off-by: Michael Nosthoff ---- - tools/mesh-cfgtest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c -index fa0474faa..116ab7f16 100644 ---- a/tools/mesh-cfgtest.c -+++ b/tools/mesh-cfgtest.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.32.0 - diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch deleted file mode 100644 index f8d74528d8..0000000000 --- a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Wed, 5 Jan 2022 15:53:35 -0800 -Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc - -util functions are not limited to daemon only which is normally the case -when using btd prefix. - -(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) -Signed-off-by: Thomas Devoogdt ---- - profiles/audio/avdtp.c | 2 +- - src/shared/util.c | 2 +- - src/shared/util.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c -index d3dfbf96d..f2b461330 100644 ---- a/profiles/audio/avdtp.c -+++ b/profiles/audio/avdtp.c -@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, - break; - } - -- cpy = btd_malloc(sizeof(*cpy) + cap->length); -+ cpy = util_malloc(sizeof(*cpy) + cap->length); - memcpy(cpy, cap, sizeof(*cap) + cap->length); - - size -= sizeof(*cap) + cap->length; -diff --git a/src/shared/util.c b/src/shared/util.c -index 81b20d86f..93110047b 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -25,7 +25,7 @@ - - #include "src/shared/util.h" - --void *btd_malloc(size_t size) -+void *util_malloc(size_t size) - { - if (__builtin_expect(!!size, 1)) { - void *ptr; -diff --git a/src/shared/util.h b/src/shared/util.h -index ac70117ca..11d09979d 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -75,7 +75,7 @@ do { \ - size_t __n = (size_t) (count); \ - size_t __s = sizeof(type); \ - void *__p; \ -- __p = btd_malloc(__n * __s); \ -+ __p = util_malloc(__n * __s); \ - memset(__p, 0, __n * __s); \ - __p; \ - })) -@@ -86,7 +86,7 @@ do { \ - char *strdelimit(char *str, char *del, char c); - int strsuffix(const char *str, const char *suffix); - --void *btd_malloc(size_t size); -+void *util_malloc(size_t size); - - typedef void (*util_debug_func_t)(const char *str, void *user_data); - --- -2.17.1 - diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch deleted file mode 100644 index d5c31a2614..0000000000 --- a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 6 Jan 2022 11:45:12 -0800 -Subject: [PATCH] shared/util: Add util_memdup - -This adds util_memdup which is intended to replace g_memdup since -replacing that with g_memdup2 requires bumping the glib version. - -(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) -Signed-off-by: Thomas Devoogdt ---- - src/shared/util.c | 16 ++++++++++++++++ - src/shared/util.h | 1 + - 2 files changed, 17 insertions(+) - -diff --git a/src/shared/util.c b/src/shared/util.c -index 93110047b..6e1c83057 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -41,6 +41,22 @@ void *util_malloc(size_t size) - return NULL; - } - -+void *util_memdup(const void *src, size_t size) -+{ -+ void *cpy; -+ -+ if (!src || !size) -+ return NULL; -+ -+ cpy = util_malloc(size); -+ if (!cpy) -+ return NULL; -+ -+ memcpy(cpy, src, size); -+ -+ return cpy; -+} -+ - void util_debug_va(util_debug_func_t function, void *user_data, - const char *format, va_list va) - { -diff --git a/src/shared/util.h b/src/shared/util.h -index 11d09979d..8ef6132c4 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); - int strsuffix(const char *str, const char *suffix); - - void *util_malloc(size_t size); -+void *util_memdup(const void *src, size_t size); - - typedef void (*util_debug_func_t)(const char *str, void *user_data); - --- -2.17.1 - diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch deleted file mode 100644 index 9e1047c957..0000000000 --- a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch +++ /dev/null @@ -1,1411 +0,0 @@ -From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 6 Jan 2022 12:50:33 -0800 -Subject: [PATCH] build: Replace use of g_memdup with util_memdup -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This replaces the uses of g_memdup with util_memdup since the former has -been deprecated: - - warning: ?g_memdup? is deprecated: Use 'g_memdup2' instead - [-Wdeprecated-declarations] - -g_memdup2 requires bumping glib version which would likely have its -own problems thus why util_memdup was introduced. - -(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) -Signed-off-by: Thomas Devoogdt ---- - Makefile.am | 10 ++--- - Makefile.obexd | 1 + - Makefile.tools | 11 ++++-- - android/a2dp.c | 9 +++-- - android/avctp.c | 5 ++- - android/avrcp-lib.c | 2 +- - android/gatt.c | 5 ++- - android/hidhost.c | 3 +- - android/tester-main.c | 77 +++++++++++++++++++++----------------- - attrib/gatt.c | 12 +++--- - client/gatt.c | 2 +- - gobex/gobex-header.c | 7 ++-- - gobex/gobex-packet.c | 5 ++- - obexd/src/obex.c | 5 ++- - plugins/neard.c | 9 +++-- - plugins/policy.c | 7 ++-- - profiles/audio/avctp.c | 9 +++-- - profiles/audio/avrcp.c | 10 ++--- - profiles/battery/bas.c | 4 +- - profiles/battery/battery.c | 4 +- - profiles/deviceinfo/dis.c | 4 +- - profiles/input/hog-lib.c | 12 +++--- - profiles/scanparam/scpp.c | 4 +- - src/eir.c | 8 ++-- - tools/gatt-service.c | 15 ++++---- - tools/mesh-gatt/gatt.c | 5 ++- - unit/test-avctp.c | 4 +- - unit/test-avdtp.c | 6 +-- - unit/test-avrcp.c | 10 ++--- - unit/test-gatt.c | 4 +- - unit/test-hfp.c | 11 +++--- - unit/test-hog.c | 26 ++++++------- - unit/test-sdp.c | 10 +++-- - unit/test-uhid.c | 2 +- - 34 files changed, 172 insertions(+), 146 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 308f13c50..9b5e140b8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ - - unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex.c --unit_test_gobex_LDADD = $(GLIB_LIBS) -+unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-packet.c --unit_test_gobex_packet_LDADD = $(GLIB_LIBS) -+unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-header.c --unit_test_gobex_header_LDADD = $(GLIB_LIBS) -+unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-transfer.c --unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) -+unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-apparam.c --unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) -+unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) - endif - - unit_tests += unit/test-lib -diff --git a/Makefile.obexd b/Makefile.obexd -index 37a133455..5d1a4ff65 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ - obexd/src/map_ap.h - obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ - gdbus/libgdbus-internal.la \ -+ src/libshared-glib.la \ - $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ - $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl - -diff --git a/Makefile.tools b/Makefile.tools -index c7bdff83f..35b0021ea 100644 ---- a/Makefile.tools -+++ b/Makefile.tools -@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c - tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) - - tools_gatt_service_SOURCES = tools/gatt-service.c --tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la -+tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ -+ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) - - profiles_iap_iapd_SOURCES = profiles/iap/main.c - profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) -@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ - tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ - tools/obex-client-tool.c - tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ -- $(GLIB_LIBS) -lreadline -+ src/libshared-glib.la $(GLIB_LIBS) -lreadline - - tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ - tools/obex-server-tool.c --tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) -+tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ -+ src/libshared-glib.la $(GLIB_LIBS) - - tools_bluetooth_player_SOURCES = tools/bluetooth-player.c - tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ -@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ - - tools_obexctl_SOURCES = tools/obexctl.c - tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ -- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline -+ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ -+ -lreadline - - tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c - tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ -diff --git a/android/a2dp.c b/android/a2dp.c -index 029107cf5..ee607a32d 100644 ---- a/android/a2dp.c -+++ b/android/a2dp.c -@@ -26,6 +26,7 @@ - #include "lib/sdp_lib.h" - #include "profiles/audio/a2dp-codecs.h" - #include "src/shared/queue.h" -+#include "src/shared/util.h" - #include "src/log.h" - #include "hal-msg.h" - #include "ipc-common.h" -@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, - - p = g_new0(struct a2dp_preset, 1); - p->len = conf_len; -- p->data = g_memdup(conf, p->len); -+ p->data = util_memdup(conf, p->len); - - return p; - } -@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, - - p = g_new0(struct a2dp_preset, 1); - p->len = conf_len; -- p->data = g_memdup(conf, p->len); -+ p->data = util_memdup(conf, p->len); - - return p; - } -@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, - - preset = g_new0(struct a2dp_preset, 1); - preset->len = cap->length - sizeof(*codec); -- preset->data = g_memdup(codec->data, preset->len); -+ preset->data = util_memdup(codec->data, preset->len); - - if (check_config(endpoint, preset) < 0) { - preset_free(preset); -@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, - - preset = g_new0(struct a2dp_preset, 1); - preset->len = p->len; -- preset->data = g_memdup(p->data, preset->len); -+ preset->data = util_memdup(p->data, preset->len); - l = g_slist_append(l, preset); - - len -= preset->len; -diff --git a/android/avctp.c b/android/avctp.c -index 14ebbc391..37b4cec4f 100644 ---- a/android/avctp.c -+++ b/android/avctp.c -@@ -31,6 +31,7 @@ - #include - - #include "lib/sdp.h" -+#include "src/shared/util.h" - #include "src/log.h" - #include "avctp.h" - -@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, - - for (i = 0; i < iov_cnt; i++) { - pdu[i].iov_len = iov[i].iov_len; -- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); -+ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); - } - - req = g_new0(struct avctp_control_req, 1); -@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, - - for (i = 0; i < iov_cnt; i++) { - pdu[i].iov_len = iov[i].iov_len; -- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); -+ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); - } - - req = g_new0(struct avctp_browsing_req, 1); -diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c -index 2007d09d2..b342692cb 100644 ---- a/android/avrcp-lib.c -+++ b/android/avrcp-lib.c -@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, - return NULL; - } - -- folders[count] = g_memdup(¶ms[i], len); -+ folders[count] = util_memdup(¶ms[i], len); - i += len; - } - -diff --git a/android/gatt.c b/android/gatt.c -index a8a0c488b..e8ba5aabb 100644 ---- a/android/gatt.c -+++ b/android/gatt.c -@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, - } - - bt_uuid_to_uuid128(&uuid, &u128); -- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); -+ new_uuid = util_memdup(&u128.value.u128, -+ sizeof(u128.value.u128)); - - uuids = g_slist_prepend(uuids, new_uuid); - } -@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, - - queue_push_tail(dev->pending_requests, data); - -- data->value = g_memdup(value, vlen); -+ data->value = util_memdup(value, vlen); - data->length = vlen; - - if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], -diff --git a/android/hidhost.c b/android/hidhost.c -index 016382e17..b4e5c527f 100644 ---- a/android/hidhost.c -+++ b/android/hidhost.c -@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) - goto fail; - - dev->rd_size = data->unitSize; -- dev->rd_data = g_memdup(data->val.str, data->unitSize); -+ dev->rd_data = util_memdup(data->val.str, -+ data->unitSize); - } - } - -diff --git a/android/tester-main.c b/android/tester-main.c -index ff5ecdf83..317c1de06 100644 ---- a/android/tester-main.c -+++ b/android/tester-main.c -@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, - for (i = 0; i < num_properties; i++) { - props[i].type = properties[i].type; - props[i].len = properties[i].len; -- props[i].val = g_memdup(properties[i].val, properties[i].len); -+ props[i].val = util_memdup(properties[i].val, -+ properties[i].len); - } - - return props; -@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, - for (i = 0; i < num_properties; i++) { - props[i].type = properties[i]->type; - props[i].len = properties[i]->len; -- props[i].val = g_memdup(properties[i]->val, properties[i]->len); -+ props[i].val = util_memdup(properties[i]->val, -+ properties[i]->len); - } - - return props; -@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, - - prop->type = type; - prop->len = len; -- prop->val = g_memdup(val, len); -+ prop->val = util_memdup(val, len); - - return prop; - } -@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) - - step->callback = CB_GATTC_SEARCH_RESULT; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); - - schedule_callback_verification(step); - } -@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); - step->callback_result.char_prop = char_prop; - -@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); -- step->callback_result.descriptor = g_memdup(descr_id, -+ step->callback_result.descriptor = util_memdup(descr_id, - sizeof(*descr_id)); - - schedule_callback_verification(step); -@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_INCLUDED_SERVICE; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.included = g_memdup(incl_srvc_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.included = util_memdup(incl_srvc_id, - sizeof(*srvc_id)); - - schedule_callback_verification(step); -@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_READ_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.read_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_READ_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.read_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_WRITE_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.write_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_WRITE_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.write_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, - step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); - step->callback_result.notification_registered = registered; - -@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) - - step->callback = CB_GATTC_NOTIFY; - step->callback_result.conn_id = conn_id; -- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.notify_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, -+ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, - sizeof(inc_srvc_handle)); - - schedule_callback_verification(step); -@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); -- step->callback_result.char_handle = g_memdup(&char_handle, -+ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); -+ step->callback_result.char_handle = util_memdup(&char_handle, - sizeof(char_handle)); - - schedule_callback_verification(step); -@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); -- step->callback_result.desc_handle = g_memdup(&desc_handle, -+ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); -+ step->callback_result.desc_handle = util_memdup(&desc_handle, - sizeof(desc_handle)); - - schedule_callback_verification(step); -@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, - - step->callback_result.conn_id = conn_id; - step->callback_result.trans_id = trans_id; -- step->callback_result.attr_handle = g_memdup(&attr_handle, -+ step->callback_result.attr_handle = util_memdup(&attr_handle, - sizeof(attr_handle)); - step->callback_result.offset = offset; - step->callback_result.is_long = is_long; -@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, - - step->callback_result.conn_id = conn_id; - step->callback_result.trans_id = trans_id; -- step->callback_result.attr_handle = g_memdup(&attr_handle, -+ step->callback_result.attr_handle = util_memdup(&attr_handle, - sizeof(attr_handle)); - step->callback_result.offset = offset; - step->callback_result.length = length; - step->callback_result.need_rsp = need_rsp; - step->callback_result.is_prep = is_prep; -- step->callback_result.value = g_memdup(&value, length); -+ step->callback_result.value = util_memdup(&value, length); - - /* Utilize property verification mechanism for bdaddr */ - props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); -@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, - inst[i].id = instances[i].id; - inst[i].scn = instances[i].scn; - inst[i].msg_types = instances[i].msg_types; -- inst[i].p_name = g_memdup(instances[i].p_name, -+ inst[i].p_name = util_memdup(instances[i].p_name, - strlen(instances[i].p_name)); - } - -diff --git a/attrib/gatt.c b/attrib/gatt.c -index 46b2ca381..b496dd1eb 100644 ---- a/attrib/gatt.c -+++ b/attrib/gatt.c -@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) - - g_slist_free_full(dc->characteristics, g_free); - g_attrib_unref(dc->attrib); -- g_free(dc->uuid); -+ free(dc->uuid); - g_free(dc); - } - -@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) - - g_slist_free_full(dd->descriptors, g_free); - g_attrib_unref(dd->attrib); -- g_free(dd->uuid); -+ free(dd->uuid); - g_free(dd); - } - -@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, - dc->user_data = user_data; - dc->end = end; - dc->start = start; -- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); -+ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); - - dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, - discover_char_ref(dc), discover_char_unref); -@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, - if (long_write->offset == long_write->vlen) { - execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, - long_write->func, long_write->user_data); -- g_free(long_write->value); -+ free(long_write->value); - g_free(long_write); - - return; -@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, - long_write->func = func; - long_write->user_data = user_data; - long_write->handle = handle; -- long_write->value = g_memdup(value, vlen); -+ long_write->value = util_memdup(value, vlen); - long_write->vlen = vlen; - - return prepare_write(long_write); -@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, - dd->user_data = user_data; - dd->start = start; - dd->end = end; -- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); -+ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); - - dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, - discover_desc_ref(dd), discover_desc_unref); -diff --git a/client/gatt.c b/client/gatt.c -index 11f70dc4f..13872c794 100644 ---- a/client/gatt.c -+++ b/client/gatt.c -@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) - - *val_len = i; - -- return g_memdup(value, i); -+ return util_memdup(value, i); - } - - void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) -diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c -index 011d33d1a..002ba8861 100644 ---- a/gobex/gobex-header.c -+++ b/gobex/gobex-header.c -@@ -15,6 +15,7 @@ - - #include "gobex-header.h" - #include "gobex-debug.h" -+#include "src/shared/util.h" - - /* Header types */ - #define G_OBEX_HDR_ENC_UNICODE (0 << 6) -@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, - - switch (data_policy) { - case G_OBEX_DATA_COPY: -- header->v.data = g_memdup(ptr, header->vlen); -+ header->v.data = util_memdup(ptr, header->vlen); - break; - case G_OBEX_DATA_REF: - header->extdata = TRUE; -@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) - break; - case G_OBEX_HDR_ENC_BYTES: - if (!header->extdata) -- g_free(header->v.data); -+ free(header->v.data); - break; - case G_OBEX_HDR_ENC_UINT8: - case G_OBEX_HDR_ENC_UINT32: -@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) - header->id = id; - header->vlen = len; - header->hlen = len + 3; -- header->v.data = g_memdup(data, len); -+ header->v.data = util_memdup(data, len); - - return header; - } -diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c -index 11937a5a5..8ae78b0f6 100644 ---- a/gobex/gobex-packet.c -+++ b/gobex/gobex-packet.c -@@ -17,6 +17,7 @@ - #include "gobex-defs.h" - #include "gobex-packet.h" - #include "gobex-debug.h" -+#include "src/shared/util.h" - - #define FINAL_BIT 0x80 - -@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, - - switch (data_policy) { - case G_OBEX_DATA_COPY: -- pkt->data.buf = g_memdup(data, len); -+ pkt->data.buf = util_memdup(data, len); - break; - case G_OBEX_DATA_REF: - pkt->data.buf_ref = data; -@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) - switch (pkt->data_policy) { - case G_OBEX_DATA_INHERIT: - case G_OBEX_DATA_COPY: -- g_free(pkt->data.buf); -+ free(pkt->data.buf); - break; - case G_OBEX_DATA_REF: - break; -diff --git a/obexd/src/obex.c b/obexd/src/obex.c -index 9f992ec18..3a68fd66c 100644 ---- a/obexd/src/obex.c -+++ b/obexd/src/obex.c -@@ -40,6 +40,7 @@ - #include "mimetype.h" - #include "service.h" - #include "transport.h" -+#include "src/shared/util.h" - - typedef struct { - uint8_t version; -@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) - os->path = NULL; - } - if (os->apparam) { -- g_free(os->apparam); -+ free(os->apparam); - os->apparam = NULL; - os->apparam_len = 0; - } -@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) - if (!g_obex_header_get_bytes(hdr, &apparam, &len)) - return; - -- os->apparam = g_memdup(apparam, len); -+ os->apparam = util_memdup(apparam, len); - os->apparam_len = len; - DBG("APPARAM"); - } -diff --git a/plugins/neard.c b/plugins/neard.c -index e07b51106..a75527148 100644 ---- a/plugins/neard.c -+++ b/plugins/neard.c -@@ -30,6 +30,7 @@ - #include "src/eir.h" - #include "src/agent.h" - #include "src/btd.h" -+#include "src/shared/util.h" - - #define NEARD_NAME "org.neard" - #define NEARD_PATH "/" -@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) - g_free(params->name); - g_free(params->hash); - g_free(params->randomizer); -- g_free(params->pin); -+ free(params->pin); - } - - static DBusMessage *error_reply(DBusMessage *msg, int error) -@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, - remote->name = g_strndup((char *)n->name, n->name_len); - - if (marker == 0x01) { -- remote->pin = g_memdup(n->authentication, 4); -+ remote->pin = util_memdup(n->authentication, 4); - remote->pin_len = 4; - } else if (marker == 0x02) { -- remote->pin = g_memdup(n->authentication, 16); -+ remote->pin = util_memdup(n->authentication, 16); - remote->pin_len = 16; - } - -@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, - if (n->name_len > 0) - remote->name = g_strndup((char *)n->name, n->name_len); - -- remote->pin = g_memdup(n->authentication, 4); -+ remote->pin = util_memdup(n->authentication, 4); - remote->pin_len = 4; - - return 0; -diff --git a/plugins/policy.c b/plugins/policy.c -index 051db82e1..48f5db7d3 100644 ---- a/plugins/policy.c -+++ b/plugins/policy.c -@@ -32,6 +32,7 @@ - #include "src/profile.h" - #include "src/btd.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #define CONTROL_CONNECT_TIMEOUT 2 - #define SOURCE_RETRY_TIMEOUT 2 -@@ -855,7 +856,7 @@ static int policy_init(void) - reconnect_attempts = default_attempts; - reconnect_intervals_len = sizeof(default_intervals) / - sizeof(*reconnect_intervals); -- reconnect_intervals = g_memdup(default_intervals, -+ reconnect_intervals = util_memdup(default_intervals, - sizeof(default_intervals)); - goto done; - } -@@ -886,7 +887,7 @@ static int policy_init(void) - g_clear_error(&gerr); - reconnect_intervals_len = sizeof(default_intervals) / - sizeof(*reconnect_intervals); -- reconnect_intervals = g_memdup(default_intervals, -+ reconnect_intervals = util_memdup(default_intervals, - sizeof(default_intervals)); - } - -@@ -919,7 +920,7 @@ static void policy_exit(void) - if (reconnect_uuids) - g_strfreev(reconnect_uuids); - -- g_free(reconnect_intervals); -+ free(reconnect_intervals); - - g_slist_free_full(reconnects, reconnect_destroy); - -diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c -index 64d1a8504..6f64f162b 100644 ---- a/profiles/audio/avctp.c -+++ b/profiles/audio/avctp.c -@@ -40,6 +40,7 @@ - #include "src/log.h" - #include "src/error.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #include "avctp.h" - #include "avrcp.h" -@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) - NULL, 0, req->user_data); - - done: -- g_free(req->operands); -+ free(req->operands); - g_free(req); - } - -@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) - req->func(session, NULL, 0, req->user_data); - - done: -- g_free(req->operands); -+ free(req->operands); - g_free(req); - } - -@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, - req->subunit = subunit; - req->op = opcode; - req->func = func; -- req->operands = g_memdup(operands, operand_count); -+ req->operands = util_memdup(operands, operand_count); - req->operand_count = operand_count; - req->user_data = user_data; - -@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, - - req = g_new0(struct avctp_browsing_req, 1); - req->func = func; -- req->operands = g_memdup(operands, operand_count); -+ req->operands = util_memdup(operands, operand_count); - req->operand_count = operand_count; - req->user_data = user_data; - -diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c -index 7c280203c..d4e19ffc0 100644 ---- a/profiles/audio/avrcp.c -+++ b/profiles/audio/avrcp.c -@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, - * Save a copy of requested settings because we can override them - * while responding - */ -- settings = g_memdup(&pdu->params[1], pdu->params[0]); -+ settings = util_memdup(&pdu->params[1], pdu->params[0]); - len = 0; - - /* -@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, - pdu->params[++len] = val; - } - -- g_free(settings); -+ free(settings); - - if (len) { - pdu->params[0] = len / 2; -@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, - break; - } - -- folders[count] = g_memdup(&pdu->params[i], len); -+ folders[count] = util_memdup(&pdu->params[i], len); - i += len; - } - -@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, - { - struct media_player *mp = player->user_data; - -- player->features = g_memdup(features, 16); -+ player->features = util_memdup(features, 16); - - if (features[7] & 0x08) { - media_player_set_browsable(mp, true); -@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) - g_slist_free(player->sessions); - g_free(player->path); - g_free(player->change_path); -- g_free(player->features); -+ free(player->features); - g_free(player); - } - -diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c -index 3c6173b61..16ff22e19 100644 ---- a/profiles/battery/bas.c -+++ b/profiles/battery/bas.c -@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) - { - bt_bas_detach(bas); - -- g_free(bas->primary); -+ free(bas->primary); - queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); - free(bas); - } -@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) - bas->gatt_op = queue_new(); - - if (primary) -- bas->primary = g_memdup(primary, sizeof(*bas->primary)); -+ bas->primary = util_memdup(primary, sizeof(*bas->primary)); - - return bt_bas_ref(bas); - } -diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c -index 176d127f6..02d024d92 100644 ---- a/profiles/battery/battery.c -+++ b/profiles/battery/battery.c -@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) - gatt_db_unref(batt->db); - bt_gatt_client_unref(batt->client); - btd_device_unref(batt->device); -- g_free (batt->initial_value); -+ free(batt->initial_value); - if (batt->battery) - btd_battery_unregister(batt->battery); - g_free(batt); -@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, - if (!length) - return; - -- batt->initial_value = g_memdup(value, length); -+ batt->initial_value = util_memdup(value, length); - - /* request notify */ - batt->batt_level_cb_id = -diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c -index 87fa63306..f660179ed 100644 ---- a/profiles/deviceinfo/dis.c -+++ b/profiles/deviceinfo/dis.c -@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) - { - bt_dis_detach(dis); - -- g_free(dis->primary); -+ free(dis->primary); - queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); - g_free(dis); - } -@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) - dis->gatt_op = queue_new(); - - if (primary) -- dis->primary = g_memdup(primary, sizeof(*dis->primary)); -+ dis->primary = util_memdup(primary, sizeof(*dis->primary)); - - return bt_dis_ref(dis); - } -diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c -index 3bbe42370..d37caa1f1 100644 ---- a/profiles/input/hog-lib.c -+++ b/profiles/input/hog-lib.c -@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, - } - - if (report->value) -- g_free(report->value); -+ free(report->value); - -- report->value = g_memdup(pdu, len); -+ report->value = util_memdup(pdu, len); - report->len = len; - } - -@@ -1217,7 +1217,7 @@ static void report_free(void *data) - { - struct report *report = data; - -- g_free(report->value); -+ free(report->value); - g_free(report); - } - -@@ -1241,7 +1241,7 @@ static void hog_free(void *data) - bt_uhid_unref(hog->uhid); - g_slist_free_full(hog->reports, report_free); - g_free(hog->name); -- g_free(hog->primary); -+ free(hog->primary); - queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); - if (hog->gatt_db) - gatt_db_unref(hog->gatt_db); -@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) - struct bt_hog *instance; - - if (!hog->primary) { -- hog->primary = g_memdup(primary, sizeof(*primary)); -+ hog->primary = util_memdup(primary, sizeof(*primary)); - discover_char(hog, hog->attrib, primary->range.start, - primary->range.end, NULL, - char_discovered_cb, hog); -@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) - if (!instance) - return; - -- instance->primary = g_memdup(primary, sizeof(*primary)); -+ instance->primary = util_memdup(primary, sizeof(*primary)); - find_included(instance, hog->attrib, primary->range.start, - primary->range.end, find_included_cb, instance); - -diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c -index da38a6aaa..4be8b26cc 100644 ---- a/profiles/scanparam/scpp.c -+++ b/profiles/scanparam/scpp.c -@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) - { - bt_scpp_detach(scan); - -- g_free(scan->primary); -+ free(scan->primary); - queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ - g_free(scan); - } -@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) - scan->gatt_op = queue_new(); - - if (primary) -- scan->primary = g_memdup(primary, sizeof(*scan->primary)); -+ scan->primary = util_memdup(primary, sizeof(*scan->primary)); - - return bt_scpp_ref(scan); - } -diff --git a/src/eir.c b/src/eir.c -index 0f5d14fcd..2f9ee036f 100644 ---- a/src/eir.c -+++ b/src/eir.c -@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) - eir->services = NULL; - g_free(eir->name); - eir->name = NULL; -- g_free(eir->hash); -+ free(eir->hash); - eir->hash = NULL; -- g_free(eir->randomizer); -+ free(eir->randomizer); - eir->randomizer = NULL; - g_slist_free_full(eir->msd_list, g_free); - eir->msd_list = NULL; -@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) - case EIR_SSP_HASH: - if (data_len < 16) - break; -- eir->hash = g_memdup(data, 16); -+ eir->hash = util_memdup(data, 16); - break; - - case EIR_SSP_RANDOMIZER: - if (data_len < 16) - break; -- eir->randomizer = g_memdup(data, 16); -+ eir->randomizer = util_memdup(data, 16); - break; - - case EIR_DEVICE_ID: -diff --git a/tools/gatt-service.c b/tools/gatt-service.c -index 631c4f249..ed6b06f1e 100644 ---- a/tools/gatt-service.c -+++ b/tools/gatt-service.c -@@ -26,6 +26,7 @@ - #include "gdbus/gdbus.h" - - #include "src/error.h" -+#include "src/shared/util.h" - - #define GATT_MGR_IFACE "org.bluez.GattManager1" - #define GATT_SERVICE_IFACE "org.bluez.GattService1" -@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, - - static void desc_write(struct descriptor *desc, const uint8_t *value, int len) - { -- g_free(desc->value); -- desc->value = g_memdup(value, len); -+ free(desc->value); -+ desc->value = util_memdup(value, len); - desc->vlen = len; - - g_dbus_emit_property_changed(connection, desc->path, -@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, - - static void chr_write(struct characteristic *chr, const uint8_t *value, int len) - { -- g_free(chr->value); -- chr->value = g_memdup(value, len); -+ free(chr->value); -+ chr->value = util_memdup(value, len); - chr->vlen = len; - - g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, -@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) - - g_free(chr->uuid); - g_free(chr->service); -- g_free(chr->value); -+ free(chr->value); - g_free(chr->path); - g_free(chr); - } -@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) - struct descriptor *desc = user_data; - - g_free(desc->uuid); -- g_free(desc->value); -+ free(desc->value); - g_free(desc->path); - g_free(desc); - } -@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, - - chr = g_new0(struct characteristic, 1); - chr->uuid = g_strdup(chr_uuid); -- chr->value = g_memdup(value, vlen); -+ chr->value = util_memdup(value, vlen); - chr->vlen = vlen; - chr->props = props; - chr->service = g_strdup(service_path); -diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c -index c8a8123fb..ab9743cd1 100644 ---- a/tools/mesh-gatt/gatt.c -+++ b/tools/mesh-gatt/gatt.c -@@ -24,6 +24,7 @@ - - #include "src/shared/io.h" - #include "src/shared/shell.h" -+#include "src/shared/util.h" - #include "gdbus/gdbus.h" - #include "lib/bluetooth.h" - #include "lib/uuid.h" -@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) - { - struct write_data *data = user_data; - -- g_free(data->gatt_data); -+ free(data->gatt_data); - free(data); - } - -@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, - /* TODO: should keep in queue in case we need to cancel write? */ - - data->gatt_len = len; -- data->gatt_data = g_memdup(buf, len); -+ data->gatt_data = util_memdup(buf, len); - data->gatt_data[0] &= GATT_TYPE_MASK; - data->iov.iov_base = data->gatt_data; - data->iov.iov_len = len; -diff --git a/unit/test-avctp.c b/unit/test-avctp.c -index fa7db59c8..25fd3abc2 100644 ---- a/unit/test-avctp.c -+++ b/unit/test-avctp.c -@@ -53,7 +53,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -64,7 +64,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c -index 4e8a68c6b..2e49def43 100644 ---- a/unit/test-avdtp.c -+++ b/unit/test-avdtp.c -@@ -48,7 +48,7 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -56,7 +56,7 @@ struct test_data { - { \ - .valid = true, \ - .fragmented = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -67,7 +67,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c -index 34a70377d..b637a8a1b 100644 ---- a/unit/test-avrcp.c -+++ b/unit/test-avrcp.c -@@ -61,7 +61,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -69,7 +69,7 @@ struct context { - { \ - .valid = true, \ - .browse = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -77,7 +77,7 @@ struct context { - { \ - .valid = true, \ - .fragmented = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -85,7 +85,7 @@ struct context { - { \ - .valid = true, \ - .continuing = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -96,7 +96,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-gatt.c b/unit/test-gatt.c -index 6a47268e6..f92d860c4 100644 ---- a/unit/test-gatt.c -+++ b/unit/test-gatt.c -@@ -73,7 +73,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -94,7 +94,7 @@ struct context { - data.uuid = bt_uuid; \ - data.step = test_step; \ - data.source_db = db; \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-hfp.c b/unit/test-hfp.c -index f504724d7..b4af99d53 100644 ---- a/unit/test-hfp.c -+++ b/unit/test-hfp.c -@@ -17,6 +17,7 @@ - #include - #include "src/shared/hfp.h" - #include "src/shared/tester.h" -+#include "src/shared/util.h" - - struct context { - guint watch_id; -@@ -50,7 +51,7 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -62,7 +63,7 @@ struct test_data { - #define type_pdu(cmd_type, args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - .type = cmd_type, \ - } -@@ -70,7 +71,7 @@ struct test_data { - #define frg_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - .fragmented = true, \ - } -@@ -82,7 +83,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - data.result_func = result_function; \ - tester_add(name, &data, NULL, function, NULL); \ - data.test_handler = test_handler; \ -@@ -96,7 +97,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - data.hf_result_func = result_func; \ - data.response_func = response_function; \ - tester_add(name, &data, NULL, function, NULL); \ -diff --git a/unit/test-hog.c b/unit/test-hog.c -index 116a5cb07..067497de4 100644 ---- a/unit/test-hog.c -+++ b/unit/test-hog.c -@@ -59,24 +59,24 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - --#define false_pdu() \ --{ \ -- .valid = false, \ -+#define false_pdu() \ -+{ \ -+ .valid = false, \ - } - --#define define_test(name, function, args...) \ -- do { \ -- const struct test_pdu pdus[] = { \ -- args, { } \ -- }; \ -- static struct test_data data; \ -- data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -- tester_add(name, &data, NULL, function, NULL); \ -+#define define_test(name, function, args...) \ -+ do { \ -+ const struct test_pdu pdus[] = { \ -+ args, { } \ -+ }; \ -+ static struct test_data data; \ -+ data.test_name = g_strdup(name); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ -+ tester_add(name, &data, NULL, function, NULL); \ - } while (0) - - static gboolean context_quit(gpointer user_data) -diff --git a/unit/test-sdp.c b/unit/test-sdp.c -index 8f95fcb71..5c04a71eb 100644 ---- a/unit/test-sdp.c -+++ b/unit/test-sdp.c -@@ -47,14 +47,16 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ -+ .raw_data = util_memdup(raw_data(args), \ -+ sizeof(raw_data(args))), \ - .raw_size = sizeof(raw_data(args)), \ - } - - #define raw_pdu_cont(cont, args...) \ - { \ - .valid = true, \ -- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ -+ .raw_data = util_memdup(raw_data(args), \ -+ sizeof(raw_data(args))), \ - .raw_size = sizeof(raw_data(args)), \ - .cont_len = cont, \ - } -@@ -66,7 +68,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.mtu = _mtu; \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, test_sdp, NULL); \ - } while (0) - -@@ -92,7 +94,7 @@ struct test_data_de { - #define define_test_de_attr(name, input, exp) \ - do { \ - static struct test_data_de data; \ -- data.input_data = g_memdup(input, sizeof(input)); \ -+ data.input_data = util_memdup(input, sizeof(input)); \ - data.input_size = sizeof(input); \ - data.expected = exp; \ - tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ -diff --git a/unit/test-uhid.c b/unit/test-uhid.c -index 001d39a3d..8a8eef855 100644 ---- a/unit/test-uhid.c -+++ b/unit/test-uhid.c -@@ -61,7 +61,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - --- -2.17.1 - diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch deleted file mode 100644 index 13033da7b2..0000000000 --- a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch +++ /dev/null @@ -1,312 +0,0 @@ -From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Feb 2022 21:17:39 +0100 -Subject: build: Fix errors with glibc < 2.25 - -getrandom and sys/random.h are only available since glibc 2.25: -https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html -resulting in the following build failures since version 5.63 and -https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: - -plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory - #include - ^ - -To fix this build failure, add util_getrandom and a fallback (borrowed -from pipewire and licensed under MIT): -https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c - -Fixes: - - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 - -[Retrieved from: -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 +++- - emulator/le.c | 3 +-- - emulator/phy.c | 3 +-- - peripheral/main.c | 4 ++-- - plugins/autopair.c | 4 ++-- - profiles/health/hdp.c | 4 ++-- - profiles/health/mcap.c | 6 +++--- - src/shared/util.c | 25 +++++++++++++++++++++++++ - src/shared/util.h | 2 ++ - tools/btgatt-server.c | 3 +-- - 10 files changed, 42 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 07d068a4d..441bd5f29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], - - AC_CHECK_FUNCS(explicit_bzero) - -+AC_CHECK_FUNCS(getrandom) -+ - AC_CHECK_FUNCS(rawmemchr) - - AC_CHECK_FUNC(signalfd, dummy=yes, -@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, - AC_CHECK_LIB(dl, dlopen, dummy=yes, - AC_MSG_ERROR(dynamic linking loader is required)) - --AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) -+AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) - - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, - AC_MSG_ERROR(GLib >= 2.28 is required)) -diff --git a/emulator/le.c b/emulator/le.c -index f8f313f2c..7656a657c 100644 ---- a/emulator/le.c -+++ b/emulator/le.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include - - #include "lib/bluetooth.h" -@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) - /* The advertising delay is a pseudo-random value with a range - * of 0 ms to 10 ms generated for each advertising event. - */ -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - /* If it fails to get the random number, use a static value */ - val = 5; - } -diff --git a/emulator/phy.c b/emulator/phy.c -index 44cace438..7de85fb05 100644 ---- a/emulator/phy.c -+++ b/emulator/phy.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) - mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); - - if (!get_random_bytes(&phy->id, sizeof(phy->id))) { -- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { -+ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { - mainloop_remove_fd(phy->rx_fd); - close(phy->tx_fd); - close(phy->rx_fd); -diff --git a/peripheral/main.c b/peripheral/main.c -index 91adb45fc..b82d7caf6 100644 ---- a/peripheral/main.c -+++ b/peripheral/main.c -@@ -25,13 +25,13 @@ - #include - #include - #include --#include - - #ifndef WAIT_ANY - #define WAIT_ANY (-1) - #endif - - #include "src/shared/mainloop.h" -+#include "src/shared/util.h" - #include "peripheral/efivars.h" - #include "peripheral/attach.h" - #include "peripheral/gap.h" -@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) - addr, 6) < 0) { - printf("Generating new persistent static address\n"); - -- if (getrandom(addr, sizeof(addr), 0) < 0) { -+ if (util_getrandom(addr, sizeof(addr), 0) < 0) { - perror("Failed to get random static address"); - return EXIT_FAILURE; - } -diff --git a/plugins/autopair.c b/plugins/autopair.c -index a75ecebe4..0b09e893f 100644 ---- a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - - #include - -@@ -29,6 +28,7 @@ - #include "src/device.h" - #include "src/log.h" - #include "src/storage.h" -+#include "src/shared/util.h" - - /* - * Plugin to handle automatic pairing of devices with reduced user -@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - if (attempt >= 4) - return 0; - -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - error("Failed to get a random pincode"); - return 0; - } -diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c -index 9d9d1e824..b6590cd3a 100644 ---- a/profiles/health/hdp.c -+++ b/profiles/health/hdp.c -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - - #include - -@@ -33,6 +32,7 @@ - #include "src/device.h" - #include "src/sdpd.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - #include "btio/btio.h" - - #include "hdp_types.h" -@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) - if (!buf) - return NULL; - -- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { -+ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { - g_free(buf); - return NULL; - } -diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c -index aad0a08a3..5d2bac3d9 100644 ---- a/profiles/health/mcap.c -+++ b/profiles/health/mcap.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - - #include - -@@ -28,6 +27,7 @@ - #include "btio/btio.h" - #include "src/log.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #include "mcap.h" - -@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, - mcl->state = MCL_IDLE; - bacpy(&mcl->addr, addr); - set_default_cb(mcl); -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - mcap_instance_unref(mcl->mi); - g_free(mcl); - return FALSE; -@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, - mcl->mi = mcap_instance_ref(mi); - bacpy(&mcl->addr, &dst); - set_default_cb(mcl); -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - mcap_instance_unref(mcl->mi); - g_free(mcl); - goto drop; -diff --git a/src/shared/util.c b/src/shared/util.c -index 6e1c83057..33196bf8b 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -13,6 +13,7 @@ - #endif - - #define _GNU_SOURCE -+#include - #include - #include - #include -@@ -23,6 +24,10 @@ - #include - #include - -+#ifdef HAVE_SYS_RANDOM_H -+#include -+#endif -+ - #include "src/shared/util.h" - - void *util_malloc(size_t size) -@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) - return DT_UNKNOWN; - } - -+/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ -+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) -+{ -+#ifdef HAVE_GETRANDOM -+ return getrandom(buf, buflen, flags); -+#else -+ int fd; -+ ssize_t bytes; -+ -+ fd = open("/dev/urandom", O_CLOEXEC); -+ if (fd < 0) -+ return -1; -+ -+ bytes = read(fd, buf, buflen); -+ close(fd); -+ -+ return bytes; -+#endif -+} -+ - /* Helpers for bitfield operations */ - - /* Find unique id in range from 1 to max but no bigger than 64. */ -diff --git a/src/shared/util.h b/src/shared/util.h -index 8ef6132c4..c01eccf8a 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, - - unsigned char util_get_dt(const char *parent, const char *name); - -+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); -+ - uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); - void util_clear_uid(uint64_t *bitmap, uint8_t id); - -diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c -index 15d49a464..4a5d2b720 100644 ---- a/tools/btgatt-server.c -+++ b/tools/btgatt-server.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - - #include "lib/bluetooth.h" - #include "lib/hci.h" -@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) - uint32_t cur_ee; - uint32_t val; - -- if (getrandom(&val, sizeof(val), 0) < 0) -+ if (util_getrandom(&val, sizeof(val), 0) < 0) - return false; - - pdu[0] = 0x06; --- -cgit - diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch deleted file mode 100644 index 8a5bd64d43..0000000000 --- a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 24 Feb 2022 18:19:33 +0100 -Subject: [PATCH] src/shared/util.h: include sys/types.h - -Include sys/types.h to avoid the following build failure on musl raised -since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: - -In file included from src/shared/queue.c:15: -./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); - | ^~~~~~~ - | size_t - -Fixes: - - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] ---- - src/shared/util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/util.h b/src/shared/util.h -index c01eccf8a..554481e1e 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - #define BIT(n) (1 << (n)) --- -2.34.1 - diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index a8f5399fa6..0324dd2d77 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz +sha256 ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 bluez-5.64.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 3d76cfb7dc..8e2c657899 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.63 +BLUEZ5_UTILS_VERSION = 5.64 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -13,8 +13,6 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez -# We're patching Makefile.am and configure.ac -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 11:59:56 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 12:59:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/openvpn: security bump version to 2.5.6 Message-ID: <20220320115956.3242683-1-bernd.kuhls@t-online.de> Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:04:28 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:04:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 14.2 Message-ID: <20220320120428.3294529-1-bernd.kuhls@t-online.de> Release notes: https://www.postgresql.org/docs/release/14.2/ Updated license hash due to copyright year bump: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e Signed-off-by: Bernd Kuhls --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c2017a1226..2ba3b07563 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2.sha256 +sha256 2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a postgresql-14.2.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c..c389246f80 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 14.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:17:08 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:17:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.6 Message-ID: <20220320121708.3679262-1-bernd.kuhls@t-online.de> Release notes: https://www.samba.org/samba/history/samba-4.15.6.html Added new answer to samba4-cache.txt needed due to upstream commit: https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc Signed-off-by: Bernd Kuhls --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e..d95776a03e 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37..20e5f00b21 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.6.tar.asc +sha256 0575b999a9048445820428dc540ba8a9527ce596fa66af02ea2ba1ea9578bcb4 samba-4.15.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742..688aaac3eb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.15.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:18:36 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:18:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-waipu: bump version to 19.2.0-Matrix Message-ID: <20220320121836.3682323-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 9411453bf0..d40a068cb5 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab4995ed32910ced6004da800ca05fe5bf2d1882277e835eb64343806cfe217d kodi-pvr-waipu-19.1.1-Matrix.tar.gz +sha256 4c5ad45ba869c8064a0d64d7fc5c0a2e0c9f47f51184823872d6cd888ab7b2a0 kodi-pvr-waipu-19.2.0-Matrix.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index ffe9e31e5a..61c5bd67ae 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 19.1.1-Matrix +KODI_PVR_WAIPU_VERSION = 19.2.0-Matrix KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:28:00 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:28:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.17 Message-ID: <20220320122800.430173-1-bernd.kuhls@t-online.de> Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 Signed-off-by: Bernd Kuhls --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb..3d73e60f90 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5 php-8.0.17.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94..6454d6fe87 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.0.17 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:33:54 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:33:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.29 Message-ID: <20220320123354.443457-1-bernd.kuhls@t-online.de> Updated license hash due to OpenBSD-related upstream commit: https://sourceforge.net/p/fetchmail/git/ci/c4419bdd2557321b268f6e105d511923b9a35936/ Signed-off-by: Bernd Kuhls --- package/fetchmail/fetchmail.hash | 6 +++--- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3d4c3da3dc..5ff129b9a8 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37388106/ -sha256 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf fetchmail-6.4.24.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37628013/ +sha256 397df984082abae51edec6831700d68636f0e117cfaffcbdd3eed66d04b97321 fetchmail-6.4.29.tar.xz # Locally computed: -sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING +sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 7d6be71954..b97f01a423 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).24 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).29 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:38:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:38:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libks: bump version to 1.8.0 Message-ID: <20220320123816.556069-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/libks/libks.hash | 2 +- package/libks/libks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index 5acbcd1ea6..d4ad7ebbbc 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz +sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index adf0107b30..4aca5c5c4c 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.7.0 +LIBKS_VERSION = 1.8.0 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:42:39 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:42:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.8 Message-ID: <20220320124239.655081-1-bernd.kuhls@t-online.de> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 736dedc25e..760c5368e5 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.7 +MESA3D_HEADERS_VERSION = 21.3.8 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b680411051..5b74e14fef 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html -sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz -sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html +sha256 e70d273bdc53a4e931871bb5550ba3900e6a3deab2fff64184107c33e92d9da7 mesa-21.3.8.tar.xz +sha512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d0b12932c4..9f375edc1f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.7 +MESA3D_VERSION = 21.3.8 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.30.2 From bernd.kuhls at t-online.de Sun Mar 20 12:48:46 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sun, 20 Mar 2022 13:48:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/sqlite: bump to version 3.38.1 Message-ID: <20220320124846.664904-1-bernd.kuhls@t-online.de> Release notes: https://sqlite.org/releaselog/3_38_1.html Signed-off-by: Bernd Kuhls --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index deb8d4c14c..1b3dc35ccb 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz +sha256 8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4 sqlite-autoconf-3380100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b702139f6c..a0c90b7f62 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.2 -SQLITE_TAR_VERSION = 3370200 +SQLITE_VERSION = 3.38.1 +SQLITE_TAR_VERSION = 3380100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain -- 2.30.2 From angelo at amarulasolutions.com Sun Mar 20 13:14:51 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Sun, 20 Mar 2022 14:14:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: <20220316060219.3448648-1-james.hilliard1@gmail.com> References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Wed, Mar 16, 2022 at 7:02 AM James Hilliard wrote: > Currently pillow doesn't correctly search pkg-config system paths > for some libraries which can prevent some libraries from being > properly detected/enabled in pillow. > > Signed-off-by: James Hilliard > Tested-by: Angelo Compagnucci > --- > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ > package/python-pillow/python-pillow.mk | 23 +++---------- > 2 files changed, 37 insertions(+), 19 deletions(-) > create mode 100644 > package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > diff --git > a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > new file mode 100644 > index 0000000000..9f979b048f > --- /dev/null > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > @@ -0,0 +1,33 @@ > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > +Subject: [PATCH] Search pkg-config system libs/cflags. > + > +We need to search the system paths as well from pkg-config for > +some packages to be found properly. > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/python-pillow/Pillow/pull/6138] > +--- > + setup.py | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index 3468b260..59d65ce2 100755 > +--- a/setup.py > ++++ b/setup.py > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > + def _pkg_config(name): > + try: > + command = os.environ.get("PKG_CONFIG", "pkg-config") > +- command_libs = [command, "--libs-only-L", name] > +- command_cflags = [command, "--cflags-only-I", name] > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", > name] > ++ command_cflags = [command, "--cflags-only-I", > "--keep-system-cflags", name] > + if not DEBUG: > + command_libs.append("--silence-errors") > + command_cflags.append("--silence-errors") > +-- > +2.35.1 > + > diff --git a/package/python-pillow/python-pillow.mk > b/package/python-pillow/python-pillow.mk > index 901876e0ee..ef677855b2 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > PYTHON_PILLOW_CPE_ID_VENDOR = python > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" > + > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > @@ -68,22 +71,4 @@ else > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > endif > > -define PYTHON_PILLOW_BUILD_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) > $(PYTHON_PILLOW_BUILD_OPTS) > -endef > - > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > -endef > - > $(eval $(python-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Sun Mar 20 15:16:49 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:16:49 +0100 Subject: [Buildroot] [PATCH 2021.02.x] DEVELOPERS: drop libqrtr-glib from Yegor Yefremov Message-ID: <20220320151649.767880-1-thomas.petazzoni@bootlin.com> Commit 73ce754531b5e45bd42b56c58718fbacc754406f in master added the libqrtr-glib package to Yegor Yefremov. This commit was backported as fad154253deb5b5399ea52a19ed6608dcd00ee4d in the LTS 2021.02.x branch, but this branch does not have the libqrtr-glib package, as it was added after 2021.02. Due to this, the DEVELOPERS file is bogus in 2021.02.x, which causes the following warning when running pkg-stats: WARNING: 'package/libqrtr-glib/' doesn't match any file This commit fixes this by dropping the bogus line from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index fad5c13844..3397565457 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2755,7 +2755,6 @@ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ F: package/libqmi/ -F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ -- 2.35.1 From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:42 +0100 Subject: [Buildroot] [git commit] package/fetchmail: bump version to 6.4.29 Message-ID: <20220320152913.CF8198452C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba6fd52195f2e3d0b04baae40cfe084226824d31 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Updated license hash due to OpenBSD-related upstream commit: https://sourceforge.net/p/fetchmail/git/ci/c4419bdd2557321b268f6e105d511923b9a35936/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fetchmail/fetchmail.hash | 6 +++--- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3d4c3da3dc..5ff129b9a8 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37388106/ -sha256 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf fetchmail-6.4.24.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37628013/ +sha256 397df984082abae51edec6831700d68636f0e117cfaffcbdd3eed66d04b97321 fetchmail-6.4.29.tar.xz # Locally computed: -sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING +sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 7d6be71954..b97f01a423 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).24 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).29 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:39 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:39 +0100 Subject: [Buildroot] [git commit] package/kodi-pvr-waipu: bump version to 19.2.0-Matrix Message-ID: <20220320152913.BDACC84529@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27c0f4532aed6dc4dcf6ddec697a5341d184e163 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 9411453bf0..d40a068cb5 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ab4995ed32910ced6004da800ca05fe5bf2d1882277e835eb64343806cfe217d kodi-pvr-waipu-19.1.1-Matrix.tar.gz +sha256 4c5ad45ba869c8064a0d64d7fc5c0a2e0c9f47f51184823872d6cd888ab7b2a0 kodi-pvr-waipu-19.2.0-Matrix.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index ffe9e31e5a..61c5bd67ae 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 19.1.1-Matrix +KODI_PVR_WAIPU_VERSION = 19.2.0-Matrix KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:35 +0100 Subject: [Buildroot] [git commit] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64 Message-ID: <20220320152913.9828684529@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a0d806dea6bc03ba1464152142baa8b6fd0f2a61 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed all patches after being applied upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- .../0001-tools-mesh-cfgtest-include-limits.h.patch | 33 - ...red-util-Rename-btd_malloc-to-util_malloc.patch | 67 - .../0003-shared-util-Add-util_memdup.patch | 57 - ...-Replace-use-of-g_memdup-with-util_memdup.patch | 1411 -------------------- .../0005-build-Fix-errors-with-glibc-2-25.patch | 312 ----- ...006-src-shared-util.h-include-sys-types.h.patch | 39 - package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +- 9 files changed, 3 insertions(+), 1924 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:44 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 21.3.8 Message-ID: <20220320152913.E136A8452E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=996f43f734282c6e92d751acae757612fbce66fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 736dedc25e..760c5368e5 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.7 +MESA3D_HEADERS_VERSION = 21.3.8 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b680411051..5b74e14fef 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000664.html -sha256 b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d mesa-21.3.7.tar.xz -sha512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88 mesa-21.3.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html +sha256 e70d273bdc53a4e931871bb5550ba3900e6a3deab2fff64184107c33e92d9da7 mesa-21.3.8.tar.xz +sha512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d0b12932c4..9f375edc1f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.7 +MESA3D_VERSION = 21.3.8 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:36 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:36 +0100 Subject: [Buildroot] [git commit] package/openvpn: security bump version to 2.5.6 Message-ID: <20220320152913.A163E82B3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9c448a016f07951a41e5c0938e3dbd8630a704b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:43 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:43 +0100 Subject: [Buildroot] [git commit] package/libks: bump version to 1.8.0 Message-ID: <20220320152913.D830684529@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=065750ee0c2a5e0dc217d82d17d7103ab5f22351 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libks/libks.hash | 2 +- package/libks/libks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libks/libks.hash b/package/libks/libks.hash index 5acbcd1ea6..d4ad7ebbbc 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz +sha256 b42544a5544ac00ceeb0675a9e6a99c8e6ecc752452c7f38c6ffe32fbedb906d libks-1.8.0.tar.gz sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index adf0107b30..4aca5c5c4c 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.7.0 +LIBKS_VERSION = 1.8.0 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:41 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.0.17 Message-ID: <20220320152913.C66328452C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff867be0302b0abbb629a751eabf45c7a7b218fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb..3d73e60f90 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5 php-8.0.17.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94..6454d6fe87 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.0.17 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:38 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.15.6 Message-ID: <20220320152913.B3A3E8452F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3eea7df286004430844bc9bd1d9b6c449b877d96 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.15.6.html Added new answer to samba4-cache.txt needed due to upstream commit: https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e..d95776a03e 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37..20e5f00b21 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.6.tar.asc +sha256 0575b999a9048445820428dc540ba8a9527ce596fa66af02ea2ba1ea9578bcb4 samba-4.15.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742..688aaac3eb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.15.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:37 +0100 Subject: [Buildroot] [git commit] package/postgresql: bump version to 14.2 Message-ID: <20220320152913.A9CA98452E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e8c436902bfac25074677858853f23d40bca8c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.postgresql.org/docs/release/14.2/ Updated license hash due to copyright year bump: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c2017a1226..2ba3b07563 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2.sha256 +sha256 2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a postgresql-14.2.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c..c389246f80 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 14.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From thomas.petazzoni at bootlin.com Sun Mar 20 15:24:45 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 16:24:45 +0100 Subject: [Buildroot] [git commit] package/sqlite: bump to version 3.38.1 Message-ID: <20220320152913.E9CF98452C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c9af74adcaf572fab40f788127d2e9cda191d91c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://sqlite.org/releaselog/3_38_1.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index deb8d4c14c..1b3dc35ccb 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz +sha256 8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4 sqlite-autoconf-3380100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b702139f6c..a0c90b7f62 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.2 -SQLITE_TAR_VERSION = 3370200 +SQLITE_VERSION = 3.38.1 +SQLITE_TAR_VERSION = 3380100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From fontaine.fabrice at gmail.com Sun Mar 20 15:47:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 16:47:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads Message-ID: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> Fix the following build failure without threads and openvpn raised since commit 0199dc161769e5f28e9aebc634230ece08ff5008: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' Fixes: - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e Signed-off-by: Fabrice Fontaine --- ...h-core.c-fix-build-without-slotevent.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch new file mode 100644 index 0000000000..5b2829c5ca --- /dev/null +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch @@ -0,0 +1,37 @@ +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Mar 2022 08:50:15 +0100 +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent + +Fix the following build failure with --disable-slotevent: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' + +Fixes: + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] +--- + lib/pkcs11h-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c +index d7bb4cd..0bf11e8 100644 +--- a/lib/pkcs11h-core.c ++++ b/lib/pkcs11h-core.c +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( + + switch (property) { + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: ++#if defined(ENABLE_PKCS11H_SLOTEVENT) + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { + goto cleanup; + } ++#endif + break; + } + cleanup: +-- +2.35.1 + -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:20:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:20:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: hid and hog needs headers >= 3.18 Message-ID: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> Fix the following build failure with hid and hog raised since their addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd because UHID_GET_REPORT is only available since kernel 3.18 and https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: profiles/input/device.c: In function 'uhid_send_get_report_reply': profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' if (size > sizeof(ev.u.get_report_reply.data)) ^ profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' size = sizeof(ev.u.get_report_reply.data); ^ profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) ev.type = UHID_GET_REPORT_REPLY; ^ Fixes: - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 Signed-off-by: Fabrice Fontaine --- package/bluez5_utils/Config.in | 16 ++++++++++++++++ package/brltty/Config.in | 2 +- package/cwiid/Config.in | 6 +++--- package/kodi/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced..49bb719102 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e20..3527df6161 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac9405..7e8cdc3086 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on !BR2_USE_MMU diff --git a/package/kodi/Config.in b/package/kodi/Config.in index c8e1e5d0ed..4c6e01745c 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf058..319415754a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:39:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:39:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:58:01 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:58:01 +0100 Subject: [Buildroot] [PATCH 1/2] package/snmppp: bump to version 3.4.9 Message-ID: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> Update hash of src/v3.cpp, update in year and "Frank Fock" added: - _## SNMP++ v3.3 + _## SNMP++ v3.4 - _## Copyright (c) 2001-2013 Jochen Katz, Frank Fock + _## Copyright (c) 2001-2021 Jochen Katz, Frank Fock - _## Hewlett-Packard and Jochen Katz make no representations about the - _## suitability of this software for any purpose. It is provided + _## Hewlett-Packard, Frank Fock, and Jochen Katz make no representations + _## about the suitability of this software for any purpose. It is provided https://www.agentpp.com/download/changes_snmp++v3.txt Signed-off-by: Fabrice Fontaine --- package/snmppp/snmppp.hash | 4 ++-- package/snmppp/snmppp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 2dcf836fc7..db3a4b5f4f 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz -sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp +sha256 7c0aaf4ea21db082453f880cc2062a86dcbbf0ee6c8d47c72beb8e0c77c26b6c snmp++-3.4.9.tar.gz +sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 601e28e207..bc05cad583 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.2 +SNMPPP_VERSION = 3.4.9 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 16:58:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 17:58:02 +0100 Subject: [Buildroot] [PATCH 2/2] package/agentpp: bump to version 4.5.3 In-Reply-To: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> References: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> Message-ID: <20220320165802.1584746-2-fontaine.fabrice@gmail.com> Drop patch (not needed anymore): "Fixed: Allow compilation without _SNMPv3 defined." https://agentpp.com/download/changes_agent++.txt Signed-off-by: Fabrice Fontaine --- ...01-Fix-build-when-SNMPv3-is-disabled.patch | 102 ------------------ package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch diff --git a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch b/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch deleted file mode 100644 index f16c2b4b77..0000000000 --- a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 14 Jul 2020 10:30:10 +0200 -Subject: [PATCH] Fix build when SNMPv3 is disabled - -agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it -is missing one and it has a few ones in excess. Fix them. - -Upstream is aware, says "will fix in later version", but thinks to make v3 -mandatory. See discussion at -https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 - -Upstream status: none, upstream is not welcoming contributions. - -Signed-off-by: Luca Ceresoli ---- - include/agent_pp/notification_log_mib.h | 4 ++-- - include/agent_pp/notification_originator.h | 2 ++ - include/agent_pp/snmp_community_mib.h | 4 ++-- - src/notification_originator.cpp | 2 ++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h -index ddac05e515d9..8fd8cfec32ca 100644 ---- a/include/agent_pp/notification_log_mib.h -+++ b/include/agent_pp/notification_log_mib.h -@@ -22,7 +22,7 @@ - - //--AgentGen BEGIN=_BEGIN - #include --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - #include - //--AgentGen END - -@@ -688,6 +688,6 @@ protected: - */ - - --#endif -+// #endif // _SNMPv3 - - -diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h -index 95e8b4e1836d..6f50cd52625b 100644 ---- a/include/agent_pp/notification_originator.h -+++ b/include/agent_pp/notification_originator.h -@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { - */ - virtual nlmLogEntry* get_nlm_log_entry(); - -+#ifdef _SNMPv3 - virtual v3MP* get_v3mp(); -+#endif - - protected: - -diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h -index 7d5c4558f36d..d9eb2b4a87ec 100644 ---- a/include/agent_pp/snmp_community_mib.h -+++ b/include/agent_pp/snmp_community_mib.h -@@ -49,7 +49,7 @@ namespace Agentpp { - #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" - #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" - --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - - /** - * snmpCommunityName -@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup - static void add_public(); - static void add_public(Mib* mib); - }; --#endif -+// #endif // _SNMPv3 - - #ifdef AGENTPP_NAMESPACE - } -diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp -index d7d566869998..39ddbe08cdeb 100644 ---- a/src/notification_originator.cpp -+++ b/src/notification_originator.cpp -@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { - return nlmLogEntry::instance; - } - -+#ifdef _SNMPv3 - v3MP* NotificationOriginator::get_v3mp() { - if (mib) { - return mib->get_request_list()->get_v3mp(); -@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { - return v3MP::I; - } - } -+#endif - - - bool NotificationOriginator::check_access(ListCursor& cur, --- -2.27.0 - diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 11b23c8ee2..f8399963e5 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 bcfc014cc7ce37afdd6eefb71b59f1eabf23984525905546aa363c2a2c498c79 agent++-4.5.3.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 8982d9e564..f30e75ef9c 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.3.1 +AGENTPP_VERSION = 4.5.3 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 -- 2.35.1 From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:34 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64 In-Reply-To: <20220320115401.3214796-1-bernd.kuhls@t-online.de> References: <20220320115401.3214796-1-bernd.kuhls@t-online.de> Message-ID: <20220320180334.131f2728@windsurf> On Sun, 20 Mar 2022 12:54:01 +0100 Bernd Kuhls wrote: > Removed all patches after being applied upstream: > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a > > Signed-off-by: Bernd Kuhls > --- > .../bluez5_utils-headers.mk | 2 +- > ...-tools-mesh-cfgtest-include-limits.h.patch | 33 - > ...til-Rename-btd_malloc-to-util_malloc.patch | 67 - > .../0003-shared-util-Add-util_memdup.patch | 57 - > ...ace-use-of-g_memdup-with-util_memdup.patch | 1411 ----------------- > ...005-build-Fix-errors-with-glibc-2-25.patch | 312 ---- > ...rc-shared-util.h-include-sys-types.h.patch | 39 - > package/bluez5_utils/bluez5_utils.hash | 2 +- > package/bluez5_utils/bluez5_utils.mk | 4 +- > 9 files changed, 3 insertions(+), 1924 deletions(-) > delete mode 100644 package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch > delete mode 100644 package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch > delete mode 100644 package/bluez5_utils/0003-shared-util-Add-util_memdup.patch > delete mode 100644 package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch > delete mode 100644 package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch > delete mode 100644 package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:41 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 In-Reply-To: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> References: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Message-ID: <20220320180641.47f18a53@windsurf> On Sun, 20 Mar 2022 17:39:30 +0100 Fabrice Fontaine wrote: > Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may > allow privilege escalation during extension installation. The > installation process uses commands such as CREATE x IF NOT EXIST that > allow an unprivileged user to precreate objects. These objects will be > used by the installer (which executes as Superuser), leading to > privilege escalation. In order to be able to take advantage of this, an > unprivileged user would need to be able to create objects in a database > and then get a Superuser to install TimescaleDB into their database. (In > the fixed versions, the installation aborts when it finds that an object > already exists.) > > "This release contains bug fixes since the 2.5.1 release. > This release is high priority for upgrade. We strongly recommend that > you upgrade as soon as possible." > > https://github.com/timescale/timescaledb/releases/tag/2.5.2 > > Signed-off-by: Fabrice Fontaine > --- > package/timescaledb/timescaledb.hash | 2 +- > package/timescaledb/timescaledb.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:04:01 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:04:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.3.8 In-Reply-To: <20220320124239.655081-1-bernd.kuhls@t-online.de> References: <20220320124239.655081-1-bernd.kuhls@t-online.de> Message-ID: <20220320180401.7821503b@windsurf> On Sun, 20 Mar 2022 13:42:39 +0100 Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html > > Signed-off-by: Bernd Kuhls > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > package/mesa3d/mesa3d.hash | 6 +++--- > package/mesa3d/mesa3d.mk | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:40 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/openvpn: security bump version to 2.5.6 In-Reply-To: <20220320115956.3242683-1-bernd.kuhls@t-online.de> References: <20220320115956.3242683-1-bernd.kuhls@t-online.de> Message-ID: <20220320180340.24bcdbd3@windsurf> On Sun, 20 Mar 2022 12:59:56 +0100 Bernd Kuhls wrote: > Switched _SITE to https and _SOURCE to .gz because upstream does not > provide a .xz tarball anymore. > > Fixes CVE 2022-0547, changelog: > https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst > > Signed-off-by: Bernd Kuhls > --- > package/openvpn/openvpn.hash | 2 +- > package/openvpn/openvpn.mk | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:51 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.17 In-Reply-To: <20220320122800.430173-1-bernd.kuhls@t-online.de> References: <20220320122800.430173-1-bernd.kuhls@t-online.de> Message-ID: <20220320180351.0642ac99@windsurf> On Sun, 20 Mar 2022 13:28:00 +0100 Bernd Kuhls wrote: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 > > Signed-off-by: Bernd Kuhls > --- > package/php/php.hash | 2 +- > package/php/php.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:44 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/snmppp: bump to version 3.4.9 In-Reply-To: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> References: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> Message-ID: <20220320180644.1946a2e0@windsurf> On Sun, 20 Mar 2022 17:58:01 +0100 Fabrice Fontaine wrote: > Update hash of src/v3.cpp, update in year and "Frank Fock" added: > > - _## SNMP++ v3.3 > + _## SNMP++ v3.4 > - _## Copyright (c) 2001-2013 Jochen Katz, Frank Fock > + _## Copyright (c) 2001-2021 Jochen Katz, Frank Fock > - _## Hewlett-Packard and Jochen Katz make no representations about the > - _## suitability of this software for any purpose. It is provided > + _## Hewlett-Packard, Frank Fock, and Jochen Katz make no representations > + _## about the suitability of this software for any purpose. It is provided > > https://www.agentpp.com/download/changes_snmp++v3.txt > > Signed-off-by: Fabrice Fontaine > --- > package/snmppp/snmppp.hash | 4 ++-- > package/snmppp/snmppp.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:57 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libks: bump version to 1.8.0 In-Reply-To: <20220320123816.556069-1-bernd.kuhls@t-online.de> References: <20220320123816.556069-1-bernd.kuhls@t-online.de> Message-ID: <20220320180357.361e12f5@windsurf> On Sun, 20 Mar 2022 13:38:16 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/libks/libks.hash | 2 +- > package/libks/libks.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:47 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:47 +0100 Subject: [Buildroot] [PATCH 2/2] package/agentpp: bump to version 4.5.3 In-Reply-To: <20220320165802.1584746-2-fontaine.fabrice@gmail.com> References: <20220320165802.1584746-1-fontaine.fabrice@gmail.com> <20220320165802.1584746-2-fontaine.fabrice@gmail.com> Message-ID: <20220320180647.79245748@windsurf> On Sun, 20 Mar 2022 17:58:02 +0100 Fabrice Fontaine wrote: > Drop patch (not needed anymore): > "Fixed: Allow compilation without _SNMPv3 defined." > > https://agentpp.com/download/changes_agent++.txt > > Signed-off-by: Fabrice Fontaine > --- > ...01-Fix-build-when-SNMPv3-is-disabled.patch | 102 ------------------ > package/agentpp/agentpp.hash | 2 +- > package/agentpp/agentpp.mk | 2 +- > 3 files changed, 2 insertions(+), 104 deletions(-) > delete mode 100644 package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:53 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.29 In-Reply-To: <20220320123354.443457-1-bernd.kuhls@t-online.de> References: <20220320123354.443457-1-bernd.kuhls@t-online.de> Message-ID: <20220320180353.65a64989@windsurf> On Sun, 20 Mar 2022 13:33:54 +0100 Bernd Kuhls wrote: > Updated license hash due to OpenBSD-related upstream commit: > https://sourceforge.net/p/fetchmail/git/ci/c4419bdd2557321b268f6e105d511923b9a35936/ > > Signed-off-by: Bernd Kuhls > --- > package/fetchmail/fetchmail.hash | 6 +++--- > package/fetchmail/fetchmail.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:48 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-waipu: bump version to 19.2.0-Matrix In-Reply-To: <20220320121836.3682323-1-bernd.kuhls@t-online.de> References: <20220320121836.3682323-1-bernd.kuhls@t-online.de> Message-ID: <20220320180348.2e5ae37a@windsurf> On Sun, 20 Mar 2022 13:18:36 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- > package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:46 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.6 In-Reply-To: <20220320121708.3679262-1-bernd.kuhls@t-online.de> References: <20220320121708.3679262-1-bernd.kuhls@t-online.de> Message-ID: <20220320180346.34c2f8a4@windsurf> On Sun, 20 Mar 2022 13:17:08 +0100 Bernd Kuhls wrote: > Release notes: https://www.samba.org/samba/history/samba-4.15.6.html > > Added new answer to samba4-cache.txt needed due to upstream commit: > https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc > > Signed-off-by: Bernd Kuhls > --- > package/samba4/samba4-cache.txt | 1 + > package/samba4/samba4.hash | 4 ++-- > package/samba4/samba4.mk | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:04:04 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:04:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/sqlite: bump to version 3.38.1 In-Reply-To: <20220320124846.664904-1-bernd.kuhls@t-online.de> References: <20220320124846.664904-1-bernd.kuhls@t-online.de> Message-ID: <20220320180404.4e2f3ceb@windsurf> On Sun, 20 Mar 2022 13:48:46 +0100 Bernd Kuhls wrote: > Release notes: https://sqlite.org/releaselog/3_38_1.html > > Signed-off-by: Bernd Kuhls > --- > package/sqlite/sqlite.hash | 2 +- > package/sqlite/sqlite.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:03:42 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:03:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 14.2 In-Reply-To: <20220320120428.3294529-1-bernd.kuhls@t-online.de> References: <20220320120428.3294529-1-bernd.kuhls@t-online.de> Message-ID: <20220320180342.1596770d@windsurf> On Sun, 20 Mar 2022 13:04:28 +0100 Bernd Kuhls wrote: > Release notes: https://www.postgresql.org/docs/release/14.2/ > > Updated license hash due to copyright year bump: > https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e > > Signed-off-by: Bernd Kuhls > --- > package/postgresql/postgresql.hash | 6 +++--- > package/postgresql/postgresql.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:35 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:35 +0100 Subject: [Buildroot] [git commit] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220320165813.8F2A884550@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:38 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:38 +0100 Subject: [Buildroot] [git commit] package/agentpp: bump to version 4.5.3 Message-ID: <20220320165813.A1C4084552@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=343d7940a4bbdd89933a29f9470cead6ff481a28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (not needed anymore): "Fixed: Allow compilation without _SNMPv3 defined." https://agentpp.com/download/changes_agent++.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Fix-build-when-SNMPv3-is-disabled.patch | 102 --------------------- package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 3 files changed, 2 insertions(+), 104 deletions(-) diff --git a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch b/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch deleted file mode 100644 index f16c2b4b77..0000000000 --- a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 14 Jul 2020 10:30:10 +0200 -Subject: [PATCH] Fix build when SNMPv3 is disabled - -agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it -is missing one and it has a few ones in excess. Fix them. - -Upstream is aware, says "will fix in later version", but thinks to make v3 -mandatory. See discussion at -https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 - -Upstream status: none, upstream is not welcoming contributions. - -Signed-off-by: Luca Ceresoli ---- - include/agent_pp/notification_log_mib.h | 4 ++-- - include/agent_pp/notification_originator.h | 2 ++ - include/agent_pp/snmp_community_mib.h | 4 ++-- - src/notification_originator.cpp | 2 ++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h -index ddac05e515d9..8fd8cfec32ca 100644 ---- a/include/agent_pp/notification_log_mib.h -+++ b/include/agent_pp/notification_log_mib.h -@@ -22,7 +22,7 @@ - - //--AgentGen BEGIN=_BEGIN - #include --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - #include - //--AgentGen END - -@@ -688,6 +688,6 @@ protected: - */ - - --#endif -+// #endif // _SNMPv3 - - -diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h -index 95e8b4e1836d..6f50cd52625b 100644 ---- a/include/agent_pp/notification_originator.h -+++ b/include/agent_pp/notification_originator.h -@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { - */ - virtual nlmLogEntry* get_nlm_log_entry(); - -+#ifdef _SNMPv3 - virtual v3MP* get_v3mp(); -+#endif - - protected: - -diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h -index 7d5c4558f36d..d9eb2b4a87ec 100644 ---- a/include/agent_pp/snmp_community_mib.h -+++ b/include/agent_pp/snmp_community_mib.h -@@ -49,7 +49,7 @@ namespace Agentpp { - #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" - #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" - --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - - /** - * snmpCommunityName -@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup - static void add_public(); - static void add_public(Mib* mib); - }; --#endif -+// #endif // _SNMPv3 - - #ifdef AGENTPP_NAMESPACE - } -diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp -index d7d566869998..39ddbe08cdeb 100644 ---- a/src/notification_originator.cpp -+++ b/src/notification_originator.cpp -@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { - return nlmLogEntry::instance; - } - -+#ifdef _SNMPv3 - v3MP* NotificationOriginator::get_v3mp() { - if (mib) { - return mib->get_request_list()->get_v3mp(); -@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { - return v3MP::I; - } - } -+#endif - - - bool NotificationOriginator::check_access(ListCursor& cur, --- -2.27.0 - diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 11b23c8ee2..f8399963e5 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 bcfc014cc7ce37afdd6eefb71b59f1eabf23984525905546aa363c2a2c498c79 agent++-4.5.3.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 8982d9e564..f30e75ef9c 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.3.1 +AGENTPP_VERSION = 4.5.3 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Sun Mar 20 17:06:37 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:06:37 +0100 Subject: [Buildroot] [git commit] package/snmppp: bump to version 3.4.9 Message-ID: <20220320165813.9890284551@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6db3b6d48cae3c3a9ad7c3977b373d4a60d6e787 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of src/v3.cpp, update in year and "Frank Fock" added: - _## SNMP++ v3.3 + _## SNMP++ v3.4 - _## Copyright (c) 2001-2013 Jochen Katz, Frank Fock + _## Copyright (c) 2001-2021 Jochen Katz, Frank Fock - _## Hewlett-Packard and Jochen Katz make no representations about the - _## suitability of this software for any purpose. It is provided + _## Hewlett-Packard, Frank Fock, and Jochen Katz make no representations + _## about the suitability of this software for any purpose. It is provided https://www.agentpp.com/download/changes_snmp++v3.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/snmppp/snmppp.hash | 4 ++-- package/snmppp/snmppp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 2dcf836fc7..db3a4b5f4f 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz -sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp +sha256 7c0aaf4ea21db082453f880cc2062a86dcbbf0ee6c8d47c72beb8e0c77c26b6c snmp++-3.4.9.tar.gz +sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 601e28e207..bc05cad583 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.2 +SNMPPP_VERSION = 3.4.9 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From thomas.petazzoni at bootlin.com Sun Mar 20 17:08:52 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:08:52 +0100 Subject: [Buildroot] [git commit] configs/octavo_osd32mp1_brk: new defconfig Message-ID: <20220320170115.B9D98845A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0380696669621b48b4d9c770af3faf2d922ed57f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support to Octavo Systems BRK board. We use the TF-A, U-Boot and Linux versions from ST, Device Trees from Octavo as well as a U-Boot patch from Octavo. Reference: https://octavosystems.com/octavo_products/osd32mp1-brk/ The device tree blobs come from Octavo System: https://github.com/octavosystems/OSD32MP1-BRK-device-tree.git The uboot patches come from Octavo System: https://github.com/octavosystems/BRK_Developer_Package_patches/tree/master/u-boot-v2020.01-stm32mp Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 + board/octavo/osd32mp1-brk/genimage.cfg | 23 + .../linux-dts/stm32mp157c-osd32mp1-brk.dts | 1167 ++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 + .../uboot/0001-osd32mp1-BRK-board-added.patch | 2349 ++++++++++++++++++++ board/octavo/osd32mp1-brk/readme.txt | 35 + .../octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr.dtsi | 119 + .../tfa-dts/stm32mp157c-osd32mp1-brk.dts | 581 +++++ configs/octavo_osd32mp1_brk_defconfig | 60 + 9 files changed, 4342 insertions(+) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Mar 20 17:08:55 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:08:55 +0100 Subject: [Buildroot] [git commit] configs/octavo_osd32mp1_red: new defconfig Message-ID: <20220320170115.CDCD9845A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=672807b815c315f1f67f465af1b6165acd01949b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support for the Octavo Systems RED board. We use the TF-A, U-Boot and Linux versions from ST, Device Trees from Octavo, as well as a U-Boot patch from Octavo. Reference: https://octavosystems.com/octavo_products/osd32mp1-red/ The device tree blobs come from Octavo System: https://github.com/octavosystems/OSD32MP1-RED-Device-tree.git The uboot patches come from Octavo System: https://github.com/octavosystems/osd32mp1-build-tools/tree/395ebd1f4832353c2bc66bbf3346b07d5243e44d/patches/u-boot-2018.11 Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/octavo/osd32mp1-red/genimage.cfg | 23 + .../octavo/osd32mp1-red/linux-dts/osd32mp1-red.dts | 1469 ++++++++++++++ .../linux-dts/stm32mp157c-osd32mp1-red.dtsi | 2077 ++++++++++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 + ...0001-Add-OSD32MP1-RED-Device-Tree-support.patch | 1730 ++++++++++++++++ ...32mp15_trusted_defconfig-disable-environm.patch | 32 + board/octavo/osd32mp1-red/readme.txt | 37 + board/octavo/osd32mp1-red/tfa-dts/osd32mp1-red.dts | 615 ++++++ .../stm32mp15-osd32mp1-ddr3-1x4Gb-1066-binG.dtsi | 119 ++ configs/octavo_osd32mp1_red_defconfig | 60 + 11 files changed, 6168 insertions(+) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Mar 20 17:11:20 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 20 Mar 2022 18:11:20 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/octavo_osd32mp1_brk: new defconfig In-Reply-To: <20211130103919.19428-1-kory.maincent@bootlin.com> References: <20211130103919.19428-1-kory.maincent@bootlin.com> Message-ID: <20220320181120.250e1916@windsurf> On Tue, 30 Nov 2021 11:39:18 +0100 Kory Maincent wrote: > This patch adds support to Octavo Systems Brk board. > > Very similar to the other stm32mp157-based boards. We use the TF-A, U-boot > and Linux version from ST used by the Octavo constructor. > > Reference: > https://octavosystems.com/octavo_products/osd32mp1-brk/ > > The device tree blobs come from Octavo System: > https://github.com/octavosystems/OSD32MP1-BRK-device-tree.git > > The uboot patches come from Octavo System: > https://github.com/octavosystems/BRK_Developer_Package_patches/tree/master/u-boot-v2020.01-stm32mp > > The kernel defconfig has been extracted from the prebuilt image. > > Device tree and patch are licensed under BSD 2-Clause. > > Signed-off-by: Kory Maincent > --- Both patches applied to the master branch, after rewording a bit the commit log. It seems like since your patch, Octavo has related an updated BSP, perhaps it is worth having a look and do an update? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Mar 20 17:12:59 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 18:12:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/json-glib: bump to version 1.6.6 Message-ID: <20220320171259.1591428-1-fontaine.fabrice@gmail.com> - Update introspection option: https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 - Disable docs (enabled by default since https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) - Disable tests (added by: https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) - Update indentation in hash file (two spaces) https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS Signed-off-by: Fabrice Fontaine --- package/json-glib/json-glib.hash | 6 +++--- package/json-glib/json-glib.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index b68794db37..680d404a4b 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz # Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index accdb4f888..52ca47e906 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,13 +4,14 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 +JSON_GLIB_VERSION_MAJOR = 1.6 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ JSON_GLIB_LICENSE_FILES = COPYING JSON_GLIB_INSTALL_STAGING = YES +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false JSON_GLIB_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection else -JSON_GLIB_CONF_OPTS += -Dintrospection=false +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 17:23:26 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 18:23:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/raptor: fix CVE-2020-25713 Message-ID: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine --- ...are-namespace-declarations-correctly.patch | 33 +++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config -- 2.35.1 From peter at korsgaard.com Sun Mar 20 17:34:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:34:28 +0100 Subject: [Buildroot] [PATCH] support/testing: TestRust{Bin} use ripgrep package for testing In-Reply-To: <20220224001455.206249-1-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 01:14:55 +0100") References: <20220224001455.206249-1-romain.naour@gmail.com> Message-ID: <87a6dkply3.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > TestRust and TestRustBin has been introduced at the time when there was > no cargo package infrastructure or any package using rust compiler > (Buildroot 2018.02). > Since then the ripgrep package has been introduced, initially using > the generic package infrastructure and converted later to the cargo > package infrastructure. > Due a recent change in rust/cargo removing the cargo config file [1] > the test TestRust and TestRustBin now fail to compile since they build > an hello-world crate outside of the cargo package infrastructure > without the correct environment for cross-compiling. > Replace the 'hello-world' crate by ripgrep package and check if it > can run properly in Qemu. > Fixes tests.package.test_rust.TestRustBin: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 > But doesn't fixes tests.package.test_rust.TestRust due another bug: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 > Signed-off-by: Romain Naour Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:35:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:35:23 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/rust: install rustc and rust-std built by Buildroot In-Reply-To: <20220224154513.220976-2-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 16:45:13 +0100") References: <20220224154513.220976-1-romain.naour@gmail.com> <20220224154513.220976-2-romain.naour@gmail.com> Message-ID: <875yo8plwk.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > The test TestRust is currently broken with ripgrep package with > the following error: > error[E0514]: found crate `core` compiled by an incompatible version of rustc > | > = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) > = note: the following crate versions were found: > crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib > error[E0514]: found crate `std` compiled by an incompatible version of rustc > The problem is not really a cross-compilation issue (we are building > for an armv7 target on x86_64 host) but a problem with rust-std libraries > (rlib). > We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same > version as the prebuilt rustc used to bootstrap the build: > TestRust/host/bin/rustc --version > rustc 1.58.1 > TestRustBin/host/bin/rustc --version > rustc 1.58.1 (db9d1b20b 2022-01-20) > Indeed we are using host-rust-bin to bootstrap the host-rust compiler > package built by Buildroot. The problem is that the > libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) > and is not removed before installing host-rust built by Buildroot. > We actually spent a lot of time to build host-rust with rust-std > and forget to install this important library HOST_DIR. > Looking at the host-rust build directory we can notice two installer > script "install.sh" (the same scripts used to install host-rust-bin): > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh > TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh > The "tarball" directory is generated by the "python x.py dist" during > the install step, we have to keep it. > Replace "python x.py install" by theses two install scripts. > Installing rust-std with the install.sh script replace the rust-std > libraries installed by host-rust-bin. > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 > Signed-off-by: Romain Naour > Cc: Eric Le Bihan Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:46:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:46:27 +0100 Subject: [Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig In-Reply-To: <20220224162517.222437-1-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 17:25:16 +0100") References: <20220224162517.222437-1-romain.naour@gmail.com> Message-ID: <871qywple4.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Commit [1] added eeze dependency using "depends on" to several efl > options (drm, libmount) instead of selecting eeze and propagate the > udev reverse dependency. > [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 > Signed-off-by: Romain Naour > --- > v2: simplify the commit log > Remove the "eeze" between parenthesis Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:46:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:46:39 +0100 Subject: [Buildroot] [PATCHv2 2/2] package/efl: handle input option In-Reply-To: <20220224162517.222437-2-romain.naour@gmail.com> (Romain Naour's message of "Thu, 24 Feb 2022 17:25:17 +0100") References: <20220224162517.222437-1-romain.naour@gmail.com> <20220224162517.222437-2-romain.naour@gmail.com> Message-ID: <87wngoo6tc.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > From: Fabrice Fontaine > Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input > option on target which was added (and enabled by default) by > https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be > resulting in the following build failure when eeze is disabled: > ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". > Fixes: > - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e > Signed-off-by: Fabrice Fontaine > [Romain: > Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the > upstream name. > use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM > remove duplicate libxkbcommon in EFL_DEPENDENCIES] > Signed-off-by: Romain Naour Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:47:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:47:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: fix musl build In-Reply-To: <20220224173615.486414-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 24 Feb 2022 18:36:15 +0100") References: <20220224173615.486414-1-fontaine.fabrice@gmail.com> Message-ID: <87sfrco6s1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following musl build failure raised since commit > 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: > In file included from src/shared/queue.c:15: > ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? > 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); > | ^~~~~~~ > | size_t > Fixes: > - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:45:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:45:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bluez5_utils: fix musl build Message-ID: <20220320173905.F030A845D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25fc940a4ca008f8c51395a0d210c0d8b7828b44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following musl build failure raised since commit 6fc5c8e92c1d7997e48b207187d2d3c7ad42819: In file included from src/shared/queue.c:15: ./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); | ^~~~~~~ | size_t Fixes: - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 96ebed1eed6dcd55d8024cbc6fe8bec646d739c6) Signed-off-by: Peter Korsgaard --- ...006-src-shared-util.h-include-sys-types.h.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch new file mode 100644 index 0000000000..8a5bd64d43 --- /dev/null +++ b/package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch @@ -0,0 +1,39 @@ +From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Feb 2022 18:19:33 +0100 +Subject: [PATCH] src/shared/util.h: include sys/types.h + +Include sys/types.h to avoid the following build failure on musl raised +since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac: + +In file included from src/shared/queue.c:15: +./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? + 106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); + | ^~~~~~~ + | size_t + +Fixes: + - http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice at gmail.com] +--- + src/shared/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/shared/util.h b/src/shared/util.h +index c01eccf8a..554481e1e 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + #define BIT(n) (1 << (n)) +-- +2.34.1 + From peter at korsgaard.com Sun Mar 20 17:45:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:45:44 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/efl: rework eeze handling in Kconfig Message-ID: <20220320173905.D79B8845D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49fcf4beeb212c38046353eaa6bd23965b982fc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit [1] added eeze dependency using "depends on" to several efl options (drm, libmount) instead of selecting eeze and propagate the udev reverse dependency. [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c7229db872acd6db83ccb7e4bb22cb4cfd06be75) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd9..4c78bef7c8 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +174,16 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm, efl-eeze depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,9 +216,10 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON @@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" From peter at korsgaard.com Sun Mar 20 17:30:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:30:05 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/testing: TestRust{Bin} use ripgrep package for testing Message-ID: <20220320173905.C3162845D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac1fa68623d89f4a66b8a91d358d755c3dfb6c41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x TestRust and TestRustBin has been introduced at the time when there was no cargo package infrastructure or any package using rust compiler (Buildroot 2018.02). Since then the ripgrep package has been introduced, initially using the generic package infrastructure and converted later to the cargo package infrastructure. Due a recent change in rust/cargo removing the cargo config file [1] the test TestRust and TestRustBin now fail to compile since they build an hello-world crate outside of the cargo package infrastructure without the correct environment for cross-compiling. Replace the 'hello-world' crate by ripgrep package and check if it can run properly in Qemu. Fixes tests.package.test_rust.TestRustBin: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202545 But doesn't fixes tests.package.test_rust.TestRust due another bug: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 [1] b6378631c2609742382984f6f7b93c1d9d2cdb78 Signed-off-by: Romain Naour Cc: Eric Le Bihan Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f0d1f211950fe7cdf1bbb52397cdb86519d4a404) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_rust.py | 48 +++--------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 884b40a4a3..a1abd20c09 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -8,9 +8,6 @@ import infra.basetest class TestRustBase(infra.basetest.BRTest): - target = 'armv7-unknown-linux-gnueabihf' - crate = 'hello-world' - def login(self): img = os.path.join(self.builddir, "images", "rootfs.cpio") self.emulator.boot(arch="armv7", @@ -18,43 +15,6 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() - def build_test_prog(self): - hostdir = os.path.join(self.builddir, 'host') - env = os.environ.copy() - env["USER"] = "br-user" - env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"] - env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo') - env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc') - cargo = os.path.join(hostdir, 'bin', 'cargo') - workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'), - self.crate) - manifest = os.path.join(workdir, 'Cargo.toml') - prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate) - - cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo init failed") - - cmd = [ - cargo, 'build', '-vv', '--target', self.target, - '--manifest-path', manifest - ] - ret = subprocess.call(cmd, - stdout=self.b.logfile, - stderr=self.b.logfile, - env=env) - if ret != 0: - raise SystemError("Cargo build failed") - - shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin')) - self.b.build() - shutil.rmtree(workdir) - - class TestRustBin(TestRustBase): config = \ """ @@ -68,12 +28,12 @@ class TestRustBin(TestRustBase): BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") class TestRust(TestRustBase): @@ -90,9 +50,9 @@ class TestRust(TestRustBase): # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y + BR2_PACKAGE_RIPGREP=y """ def test_run(self): - self.build_test_prog() self.login() - self.assertRunOk(self.crate) + self.assertRunOk("rg Buildroot /etc/issue") From peter at korsgaard.com Sun Mar 20 17:31:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:31:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rust: install rustc and rust-std built by Buildroot Message-ID: <20220320173905.CD590845D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34effd4a4729f87bd5607834dfc3954f08b5e592 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The test TestRust is currently broken with ripgrep package with the following error: error[E0514]: found crate `core` compiled by an incompatible version of rustc | = help: please recompile that crate using this compiler (rustc 1.58.1) (consider running `cargo clean` first) = note: the following crate versions were found: crate `core` compiled by rustc 1.58.1 (db9d1b20b 2022-01-20): TestRust/host/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-6cfcec236d576603.rlib error[E0514]: found crate `std` compiled by an incompatible version of rustc The problem is not really a cross-compilation issue (we are building for an armv7 target on x86_64 host) but a problem with rust-std libraries (rlib). We can notice that "rustc 1.58.1 (db9d1b20b 2022-01-20)" is the same version as the prebuilt rustc used to bootstrap the build: TestRust/host/bin/rustc --version rustc 1.58.1 TestRustBin/host/bin/rustc --version rustc 1.58.1 (db9d1b20b 2022-01-20) Indeed we are using host-rust-bin to bootstrap the host-rust compiler package built by Buildroot. The problem is that the libcore-6cfcec236d576603.rlib file come from host-rust-bin (rust-std) and is not removed before installing host-rust built by Buildroot. We actually spent a lot of time to build host-rust with rust-std and forget to install this important library HOST_DIR. Looking at the host-rust build directory we can notice two installer script "install.sh" (the same scripts used to install host-rust-bin): TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust/x86_64-unknown-linux-gnu/rust-1.58.1-x86_64-unknown-linux-gnu/install.sh TestRust/build/host-rust-1.58.1/build/tmp/tarball/rust-std/armv7-unknown-linux-gnueabihf/rust-std-1.58.1-armv7-unknown-linux-gnueabihf/install.sh The "tarball" directory is generated by the "python x.py dist" during the install step, we have to keep it. Replace "python x.py install" by theses two install scripts. Installing rust-std with the install.sh script replace the rust-std libraries installed by host-rust-bin. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2116202544 Signed-off-by: Romain Naour Cc: Eric Le Bihan [Arnout: remove redundant parenthesis; only use a variable for the common install opts] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 15682493918ead960d326bf24763e9b5d8d331d9) Signed-off-by: Peter Korsgaard --- package/rust/rust.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b7..3c560882ca 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -67,9 +67,26 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +define HOST_RUST_INSTALL_RUSTC + cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) From peter at korsgaard.com Sun Mar 20 17:45:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:45:50 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/efl: handle input option Message-ID: <20220320173905.E363D845D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=30e5d4ebc19a7a970e17ecc0e12397a13b34e89a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input option on target which was added (and enabled by default) by https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be resulting in the following build failure when eeze is disabled: ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze". Fixes: - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e Signed-off-by: Fabrice Fontaine [Romain: Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the upstream name. use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM remove duplicate libxkbcommon in EFL_DEPENDENCIES] Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 70ad44ffd00786cf25145445afa374cbb295f722) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 19 +++++++++++++++---- package/efl/efl.mk | 11 ++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 4c78bef7c8..c4f82b92e3 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -216,13 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcb..d4a16475e5 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true @@ -192,7 +199,7 @@ endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) EFL_CONF_OPTS += -Ddrm=true -EFL_DEPENDENCIES += libdrm libegl libinput mesa3d +EFL_DEPENDENCIES += libdrm libegl mesa3d else EFL_CONF_OPTS += -Ddrm=false endif @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. From peter at korsgaard.com Sun Mar 20 17:49:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:49:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS In-Reply-To: <20220224175119.487040-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 24 Feb 2022 18:51:19 +0100") References: <20220224175119.487040-1-fontaine.fabrice@gmail.com> Message-ID: <87o820o6o6.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > bpftool uses its own local copy of libbpf so add > BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure > on ARM: > btf.c: In function 'btf_type_by_id': > btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] > if (type_id < btf->start_id) > ^ > bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > Fixes: > - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 17:49:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 18:49:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bpftool: add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS Message-ID: <20220320174059.B9293845D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44db0dba5976bc1b5ff979589e51c8d023af4195 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x bpftool uses its own local copy of libbpf so add BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS to avoid the following build failure on ARM: btf.c: In function 'btf_type_by_id': btf.c:461:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (type_id < btf->start_id) ^ bpf.c:62:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fixes: - http://autobuild.buildroot.org/results/aae772f1cfb16516a57f310c4f022e80a2a8d65e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c750dd4e5d03430148841d2d897e90dbe19ce172) Signed-off-by: Peter Korsgaard --- package/bpftool/Config.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343..a1ef3843e6 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + config BR2_PACKAGE_BPFTOOL bool "bpftool" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 # binutils depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils @@ -13,6 +23,7 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" + depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ From peter at korsgaard.com Sun Mar 20 18:14:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:14:07 +0100 Subject: [Buildroot] [PATCH] package/rust: set musl-root for musl toolchains In-Reply-To: <20220225083037.229109-1-romain.naour@gmail.com> (Romain Naour's message of "Fri, 25 Feb 2022 09:30:37 +0100") References: <20220225083037.229109-1-romain.naour@gmail.com> Message-ID: <87k0coo5jk.fsf@dell.be.48ers.dk> >>>>> "Romain" == Romain Naour writes: > Without musl-root in config.toml the build stop with the following error: > thread 'main' panicked at 'couldn't find libc.a in musl libdir: > output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', > src/bootstrap/sanity.rs:192:25 > musl-root is needed to provide the path to libc.a and libunwind.a because > rust link them statically into the standard library and liblibc [1]. > For other libc, musl-root is not used and ignored [2]. > [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd > [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 > Signed-off-by: Romain Naour > --- > Runtime tested with TestRust with ripgrep and bat packages. Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:15:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:15:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/rpi-userland: fix build with libexecinfo In-Reply-To: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 25 Feb 2022 19:52:04 +0100") References: <20220225185204.1043277-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnco5hx.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' > Fixes: > - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:13:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:13:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rust: set musl-root for musl toolchains Message-ID: <20220320180628.5EB3B845E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46c073662bc24bb7c5b9fd1a27ae1945d0439528 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Without musl-root in config.toml the build stop with the following error: thread 'main' panicked at 'couldn't find libc.a in musl libdir: output/host/arm-buildroot-linux-musleabihf/sysroot/lib/lib', src/bootstrap/sanity.rs:192:25 musl-root is needed to provide the path to libc.a and libunwind.a because rust link them statically into the standard library and liblibc [1]. For other libc, musl-root is not used and ignored [2]. [1] https://github.com/rust-lang/rust/commit/cd980b3bee5bd48e8a6cd4c0d7c8e0fb0fdb64dd [2] https://github.com/rust-lang/rust/blob/1.58.1/src/bootstrap/sanity.rs#L181 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a41b0f31dea3e62b006ac815bf628600676b328f) Signed-off-by: Peter Korsgaard --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 3c560882ca..cd8c87b68d 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -56,6 +56,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ From peter at korsgaard.com Sun Mar 20 18:14:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:14:23 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rpi-userland: fix build with libexecinfo Message-ID: <20220320180628.65E9C845D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fd0c2292f2a46bfcc61e73c2d4567f50b547b787 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' Fixes: - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bc4cc27705de50356d7e9945e41bd989fdc56fe8) Signed-off-by: Peter Korsgaard --- ...006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch | 58 ++++++++++++++++++++++ package/rpi-userland/rpi-userland.mk | 5 ++ 2 files changed, 63 insertions(+) diff --git a/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch new file mode 100644 index 0000000000..bf2a9eb6ea --- /dev/null +++ b/package/rpi-userland/0006-don-t-override-CMAKE_EXE_LINKER_FLAGS.patch @@ -0,0 +1,58 @@ +From 87febf8b7b1c0a6d0ea1d26770d3665008d66fd2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as it could be used by the user to +pass additional flags such as -lexecinfo on musl and uclibc-ng + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- + host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- + makefiles/cmake/arm-linux.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index e7206cc..16c64db 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(COMPILE_DEFINITIONS -Werror -Wall) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + +diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt +index e6bd373..2f72eb2 100644 +--- a/host_applications/linux/apps/raspicam/CMakeLists.txt ++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt +@@ -6,7 +6,7 @@ SET(COMPILE_DEFINITIONS -Werror) + # Set --no-as-needed to stop the linker discarding mmal_vc_client + # as it can't see that the constructor registers a load of functionality + # with the MMAL core. +-SET( CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed" ) ++SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" ) + + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) + include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) +diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake +index 957846a..e172282 100644 +--- a/makefiles/cmake/arm-linux.cmake ++++ b/makefiles/cmake/arm-linux.cmake +@@ -93,7 +93,7 @@ if(ANDROID) + set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") + + link_directories(${ANDROID_LIBS}) +- set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") +-- +2.34.1 + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3..3564ec0703 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -13,6 +13,11 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +RPI_USERLAND_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON From peter at korsgaard.com Sun Mar 20 18:23:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:23:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/zabbix: fix shared netsnmp build In-Reply-To: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 00:05:18 +0100") References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> Message-ID: <87bky0o541.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following shared build failure with netsnmp raised since the > addition of the package in commit > 42382a171277ead59e365f5920e757f01c04ac77: > configure: error: "libnetsnmp.a static library was not found in > /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" > Fixes: > - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:23:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:23:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/zabbix: netsnmp needs mib In-Reply-To: <20220225230519.1584174-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Feb 2022 00:05:19 +0100") References: <20220225230519.1584174-1-fontaine.fabrice@gmail.com> <20220225230519.1584174-2-fontaine.fabrice@gmail.com> Message-ID: <877d8oo53p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > netsnmp support needs mib to avoid the following build failure raised > since the addition of the package in commit > 42382a171277ead59e365f5920e757f01c04ac77: > checks_snmp.c: In function ?zbx_snmp_get_octet_string?: > checks_snmp.c:694:35: error: invalid use of undefined type ?struct tree? > 694 | hint = (NULL != subtree ? subtree->hint : NULL); > | ^~ > Fixes: > - No autobuilder failures (yet) > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:24:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:24:44 +0100 Subject: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency In-Reply-To: <20220314153111.1390512-2-clement.leger@bootlin.com> (=?utf-8?Q?=22Cl=C3=A9ment=09L=C3=A9ger?= via buildroot"'s message of "Mon, 14 Mar 2022 16:31:04 +0100") References: <20220314153111.1390512-1-clement.leger@bootlin.com> <20220314153111.1390512-2-clement.leger@bootlin.com> Message-ID: <8735jco51v.fsf@dell.be.48ers.dk> >>>>> "Cl?ment" == Cl?ment L?ger via buildroot writes: > Some platforms (stm32, sam) needs DTC to build the platform > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration > option to select host-dtc package when building. > Signed-off-by: Cl?ment L?ger Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:27:22 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:27:22 +0100 Subject: [Buildroot] [PATCH/next 1/2] package/valijson: drop boost dependency In-Reply-To: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Feb 2022 11:35:27 +0100") References: <20220227103528.3888282-1-fontaine.fabrice@gmail.com> Message-ID: <87y214mqd1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > boost is not mandatory since the deactivation of tests when bumping to > version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and > https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:28:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:28:55 +0100 Subject: [Buildroot] [PATCH] package/shairport-sync: install dbus policy file to target In-Reply-To: <20220228022840.2140908-1-t123yh.xyz@gmail.com> (Yunhao Tian's message of "Mon, 28 Feb 2022 10:28:40 +0800") References: <20220228022840.2140908-1-t123yh.xyz@gmail.com> Message-ID: <87tubsmqag.fsf@dell.be.48ers.dk> >>>>> "Yunhao" == Yunhao Tian writes: > This adds two extra commands to install dbus policy config > to target if dbus option is enabled. > Signed-off-by: Yunhao Tian Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:30:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:30:10 +0100 Subject: [Buildroot] [PATCH v1] package/mtools: bump version to 4.0.38 In-Reply-To: <20220311065928.14849-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 11 Mar 2022 07:59:28 +0100") References: <20220311065928.14849-1-ps.report@gmx.net> Message-ID: <87pmmgmq8d.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > For details see [1]. > [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html > Signed-off-by: Peter Seiderer Committed to 2022.02.x given the bugfixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:30:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:30:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/ts4900-fpga: bump version to 20170510 In-Reply-To: <20220310185921.8852-1-kris@embeddedTS.com> (Kris Bahnsen via buildroot's message of "Thu, 10 Mar 2022 10:59:21 -0800") References: <20220310185921.8852-1-kris@embeddedTS.com> Message-ID: <87lex4mq73.fsf@dell.be.48ers.dk> >>>>> "Kris" == Kris Bahnsen via buildroot writes: > Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte > transmits. > Signed-off-by: Kris Bahnsen Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:31:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:31:56 +0100 Subject: [Buildroot] [PATCH 1/1] linux: fix kernel image format for aarch64 BE In-Reply-To: <20220228162632.2777188-1-remi.duraffort@linaro.org> (=?utf-8?Q?=22R=C3=A9mi?= Duraffort"'s message of "Mon, 28 Feb 2022 17:26:32 +0100") References: <20220228162632.2777188-1-remi.duraffort@linaro.org> Message-ID: <87h77smq5f.fsf@dell.be.48ers.dk> >>>>> "R?mi" == R?mi Duraffort writes: > Signed-off-by: R?mi Duraffort Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:39:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:39:26 +0100 Subject: [Buildroot] [git commit] package/gcr: depends on !gnupg In-Reply-To: <20220315211222.E6D258408A@busybox.osuosl.org> (Arnout Vandecappelle's message of "Tue, 15 Mar 2022 22:10:00 +0100") References: <20220315211222.E6D258408A@busybox.osuosl.org> Message-ID: <87czigmpsx.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=5783a418f4b30931068b81f850fc06cd8d3d9732 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Since gcr selects gnupg2, it's incompatible with gnupg. Add this > dependency and corresponding comment. > While we're at it, also hide the existing comment when > !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:42:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:42:24 +0100 Subject: [Buildroot] [git commit] support/testing: test_rust.py: fix flake8 errors In-Reply-To: <20220315211223.1F9208408A@busybox.osuosl.org> (Arnout Vandecappelle's message of "Tue, 15 Mar 2022 22:10:01 +0100") References: <20220315211223.1F9208408A@busybox.osuosl.org> Message-ID: <878rt4mpnz.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: > commit: https://git.buildroot.net/buildroot/commit/?id=12588a667a6e4d3c852a82a9d89c58bcf43eea1e > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Fix flake8 errors introduced in commit f0d1f21195 > Fixes: > support/testing/tests/package/test_rust.py:2:1: F401 'tempfile' imported but unused > support/testing/tests/package/test_rust.py:3:1: F401 'subprocess' imported but unused > support/testing/tests/package/test_rust.py:4:1: F401 'shutil' imported but unused > support/testing/tests/package/test_rust.py:18:1: E302 expected 2 blank lines, found 1 Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:46:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:46:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/boinc: disable fcgi In-Reply-To: <20220308211205.3682-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 8 Mar 2022 22:12:05 +0100") References: <20220308211205.3682-1-fontaine.fabrice@gmail.com> Message-ID: <874k3smpht.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libfcgi raises the following build failure with glibc 2.34 and gcc > 11.2.0: > In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, > from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, > from boinc_fcgi.h:19, > from coproc.cpp:22: > /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous > 582 | __attribute_malloc__ __attr_dealloc_fclose; > | ^~~~~~~~~~~~~~~~~~~~~ > RawTherapee has the same kind of issue: > - https://github.com/Beep6581/RawTherapee/issues/6324 > - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 > Fixes: > - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 18:38:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:38:55 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/gcr: depends on !gnupg Message-ID: <20220320183723.7F8C6845FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c05744eca4a2453fe4403c97cee3229152f50e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5783a418f4b30931068b81f850fc06cd8d3d9732) Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Sun Mar 20 18:45:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:45:54 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/boinc: disable fcgi Message-ID: <20220320183723.8A92484332@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f23eeb8e986693ede48feae84908b2025c048816 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 54cb3b506de44fb8389832a1612b55d179b2cfd4) Signed-off-by: Peter Korsgaard --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot From peter at korsgaard.com Sun Mar 20 18:39:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:39:05 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/gcr: depends on !gnupg Message-ID: <20220320183729.9963C84605@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=816861524a079658040d6e059743697affdeafce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5783a418f4b30931068b81f850fc06cd8d3d9732) Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Sun Mar 20 18:21:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:21:20 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zabbix: netsnmp needs mib Message-ID: <20220320183734.6FFE38461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3c27619bfb917e5b2e893871d2a25f434c8efc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x netsnmp support needs mib to avoid the following build failure raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: checks_snmp.c: In function ???zbx_snmp_get_octet_string???: checks_snmp.c:694:35: error: invalid use of undefined type ???struct tree??? 694 | hint = (NULL != subtree ? subtree->hint : NULL); | ^~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 77f9d2d6a6fc4a6485acd7b5f1970b638764c1fa) Signed-off-by: Peter Korsgaard --- package/zabbix/zabbix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index a8ecbb42db..adc54028ad 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -55,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else From peter at korsgaard.com Sun Mar 20 18:28:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:28:37 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/shairport-sync: install dbus policy file to target Message-ID: <20220320183734.8E56E8461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=38aa995347d264fdc171101a6ebe60835e65c2bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This adds two extra commands to install dbus policy config to target if dbus option is enabled. Signed-off-by: Yunhao Tian Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d74963400633ec9056646fdc50a91a046489a719) Signed-off-by: Peter Korsgaard --- package/shairport-sync/shairport-sync.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e5..4430014ec9 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -82,6 +90,7 @@ define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV From peter at korsgaard.com Sun Mar 20 18:30:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:30:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/ts4900-fpga: bump version to 20170510 Message-ID: <20220320183734.A19BB8461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5dab7fc53b6df5333ecf7ba170e0507833f24075 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fixes TXEN on CPU UARTs not correctly asserting in some multi-byte transmits. Signed-off-by: Kris Bahnsen Signed-off-by: Thomas Petazzoni (cherry picked from commit 503948f452d0cb46cbc7990ecaeabd60f2b3dfd7) Signed-off-by: Peter Korsgaard --- package/ts4900-fpga/ts4900-fpga.hash | 6 +++--- package/ts4900-fpga/ts4900-fpga.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 9ffff643af..1d3c62bfd1 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index a3e42c0812..73e7a28e31 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,7 +4,7 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. From peter at korsgaard.com Sun Mar 20 18:38:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:38:26 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gcr: depends on !gnupg Message-ID: <20220320183734.B36CB8461F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf0c9830c0eef17116081d04ccc10a1aa0850553 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5783a418f4b30931068b81f850fc06cd8d3d9732) Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Sun Mar 20 18:24:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:24:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] boot/optee-os: add option to select DTC dependency Message-ID: <20220320183734.7921A8461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1feb0309f967fbbed17e96f99ddf555ec0e2054d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Some platforms (stm32, sam) needs DTC to build the platform device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration option to select host-dtc package when building. Signed-off-by: Cl??ment L??ger Acked-by: Etienne Carriere [yann.morin.1998 at free.fr: move option] Signed-off-by: Yann E. MORIN (cherry picked from commit 67be54cd943a466aab6bf53df2aa9e712da43556) Signed-off-by: Peter Korsgaard --- boot/optee-os/Config.in | 7 +++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 0974578484..ea16550b72 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -54,6 +54,13 @@ config BR2_TARGET_OPTEE_OS_VERSION default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c..9f76d8450e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -23,6 +23,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif + # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit # trusted applications. Since buildroot currently references From peter at korsgaard.com Sun Mar 20 18:26:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:26:57 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/valijson: drop boost dependency Message-ID: <20220320183734.84A098461F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a2efbee7a901691e80462b8aba683a68074e4d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x boost is not mandatory since the deactivation of tests when bumping to version 0.2.0 in commit d8e2876104be3f9f01613b17d3e60120883be1a1 and https://github.com/tristanpenman/valijson/commit/1844241d2a2379bca79a0d654f4b007209b10883 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b9391c7dd21dee3eff04e665bf6a92ef6fc5f234) Signed-off-by: Peter Korsgaard --- package/valijson/Config.in | 8 ++------ package/valijson/valijson.mk | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b3703..07706cd963 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26..71c5b05f2b 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,7 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) From peter at korsgaard.com Sun Mar 20 18:17:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:17:50 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zabbix: fix shared netsnmp build Message-ID: <20220320183734.65AF48461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61dfa6a4ef4780e3e74d6a28d67ede17d3f4fd78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following shared build failure with netsnmp raised since the addition of the package in commit 42382a171277ead59e365f5920e757f01c04ac77: configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" Fixes: - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 532e5063f54434cce4afec2ad5371fbf02488b67) Signed-off-by: Peter Korsgaard --- ...01-m4-netsnmp.m4-fix-shared-netsnmp-build.patch | 44 ++++++++++++++++++++++ package/zabbix/zabbix.mk | 2 + 2 files changed, 46 insertions(+) diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 0000000000..ffb1f54ba2 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd..a8ecbb42db 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -10,6 +10,8 @@ ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJO ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = pcre ZABBIX_CONF_OPTS = \ From peter at korsgaard.com Sun Mar 20 18:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:43:08 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/boinc: disable fcgi Message-ID: <20220320183734.C509E8461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb7b9e5a7294fb8a970aaec653b49e6226c4a7a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libfcgi raises the following build failure with glibc 2.34 and gcc 11.2.0: In file included from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:488, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/bits/libc-header-start.h:33, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/stdio.h:27, from /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/fcgi_stdio.h:18, from boinc_fcgi.h:19, from coproc.cpp:22: /home/peko/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous 582 | __attribute_malloc__ __attr_dealloc_fclose; | ^~~~~~~~~~~~~~~~~~~~~ RawTherapee has the same kind of issue: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747 Fixes: - http://autobuild.buildroot.org/results/232dae62570ed7927a10864d83dccaf9b6214500 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 54cb3b506de44fb8389832a1612b55d179b2cfd4) Signed-off-by: Peter Korsgaard --- package/boinc/boinc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea..0d992f136c 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,13 +39,6 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi -endif - BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot From peter at korsgaard.com Sun Mar 20 18:31:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:31:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] linux: make Image{, .gz} format available for aarch64 BE Message-ID: <20220320183734.AA1E48461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcbce93cfce0a84d32de323b6962c9846b58c887 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Just like aarch64, aarch64 BE supports the Image and Image.gz format. Signed-off-by: R??mi Duraffort Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d1579589e0a7d1870aa0ad587acd78f799f31257) Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 36744c5337..043e7c6574 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" From peter at korsgaard.com Sun Mar 20 18:42:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:42:14 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/testing: test_rust.py: fix flake8 errors Message-ID: <20220320183734.BBFE68461D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae50728e7665662c17a4bb2a9ad3c98bc463e227 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix flake8 errors introduced in commit f0d1f21195 Fixes: support/testing/tests/package/test_rust.py:2:1: F401 'tempfile' imported but unused support/testing/tests/package/test_rust.py:3:1: F401 'subprocess' imported but unused support/testing/tests/package/test_rust.py:4:1: F401 'shutil' imported but unused support/testing/tests/package/test_rust.py:18:1: E302 expected 2 blank lines, found 1 (cherry picked from commit 12588a667a6e4d3c852a82a9d89c58bcf43eea1e) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_rust.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index a1abd20c09..fb9dd2d916 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,7 +1,4 @@ import os -import tempfile -import subprocess -import shutil import infra.basetest @@ -15,6 +12,7 @@ class TestRustBase(infra.basetest.BRTest): options=["-initrd", img]) self.emulator.login() + class TestRustBin(TestRustBase): config = \ """ From peter at korsgaard.com Sun Mar 20 18:29:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 19:29:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/mtools: bump version to 4.0.38 Message-ID: <20220320183734.984F48461A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39534938739db48acf27ab14aed0ba059ae617d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x For details see [1]. [1] https://lists.gnu.org/archive/html/info-gnu/2022-03/msg00000.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 88de5d08226b490ea2784fbfd0580dd3430b5699) Signed-off-by: Peter Korsgaard --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486f..a162bfdc95 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231..c875814bc7 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From joerg.krause at embedded.rocks Sun Mar 20 18:51:44 2022 From: joerg.krause at embedded.rocks (=?UTF-8?q?J=C3=B6rg=20Krause?=) Date: Sun, 20 Mar 2022 18:51:44 +0000 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 Message-ID: <20220320185144.10894-1-joerg.krause@embedded.rocks> Drop patch wich is included in the new version. Also recreate config.xml by building and running Gerbera using: ``` ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml ``` Note, that Gerbera sets the `` parameter to the runtime user's home by default when generating the script. This is not appropriate when running Gerbera on an embedded Linux system as we usually do not have multiple users or even users at all. Therefore, we set the home directory to /var/lib/gerbera`. Signed-off-by: J?rg Krause --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------- package/gerbera/config.xml | 58 ++++++++++++++++++---- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 4 files changed, 51 insertions(+), 55 deletions(-) delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index 30d70e21f7..e6261f25d0 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ Gerbera - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 /var/lib/gerbera /usr/share/gerbera/web - 1800 + 180 gerbera.db + + + upnp:class derivedfrom "object.item" and last_updated > "@last7" + + + upnp:class derivedfrom "object.item" and last_modified > "@last7" + + * @@ -45,12 +53,15 @@ - - - + + + + + + @@ -98,14 +109,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -133,3 +172,4 @@ + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md -- 2.35.1 From yann.morin.1998 at free.fr Sun Mar 20 21:11:38 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 22:11:38 +0100 Subject: [Buildroot] [git commit] package/raptor: fix CVE-2020-25713 Message-ID: <20220320210328.ED9BC8462A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fca33462b8ed4ed7c54d5d0640ddb64723b3dae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From yann.morin.1998 at free.fr Sun Mar 20 21:12:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 22:12:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/raptor: fix CVE-2020-25713 In-Reply-To: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> References: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> Message-ID: <20220320211217.GG1566358@scaer> Fabrice, All On 2022-03-20 18:23 +0100, Fabrice Fontaine spake thusly: > A malformed input file can lead to a segfault due to an out of bounds > array access in raptor_xml_writer_start_element_common. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...are-namespace-declarations-correctly.patch | 33 +++++++++++++++++++ > package/raptor/raptor.mk | 3 ++ > 2 files changed, 36 insertions(+) > create mode 100644 package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch > > diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch > new file mode 100644 > index 0000000000..a48a583cb1 > --- /dev/null > +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch > @@ -0,0 +1,33 @@ > +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 > +From: Dave Beckett > +Date: Sat, 18 Sep 2021 17:40:00 -0700 > +Subject: [PATCH] XML Writer : compare namespace declarations correctly > + > +Apply patch from > +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 > +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 > +which overwrote heap during XML writing in parse type literal > +content. This was detected with clang asan. > + > +Thanks to Michael Stahl / mst2 for the fix. > + > +[Retrieved from: > +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] > +Signed-off-by: Fabrice Fontaine > +--- > + src/raptor_xml_writer.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c > +index 56993dc3..4426d38c 100644 > +--- a/src/raptor_xml_writer.c > ++++ b/src/raptor_xml_writer.c > +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, > + > + /* check it wasn't an earlier declaration too */ > + for(j = 0; j < nspace_declarations_count; j++) > +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { > ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { > + declare_me = 0; > + break; > + } > diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk > index 6d21fad58e..69ac121300 100644 > --- a/package/raptor/raptor.mk > +++ b/package/raptor/raptor.mk > @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES > # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch > RAPTOR_IGNORE_CVES += CVE-2017-18926 > > +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch > +RAPTOR_IGNORE_CVES += CVE-2020-25713 > + > RAPTOR_CONF_OPTS =\ > --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ > --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Mar 20 21:18:14 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 22:18:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/jack1: libsamplerate is optional, not mandatory Message-ID: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> libsamplerate is only needed to build the NetJack backend and internal client Signed-off-by: Fabrice Fontaine --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f10332..625afdf8c1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba0..39183826a4 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate +endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 20 21:18:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 20 Mar 2022 22:18:15 +0100 Subject: [Buildroot] [PATCH 2/2] package/jack1: libsndfile is optional, not mandatory In-Reply-To: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> Message-ID: <20220320211815.1798812-2-fontaine.fabrice@gmail.com> libsndfile is only needed to build jackrec example client Signed-off-by: Fabrice Fontaine --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 625afdf8c1..5b3116e2f1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 39183826a4..6dca56001f 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,12 +11,16 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK1_DEPENDENCIES += libsndfile +endif + ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline endif -- 2.35.1 From peter at korsgaard.com Sun Mar 20 21:22:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:22:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/dnsmasq: fix dnssec static build In-Reply-To: <20220308231733.176991-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 00:17:33 +0100") References: <20220308231733.176991-1-fontaine.fabrice@gmail.com> Message-ID: <87zglkl3oa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Drop -DHAVE_DNSSEC_STATIC which has been added by commit > e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises > the following static build failure because dnsmasq will wrongly append > "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": > /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc > -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o > network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o > helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o > outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o > blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o > crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o > -Wl,-Bstatic > -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib > -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp > -Wl,-Bdynamic > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: > attempted static link of dynamic object > `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' > Strangely enough, this is the first time this build failure is raised by > the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: > https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 > Fixes: > - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:24:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:24:26 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220320211605.0D4EA8462D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=572e7c73cb1411579d167fb8a20083eac8f8c417 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c6a8192081a65fee20b7757ece8880c25c32ee6a) Signed-off-by: Peter Korsgaard --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a9..d2b03eeb2a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ From peter at korsgaard.com Sun Mar 20 21:25:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/usbguard: add USBGUARD_CPE_ID_VENDOR In-Reply-To: <20220309213459.677932-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 9 Mar 2022 22:34:59 +0100") References: <20220309213459.677932-1-fontaine.fabrice@gmail.com> Message-ID: <87v8w8l3k9.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:26:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:26:05 +0100 Subject: [Buildroot] [PATCH] docs/manual: Remove link to emdebian and replace with debian port page In-Reply-To: <20220309215531.638593-1-yannick.brosseau@gmail.com> (Yannick Brosseau's message of "Wed, 9 Mar 2022 16:55:31 -0500") References: <20220309215531.638593-1-yannick.brosseau@gmail.com> Message-ID: <87r16wl3iq.fsf@dell.be.48ers.dk> >>>>> "Yannick" == Yannick Brosseau writes: > In the list of full distribution, the FAQ contains a link to Emdebian. > This project stopped receiving updates in 2014 and the main web page does not exist anymore. > This replace the entry with a link to the Debian ports page. > Signed-off-by: Yannick Brosseau Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:19:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:19:33 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/dnsmasq: fix dnssec static build Message-ID: <20220320211733.8CB0784633@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=80ca8b0a4bcc0373ffdf8c0fd4633e5c8aeaa27c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Drop -DHAVE_DNSSEC_STATIC which has been added by commit e913527b94e2e47b4ea6fcf13e281d5969f54fd6 but is not needed and raises the following static build failure because dnsmasq will wrongly append "-Wl,-Bstatic -lgmp -Wl,-Bdynamic": /home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o hash-questions.o domain-match.o -Wl,-Bstatic -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../x86_64-buildroot-linux-musl/sysroot/usr/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic -Wl,-Bstatic -lgmp -Wl,-Bdynamic /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/buildroot/autobuild/instance-2/output-1/host/x86_64-buildroot-linux-musl/sysroot/lib/../lib64/libc.so' Strangely enough, this is the first time this build failure is raised by the autobuilders whereas "-Wl,-Bdynamic" is set since a very long time: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=c979fa04a40ff12370c8d3a82ad27d9d3b5907e3 Fixes: - http://autobuild.buildroot.org/results/99b419ddb5a3be561d39e715833510a59519213e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b6a4453bd7352d3bb27aef565d9023a1d11209c9) Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4..230e4a8116 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -26,9 +26,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) From peter at korsgaard.com Sun Mar 20 21:24:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:24:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/usbguard: add USBGUARD_CPE_ID_VENDOR Message-ID: <20220320211733.95DD484639@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b2625c038650ca986aba5b5979d5212552b92e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x cpe:2.3:a:usbguard_project:usbguard is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Ausbguard_project%3Ausbguard Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c6a8192081a65fee20b7757ece8880c25c32ee6a) Signed-off-by: Peter Korsgaard --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a9..d2b03eeb2a 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ From peter at korsgaard.com Sun Mar 20 21:25:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:45 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220320211733.9E11E8463A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21278889daf2b899b1b416f259ca6ae839abf060 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0) Signed-off-by: Peter Korsgaard --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From peter at korsgaard.com Sun Mar 20 21:25:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:24 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220320211737.99F458463E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b85b18887554f37002124108cd890c8dca58f76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0) Signed-off-by: Peter Korsgaard --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From peter at korsgaard.com Sun Mar 20 21:25:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:25:36 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] docs/manual: Remove link to emdebian and replace with debian port page Message-ID: <20220320212105.A095384680@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4667ddcc8608b363c04433c166e2c38d6416acc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x In the list of full distribution, the FAQ contains a link to Emdebian. This project stopped receiving updates in 2014 and the main web page does not exist anymore. This replace the entry with a link to the Debian ports page. Signed-off-by: Yannick Brosseau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit db2b8a1ce22e9ee458532d2900d4c8cbe96d9ba0) Signed-off-by: Peter Korsgaard --- docs/manual/faq-troubleshooting.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce..b08bf9bc4a 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] From peter at korsgaard.com Sun Mar 20 21:35:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:35:01 +0100 Subject: [Buildroot] [PATCH] package/libglib2: bump to version 2.70.4 In-Reply-To: <20220310114122.919781-1-francois.perrad@gadz.org> (Francois Perrad's message of "Thu, 10 Mar 2022 12:41:22 +0100") References: <20220310114122.919781-1-francois.perrad@gadz.org> Message-ID: <87mthkl33u.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:35:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:35:46 +0100 Subject: [Buildroot] [PATCH] package/libgtk3: bump to version 3.24.33 In-Reply-To: <20220310114141.919836-1-francois.perrad@gadz.org> (Francois Perrad's message of "Thu, 10 Mar 2022 12:41:41 +0100") References: <20220310114141.919836-1-francois.perrad@gadz.org> Message-ID: <87ils8l32l.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:37:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:37:55 +0100 Subject: [Buildroot] [PATCH v1] package/libopenssl: bump version to 1.1.1n In-Reply-To: <20220316213626.GZ283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 22:36:26 +0100") References: <20220315205405.9291-1-ps.report@gmx.net> <20220316213626.GZ283544@scaer> Message-ID: <87ee2wl2z0.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > +Peter K.: candidate to be backported, that's a security fix. Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. > On 2022-03-15 21:54 +0100, Peter Seiderer spake thusly: >> Changes between 1.1.1m and 1.1.1n [15 Mar 2022] >> >> *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever >> for non-prime moduli. >> >> Internally this function is used when parsing certificates that contain >> elliptic curve public keys in compressed form or explicit elliptic curve >> parameters with a base point encoded in compressed form. >> >> It is possible to trigger the infinite loop by crafting a certificate that >> has invalid explicit curve parameters. >> >> Since certificate parsing happens prior to verification of the certificate >> signature, any process that parses an externally supplied certificate may >> thus be subject to a denial of service attack. The infinite loop can also >> be reached when parsing crafted private keys as they can contain explicit >> elliptic curve parameters. >> >> Thus vulnerable situations include: >> >> - TLS clients consuming server certificates >> - TLS servers consuming client certificates >> - Hosting providers taking certificates or private keys from customers >> - Certificate authorities parsing certification requests from subscribers >> - Anything else which parses ASN.1 elliptic curve parameters >> >> Also any other applications that use the BN_mod_sqrt() where the attacker >> can control the parameter values are vulnerable to this DoS issue. >> (CVE-2022-0778) >> [Tom?? Mr?z] >> >> *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) >> to the list of ciphersuites providing Perfect Forward Secrecy as >> required by SECLEVEL >= 3. >> >> [Dmitry Belyavskiy, Nicola Tuveri] >> >> Signed-off-by: Peter Seiderer > Applied to master, thanks. > Regards, > Yann E. MORIN. >> --- >> package/libopenssl/libopenssl.hash | 4 ++-- >> package/libopenssl/libopenssl.mk | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash >> index a055cbc270..22bb365bcc 100644 >> --- a/package/libopenssl/libopenssl.hash >> +++ b/package/libopenssl/libopenssl.hash >> @@ -1,5 +1,5 @@ >> -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 >> -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz >> +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 >> +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz >> >> # License files >> sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE >> diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk >> index bd8ef6141a..ae6658ed40 100644 >> --- a/package/libopenssl/libopenssl.mk >> +++ b/package/libopenssl/libopenssl.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -LIBOPENSSL_VERSION = 1.1.1m >> +LIBOPENSSL_VERSION = 1.1.1n >> LIBOPENSSL_SITE = https://www.openssl.org/source >> LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz >> LIBOPENSSL_LICENSE = OpenSSL or SSLeay >> -- >> 2.35.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:37:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:37:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libopenssl: security bump version to 1.1.1n Message-ID: <20220320212912.909F484685@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4750711e879647cb40b0b1af4f0606494748dd4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66868e9fab2806686fd08850a3e56185ef00b127) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index e713afef7f..2a2870b85e 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sun Mar 20 21:37:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:37:09 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libopenssl: security bump version to 1.1.1n Message-ID: <20220320212918.2221F84688@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf9a6bc55c04533849dc33ac625ada5965781e5a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66868e9fab2806686fd08850a3e56185ef00b127) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sun Mar 20 21:35:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:35:37 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgtk3: bump to version 3.24.33 Message-ID: <20220320212923.B57F88468E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=414b4c5d86813393ae7816e918066dff9a98f569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ed721a0b9b3bbb3fca8487b49117f55bbf791180) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb518..23ce1f42bb 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.sha256sum +sha256 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 gtk+-3.24.33.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade6..cd0a75eb23 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).33 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From peter at korsgaard.com Sun Mar 20 21:36:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:36:51 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libopenssl: security bump version to 1.1.1n Message-ID: <20220320212923.C1B2B8468D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e1fe19616196930cb803f52760c55340607c894e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changes between 1.1.1m and 1.1.1n [15 Mar 2022] *) Fixed a bug in the BN_mod_sqrt() function that can cause it to loop forever for non-prime moduli. Internally this function is used when parsing certificates that contain elliptic curve public keys in compressed form or explicit elliptic curve parameters with a base point encoded in compressed form. It is possible to trigger the infinite loop by crafting a certificate that has invalid explicit curve parameters. Since certificate parsing happens prior to verification of the certificate signature, any process that parses an externally supplied certificate may thus be subject to a denial of service attack. The infinite loop can also be reached when parsing crafted private keys as they can contain explicit elliptic curve parameters. Thus vulnerable situations include: - TLS clients consuming server certificates - TLS servers consuming client certificates - Hosting providers taking certificates or private keys from customers - Certificate authorities parsing certification requests from subscribers - Anything else which parses ASN.1 elliptic curve parameters Also any other applications that use the BN_mod_sqrt() where the attacker can control the parameter values are vulnerable to this DoS issue. (CVE-2022-0778) [Tom???? Mr??z] *) Add ciphersuites based on DHE_PSK (RFC 4279) and ECDHE_PSK (RFC 5489) to the list of ciphersuites providing Perfect Forward Secrecy as required by SECLEVEL >= 3. [Dmitry Belyavskiy, Nicola Tuveri] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 66868e9fab2806686fd08850a3e56185ef00b127) Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc270..22bb365bcc 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1n.tar.gz.sha256 +sha256 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a..ae6658ed40 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1n LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From peter at korsgaard.com Sun Mar 20 21:34:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:34:43 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libglib2: bump to version 2.70.4 Message-ID: <20220320212923.AA6968468D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f91778be4df5b0caebfeee2a421eae64af2689f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2a8ceb5cb30a9c28447e89c4b5bef67277697935) Signed-off-by: Peter Korsgaard --- package/libglib2/0002-remove-cpp-requirement.patch | 6 +++--- .../0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch | 2 +- .../0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 4 ++-- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f95228932..b5603c92f4 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', + version : '2.70.4', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', @@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2339,7 +2324,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982e..e212393011 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd31..db77a73203 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,7 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,7 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08e..f0f0cb55ad 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum +sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8bb..18f5b329c7 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From peter at korsgaard.com Sun Mar 20 21:42:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:42:11 +0100 Subject: [Buildroot] [PATCH 1/6] package/zynaddsubfx: fix PluginEnable option In-Reply-To: <20220316214441.GB283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 22:44:41 +0100") References: <20220316212220.3437314-1-fontaine.fabrice@gmail.com> <20220316214441.GB283544@scaer> Message-ID: <87a6dkl2rw.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Fabrice, All, > On 2022-03-16 22:22 +0100, Fabrice Fontaine spake thusly: >> Replace False by OFF when setting PluginEnable option >> >> Signed-off-by: Fabrice Fontaine > Series of 6 patches applied to master, thanks. And to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 20 21:41:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:07 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: fix atomic linking Message-ID: <20220320213324.E07E2846A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcfccfddf169c6382ef162066a769dc8b28428d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: libzynaddsubfx_core.a(Master.cpp.o): in function `.L1880': Master.cpp:(.text+0x7cc0): undefined reference to `__atomic_exchange_1' Fixes: - http://autobuild.buildroot.org/results/91b5959ca0eb136c1609462e71d109ff09cca5e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ba7319a06e1b98524fde1384dc570a7f34870881) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index b2eb1921fa..db0459ce62 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -14,7 +14,7 @@ ZYNADDSUBFX_LICENSE_FILES = COPYING ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ From peter at korsgaard.com Sun Mar 20 21:40:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:40:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: fix PluginEnable option Message-ID: <20220320213324.C8235846A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35dcc9ca2265b8587026b0a96ee892e95dc71f2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Replace False by OFF when setting PluginEnable option Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2e1a86e95091b69ad043c33aadf7220866a45f29) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede..c8d64f5ce8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Sun Mar 20 21:41:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: disable tests Message-ID: <20220320213324.D48C2846A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f63050ec64a87da67c0d20c2b800a6b6f5bdcdc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable tests which are enabled by default since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 886629bf64d8093fc847ebbbed779a09722843da) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index c8d64f5ce8..b2eb1921fa 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,7 +11,7 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=OFF +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Sun Mar 20 21:41:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:20 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: add jack{1, 2} optional dependency Message-ID: <20220320213325.0960F846A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=af8839589acb2b3399e36a925e37a48d7b170382 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x jack{1,2} is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3bcedaa732b539e4ad32776e867ef9626ffca5b7) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index aeeb0b6405..461146aae8 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -30,4 +30,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF endif +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + $(eval $(cmake-package)) From peter at korsgaard.com Sun Mar 20 21:41:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:11 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: fix alsa-lib handling Message-ID: <20220320213324.F12C1846A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=76de77202d01d280a2b0f4c6c98e8b8887e73675 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fc2191845799ae2358b752fa29839817d33ad82) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package)) From peter at korsgaard.com Sun Mar 20 21:41:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 22:41:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/zynaddsubfx: add portaudio optional dependency Message-ID: <20220320213325.14BD8846A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84a9bdb30e7510cb6426d02f39109c53fd1dc420 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x portaudio is an optional dependency (enabled by default) since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e820feba362a29a310ed3a93c8ad5546ceb8a2ee) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/zynaddsubfx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 461146aae8..aff9ac4bf4 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -37,4 +37,11 @@ else ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) From paguilar at paguilar.org Sun Mar 20 22:14:44 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 20 Mar 2022 23:14:44 +0100 Subject: [Buildroot] [PATCH 1/2] packages/guile: bump to version 3.0.8 Message-ID: <20220320221445.10259-1-paguilar@paguilar.org> Signed-off-by: Pedro Aguilar --- package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/guile/guile.hash b/package/guile/guile.hash index c2719fa7f2..e9ae5b6e51 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz +sha256 daa7060a56f2804e9b74c8d7e7fe8beed12b43aab2789a38585183fcc17b8a13 guile-3.0.8.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 859d7ec96f..9478e75b41 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 3.0.7 +GUILE_VERSION = 3.0.8 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES -- 2.25.1 From peter at korsgaard.com Sun Mar 20 22:38:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:38:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220320222954.4B370846AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d17874dfbeff4017b0fb59510dcd51fa895a0ff3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN (cherry picked from commit c72f3f2b43f4607ed94d51a21abe5e3d909efb36) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index f6da090d22..2a3d8a78a8 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -475,7 +475,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From peter at korsgaard.com Sun Mar 20 22:38:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:38:38 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220320222958.E270B846CB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbd4355aecf49b329ea7ab71c3a0d1d4466fad02 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN (cherry picked from commit c72f3f2b43f4607ed94d51a21abe5e3d909efb36) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index abd36a3dd5..a27d6a269f 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From peter at korsgaard.com Sun Mar 20 22:38:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:38:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() Message-ID: <20220320223004.8314B846D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6788e82f45d38cff560c33392f4b556e9d79e476 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The check_package_get_latest_version_by_distro() function analyzes the data returned by release-monitoring.org. For two of our packages (bento4 and qextserialport), release-monitoring.org returns something that is a bit odd: it returns an entry with a "stable_versions" field that contains an empty array. Our code was ready to have or not have a "stable_versions" entry, but when it is present, we assumed it was not an empty array. These two packages, for some reason, break this assumption. In order to solve this problem, this commit is more careful, and uses the stable_versions field only if it exists and it has at least one entry. The code is also reworked as a sequence of "if...elif...else" to be more readable. This fixes the following exception when running pkg-stats on the full package set: Task exception was never retrieved future: exception=IndexError('list index out of range')> Traceback (most recent call last): File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get if await check_package_get_latest_version_by_distro(session, pkg): File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None IndexError: list index out of range Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: non-sequence tests as True] Signed-off-by: Yann E. MORIN (cherry picked from commit c72f3f2b43f4607ed94d51a21abe5e3d909efb36) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d99407..8cc64a54d1 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -486,7 +486,12 @@ async def check_package_get_latest_version_by_distro(session, pkg, retry=True): return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, From yann.morin.1998 at free.fr Sun Mar 20 22:39:26 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 23:39:26 +0100 Subject: [Buildroot] [PATCH] pkg-generic: fix rdepends and phony targets of virtual packages In-Reply-To: <9470ba2b-e40f-322d-b37a-f0daea8f5059@mind.be> References: <20220316101223.3704745-1-anssi.hannula@bitwise.fi> <9470ba2b-e40f-322d-b37a-f0daea8f5059@mind.be> Message-ID: <20220320223926.GH1566358@scaer> Arnout, Anssi, All, On 2022-03-17 22:27 +0100, Arnout Vandecappelle spake thusly: > On 16/03/2022 11:12, Anssi Hannula wrote: > >Virtual packages are not added to the _RDEPENDENCIES list of packages > >that they depend on (i.e. their provider). > > > >This causes -show-rdepends to not show the virtual package > >and -show-recursive-rdepends to miss all the packages that > >transitively depend on via the virtual package. > > > >The virtual make targets (e.g. -show-info) are also not marked as > >phony for virtual packages. > > > >To fix those issues, remove most of the special handling of virtual > >packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as > >well. Very elegant solution. > >This also allows removal of some duplicated code in pkg-generic.mk and a > >now unneeded special condition in CHECK_ONE_DEPENDENCY. > > > >Still keep the virtual package out of PACKAGES since there is e.g. no > >need to rsync per-package target dir to global target dir. I am not > >aware of any showstoppers preventing addition to PACKAGES as well, > >though, so it is probably just an optimization. > > > >Signed-off-by: Anssi Hannula > >--- > > > >I encountered this while using -show-recursive-rdepends to > >determine which packages to dirclean after modification of a > >(non-virtual) in per-package mode. > > > >The current virtual vs. real distinction didn't seem worth the risk of > > Well, I guess there *was* a reason that we introduced this distinction way > back when, and that all the build targets are skipped for virtual packages. > However, I can't remember the reason. Maybe Yann (the instigator of this > feature) still remembers? Not really. I did some archeology in the commit logs, but found no explicit reason... > Looking at the history, in particular e.g. commit c5d546450fc1 that > converts libgles from generic infrastructure to virtual, it looks like it > really *should* be OK to keep the full build targets. And in that case, this > patch is a really nice simplification! > > So, unless Yann objects, I'd say: let's try it and let the autobuilders complain! I've smoke-tested it with a few of my favourite rules with a simple configuration with a virtual package: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_PYC=y BR2_PACKAGE_WAYLAND=y $ make source $ make legal-info $ make show-info $ make show-vars All went OK. Applied to master, thanks. Regards, Yann E. MORIN. > Regards, > Arnout > > >unintentional differences so I dropped it, but I'm not too familiar with > >the code so I could have missed something. > >In case I did and this is not a good idea, one less intrusive option > >would be to split the common-to-virtual-and-real-packages code to be > >under a new separate conditional block. > > > > > > Makefile | 2 -- > > package/pkg-generic.mk | 24 +++++------------------- > > 2 files changed, 5 insertions(+), 21 deletions(-) > > > >diff --git a/Makefile b/Makefile > >index 4f693d40a9..9e875dd8d8 100644 > >--- a/Makefile > >+++ b/Makefile > >@@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) > > define CHECK_ONE_DEPENDENCY > > ifeq ($$($(2)_TYPE),target) > >-ifeq ($$($(2)_IS_VIRTUAL),) > > ifneq ($$($$($(2)_KCONFIG_VAR)),y) > > $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ > > has added it to its _DEPENDENCIES variable without selecting it or \ > > depending on it from Config.in) > > endif > > endif > >-endif > > endef > > $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ > >diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > >index b3a7e1d60e..a0d6198edc 100644 > >--- a/package/pkg-generic.mk > >+++ b/package/pkg-generic.mk > >@@ -1064,15 +1064,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > > $$($(2)_TARGET_DIRCLEAN): NAME=$(1) > > # Compute the name of the Kconfig option that correspond to the > >-# package being enabled. We handle three cases: the special Linux > >-# kernel case, the bootloaders case, and the normal packages case. > >-# Virtual packages are handled separately (see below). > >+# package being enabled. > > ifeq ($(1),linux) > > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > > $(2)_KCONFIG_VAR = BR2_TARGET_$(2) > > else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) > > $(2)_KCONFIG_VAR = BR2_$(2) > >+else ifeq ($$($(2)_IS_VIRTUAL),YES) > >+$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) > > else > > $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) > > endif > >@@ -1178,7 +1178,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) > > $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) > > $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) > >+ifneq ($$($(2)_IS_VIRTUAL),YES) > > PACKAGES += $(1) > >+endif > > ifneq ($$($(2)_PERMISSIONS),) > > PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > >@@ -1268,22 +1270,6 @@ ifneq ($$($(2)_HELP_CMDS),) > > HELP_PACKAGES += $(2) > > endif > >-# Virtual packages are not built but it's useful to allow them to have > >-# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > >-else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR > >- > >-ifneq ($$($(2)_PERMISSIONS),) > >-PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > >-endif > >-ifneq ($$($(2)_DEVICES),) > >-PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) > >-endif > >-ifneq ($$($(2)_USERS),) > >-PACKAGES_USERS += $$($(2)_USERS)$$(sep) > >-endif > >-TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) > >-ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) > >- > > endif # $(2)_KCONFIG_VAR > > endef # inner-generic-package -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Mar 20 21:55:17 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 22:55:17 +0100 Subject: [Buildroot] [git commit] pkg-generic: fix rdepends and phony targets of virtual packages Message-ID: <20220320223043.867B6846DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=842ba7eceffb97e9795807e890b0557ab6d542aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Virtual packages are not added to the _RDEPENDENCIES list of packages that they depend on (i.e. their provider). This causes -show-rdepends to not show the virtual package and -show-recursive-rdepends to miss all the packages that transitively depend on via the virtual package. The virtual make targets (e.g. -show-info) are also not marked as phony for virtual packages. To fix those issues, remove most of the special handling of virtual packages in pkg-generic by making $($($(1)_KCONFIG_VAR))=y for them as well. This also allows removal of some duplicated code in pkg-generic.mk and a now unneeded special condition in CHECK_ONE_DEPENDENCY. Still keep the virtual package out of PACKAGES since there is e.g. no need to rsync per-package target dir to global target dir. I am not aware of any showstoppers preventing addition to PACKAGES as well, though, so it is probably just an optimization. Signed-off-by: Anssi Hannula Signed-off-by: Yann E. MORIN --- Makefile | 2 -- package/pkg-generic.mk | 24 +++++------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 6756945819..3bbbdfbe01 100644 --- a/Makefile +++ b/Makefile @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) define CHECK_ONE_DEPENDENCY ifeq ($$($(2)_TYPE),target) -ifeq ($$($(2)_IS_VIRTUAL),) ifneq ($$($$($(2)_KCONFIG_VAR)),y) $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ has added it to its _DEPENDENCIES variable without selecting it or \ depending on it from Config.in) endif endif -endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 79fcf603d3..1222526ba1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1088,15 +1088,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the -# package being enabled. We handle three cases: the special Linux -# kernel case, the bootloaders case, and the normal packages case. -# Virtual packages are handled separately (see below). +# package being enabled. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) +else ifeq ($$($(2)_IS_VIRTUAL),YES) +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif @@ -1202,7 +1202,9 @@ $(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) $(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) $(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) +ifneq ($$($(2)_IS_VIRTUAL),YES) PACKAGES += $(1) +endif ifneq ($$($(2)_PERMISSIONS),) PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) @@ -1292,22 +1294,6 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif -# Virtual packages are not built but it's useful to allow them to have -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR - -ifneq ($$($(2)_PERMISSIONS),) -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) -endif -ifneq ($$($(2)_DEVICES),) -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) -endif -ifneq ($$($(2)_USERS),) -PACKAGES_USERS += $$($(2)_USERS)$$(sep) -endif -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) - endif # $(2)_KCONFIG_VAR endef # inner-generic-package From peter at korsgaard.com Sun Mar 20 22:39:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 20 Mar 2022 23:39:31 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni via buildroot's message of "Wed, 16 Mar 2022 22:48:46 +0100") References: <20220316214848.448925-1-thomas.petazzoni@bootlin.com> Message-ID: <875yo8l04c.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > The check_package_get_latest_version_by_distro() function analyzes the > data returned by release-monitoring.org. For two of our > packages (bento4 and qextserialport), release-monitoring.org returns > something that is a bit odd: it returns an entry with a > "stable_versions" field that contains an empty array. Our code was > ready to have or not have a "stable_versions" entry, but when it is > present, we assumed it was not an empty array. These two packages, for > some reason, break this assumption. > In order to solve this problem, this commit is more careful, and uses > the stable_versions field only if it exists and it has at least one > entry. The code is also reworked as a sequence of "if...elif...else" > to be more readable. > This fixes the following exception when running pkg-stats on the full > package set: > Task exception was never retrieved > future: exception=IndexError('list index out of range')> > Traceback (most recent call last): > File "./support/scripts/pkg-stats", line 535, in check_package_latest_version_get > if await check_package_get_latest_version_by_distro(session, pkg): > File "./support/scripts/pkg-stats", line 489, in check_package_get_latest_version_by_distro > version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None > IndexError: list index out of range > Signed-off-by: Thomas Petazzoni Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sun Mar 20 22:52:24 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 20 Mar 2022 23:52:24 +0100 Subject: [Buildroot] [git commit] support/scripts/graph-build-time: add support for timeline graphing Message-ID: <20220320230556.2F0A6846E4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e8b01afd5d8d8af8f4ce334073df9b15497cf36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit adds support for a new type of graph, showing the timeline of a build. It shows, with one line per package, when each of this package steps started/ended, and therefore allows to see the sequencing of the package builds. For a fully serialized build like we have today, this is not super useful (except to show that everything is serialized), but it becomes much more useful in the context of top-level parallel build. We chose to order the graph by the time-of-configure, as it is the closest to the actual cascade-style of a true dependency graph, which is tiny bit more complex to achieve properly. The actual result still looks pretty good. The graph-build make target is extended to also generate this new timeline graph. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - sort by start-of-configure time - re-use existing colorsets (default or alternate) - fix python2isms - fix check-package ] Signed-off-by: Yann E. MORIN --- Makefile | 3 ++ support/scripts/graph-build-time | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3bbbdfbe01..05b790d770 100644 --- a/Makefile +++ b/Makefile @@ -871,6 +871,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a50..1edc3b3c00 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) From paguilar at paguilar.org Sun Mar 20 22:14:45 2022 From: paguilar at paguilar.org (Pedro Aguilar) Date: Sun, 20 Mar 2022 23:14:45 +0100 Subject: [Buildroot] [PATCH 2/2] packages/guile: remove patches not needed in 3.0.8 In-Reply-To: <20220320221445.10259-1-paguilar@paguilar.org> References: <20220320221445.10259-1-paguilar@paguilar.org> Message-ID: <20220320221445.10259-2-paguilar@paguilar.org> These patches are already part of Guile's source code in version 3.0.8. Let's remove them to avoid errors while patching the package. 0003-module-system-base-target.scm-support-riscv32.patch 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch Signed-off-by: Pedro Aguilar --- ...stem-base-target.scm-support-riscv32.patch | 33 - ...38a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 ---------------- 2 files changed, 13963 deletions(-) delete mode 100644 package/guile/0003-module-system-base-target.scm-support-riscv32.patch delete mode 100644 package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch diff --git a/package/guile/0003-module-system-base-target.scm-support-riscv32.patch b/package/guile/0003-module-system-base-target.scm-support-riscv32.patch deleted file mode 100644 index a988d2d995..0000000000 --- a/package/guile/0003-module-system-base-target.scm-support-riscv32.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 6 Aug 2021 19:49:37 +0200 -Subject: [PATCH] module/system/base/target.scm: support riscv32 - -Fix the following build failure on riscv32: - -system/base/target.scm:132:16: In procedure triplet-pointer-size: -unknown CPU word size "riscv32" - -Fixes: - - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8 - -Signed-off-by: Fabrice Fontaine ---- - module/system/base/target.scm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/system/base/target.scm b/module/system/base/target.scm -index 2088cd866..dba46664d 100644 ---- a/module/system/base/target.scm -+++ b/module/system/base/target.scm -@@ -116,6 +116,7 @@ - - ((string-match "^x86_64-.*-gnux32" triplet) 4) ; x32 - -+ ((string-match "32$" cpu) 4) - ((string-match "64$" cpu) 8) - ((string-match "64_?[lbe][lbe]$" cpu) 8) - ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4) --- -2.30.2 - diff --git a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch deleted file mode 100644 index f471dbc5c0..0000000000 --- a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch +++ /dev/null @@ -1,13930 +0,0 @@ -From b4a80f4239b19fea4d2cc3e9d197f24b809f0624 Mon Sep 17 00:00:00 2001 -From: Daniel Llorens -Date: Mon, 16 Aug 2021 13:23:27 +0200 -Subject: Update gnulib to 8f4538a53d64054ae2fc8b86c0f87c418c6176e6 - -Includes gnulib:0c907f7da13232908f05c415b8cec56024071906 to fix #49930 -https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html. - -[Retrieved from: -https://git.savannah.gnu.org/cgit/guile.git/commit/?id=b4a80f4239b19fea4d2cc3e9d197f24b809f0624] -Signed-off-by: Fabrice Fontaine ---- - build-aux/announce-gen | 49 +- - build-aux/gendocs.sh | 6 +- - build-aux/git-version-gen | 8 +- - build-aux/gnupload | 17 +- - build-aux/useless-if-before-free | 18 +- - lib/Makefile.am | 986 ++++++++++++++++++++------------------- - lib/_Noreturn.h | 2 +- - lib/accept.c | 10 +- - lib/accept4.c | 14 +- - lib/alignof.h | 12 +- - lib/alloca.c | 4 +- - lib/alloca.in.h | 20 +- - lib/arpa_inet.in.h | 12 +- - lib/asnprintf.c | 14 +- - lib/assure.h | 10 +- - lib/attribute.h | 16 +- - lib/basename-lgpl.c | 10 +- - lib/basename-lgpl.h | 26 +- - lib/binary-io.c | 10 +- - lib/binary-io.h | 10 +- - lib/bind.c | 10 +- - lib/btowc.c | 10 +- - lib/byteswap.in.h | 10 +- - lib/c-ctype.c | 18 + - lib/c-ctype.h | 24 +- - lib/c-strcase.h | 12 +- - lib/c-strcasecmp.c | 12 +- - lib/c-strcaseeq.h | 14 +- - lib/c-strncasecmp.c | 12 +- - lib/canonicalize-lgpl.c | 3 +- - lib/cdefs.h | 43 +- - lib/ceil.c | 10 +- - lib/cloexec.c | 14 +- - lib/cloexec.h | 14 +- - lib/close.c | 10 +- - lib/connect.c | 10 +- - lib/copysign.c | 10 +- - lib/dirent.in.h | 111 +++-- - lib/dirfd.c | 10 +- - lib/dirname-lgpl.c | 10 +- - lib/dirname.h | 39 +- - lib/dup2.c | 10 +- - lib/duplocale.c | 10 +- - lib/dynarray.h | 20 +- - lib/errno.in.h | 12 +- - lib/fcntl.c | 10 +- - lib/fcntl.in.h | 10 +- - lib/fd-hook.c | 14 +- - lib/fd-hook.h | 14 +- - lib/float+.h | 12 +- - lib/float.c | 10 +- - lib/float.in.h | 10 +- - lib/floor.c | 10 +- - lib/free.c | 10 +- - lib/frexp.c | 10 +- - lib/fstat.c | 10 +- - lib/fsync.c | 14 +- - lib/full-read.c | 10 +- - lib/full-read.h | 10 +- - lib/full-write.c | 10 +- - lib/full-write.h | 10 +- - lib/gai_strerror.c | 12 +- - lib/getaddrinfo.c | 12 +- - lib/getdtablesize.c | 10 +- - lib/getlogin.c | 10 +- - lib/getpeername.c | 10 +- - lib/getrandom.c | 16 +- - lib/getsockname.c | 10 +- - lib/getsockopt.c | 10 +- - lib/gettext.h | 14 +- - lib/hard-locale.c | 10 +- - lib/hard-locale.h | 10 +- - lib/iconv.c | 14 +- - lib/iconv.in.h | 12 +- - lib/iconv_close.c | 14 +- - lib/iconv_open-aix.gperf | 14 +- - lib/iconv_open-hpux.gperf | 14 +- - lib/iconv_open-irix.gperf | 14 +- - lib/iconv_open-osf.gperf | 14 +- - lib/iconv_open-solaris.gperf | 14 +- - lib/iconv_open-zos.gperf | 14 +- - lib/iconv_open.c | 14 +- - lib/iconveh.h | 10 +- - lib/inet_ntop.c | 12 +- - lib/inet_pton.c | 10 +- - lib/inttypes.in.h | 10 +- - lib/isfinite.c | 14 +- - lib/isinf.c | 14 +- - lib/isnan.c | 10 +- - lib/isnand-nolibm.h | 10 +- - lib/isnand.c | 10 +- - lib/isnanf-nolibm.h | 10 +- - lib/isnanf.c | 10 +- - lib/isnanl-nolibm.h | 10 +- - lib/isnanl.c | 10 +- - lib/itold.c | 10 +- - lib/langinfo.in.h | 12 +- - lib/lc-charset-dispatch.c | 10 +- - lib/lc-charset-dispatch.h | 10 +- - lib/libc-config.h | 20 +- - lib/libunistring.valgrind | 22 +- - lib/limits.in.h | 28 +- - lib/link.c | 12 +- - lib/listen.c | 10 +- - lib/localcharset.c | 14 +- - lib/localcharset.h | 14 +- - lib/locale.in.h | 10 +- - lib/localeconv.c | 10 +- - lib/log.c | 10 +- - lib/log1p.c | 10 +- - lib/lstat.c | 10 +- - lib/malloc.c | 47 +- - lib/malloc/dynarray_at_failure.c | 3 +- - lib/malloca.c | 36 +- - lib/malloca.h | 36 +- - lib/math.c | 18 + - lib/math.in.h | 10 +- - lib/mbrtowc-impl-utf8.h | 10 +- - lib/mbrtowc-impl.h | 10 +- - lib/mbrtowc.c | 10 +- - lib/mbsinit.c | 10 +- - lib/mbtowc-impl.h | 10 +- - lib/mbtowc-lock.c | 10 +- - lib/mbtowc-lock.h | 10 +- - lib/mbtowc.c | 10 +- - lib/memchr.c | 24 +- - lib/memchr.valgrind | 10 +- - lib/mempcpy.c | 12 +- - lib/minmax.h | 12 +- - lib/mkdir.c | 10 +- - lib/mkostemp.c | 10 +- - lib/msvc-inval.c | 14 +- - lib/msvc-inval.h | 14 +- - lib/msvc-nothrow.c | 14 +- - lib/msvc-nothrow.h | 14 +- - lib/netdb.in.h | 12 +- - lib/netinet_in.in.h | 12 +- - lib/nl_langinfo-lock.c | 10 +- - lib/nl_langinfo.c | 10 +- - lib/nproc.c | 12 +- - lib/nproc.h | 12 +- - lib/nstrftime.c | 19 +- - lib/open.c | 10 +- - lib/pathmax.h | 12 +- - lib/pipe.c | 14 +- - lib/pipe2.c | 14 +- - lib/poll.c | 14 +- - lib/poll.in.h | 14 +- - lib/printf-args.c | 14 +- - lib/printf-args.h | 14 +- - lib/printf-parse.c | 25 +- - lib/printf-parse.h | 14 +- - lib/putenv.c | 10 +- - lib/raise.c | 10 +- - lib/rawmemchr.c | 10 +- - lib/rawmemchr.valgrind | 10 +- - lib/read.c | 10 +- - lib/readlink.c | 10 +- - lib/realloc.c | 68 +-- - lib/recv.c | 10 +- - lib/recvfrom.c | 10 +- - lib/regex_internal.c | 9 +- - lib/regexec.c | 12 +- - lib/rename.c | 10 +- - lib/rmdir.c | 10 +- - lib/round.c | 14 +- - lib/safe-read.c | 10 +- - lib/safe-read.h | 10 +- - lib/safe-write.c | 10 +- - lib/safe-write.h | 10 +- - lib/same-inode.h | 10 +- - lib/scratch_buffer.h | 20 +- - lib/select.c | 23 +- - lib/send.c | 10 +- - lib/sendto.c | 10 +- - lib/setenv.c | 10 +- - lib/setlocale-lock.c | 10 +- - lib/setlocale_null.c | 10 +- - lib/setlocale_null.h | 10 +- - lib/setsockopt.c | 10 +- - lib/shutdown.c | 10 +- - lib/signal.in.h | 10 +- - lib/signbitd.c | 10 +- - lib/signbitf.c | 10 +- - lib/signbitl.c | 10 +- - lib/size_max.h | 12 +- - lib/snprintf.c | 14 +- - lib/socket.c | 10 +- - lib/sockets.c | 10 +- - lib/sockets.h | 10 +- - lib/stat-time.c | 18 + - lib/stat-time.h | 10 +- - lib/stat-w32.c | 10 +- - lib/stat-w32.h | 10 +- - lib/stat.c | 10 +- - lib/stdalign.in.h | 12 +- - lib/stdbool.in.h | 12 +- - lib/stddef.in.h | 12 +- - lib/stdint.in.h | 16 +- - lib/stdio.in.h | 126 +++-- - lib/stdlib.in.h | 185 ++++++-- - lib/strdup.c | 14 +- - lib/streq.h | 14 +- - lib/strftime.h | 10 +- - lib/striconveh.c | 10 +- - lib/striconveh.h | 18 +- - lib/string.in.h | 68 ++- - lib/stripslash.c | 10 +- - lib/sys-limits.h | 12 +- - lib/sys_file.in.h | 12 +- - lib/sys_random.in.h | 12 +- - lib/sys_select.in.h | 12 +- - lib/sys_socket.c | 18 + - lib/sys_socket.in.h | 12 +- - lib/sys_stat.in.h | 12 +- - lib/sys_time.in.h | 12 +- - lib/sys_times.in.h | 12 +- - lib/sys_types.in.h | 12 +- - lib/sys_uio.in.h | 12 +- - lib/tempname.h | 10 +- - lib/time-internal.h | 14 +- - lib/time.in.h | 12 +- - lib/time_r.c | 14 +- - lib/time_rz.c | 14 +- - lib/times.c | 12 +- - lib/trunc.c | 10 +- - lib/tzset.c | 12 +- - lib/unistd.c | 18 + - lib/unistd.in.h | 25 +- - lib/unsetenv.c | 10 +- - lib/vasnprintf.c | 50 +- - lib/vasnprintf.h | 14 +- - lib/verify.h | 14 +- - lib/vsnprintf.c | 14 +- - lib/w32sock.h | 10 +- - lib/wchar.in.h | 63 ++- - lib/wcrtomb.c | 10 +- - lib/wctype-h.c | 19 + - lib/wctype.in.h | 22 +- - lib/windows-initguard.h | 12 +- - lib/write.c | 10 +- - lib/xalloc-oversized.h | 47 +- - lib/xsize.c | 18 + - lib/xsize.h | 12 +- - m4/arpa_inet_h.m4 | 31 +- - m4/dirent_h.m4 | 45 +- - m4/environ.m4 | 5 +- - m4/fcntl_h.m4 | 39 +- - m4/flock.m4 | 4 +- - m4/fstat.m4 | 4 +- - m4/getaddrinfo.m4 | 10 +- - m4/gnulib-common.m4 | 140 +++++- - m4/gnulib-comp.m4 | 140 ++++-- - m4/hostent.m4 | 4 +- - m4/iconv_h.m4 | 27 +- - m4/inttypes.m4 | 31 +- - m4/langinfo_h.m4 | 25 +- - m4/largefile.m4 | 28 +- - m4/limits-h.m4 | 3 +- - m4/locale_h.m4 | 37 +- - m4/malloc.m4 | 152 ++++-- - m4/math_h.m4 | 227 ++++----- - m4/memchr.m4 | 4 +- - m4/mempcpy.m4 | 4 +- - m4/mktime.m4 | 4 +- - m4/netdb_h.m4 | 25 +- - m4/poll_h.m4 | 29 +- - m4/printf.m4 | 5 +- - m4/rawmemchr.m4 | 4 +- - m4/realloc.m4 | 47 +- - m4/regex.m4 | 44 +- - m4/select.m4 | 4 +- - m4/servent.m4 | 4 +- - m4/signal_h.m4 | 33 +- - m4/sockpfaf.m4 | 6 +- - m4/stat.m4 | 4 +- - m4/stddef_h.m4 | 23 +- - m4/stdint.m4 | 6 +- - m4/stdio_h.m4 | 168 ++++--- - m4/stdlib_h.m4 | 116 +++-- - m4/strdup.m4 | 6 +- - m4/string_h.m4 | 124 ++--- - m4/sys_file_h.m4 | 29 +- - m4/sys_random_h.m4 | 25 +- - m4/sys_select_h.m4 | 29 +- - m4/sys_socket_h.m4 | 53 ++- - m4/sys_stat_h.m4 | 65 ++- - m4/sys_time_h.m4 | 34 +- - m4/sys_times_h.m4 | 25 +- - m4/sys_types_h.m4 | 16 +- - m4/sys_uio_h.m4 | 23 +- - m4/threadlib.m4 | 64 ++- - m4/time_h.m4 | 62 +-- - m4/time_r.m4 | 2 +- - m4/time_rz.m4 | 2 +- - m4/timegm.m4 | 4 +- - m4/tzset.m4 | 4 +- - m4/unistd_h.m4 | 194 ++++---- - m4/visibility.m4 | 6 +- - m4/wchar_h.m4 | 109 +++-- - m4/wctype_h.m4 | 39 +- - m4/wint_t.m4 | 10 +- - m4/year2038.m4 | 124 +++++ - maint.mk | 3 +- - 304 files changed, 4266 insertions(+), 3005 deletions(-) - create mode 100644 m4/year2038.m4 - -diff --git a/build-aux/announce-gen b/build-aux/announce-gen -index 84d2d63..f3b5461 100755 ---- a/build-aux/announce-gen -+++ b/build-aux/announce-gen -@@ -35,12 +35,14 @@ - eval 'exec perl -wSx "$0" "$@"' - if 0; - --my $VERSION = '2020-05-10 16:13'; # UTC -+my $VERSION = '2021-08-04 09:17'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - -+my $copyright_year = '2021'; -+ - use strict; - use Getopt::Long; - use POSIX qw(strftime); -@@ -49,12 +51,6 @@ use POSIX qw(strftime); - - my %valid_release_types = map {$_ => 1} qw (alpha beta stable); - my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz); --my %digest_classes = -- ( -- 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), -- 'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA') -- or (eval { require Digest::SHA1; } and 'Digest::SHA1')) -- ); - my $srcdir = '.'; - - sub usage ($) -@@ -94,7 +90,7 @@ The following are optional: - VERSION is the result of running git describe - in the gnulib source directory. - required if gnulib is in TOOL_LIST. -- --no-print-checksums do not emit MD5 or SHA1 checksums -+ --no-print-checksums do not emit SHA1 or SHA256 checksums - --archive-suffix=SUF add SUF to the list of archive suffixes - --mail-headers=HEADERS a space-separated list of mail headers, e.g., - To: x\@example.com Cc: y-announce\@example.com,... -@@ -161,7 +157,7 @@ sub print_locations ($\@\%@) - - =item C. -+Print the SHA1 and SHA256 signature section for each C<@file>. - - =cut - -@@ -169,23 +165,18 @@ sub print_checksums (@) - { - my (@file) = @_; - -- print "Here are the MD5 and SHA1 checksums:\n"; -+ print "Here are the SHA1 and SHA256 checksums:\n"; - print "\n"; - -- foreach my $meth (qw (md5 sha1)) -+ use Digest::file qw(digest_file_hex digest_file_base64); -+ -+ foreach my $f (@file) - { -- my $class = $digest_classes{$meth} or next; -- foreach my $f (@file) -- { -- open IN, '<', $f -- or die "$ME: $f: cannot open for reading: $!\n"; -- binmode IN; -- my $dig = $class->new->addfile(*IN)->hexdigest; -- close IN; -- print "$dig $f\n"; -- } -+ print digest_file_hex($f, "SHA-1"), " $f\n"; -+ print digest_file_base64($f, "SHA-256"), " $f\n"; - } -- print "\n"; -+ print "\nThe SHA256 checksum is base64 encoded, instead of the\n"; -+ print "hexadecimal encoding that most checksum tools default to.\n\n"; - } - - =item C \@archive_suffixes, - - help => sub { usage 0 }, -- version => sub { print "$ME version $VERSION\n"; exit }, -+ version => -+ sub -+ { -+ print "$ME version $VERSION\n"; -+ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; -+ print "License GPLv3+: GNU GPL version 3 or later .\n" -+ . "This is free software: you are free to change and redistribute it.\n" -+ . "There is NO WARRANTY, to the extent permitted by law.\n"; -+ print "\n"; -+ my $author = "Jim Meyering"; -+ print "Written by $author.\n"; -+ exit -+ }, - ) or usage 1; - - my $fail = 0; -diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh -index 1872de9..1241ee3 100755 ---- a/build-aux/gendocs.sh -+++ b/build-aux/gendocs.sh -@@ -2,7 +2,7 @@ - # gendocs.sh -- generate a GNU manual in many formats. This script is - # mentioned in maintain.texi. See the help message below for usage details. - --scriptversion=2021-01-01.00 -+scriptversion=2021-07-19.18 - - # Copyright 2003-2021 Free Software Foundation, Inc. - # -@@ -58,7 +58,7 @@ EMAIL=webmasters at gnu.org # please override with --email - commonarg= # passed to all makeinfo/texi2html invcations. - dirargs= # passed to all tools (-I dir). - dirs= # -I directories. --htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" -+htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" - default_htmlarg=true - infoarg=--no-split - generate_ascii=true -@@ -202,7 +202,7 @@ base=$PACKAGE - - if $default_htmlarg && test -n "$use_texi2html"; then - # The legacy texi2html doesn't support TOP_NODE_UP_URL -- htmlarg="--css-ref=/software/gnulib/manual.css" -+ htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css" - fi - - if test -n "$srcfile"; then -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen -index be0fc20..5e42afb 100755 ---- a/build-aux/git-version-gen -+++ b/build-aux/git-version-gen -@@ -75,10 +75,10 @@ me=$0 - year=`expr "$scriptversion" : '\([^-]*\)'` - version="git-version-gen $scriptversion - --Copyright $year Free Software Foundation, Inc. --There is NO warranty. You may redistribute this software --under the terms of the GNU General Public License. --For more information about these matters, see the files named COPYING." -+Copyright (C) ${year} Free Software Foundation, Inc. -+License GPLv3+: GNU GPL version 3 or later . -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law." - - usage="\ - Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] -diff --git a/build-aux/gnupload b/build-aux/gnupload -index 434741d..e7822ae 100755 ---- a/build-aux/gnupload -+++ b/build-aux/gnupload -@@ -1,13 +1,13 @@ - #!/bin/sh - # Sign files and upload them. - --scriptversion=2018-05-19.18; # UTC -+scriptversion=2021-04-11.09; # UTC - - # Copyright (C) 2004-2021 Free Software Foundation, Inc. - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 3, or (at your option) -+# the Free Software Foundation; either version 2, or (at your option) - # any later version. - # - # This program is distributed in the hope that it will be useful, -@@ -27,8 +27,8 @@ set -e - GPG=gpg - # Choose the proper version of gpg, so as to avoid a - # "gpg-agent is not available in this session" error --# when gpg-agent is version 3 but gpg is still version 1. --# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg -+# when gpg-agent is version 2 but gpg is still version 1. -+# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg - gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` - case "$gpg_agent_version" in - 2.*) -@@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package - - Send patches and bug reports to ." - -+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` -+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. -+License GPLv2+: GNU GPL version 2 or later . -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law." -+ - # Read local configuration file - if test -r "$conffile"; then - echo "$0: Reading configuration file $conffile" -@@ -209,7 +215,8 @@ while test -n "$1"; do - ;; - --version) - echo "gnupload $scriptversion" -- exit $? -+ echo "$copyright" -+ exit 0 - ;; - --) - shift -diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free -index 784d80b..5bbbc44 100755 ---- a/build-aux/useless-if-before-free -+++ b/build-aux/useless-if-before-free -@@ -36,12 +36,14 @@ - eval 'exec perl -wSx "$0" "$@"' - if 0; - --my $VERSION = '2020-04-04 15:07'; # UTC -+my $VERSION = '2021-04-11 10:11'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - -+my $copyright_year = '2021'; -+ - use strict; - use warnings; - use Getopt::Long; -@@ -118,7 +120,19 @@ sub is_NULL ($) - GetOptions - ( - help => sub { usage 0 }, -- version => sub { print "$ME version $VERSION\n"; exit }, -+ version => -+ sub -+ { -+ print "$ME version $VERSION\n"; -+ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; -+ print "License GPLv3+: GNU GPL version 3 or later .\n" -+ . "This is free software: you are free to change and redistribute it.\n" -+ . "There is NO WARRANTY, to the extent permitted by law.\n"; -+ print "\n"; -+ my $author = "Jim Meyering"; -+ print "Written by $author.\n"; -+ exit -+ }, - list => \$list, - 'name=s@' => \@name, - ) or usage 1; -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 02480f6..cb29c31 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -288,8 +288,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON - -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ - -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ -- -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ -- -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ -+ -e 's/@''GNULIB_INET_NTOP''@/$(GL_GNULIB_INET_NTOP)/g' \ -+ -e 's/@''GNULIB_INET_PTON''@/$(GL_GNULIB_INET_PTON)/g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ - -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ -@@ -470,14 +470,14 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ -- -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ -- -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ -- -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ -- -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ -- -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ -- -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ -- -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ -- -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ -+ -e 's/@''GNULIB_OPENDIR''@/$(GL_GNULIB_OPENDIR)/g' \ -+ -e 's/@''GNULIB_READDIR''@/$(GL_GNULIB_READDIR)/g' \ -+ -e 's/@''GNULIB_REWINDDIR''@/$(GL_GNULIB_REWINDDIR)/g' \ -+ -e 's/@''GNULIB_CLOSEDIR''@/$(GL_GNULIB_CLOSEDIR)/g' \ -+ -e 's/@''GNULIB_DIRFD''@/$(GL_GNULIB_DIRFD)/g' \ -+ -e 's/@''GNULIB_FDOPENDIR''@/$(GL_GNULIB_FDOPENDIR)/g' \ -+ -e 's/@''GNULIB_SCANDIR''@/$(GL_GNULIB_SCANDIR)/g' \ -+ -e 's/@''GNULIB_ALPHASORT''@/$(GL_GNULIB_ALPHASORT)/g' \ - -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ - -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ - -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ -@@ -543,6 +543,32 @@ EXTRA_libgnu_la_SOURCES += duplocale.c - ## begin gnulib module dynarray - - if gl_GNULIB_ENABLED_dynarray -+BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h -+ -+malloc/dynarray.gl.h: malloc/dynarray.h -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t -+ -+malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|||g' \ -+ -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ -+ -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ -+ -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ -+ -e 's|__glibc_likely|_GL_LIKELY|g' \ -+ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ -+ < $(srcdir)/malloc/dynarray-skeleton.c; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t -+ - libgnu_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c - - endif -@@ -620,13 +646,13 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -- -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ -- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -- -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ -- -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ -+ -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ -+ -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ -+ -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ -+ -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ -+ -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ -+ -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ -@@ -930,7 +956,7 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ -- -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ -+ -e 's/@''GNULIB_ICONV''@/$(GL_GNULIB_ICONV)/g' \ - -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ - -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ - -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ -@@ -984,10 +1010,8 @@ EXTRA_libgnu_la_SOURCES += iconv.c iconv_close.c iconv_open.c - - ## begin gnulib module idx - --if gl_GNULIB_ENABLED_idx - libgnu_la_SOURCES += idx.h - --endif - ## end gnulib module idx - - ## begin gnulib module inet_ntop -@@ -1031,10 +1055,10 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U - -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ -- -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ -- -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ -- -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ -- -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ -+ -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ -+ -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ -+ -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ -+ -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ - -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ - -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ - -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -@@ -1151,7 +1175,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ -- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ -+ -e 's/@''GNULIB_NL_LANGINFO''@/$(GL_GNULIB_NL_LANGINFO)/g' \ - -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ - -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ - -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ -@@ -1264,11 +1288,11 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ -- -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -- -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ -- -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ -- -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ -- -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ -+ -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \ -+ -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ -+ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ -+ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ -+ -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ - -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ - -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ - -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ -@@ -1379,108 +1403,108 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ -- -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ -- -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ -- -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ -- -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ -- -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ -- -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ -- -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ -- -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ -- -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ -- -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ -- -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ -- -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ -- -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ -- -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ -- -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ -- -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ -- -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ -- -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ -- -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ -- -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ -- -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ -- -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ -- -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ -- -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ -- -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ -- -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ -- -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ -- -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ -- -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ -- -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ -- -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ -- -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ -- -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ -- -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ -- -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ -- -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ -- -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ -- -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ -- -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ -- -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ -- -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ -- -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ -- -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ -- -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ -+ -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ -+ -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ -+ -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ -+ -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ -+ -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ -+ -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ -+ -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ -+ -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ -+ -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ -+ -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ -+ -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ -+ -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ -+ -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ -+ -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ -+ -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ -+ -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ -+ -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ -+ -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ -+ -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ -+ -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ -+ -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ -+ -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ -+ -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ -+ -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ -+ -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ -+ -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ -+ -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ -+ -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ -+ -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ -+ -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ -+ -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ -+ -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ -+ -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ -+ -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ -+ -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ -+ -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ -+ -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ -+ -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ -+ -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ -+ -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ -+ -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ -+ -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ -+ -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ -+ -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ - < $(srcdir)/math.in.h | \ -- sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ -- -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ -- -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ -- -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ -- -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ -- -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ -- -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ -- -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ -- -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ -- -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ -- -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ -- -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ -- -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ -- -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ -- -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ -- -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ -- -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ -- -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ -- -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ -- -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ -- -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ -- -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ -- -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ -- -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ -- -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ -- -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ -- -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ -- -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ -- -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ -- -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ -- -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ -- -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ -- -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ -- -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ -- -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ -- -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ -- -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ -- -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ -- -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ -- -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ -- -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ -- -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ -- -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ -- -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ -- -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ -- -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ -- -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ -- -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ -- -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ -- -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ -- -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ -- -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ -- -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ -- -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ -- -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ -- -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ -- -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ -+ sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ -+ -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ -+ -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ -+ -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ -+ -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ -+ -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ -+ -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ -+ -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ -+ -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ -+ -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ -+ -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ -+ -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ -+ -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ -+ -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ -+ -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ -+ -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ -+ -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ -+ -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ -+ -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ -+ -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ -+ -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ -+ -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ -+ -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ -+ -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ -+ -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ -+ -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ -+ -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ -+ -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ -+ -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ -+ -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ -+ -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ -+ -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ -+ -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ -+ -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ -+ -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ -+ -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ -+ -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ -+ -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ -+ -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ -+ -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ -+ -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ -+ -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ -+ -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ -+ -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ -+ -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ -+ -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ -+ -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ -+ -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ -+ -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ -+ -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ -+ -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ -+ -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ -+ -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ -+ -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ -+ -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ -+ -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ -+ -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ - | \ - sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ - -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ -@@ -1804,7 +1828,7 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ - -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ -- -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ -+ -e 's/@''GNULIB_GETADDRINFO''@/$(GL_GNULIB_GETADDRINFO)/g' \ - -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ - -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ -@@ -1937,7 +1961,7 @@ poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_POLL_H''@|$(NEXT_POLL_H)|g' \ -- -e 's/@''GNULIB_POLL''@/$(GNULIB_POLL)/g' \ -+ -e 's/@''GNULIB_POLL''@/$(GL_GNULIB_POLL)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \ - -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \ -@@ -2098,6 +2122,21 @@ EXTRA_DIST += same-inode.h - ## begin gnulib module scratch_buffer - - if gl_GNULIB_ENABLED_scratch_buffer -+BUILT_SOURCES += malloc/scratch_buffer.gl.h -+ -+malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ -+ -e 's|__glibc_likely|_GL_LIKELY|g' \ -+ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ -+ -e '/libc_hidden_proto/d' \ -+ < $(srcdir)/malloc/scratch_buffer.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t -+ - libgnu_la_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c - - endif -@@ -2185,11 +2224,11 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -- -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ -- -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ -- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -+ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ -+ -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ -+ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ -+ -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ - -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ -@@ -2442,7 +2481,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status - -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ - < $(srcdir)/stdint.in.h; \ - } > $@-t && \ - mv $@-t $@ -@@ -2470,65 +2509,65 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ -- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ -- -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ -- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ -- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ -- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ -- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ -- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ -- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ -- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ -- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ -- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ -- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ -- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ -- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ -- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ -- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ -- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ -- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ -- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ -- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ -- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ -- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ -- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ -- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ -- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ -- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ -- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ -- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ -- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ -- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ -- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ -- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ -- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ -- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ -- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ -- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ -- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ -- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ -- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ -- -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ -- -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ -- -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ -- -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ -- -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ -+ -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \ -+ -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ -+ -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ -+ -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ -+ -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ -+ -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ -+ -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ -+ -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ -+ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ -+ -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ -+ -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ -+ -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ -+ -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ -+ -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ -+ -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ -+ -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ -+ -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ -+ -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ -+ -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ -+ -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ -+ -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ -+ -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ -+ -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ -+ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ -+ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ -+ -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ -+ -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ -+ -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ -+ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ -+ -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ -+ -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ -+ -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ -+ -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ -+ -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ -+ -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ -+ -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ -+ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ -+ -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ -+ -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ -+ -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ -+ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ -+ -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ -+ -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ -+ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ -+ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ -+ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ -+ -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ -+ -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ -+ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ -+ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ - -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -@@ -2606,51 +2645,51 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ -- -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ -- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ -- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ -- -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ -- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ -- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ -- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ -- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ -- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ -- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ -- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ -- -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ -- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ -- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ -- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ -- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ -- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ -- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ -- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ -- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ -- -e 's/@''GNULIB_STRTOL''@/$(GNULIB_STRTOL)/g' \ -- -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ -- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ -- -e 's/@''GNULIB_STRTOUL''@/$(GNULIB_STRTOUL)/g' \ -- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ -- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ -- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ -- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ -- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ -- -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ -- -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ -- -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ -- -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ -- -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ -+ -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ -+ -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ -+ -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ -+ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ -+ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ -+ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ -+ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ -+ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ -+ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ -+ -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ -+ -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ -+ -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ -+ -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ -+ -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ -+ -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ -+ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ -+ -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ -+ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ -+ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ -+ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ -+ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ -+ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ -+ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ -+ -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ -+ -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ -+ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ -+ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ -+ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ -+ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ -+ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ -+ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ -+ -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ -+ -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ -+ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ -+ -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ -+ -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ -+ -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ -+ -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ -+ -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ -+ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ -+ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ -+ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -@@ -2711,6 +2750,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -+ -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -@@ -2779,49 +2819,49 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -- -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ -- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ -- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ -- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ -- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ -- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ -- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ -- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ -- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ -- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ -- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ -- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ -- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ -- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ -- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ -- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ -- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ -- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ -- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ -- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ -- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ -- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ -- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ -- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ -- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ -- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ -- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ -- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ -- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ -- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ -- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ -- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ -- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ -- -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ -- -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ -- -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ -- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ -- -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ -- -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ -+ -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ -+ -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ -+ -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ -+ -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ -+ -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ -+ -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ -+ -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ -+ -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ -+ -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ -+ -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ -+ -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ -+ -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ -+ -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ -+ -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ -+ -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ -+ -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ -+ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ -+ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ -+ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ -+ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ -+ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ -+ -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ -+ -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ -+ -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ -+ -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ -+ -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ -+ -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ -+ -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ -+ -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ -+ -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ -+ -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ -+ -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ -+ -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ -+ -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ -+ -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ -+ -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ -+ -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ -+ -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ -+ -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ -+ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ - -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -@@ -2893,7 +2933,7 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ - -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ -- -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ -+ -e 's/@''GNULIB_FLOCK''@/$(GL_GNULIB_FLOCK)/g' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_file.in.h; \ - } > $@-t && \ -@@ -2922,7 +2962,7 @@ sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ - -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ -- -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ -+ -e 's/@''GNULIB_GETRANDOM''@/$(GL_GNULIB_GETRANDOM)/g' \ - -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ - -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -@@ -2955,8 +2995,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ - -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ -- -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ -- -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ -+ -e 's/@''GNULIB_PSELECT''@/$(GL_GNULIB_PSELECT)/g' \ -+ -e 's/@''GNULIB_SELECT''@/$(GL_GNULIB_SELECT)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ - -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ -@@ -2990,22 +3030,22 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ - -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ -- -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ -- -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ -- -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ -- -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ -- -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ -- -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ -- -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ -- -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ -- -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ -- -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ -- -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ -- -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ -- -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ -- -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ -+ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ -+ -e 's/@''GNULIB_SOCKET''@/$(GL_GNULIB_SOCKET)/g' \ -+ -e 's/@''GNULIB_CONNECT''@/$(GL_GNULIB_CONNECT)/g' \ -+ -e 's/@''GNULIB_ACCEPT''@/$(GL_GNULIB_ACCEPT)/g' \ -+ -e 's/@''GNULIB_BIND''@/$(GL_GNULIB_BIND)/g' \ -+ -e 's/@''GNULIB_GETPEERNAME''@/$(GL_GNULIB_GETPEERNAME)/g' \ -+ -e 's/@''GNULIB_GETSOCKNAME''@/$(GL_GNULIB_GETSOCKNAME)/g' \ -+ -e 's/@''GNULIB_GETSOCKOPT''@/$(GL_GNULIB_GETSOCKOPT)/g' \ -+ -e 's/@''GNULIB_LISTEN''@/$(GL_GNULIB_LISTEN)/g' \ -+ -e 's/@''GNULIB_RECV''@/$(GL_GNULIB_RECV)/g' \ -+ -e 's/@''GNULIB_SEND''@/$(GL_GNULIB_SEND)/g' \ -+ -e 's/@''GNULIB_RECVFROM''@/$(GL_GNULIB_RECVFROM)/g' \ -+ -e 's/@''GNULIB_SENDTO''@/$(GL_GNULIB_SENDTO)/g' \ -+ -e 's/@''GNULIB_SETSOCKOPT''@/$(GL_GNULIB_SETSOCKOPT)/g' \ -+ -e 's/@''GNULIB_SHUTDOWN''@/$(GL_GNULIB_SHUTDOWN)/g' \ -+ -e 's/@''GNULIB_ACCEPT4''@/$(GL_GNULIB_ACCEPT4)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ -@@ -3042,25 +3082,25 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ - -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -- -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ -- -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ -- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ -- -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ -- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ -- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ -- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ -- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ -- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -- -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -- -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ -- -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ -- -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ -+ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -+ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -+ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ -+ -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ -+ -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ -+ -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ -+ -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ -+ -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ -+ -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ -+ -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ -+ -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ -+ -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ -+ -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ -+ -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ -+ -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -+ -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ -+ -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ -+ -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ -@@ -3114,7 +3154,7 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -+ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GL_GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ -@@ -3148,7 +3188,7 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ -- -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ -+ -e 's/@''GNULIB_TIMES''@/$(GL_GNULIB_TIMES)/g' \ - -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ - -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -@@ -3239,18 +3279,18 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -- -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ -- -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -- -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -- -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ -- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -- -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ -- -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -- -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ -+ -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ -+ -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ -+ -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ -+ -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ -+ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ -+ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ -+ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ -+ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ -+ -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ -+ -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ -+ -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ -+ -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -@@ -3360,89 +3400,89 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ -- -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ -- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ -- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ -- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ -- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ -- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ -- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ -- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ -- -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ -- -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ -- -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ -- -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ -- -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ -- -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ -- -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ -- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ -- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ -- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ -- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ -- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ -- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ -- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ -- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ -- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ -- -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ -- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ -- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ -- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ -- -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ -- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -- -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ -- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ -- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ -- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ -- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ -- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ -- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ -- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ -- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ -- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ -- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ -- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ -- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ -- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ -- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ -- -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ -- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ -- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ -- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ -- -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ -- -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ -- -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ -- -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ -- -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ -- -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ -- -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ -- -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ -- -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ -- -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ -- -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ -- -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ -- -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ -- -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ -- -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ -- -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ -- -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ -- -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ -- -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ -- -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ -- -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ -+ -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ -+ -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ -+ -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ -+ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ -+ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ -+ -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ -+ -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ -+ -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ -+ -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ -+ -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ -+ -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ -+ -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ -+ -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ -+ -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ -+ -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ -+ -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ -+ -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ -+ -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ -+ -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ -+ -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ -+ -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ -+ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ -+ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ -+ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ -+ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ -+ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ -+ -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ -+ -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ -+ -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ -+ -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ -+ -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ -+ -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ -+ -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ -+ -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ -+ -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ -+ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ -+ -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ -+ -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ -+ -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ -+ -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ -+ -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ -+ -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ -+ -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ -+ -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ -+ -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ -+ -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ -+ -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ -+ -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ -+ -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ -+ -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ -+ -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ -+ -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ -+ -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ -+ -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ -+ -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ -+ -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ -+ -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ -+ -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ -+ -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ -+ -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ -+ -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ -+ -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ -+ -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ -+ -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ -+ -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ -+ -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ -+ -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ -+ -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ -+ -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ -+ -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ -+ -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ -+ -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ -+ -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ -+ -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ -+ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ -+ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ -@@ -3617,49 +3657,49 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ - -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ - -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ -- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ -- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ -- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ -- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ -- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ -- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ -- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ -- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ -- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ -- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ -- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ -- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ -- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ -- -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ -- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ -- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ -- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ -- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ -- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ -- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ -- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ -- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ -- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ -- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ -- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ -- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ -- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ -- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ -- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ -- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ -- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ -- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ -- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ -- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ -- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ -- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ -- -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ -- -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -+ -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ -+ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ -+ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ -+ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ -+ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ -+ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ -+ -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ -+ -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ -+ -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ -+ -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ -+ -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ -+ -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ -+ -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ -+ -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ -+ -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ -+ -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ -+ -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ -+ -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ -+ -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ -+ -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ -+ -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ -+ -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ -+ -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ -+ -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ -+ -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ -+ -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ -+ -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ -+ -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ -+ -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ -+ -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ -+ -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ -+ -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ -+ -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ -+ -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ -+ -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ -+ -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ -+ -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ -+ -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ -+ -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ -+ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ -+ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ -+ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ - -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -@@ -3760,14 +3800,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ - -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ -- -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ -- -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ -- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ -- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ -- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -+ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ -+ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ -+ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ -+ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ -+ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ -+ -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ -+ -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ - -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ - -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ - -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ -diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h -index cb72f26..6fed3c7 100644 ---- a/lib/_Noreturn.h -+++ b/lib/_Noreturn.h -@@ -29,7 +29,7 @@ - # elif ((!defined __cplusplus || defined __clang__) \ - && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || (!defined __STRICT_ANSI__ \ -- && (__4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ -+ && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))))) -diff --git a/lib/accept.c b/lib/accept.c -index 4ec4f43..71457db 100644 ---- a/lib/accept.c -+++ b/lib/accept.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/accept4.c b/lib/accept4.c -index b444e22..4c2b80e 100644 ---- a/lib/accept4.c -+++ b/lib/accept4.c -@@ -1,18 +1,18 @@ - /* Accept a connection on a socket, with specific opening flags. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/alignof.h b/lib/alignof.h -index 6977c3e..e6e7a51 100644 ---- a/lib/alignof.h -+++ b/lib/alignof.h -@@ -1,18 +1,18 @@ - /* Determine alignment of types. - Copyright (C) 2003-2004, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ALIGNOF_H - #define _ALIGNOF_H -diff --git a/lib/alloca.c b/lib/alloca.c -index 91b9ec3..4880283 100644 ---- a/lib/alloca.c -+++ b/lib/alloca.c -@@ -1,5 +1,7 @@ - /* alloca.c -- allocate automatically reclaimed memory -- (Mostly) portable public-domain implementation -- D A Gwyn -+ This file is in the public domain. */ -+ -+/* (Mostly) portable implementation -- D A Gwyn - - This implementation of the PWB library alloca function, - which is used to allocate space off the run-time stack so -diff --git a/lib/alloca.in.h b/lib/alloca.in.h -index 9c7ccbb..65c2d4d 100644 ---- a/lib/alloca.in.h -+++ b/lib/alloca.in.h -@@ -3,20 +3,18 @@ - Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, - Inc. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public -- License along with this program; if not, see -- . -- */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H - means there is a real alloca function. */ -diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h -index 0ac83ab..9968067 100644 ---- a/lib/arpa_inet.in.h -+++ b/lib/arpa_inet.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_ARPA_INET_H - -diff --git a/lib/asnprintf.c b/lib/asnprintf.c -index 420440a..c5367b2 100644 ---- a/lib/asnprintf.c -+++ b/lib/asnprintf.c -@@ -1,18 +1,18 @@ - /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/assure.h b/lib/assure.h -index d95c0c9..49aa82f 100644 ---- a/lib/assure.h -+++ b/lib/assure.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2014-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/attribute.h b/lib/attribute.h -index 27a0fce..80a23f5 100644 ---- a/lib/attribute.h -+++ b/lib/attribute.h -@@ -2,15 +2,15 @@ - - Copyright 2020-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -@@ -32,7 +32,7 @@ - - - /* This file defines two types of attributes: -- * C2X standard attributes. These have macro names that do not begin with -+ * C2x standard attributes. These have macro names that do not begin with - 'ATTRIBUTE_'. - * Selected GCC attributes; see: - https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html -diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c -index 405edfa..5dbd157 100644 ---- a/lib/basename-lgpl.c -+++ b/lib/basename-lgpl.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h -index 222d21f..d520c09 100644 ---- a/lib/basename-lgpl.h -+++ b/lib/basename-lgpl.h -@@ -1,20 +1,20 @@ --/* Extract the last component (base name) of a file name. -+/* Extract the last component (base name) of a file name. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -- Inc. -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -+ Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU Lesser General Public License for more details. -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _BASENAME_LGPL_H - #define _BASENAME_LGPL_H -diff --git a/lib/binary-io.c b/lib/binary-io.c -index 83a820a..adc0ae2 100644 ---- a/lib/binary-io.c -+++ b/lib/binary-io.c -@@ -1,12 +1,12 @@ - /* Binary mode I/O. - Copyright 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/binary-io.h b/lib/binary-io.h -index 1dfbe5a..0fa8d54 100644 ---- a/lib/binary-io.h -+++ b/lib/binary-io.h -@@ -1,12 +1,12 @@ - /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/bind.c b/lib/bind.c -index 87fe0ed..0e47254 100644 ---- a/lib/bind.c -+++ b/lib/bind.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/btowc.c b/lib/btowc.c -index e800878..b8239af 100644 ---- a/lib/btowc.c -+++ b/lib/btowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h -index c176238..113f878 100644 ---- a/lib/byteswap.in.h -+++ b/lib/byteswap.in.h -@@ -2,12 +2,12 @@ - Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - Written by Oskar Liljeblad , 2005. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/c-ctype.c b/lib/c-ctype.c -index 5d9d4d8..300f97c 100644 ---- a/lib/c-ctype.c -+++ b/lib/c-ctype.c -@@ -1,3 +1,21 @@ -+/* Character handling in C locale. -+ -+ Copyright (C) 2003-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define C_CTYPE_INLINE _GL_EXTERN_INLINE - #include "c-ctype.h" -diff --git a/lib/c-ctype.h b/lib/c-ctype.h -index e8403db..3a652ac 100644 ---- a/lib/c-ctype.h -+++ b/lib/c-ctype.h -@@ -7,18 +7,18 @@ - - Copyright (C) 2000-2003, 2006, 2008-2021 Free Software Foundation, Inc. - --This program is free software; you can redistribute it and/or modify --it under the terms of the GNU Lesser General Public License as published by --the Free Software Foundation; either version 2 of the License, or --(at your option) any later version. -- --This program is distributed in the hope that it will be useful, --but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --GNU Lesser General Public License for more details. -- --You should have received a copy of the GNU Lesser General Public License --along with this program; if not, see . */ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef C_CTYPE_H - #define C_CTYPE_H -diff --git a/lib/c-strcase.h b/lib/c-strcase.h -index 8240dbc..82f99bb 100644 ---- a/lib/c-strcase.h -+++ b/lib/c-strcase.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef C_STRCASE_H - #define C_STRCASE_H -diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c -index 805dc99..3c22455 100644 ---- a/lib/c-strcasecmp.c -+++ b/lib/c-strcasecmp.c -@@ -1,18 +1,18 @@ - /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h -index ed979aa..66b9cf3 100644 ---- a/lib/c-strcaseeq.h -+++ b/lib/c-strcaseeq.h -@@ -1,15 +1,15 @@ - /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c -index c3203fd..f3ca786 100644 ---- a/lib/c-strncasecmp.c -+++ b/lib/c-strncasecmp.c -@@ -1,18 +1,18 @@ - /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c -index c6fef17..92e9639 100644 ---- a/lib/canonicalize-lgpl.c -+++ b/lib/canonicalize-lgpl.c -@@ -74,7 +74,6 @@ - # define __pathconf pathconf - # define __rawmemchr rawmemchr - # define __readlink readlink --# define __stat stat - # if IN_RELOCWRAPPER - /* When building the relocatable program wrapper, use the system's memmove - function, not the gnulib override, otherwise we would get a link error. -@@ -105,7 +104,7 @@ file_accessible (char const *file) - return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; - # else - struct stat st; -- return __stat (file, &st) == 0 || errno == EOVERFLOW; -+ return stat (file, &st) == 0 || errno == EOVERFLOW; - # endif - } - -diff --git a/lib/cdefs.h b/lib/cdefs.h -index 90f9741..4dac9d2 100644 ---- a/lib/cdefs.h -+++ b/lib/cdefs.h -@@ -259,9 +259,7 @@ - # define __attribute_const__ /* Ignore */ - #endif - --#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ --# define __attribute_maybe_unused__ [[__maybe_unused__]] --#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) -+#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) - # define __attribute_maybe_unused__ __attribute__ ((__unused__)) - #else - # define __attribute_maybe_unused__ /* Ignore */ -@@ -320,7 +318,9 @@ - #endif - - /* The nonnull function attribute marks pointer parameters that -- must not be NULL. */ -+ must not be NULL. This has the name __nonnull in glibc, -+ and __attribute_nonnull__ in files shared with Gnulib to avoid -+ collision with a different __nonnull in DragonFlyBSD 5.9. */ - #ifndef __attribute_nonnull__ - # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) - # define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -@@ -332,6 +332,16 @@ - # define __nonnull(params) __attribute_nonnull__ (params) - #endif - -+/* The returns_nonnull function attribute marks the return type of the function -+ as always being non-null. */ -+#ifndef __returns_nonnull -+# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__) -+# define __returns_nonnull __attribute__ ((__returns_nonnull__)) -+# else -+# define __returns_nonnull -+# endif -+#endif -+ - /* If fortification mode, we warn about unused results of certain - function calls which can lead to problems. */ - #if __GNUC_PREREQ (3,4) || __glibc_has_attribute (__warn_unused_result__) -@@ -485,9 +495,9 @@ - [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] - #endif - --/* The #ifndef lets Gnulib avoid including these on non-glibc -- platforms, where the includes typically do not exist. */ --#ifndef __WORDSIZE -+/* Gnulib avoids including these, as they don't work on non-glibc or -+ older glibc platforms. */ -+#ifndef __GNULIB_CDEFS - # include - # include - #endif -@@ -594,9 +604,26 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf - array according to access mode, or at least one element when - size-index is not provided: - access (access-mode, [, ]) */ --#define __attr_access(x) __attribute__ ((__access__ x)) -+# define __attr_access(x) __attribute__ ((__access__ x)) -+# if __GNUC_PREREQ (11, 0) -+# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) -+# else -+# define __attr_access_none(argno) -+# endif - #else - # define __attr_access(x) -+# define __attr_access_none(argno) -+#endif -+ -+#if __GNUC_PREREQ (11, 0) -+/* Designates dealloc as a function to call to deallocate objects -+ allocated by the declared function. */ -+# define __attr_dealloc(dealloc, argno) \ -+ __attribute__ ((__malloc__ (dealloc, argno))) -+# define __attr_dealloc_free __attr_dealloc (__builtin_free, 1) -+#else -+# define __attr_dealloc(dealloc, argno) -+# define __attr_dealloc_free - #endif - - /* Specify that a function such as setjmp or vfork may return -diff --git a/lib/ceil.c b/lib/ceil.c -index 06e7e5e..fce05d9 100644 ---- a/lib/ceil.c -+++ b/lib/ceil.c -@@ -1,12 +1,12 @@ - /* Round towards positive infinity. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/cloexec.c b/lib/cloexec.c -index 1f58b72..7defa93 100644 ---- a/lib/cloexec.c -+++ b/lib/cloexec.c -@@ -2,20 +2,20 @@ - - Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . -+ along with this program. If not, see . */ - -- The code is taken from glibc/manual/llio.texi */ -+/* The code is taken from glibc/manual/llio.texi */ - - #include - -diff --git a/lib/cloexec.h b/lib/cloexec.h -index 7a71ad4..97a3659 100644 ---- a/lib/cloexec.h -+++ b/lib/cloexec.h -@@ -2,20 +2,18 @@ - - Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . -- --*/ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/close.c b/lib/close.c -index 11e31db..5b9ab6c 100644 ---- a/lib/close.c -+++ b/lib/close.c -@@ -1,12 +1,12 @@ - /* close replacement. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/connect.c b/lib/connect.c -index fe0de7e..b2b2e93 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/copysign.c b/lib/copysign.c -index ad5b102..fee131b 100644 ---- a/lib/copysign.c -+++ b/lib/copysign.c -@@ -1,12 +1,12 @@ - /* Copy sign into another 'double' number. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dirent.in.h b/lib/dirent.in.h -index a285bde..5775edf 100644 ---- a/lib/dirent.in.h -+++ b/lib/dirent.in.h -@@ -1,12 +1,12 @@ - /* A GNU-like . - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -74,6 +74,30 @@ typedef struct gl_directory DIR; - - /* Declare overridden functions. */ - -+#if @GNULIB_CLOSEDIR@ -+# if @REPLACE_CLOSEDIR@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef closedir -+# define closedir rpl_closedir -+# define GNULIB_defined_closedir 1 -+# endif -+_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); -+_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); -+# else -+# if !@HAVE_CLOSEDIR@ -+_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); -+# endif -+_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); -+# endif -+_GL_CXXALIASWARN (closedir); -+#elif defined GNULIB_POSIXCHECK -+# undef closedir -+# if HAVE_RAW_DECL_CLOSEDIR -+_GL_WARN_ON_USE (closedir, "closedir is not portable - " -+ "use gnulib module closedir for portability"); -+# endif -+#endif -+ - #if @GNULIB_OPENDIR@ - # if @REPLACE_OPENDIR@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -81,20 +105,36 @@ typedef struct gl_directory DIR; - # define opendir rpl_opendir - # define GNULIB_defined_opendir 1 - # endif --_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); - # else --# if !@HAVE_OPENDIR@ --_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); -+# if !@HAVE_OPENDIR@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - # endif - _GL_CXXALIAS_SYS (opendir, DIR *, (const char *dir_name)); - # endif - _GL_CXXALIASWARN (opendir); --#elif defined GNULIB_POSIXCHECK --# undef opendir --# if HAVE_RAW_DECL_OPENDIR -+#else -+# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined opendir -+/* For -Wmismatched-dealloc: Associate opendir with closedir or -+ rpl_closedir. */ -+_GL_FUNCDECL_SYS (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef opendir -+# if HAVE_RAW_DECL_OPENDIR - _GL_WARN_ON_USE (opendir, "opendir is not portable - " - "use gnulib module opendir for portability"); -+# endif - # endif - #endif - -@@ -126,30 +166,6 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " - # endif - #endif - --#if @GNULIB_CLOSEDIR@ --# if @REPLACE_CLOSEDIR@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef closedir --# define closedir rpl_closedir --# define GNULIB_defined_closedir 1 --# endif --_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); --# else --# if !@HAVE_CLOSEDIR@ --_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); --# endif --_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); --# endif --_GL_CXXALIASWARN (closedir); --#elif defined GNULIB_POSIXCHECK --# undef closedir --# if HAVE_RAW_DECL_CLOSEDIR --_GL_WARN_ON_USE (closedir, "closedir is not portable - " -- "use gnulib module closedir for portability"); --# endif --#endif -- - #if @GNULIB_DIRFD@ - /* Return the file descriptor associated with the given directory stream, - or -1 if none exists. */ -@@ -200,20 +216,33 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " - # undef fdopendir - # define fdopendir rpl_fdopendir - # endif --_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd)); -+_GL_FUNCDECL_RPL (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); - # else --# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ --_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd)); -+# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - # endif - _GL_CXXALIAS_SYS (fdopendir, DIR *, (int fd)); - # endif - _GL_CXXALIASWARN (fdopendir); --#elif defined GNULIB_POSIXCHECK --# undef fdopendir --# if HAVE_RAW_DECL_FDOPENDIR -+#else -+# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined fdopendir -+/* For -Wmismatched-dealloc: Associate fdopendir with closedir or -+ rpl_closedir. */ -+_GL_FUNCDECL_SYS (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fdopendir -+# if HAVE_RAW_DECL_FDOPENDIR - _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " - "use gnulib module fdopendir for portability"); -+# endif - # endif - #endif - -diff --git a/lib/dirfd.c b/lib/dirfd.c -index 7da640f..640cb4f 100644 ---- a/lib/dirfd.c -+++ b/lib/dirfd.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2001, 2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c -index 9cc5db7..95f9c99 100644 ---- a/lib/dirname-lgpl.c -+++ b/lib/dirname-lgpl.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dirname.h b/lib/dirname.h -index dce1859..25abc7b 100644 ---- a/lib/dirname.h -+++ b/lib/dirname.h -@@ -1,26 +1,26 @@ --/* Take file names apart into directory and base names. -+/* Take file names apart into directory and base names. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -- Inc. -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -+ Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU Lesser General Public License for more details. -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License -- along with this program. If not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef DIRNAME_H_ - # define DIRNAME_H_ 1 - - # include --# include -+# include - # include "filename.h" - # include "basename-lgpl.h" - -@@ -33,11 +33,16 @@ extern "C" { - #endif - - # if GNULIB_DIRNAME --char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; --char *dir_name (char const *file); -+char *base_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE -+ _GL_ATTRIBUTE_RETURNS_NONNULL; -+char *dir_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE -+ _GL_ATTRIBUTE_RETURNS_NONNULL; - # endif - --char *mdir_name (char const *file); -+char *mdir_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; - - bool strip_trailing_slashes (char *file); -diff --git a/lib/dup2.c b/lib/dup2.c -index 653ef89..53e5552 100644 ---- a/lib/dup2.c -+++ b/lib/dup2.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/duplocale.c b/lib/duplocale.c -index 430634d..bc8740d 100644 ---- a/lib/duplocale.c -+++ b/lib/duplocale.c -@@ -1,12 +1,12 @@ - /* Duplicate a locale object. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/dynarray.h b/lib/dynarray.h -index 5db6ed9..ec64273 100644 ---- a/lib/dynarray.h -+++ b/lib/dynarray.h -@@ -1,12 +1,12 @@ - /* Type-safe arrays which grow dynamically. - Copyright 2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * - - #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX - --# include -+# ifndef _GL_LIKELY -+/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -+# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -+# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -+# endif - - /* Define auxiliary structs and declare auxiliary functions, common to all - instantiations of dynarray. */ --# include -+# include - - /* Define the instantiation, specified through - DYNARRAY_STRUCT - DYNARRAY_ELEMENT - DYNARRAY_PREFIX - etc. */ --# include -+# include - - #else - -diff --git a/lib/errno.in.h b/lib/errno.in.h -index 0ae2ace..3cad9e2 100644 ---- a/lib/errno.in.h -+++ b/lib/errno.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_ERRNO_H - -diff --git a/lib/fcntl.c b/lib/fcntl.c -index e6c4b8e..c744eb9 100644 ---- a/lib/fcntl.c -+++ b/lib/fcntl.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h -index 7254a56..26dedc3 100644 ---- a/lib/fcntl.in.h -+++ b/lib/fcntl.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fd-hook.c b/lib/fd-hook.c -index f8e2781..75b1626 100644 ---- a/lib/fd-hook.c -+++ b/lib/fd-hook.c -@@ -2,15 +2,15 @@ - Copyright (C) 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2009. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/fd-hook.h b/lib/fd-hook.h -index 0005db7..98e2a52 100644 ---- a/lib/fd-hook.h -+++ b/lib/fd-hook.h -@@ -1,15 +1,15 @@ - /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/float+.h b/lib/float+.h -index d814bf1..ad891f6 100644 ---- a/lib/float+.h -+++ b/lib/float+.h -@@ -2,18 +2,18 @@ - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2007. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _FLOATPLUS_H - #define _FLOATPLUS_H -diff --git a/lib/float.c b/lib/float.c -index 5c16d61..dd1e84a 100644 ---- a/lib/float.c -+++ b/lib/float.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/float.in.h b/lib/float.in.h -index 1179df5..f52aba3 100644 ---- a/lib/float.in.h -+++ b/lib/float.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/floor.c b/lib/floor.c -index 9f13d16..1530300 100644 ---- a/lib/floor.c -+++ b/lib/floor.c -@@ -1,12 +1,12 @@ - /* Round towards negative infinity. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/free.c b/lib/free.c -index b221241..780f03d 100644 ---- a/lib/free.c -+++ b/lib/free.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/frexp.c b/lib/frexp.c -index 55340b8..ab5f343 100644 ---- a/lib/frexp.c -+++ b/lib/frexp.c -@@ -1,12 +1,12 @@ - /* Split a double into fraction and mantissa. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fstat.c b/lib/fstat.c -index 30440d6..512c688 100644 ---- a/lib/fstat.c -+++ b/lib/fstat.c -@@ -1,12 +1,12 @@ - /* fstat() replacement. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/fsync.c b/lib/fsync.c -index 71fcdde..99a932d 100644 ---- a/lib/fsync.c -+++ b/lib/fsync.c -@@ -9,15 +9,15 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This library is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/full-read.c b/lib/full-read.c -index 32ff1a5..53be659 100644 ---- a/lib/full-read.c -+++ b/lib/full-read.c -@@ -1,12 +1,12 @@ - /* An interface to read that retries after partial reads and interrupts. - Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/full-read.h b/lib/full-read.h -index 450d645..b36f2e1 100644 ---- a/lib/full-read.h -+++ b/lib/full-read.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/full-write.c b/lib/full-write.c -index acbfc31..614ca0b 100644 ---- a/lib/full-write.c -+++ b/lib/full-write.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1993-1994, 1997-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/full-write.h b/lib/full-write.h -index 1220d05..c316224 100644 ---- a/lib/full-write.h -+++ b/lib/full-write.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c -index 907e8e6..4874ef5 100644 ---- a/lib/gai_strerror.c -+++ b/lib/gai_strerror.c -@@ -3,18 +3,18 @@ - This file is part of the GNU C Library. - Contributed by Philip Blundell , 1997. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c -index 05fc59e..0c42d1b 100644 ---- a/lib/getaddrinfo.c -+++ b/lib/getaddrinfo.c -@@ -2,18 +2,18 @@ - Copyright (C) 1997, 2001-2002, 2004-2021 Free Software Foundation, Inc. - Contributed by Simon Josefsson . - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc - optimizes away the sa == NULL test below. */ -diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c -index 918db9d..5006c2d 100644 ---- a/lib/getdtablesize.c -+++ b/lib/getdtablesize.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getlogin.c b/lib/getlogin.c -index 4a70994..7b78c67 100644 ---- a/lib/getlogin.c -+++ b/lib/getlogin.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getpeername.c b/lib/getpeername.c -index 5d9cf79..468bb3d 100644 ---- a/lib/getpeername.c -+++ b/lib/getpeername.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getrandom.c b/lib/getrandom.c -index b467caa..a186c4d 100644 ---- a/lib/getrandom.c -+++ b/lib/getrandom.c -@@ -2,12 +2,12 @@ - - Copyright 2020-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -178,7 +178,11 @@ getrandom (void *buffer, size_t length, unsigned int flags) - + (flags & GRND_NONBLOCK ? O_NONBLOCK : 0)); - fd = open (randdevice[devrandom], oflags); - if (fd < 0) -- return fd; -+ { -+ if (errno == ENOENT || errno == ENOTDIR) -+ errno = ENOSYS; -+ return -1; -+ } - randfd[devrandom] = fd; - } - -diff --git a/lib/getsockname.c b/lib/getsockname.c -index 83c1b7d..d1f17b3 100644 ---- a/lib/getsockname.c -+++ b/lib/getsockname.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/getsockopt.c b/lib/getsockopt.c -index cec4933..b92d034 100644 ---- a/lib/getsockopt.c -+++ b/lib/getsockopt.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/gettext.h b/lib/gettext.h -index dd05cda..f1c7a24 100644 ---- a/lib/gettext.h -+++ b/lib/gettext.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBGETTEXT_H - #define _LIBGETTEXT_H 1 -diff --git a/lib/hard-locale.c b/lib/hard-locale.c -index ab3610d..8b6802d 100644 ---- a/lib/hard-locale.c -+++ b/lib/hard-locale.c -@@ -3,12 +3,12 @@ - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/hard-locale.h b/lib/hard-locale.h -index c4449f9..eba6601 100644 ---- a/lib/hard-locale.h -+++ b/lib/hard-locale.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1999, 2003-2004, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/iconv.c b/lib/iconv.c -index f3480aa..bf51493 100644 ---- a/lib/iconv.c -+++ b/lib/iconv.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconv.in.h b/lib/iconv.in.h -index 0fc0fa7..3a2f94e 100644 ---- a/lib/iconv.in.h -+++ b/lib/iconv.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_ICONV_H - -diff --git a/lib/iconv_close.c b/lib/iconv_close.c -index bc40fec..7429b92 100644 ---- a/lib/iconv_close.c -+++ b/lib/iconv_close.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconv_open-aix.gperf b/lib/iconv_open-aix.gperf -index 20ce70a..d073759 100644 ---- a/lib/iconv_open-aix.gperf -+++ b/lib/iconv_open-aix.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-hpux.gperf b/lib/iconv_open-hpux.gperf -index 921c722..f4664d6 100644 ---- a/lib/iconv_open-hpux.gperf -+++ b/lib/iconv_open-hpux.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[9 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-irix.gperf b/lib/iconv_open-irix.gperf -index 6241de6..9885d92 100644 ---- a/lib/iconv_open-irix.gperf -+++ b/lib/iconv_open-irix.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-osf.gperf b/lib/iconv_open-osf.gperf -index 97d570c..d818d79 100644 ---- a/lib/iconv_open-osf.gperf -+++ b/lib/iconv_open-osf.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-solaris.gperf b/lib/iconv_open-solaris.gperf -index 0283aba..648dd3a 100644 ---- a/lib/iconv_open-solaris.gperf -+++ b/lib/iconv_open-solaris.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009, 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-zos.gperf b/lib/iconv_open-zos.gperf -index faf5d65..1c3552e 100644 ---- a/lib/iconv_open-zos.gperf -+++ b/lib/iconv_open-zos.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open.c b/lib/iconv_open.c -index 304592e..e573556 100644 ---- a/lib/iconv_open.c -+++ b/lib/iconv_open.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconveh.h b/lib/iconveh.h -index b2be8fa..cbf692e 100644 ---- a/lib/iconveh.h -+++ b/lib/iconveh.h -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c -index 5b9ea11..409e88c 100644 ---- a/lib/inet_ntop.c -+++ b/lib/inet_ntop.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* - * Copyright (c) 1996-1999 by Internet Software Consortium. -diff --git a/lib/inet_pton.c b/lib/inet_pton.c -index 57dc7dc..14e8b0a 100644 ---- a/lib/inet_pton.c -+++ b/lib/inet_pton.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h -index fe0af82..41cb422 100644 ---- a/lib/inttypes.in.h -+++ b/lib/inttypes.in.h -@@ -2,12 +2,12 @@ - Written by Paul Eggert, Bruno Haible, Derek Price. - This file is part of gnulib. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isfinite.c b/lib/isfinite.c -index cfd2d33..f1373b9 100644 ---- a/lib/isfinite.c -+++ b/lib/isfinite.c -@@ -1,18 +1,18 @@ - /* Test for finite value (zero, subnormal, or normal, and not infinite or NaN). - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2007. */ - -diff --git a/lib/isinf.c b/lib/isinf.c -index 6d4dfc0..62becf2 100644 ---- a/lib/isinf.c -+++ b/lib/isinf.c -@@ -1,18 +1,18 @@ - /* Test for positive or negative infinity. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2008. */ - -diff --git a/lib/isnan.c b/lib/isnan.c -index 2282269..ed3452f 100644 ---- a/lib/isnan.c -+++ b/lib/isnan.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h -index fbed474..df64f4e 100644 ---- a/lib/isnand-nolibm.h -+++ b/lib/isnand-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnand.c b/lib/isnand.c -index f359130..7c5df90 100644 ---- a/lib/isnand.c -+++ b/lib/isnand.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h -index ba609d5..bd85811 100644 ---- a/lib/isnanf-nolibm.h -+++ b/lib/isnanf-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanf.c b/lib/isnanf.c -index 94a32e5..3b60340 100644 ---- a/lib/isnanf.c -+++ b/lib/isnanf.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h -index 797c06b..41fe156 100644 ---- a/lib/isnanl-nolibm.h -+++ b/lib/isnanl-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/isnanl.c b/lib/isnanl.c -index b459560..e8dedf0 100644 ---- a/lib/isnanl.c -+++ b/lib/isnanl.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/itold.c b/lib/itold.c -index f52216a..7984866 100644 ---- a/lib/itold.c -+++ b/lib/itold.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h -index e8ac12c..4873899 100644 ---- a/lib/langinfo.in.h -+++ b/lib/langinfo.in.h -@@ -1,18 +1,18 @@ - /* Substitute for and wrapper around . - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* - * POSIX for platforms that lack it or have an incomplete one. -diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c -index 98c6e9d..88a0bd3 100644 ---- a/lib/lc-charset-dispatch.c -+++ b/lib/lc-charset-dispatch.c -@@ -1,12 +1,12 @@ - /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h -index d9d1ac1..59b485d 100644 ---- a/lib/lc-charset-dispatch.h -+++ b/lib/lc-charset-dispatch.h -@@ -1,12 +1,12 @@ - /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/libc-config.h b/lib/libc-config.h -index f14013f..886c11f 100644 ---- a/lib/libc-config.h -+++ b/lib/libc-config.h -@@ -28,7 +28,10 @@ - - When compiled as part of glibc this is a no-op; when compiled as - part of Gnulib this includes Gnulib's and defines macros -- that glibc library code would normally assume. */ -+ that glibc library code would normally assume. -+ -+ Note: This header file MUST NOT be included by public header files -+ of Gnulib. */ - - #include - -@@ -71,7 +74,7 @@ - # endif - #endif - --#ifndef __attribute_maybe_unused__ -+#ifndef __attribute_nonnull__ - /* either does not exist, or is too old for Gnulib. - Prepare to include , which is Gnulib's version of a - more-recent glibc . */ -@@ -80,13 +83,9 @@ - # ifndef _FEATURES_H - # define _FEATURES_H 1 - # endif --/* Define __WORDSIZE so that does not attempt to include -- nonexistent files. Make it a syntax error, since Gnulib does not -- use __WORDSIZE now, and if Gnulib uses it later the syntax error -- will let us know that __WORDSIZE needs configuring. */ --# ifndef __WORDSIZE --# define __WORDSIZE %%% --# endif -+/* Define __GNULIB_CDEFS so that does not attempt to include -+ nonexistent files. */ -+# define __GNULIB_CDEFS - /* Undef the macros unconditionally defined by our copy of glibc - , so that they do not clash with any system-defined - versions. */ -@@ -118,6 +117,9 @@ - # undef __THROW - # undef __THROWNL - # undef __attr_access -+# undef __attr_access_none -+# undef __attr_dealloc -+# undef __attr_dealloc_free - # undef __attribute__ - # undef __attribute_alloc_size__ - # undef __attribute_artificial__ -diff --git a/lib/libunistring.valgrind b/lib/libunistring.valgrind -index 712c39a..9eee19a 100644 ---- a/lib/libunistring.valgrind -+++ b/lib/libunistring.valgrind -@@ -2,18 +2,26 @@ - - # Copyright (C) 2010-2021 Free Software Foundation, Inc. - # --# This program is free software: you can redistribute it and/or modify it --# under the terms of the GNU Lesser General Public License as published --# by the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. -+# This file is free software. -+# It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". -+# You can redistribute it and/or modify it under either -+# - the terms of the GNU Lesser General Public License as published -+# by the Free Software Foundation; either version 3, or (at your -+# option) any later version, or -+# - the terms of the GNU General Public License as published by the -+# Free Software Foundation; either version 2, or (at your option) -+# any later version, or -+# - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". - # - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Lesser General Public License for more details. -+# Lesser General Public License and the GNU General Public License -+# for more details. - # --# You should have received a copy of the GNU Lesser General Public License --# along with this program. If not, see . -+# You should have received a copy of the GNU Lesser General Public -+# License and of the GNU General Public License along with this -+# program. If not, see . - - # Suppress a valgrind message about use of uninitialized memory in freea(). - # This use is OK because it provides only a speedup. -diff --git a/lib/limits.in.h b/lib/limits.in.h -index 4675ba4..2ecafeb 100644 ---- a/lib/limits.in.h -+++ b/lib/limits.in.h -@@ -2,18 +2,18 @@ - - Copyright 2016-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public License -- as published by the Free Software Foundation; either version 2, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -99,10 +99,11 @@ - # endif - #endif - --/* Macros specified by ISO/IEC TS 18661-1:2014. */ -+/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014. */ - - #if (! defined ULLONG_WIDTH \ -- && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) -+ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ -+ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) - # define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) - # define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) - # define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) -@@ -114,7 +115,16 @@ - # define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) - # define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) - # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) --#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ -+#endif -+ -+/* Macros specified by C2x. */ -+ -+#if (! defined BOOL_WIDTH \ -+ && (defined _GNU_SOURCE \ -+ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) -+# define BOOL_MAX 1 -+# define BOOL_WIDTH 1 -+#endif - - #endif /* _ at GUARD_PREFIX@_LIMITS_H */ - #endif /* _ at GUARD_PREFIX@_LIMITS_H */ -diff --git a/lib/link.c b/lib/link.c -index 3ba897a..bd4bef9 100644 ---- a/lib/link.c -+++ b/lib/link.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/listen.c b/lib/listen.c -index ccf881c..a145f82 100644 ---- a/lib/listen.c -+++ b/lib/listen.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/localcharset.c b/lib/localcharset.c -index 87a5979..9c22050 100644 ---- a/lib/localcharset.c -+++ b/lib/localcharset.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2000-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Bruno Haible . */ - -diff --git a/lib/localcharset.h b/lib/localcharset.h -index c2c1c67..27c3ab6 100644 ---- a/lib/localcharset.h -+++ b/lib/localcharset.h -@@ -2,18 +2,18 @@ - Copyright (C) 2000-2003, 2009-2021 Free Software Foundation, Inc. - This file is part of the GNU CHARSET Library. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LOCALCHARSET_H - #define _LOCALCHARSET_H -diff --git a/lib/locale.in.h b/lib/locale.in.h -index 4eb3c80..1063070 100644 ---- a/lib/locale.in.h -+++ b/lib/locale.in.h -@@ -1,12 +1,12 @@ - /* A POSIX . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/localeconv.c b/lib/localeconv.c -index cdcaf86..25e95a1 100644 ---- a/lib/localeconv.c -+++ b/lib/localeconv.c -@@ -1,12 +1,12 @@ - /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/log.c b/lib/log.c -index 03e9ac9..3f142e8 100644 ---- a/lib/log.c -+++ b/lib/log.c -@@ -1,12 +1,12 @@ - /* Logarithm. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/log1p.c b/lib/log1p.c -index 0e51498..c45c6ff 100644 ---- a/lib/log1p.c -+++ b/lib/log1p.c -@@ -1,12 +1,12 @@ - /* Natural logarithm of 1 plus argument. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/lstat.c b/lib/lstat.c -index d414d3a..7de0bf1 100644 ---- a/lib/lstat.c -+++ b/lib/lstat.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1997-2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/malloc.c b/lib/malloc.c -index 6bbb97d..0d8b359 100644 ---- a/lib/malloc.c -+++ b/lib/malloc.c -@@ -2,61 +2,50 @@ - - Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* written by Jim Meyering and Bruno Haible */ - - #define _GL_USE_STDLIB_ALLOC 1 - #include --/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ --#ifdef malloc --# define NEED_MALLOC_GNU 1 --# undef malloc --/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ --#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU --# define NEED_MALLOC_GNU 1 --#endif - - #include - --/* A function definition is only needed if NEED_MALLOC_GNU is defined above -- or if the module 'malloc-posix' requests it. */ --#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) -+#include - --# include -+#include "xalloc-oversized.h" - --/* Allocate an N-byte block of memory from the heap. -- If N is zero, allocate a 1-byte block. */ -+/* Allocate an N-byte block of memory from the heap, even if N is 0. */ - - void * - rpl_malloc (size_t n) - { -- void *result; -- --# if NEED_MALLOC_GNU - if (n == 0) - n = 1; --# endif - -- result = malloc (n); -+ if (xalloc_oversized (n, 1)) -+ { -+ errno = ENOMEM; -+ return NULL; -+ } -+ -+ void *result = malloc (n); - --# if !HAVE_MALLOC_POSIX -+#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; --# endif -+#endif - - return result; - } -- --#endif -diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c -index 4f840db..8dd6850 100644 ---- a/lib/malloc/dynarray_at_failure.c -+++ b/lib/malloc/dynarray_at_failure.c -@@ -18,11 +18,11 @@ - - #ifndef _LIBC - # include -+# include - #endif - - #include - #include --#include - - void - __libc_dynarray_at_failure (size_t size, size_t index) -@@ -32,6 +32,7 @@ __libc_dynarray_at_failure (size_t size, size_t index) - __snprintf (buf, sizeof (buf), "Fatal glibc error: " - "array index %zu not less than array length %zu\n", - index, size); -+ __libc_fatal (buf); - #else - abort (); - #endif -diff --git a/lib/malloca.c b/lib/malloca.c -index a546b30..b488423 100644 ---- a/lib/malloca.c -+++ b/lib/malloca.c -@@ -2,18 +2,18 @@ - Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2003, 2018. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #define _GL_USE_STDLIB_ALLOC 1 - #include -@@ -21,6 +21,8 @@ - /* Specification. */ - #include "malloca.h" - -+#include "idx.h" -+#include "intprops.h" - #include "verify.h" - - /* The speed critical point in this file is freea() applied to an alloca() -@@ -45,24 +47,30 @@ mmalloca (size_t n) - #if HAVE_ALLOCA - /* Allocate one more word, used to determine the address to pass to freea(), - and room for the alignment ? sa_alignment_max mod 2*sa_alignment_max. */ -- size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; -- -- if (nplus >= n) -+ uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; -+ int plus = sizeof (small_t) + alignment2_mask; -+ idx_t nplus; -+ if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) - { - char *mem = (char *) malloc (nplus); - - if (mem != NULL) - { -- char *p = -- (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) -- & ~(uintptr_t)(2 * sa_alignment_max - 1)) -- + sa_alignment_max); -+ uintptr_t umem = (uintptr_t)mem, umemplus; -+ /* The INT_ADD_WRAPV avoids signed integer overflow on -+ theoretical platforms where UINTPTR_MAX <= INT_MAX. */ -+ INT_ADD_WRAPV (umem, sizeof (small_t) + sa_alignment_max - 1, -+ &umemplus); -+ idx_t offset = ((umemplus & ~alignment2_mask) -+ + sa_alignment_max - umem); -+ void *vp = mem + offset; -+ small_t *p = vp; - /* Here p >= mem + sizeof (small_t), - and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 - hence p + n <= mem + nplus. - So, the memory range [p, p+n) lies in the allocated memory range - [mem, mem + nplus). */ -- ((small_t *) p)[-1] = p - mem; -+ p[-1] = offset; - /* p ? sa_alignment_max mod 2*sa_alignment_max. */ - return p; - } -diff --git a/lib/malloca.h b/lib/malloca.h -index 9cf7fbb..7eb63d2 100644 ---- a/lib/malloca.h -+++ b/lib/malloca.h -@@ -2,18 +2,18 @@ - Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _MALLOCA_H - #define _MALLOCA_H -@@ -51,6 +51,13 @@ extern "C" { - # define safe_alloca(N) ((void) (N), NULL) - #endif - -+/* Free a block of memory allocated through malloca(). */ -+#if HAVE_ALLOCA -+extern void freea (void *p); -+#else -+# define freea free -+#endif -+ - /* malloca(N) is a safe variant of alloca(N). It allocates N bytes of - memory allocated on the stack, that must be freed using freea() before - the function returns. Upon failure, it returns NULL. */ -@@ -65,21 +72,16 @@ extern "C" { - # define malloca(N) \ - mmalloca (N) - #endif --extern void * mmalloca (size_t n); -- --/* Free a block of memory allocated through malloca(). */ --#if HAVE_ALLOCA --extern void freea (void *p); --#else --# define freea free --#endif -+extern void *mmalloca (size_t n) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (freea, 1) -+ _GL_ATTRIBUTE_ALLOC_SIZE ((1)); - - /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). - It allocates an array of N objects, each with S bytes of memory, -- on the stack. S must be positive and N must be nonnegative. -- Either N or S should be of type ptrdiff_t or size_t or wider. -+ on the stack. N and S should be nonnegative and free of side effects. - The array must be freed using freea() before the function returns. */ --#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) -+#define nmalloca(n, s) \ -+ (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) - - - #ifdef __cplusplus -diff --git a/lib/math.c b/lib/math.c -index ba2a6ab..3ffd1d7 100644 ---- a/lib/math.c -+++ b/lib/math.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_MATH_INLINE _GL_EXTERN_INLINE - #include "math.h" - typedef int dummy; -diff --git a/lib/math.in.h b/lib/math.in.h -index d80047c..6a055fb 100644 ---- a/lib/math.in.h -+++ b/lib/math.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h -index ea5ef1f..330fb10 100644 ---- a/lib/mbrtowc-impl-utf8.h -+++ b/lib/mbrtowc-impl-utf8.h -@@ -1,12 +1,12 @@ - /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h -index f7e28fc..bc3e688 100644 ---- a/lib/mbrtowc-impl.h -+++ b/lib/mbrtowc-impl.h -@@ -1,12 +1,12 @@ - /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c -index 0db5104..8832f6e 100644 ---- a/lib/mbrtowc.c -+++ b/lib/mbrtowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbsinit.c b/lib/mbsinit.c -index 7ca8df7..f440155 100644 ---- a/lib/mbsinit.c -+++ b/lib/mbsinit.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h -index 01342af..30d715d 100644 ---- a/lib/mbtowc-impl.h -+++ b/lib/mbtowc-impl.h -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c -index ce74793..0f7ae6c 100644 ---- a/lib/mbtowc-lock.c -+++ b/lib/mbtowc-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h -index 0939517..d31b0b6 100644 ---- a/lib/mbtowc-lock.h -+++ b/lib/mbtowc-lock.h -@@ -1,12 +1,12 @@ - /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mbtowc.c b/lib/mbtowc.c -index 2711194..47b431a 100644 ---- a/lib/mbtowc.c -+++ b/lib/mbtowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/memchr.c b/lib/memchr.c -index d8feb19..56fd59d 100644 ---- a/lib/memchr.c -+++ b/lib/memchr.c -@@ -7,21 +7,21 @@ - adaptation to memchr suggested by Dick Karpinski (dick at cca.ucsf.edu), - and implemented by Roland McGrath (roland at ai.mit.edu). - --NOTE: The canonical source of this file is maintained with the GNU C Library. --Bugs can be reported to bug-glibc at prep.ai.mit.edu. -+ NOTE: The canonical source of this file is maintained with the GNU C Library. -+ Bugs can be reported to bug-glibc at prep.ai.mit.edu. - --This program is free software: you can redistribute it and/or modify it --under the terms of the GNU Lesser General Public License as published by the --Free Software Foundation; either version 3 of the License, or any --later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - --This program is distributed in the hope that it will be useful, --but WITHOUT ANY WARRANTY; without even the implied warranty of --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --GNU Lesser General Public License for more details. -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - --You should have received a copy of the GNU Lesser General Public License --along with this program. If not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind -index 034d1ee..4f16481 100644 ---- a/lib/memchr.valgrind -+++ b/lib/memchr.valgrind -@@ -2,12 +2,12 @@ - - # Copyright (C) 2009-2021 Free Software Foundation, Inc. - # --# This program is free software: you can redistribute it and/or modify --# it under the terms of the GNU Lesser General Public License as published by --# the Free Software Foundation; either version 3 of the License, or --# (at your option) any later version. -+# This file is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2.1 of the -+# License, or (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, -+# This file is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU Lesser General Public License for more details. -diff --git a/lib/mempcpy.c b/lib/mempcpy.c -index c80e119..cacacdb 100644 ---- a/lib/mempcpy.c -+++ b/lib/mempcpy.c -@@ -1,18 +1,18 @@ - /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/minmax.h b/lib/minmax.h -index 7d0b672..a03361b 100644 ---- a/lib/minmax.h -+++ b/lib/minmax.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _MINMAX_H - #define _MINMAX_H -diff --git a/lib/mkdir.c b/lib/mkdir.c -index 453e428..2766cc7 100644 ---- a/lib/mkdir.c -+++ b/lib/mkdir.c -@@ -3,12 +3,12 @@ - - Copyright (C) 2001, 2003, 2006, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/mkostemp.c b/lib/mkostemp.c -index cfab635..285f1ba 100644 ---- a/lib/mkostemp.c -+++ b/lib/mkostemp.c -@@ -2,12 +2,12 @@ - Foundation, Inc. - This file is derived from the one in the GNU C Library. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c -index de6ebee..a23dac9 100644 ---- a/lib/msvc-inval.c -+++ b/lib/msvc-inval.c -@@ -1,18 +1,18 @@ - /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h -index 0d418e1..e115a35 100644 ---- a/lib/msvc-inval.h -+++ b/lib/msvc-inval.h -@@ -1,18 +1,18 @@ - /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _MSVC_INVAL_H - #define _MSVC_INVAL_H -diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c -index e72dabe..d3c1f54 100644 ---- a/lib/msvc-nothrow.c -+++ b/lib/msvc-nothrow.c -@@ -2,18 +2,18 @@ - with MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h -index a56cd4e..057b5dd 100644 ---- a/lib/msvc-nothrow.h -+++ b/lib/msvc-nothrow.h -@@ -2,18 +2,18 @@ - with MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _MSVC_NOTHROW_H - #define _MSVC_NOTHROW_H -diff --git a/lib/netdb.in.h b/lib/netdb.in.h -index 6bcaf1a..eb5c960 100644 ---- a/lib/netdb.in.h -+++ b/lib/netdb.in.h -@@ -2,18 +2,18 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* This file is supposed to be used on platforms that lack . - It is intended to provide definitions and prototypes needed by an -diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h -index 3c1cad6..21f3a64 100644 ---- a/lib/netinet_in.in.h -+++ b/lib/netinet_in.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_NETINET_IN_H - -diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c -index 915c38b..fcdf56d 100644 ---- a/lib/nl_langinfo-lock.c -+++ b/lib/nl_langinfo-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by nl_langinfo. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c -index e8f3cef..b481f20 100644 ---- a/lib/nl_langinfo.c -+++ b/lib/nl_langinfo.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/nproc.c b/lib/nproc.c -index fef1f8b..e3ddb92 100644 ---- a/lib/nproc.c -+++ b/lib/nproc.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Glen Lenker and Bruno Haible. */ - -diff --git a/lib/nproc.h b/lib/nproc.h -index cd3ed36..d7659a5 100644 ---- a/lib/nproc.h -+++ b/lib/nproc.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Glen Lenker and Bruno Haible. */ - -diff --git a/lib/nstrftime.c b/lib/nstrftime.c -index 7ef7529..7f258e8 100644 ---- a/lib/nstrftime.c -+++ b/lib/nstrftime.c -@@ -1,19 +1,18 @@ - /* Copyright (C) 1991-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- The GNU C Library is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifdef _LIBC - # define USE_IN_EXTENDED_LOCALE_MODEL 1 -diff --git a/lib/open.c b/lib/open.c -index 5dc117e..372cda8 100644 ---- a/lib/open.c -+++ b/lib/open.c -@@ -1,12 +1,12 @@ - /* Open a descriptor to a file. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/pathmax.h b/lib/pathmax.h -index 4af7802..716f4a9 100644 ---- a/lib/pathmax.h -+++ b/lib/pathmax.h -@@ -2,18 +2,18 @@ - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _PATHMAX_H - # define _PATHMAX_H -diff --git a/lib/pipe.c b/lib/pipe.c -index 3316ceb..fc978f2 100644 ---- a/lib/pipe.c -+++ b/lib/pipe.c -@@ -1,18 +1,18 @@ - /* Create a pipe. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/pipe2.c b/lib/pipe2.c -index 25bce6f..9ba8c3b 100644 ---- a/lib/pipe2.c -+++ b/lib/pipe2.c -@@ -1,18 +1,18 @@ - /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/poll.c b/lib/poll.c -index d787676..8d5ba96 100644 ---- a/lib/poll.c -+++ b/lib/poll.c -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Tell gcc not to warn about the (nfd < 0) tests, below. */ - #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ -diff --git a/lib/poll.in.h b/lib/poll.in.h -index 1fe8370..e94cd31 100644 ---- a/lib/poll.in.h -+++ b/lib/poll.in.h -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_POLL_H - -diff --git a/lib/printf-args.c b/lib/printf-args.c -index 22e44ef..b822682 100644 ---- a/lib/printf-args.c -+++ b/lib/printf-args.c -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. -diff --git a/lib/printf-args.h b/lib/printf-args.h -index d15b12d..c8d9174 100644 ---- a/lib/printf-args.h -+++ b/lib/printf-args.h -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _PRINTF_ARGS_H - #define _PRINTF_ARGS_H -diff --git a/lib/printf-parse.c b/lib/printf-parse.c -index 9f97995..f21cc17 100644 ---- a/lib/printf-parse.c -+++ b/lib/printf-parse.c -@@ -1,18 +1,18 @@ - /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - CHAR_T The element type of the format string. -@@ -48,16 +48,7 @@ - #include - - /* Get intmax_t. */ --#if defined IN_LIBINTL || defined IN_LIBASPRINTF --# if HAVE_STDINT_H_WITH_UINTMAX --# include --# endif --# if HAVE_INTTYPES_H_WITH_UINTMAX --# include --# endif --#else --# include --#endif -+#include - - /* malloc(), realloc(), free(). */ - #include -diff --git a/lib/printf-parse.h b/lib/printf-parse.h -index e05ac8f..77b7409 100644 ---- a/lib/printf-parse.h -+++ b/lib/printf-parse.h -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software - Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _PRINTF_PARSE_H - #define _PRINTF_PARSE_H -diff --git a/lib/putenv.c b/lib/putenv.c -index d342b81..435d10f 100644 ---- a/lib/putenv.c -+++ b/lib/putenv.c -@@ -4,12 +4,12 @@ - NOTE: The canonical source of this file is maintained with the GNU C - Library. Bugs can be reported to bug-glibc at prep.ai.mit.edu. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published by the -- Free Software Foundation; either version 3 of the License, or any -- later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/raise.c b/lib/raise.c -index eda9126..37c100d 100644 ---- a/lib/raise.c -+++ b/lib/raise.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c -index ef35689..896d435 100644 ---- a/lib/rawmemchr.c -+++ b/lib/rawmemchr.c -@@ -1,12 +1,12 @@ - /* Searching in a string. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind -index 90ed95e..d489c32 100644 ---- a/lib/rawmemchr.valgrind -+++ b/lib/rawmemchr.valgrind -@@ -2,12 +2,12 @@ - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # --# This program is free software: you can redistribute it and/or modify --# it under the terms of the GNU Lesser General Public License as published by --# the Free Software Foundation; either version 3 of the License, or --# (at your option) any later version. -+# This file is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2.1 of the -+# License, or (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, -+# This file is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU Lesser General Public License for more details. -diff --git a/lib/read.c b/lib/read.c -index 125e738..840d9ed 100644 ---- a/lib/read.c -+++ b/lib/read.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/readlink.c b/lib/readlink.c -index 38d9e0c..d4f4b08 100644 ---- a/lib/readlink.c -+++ b/lib/readlink.c -@@ -1,12 +1,12 @@ - /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/realloc.c b/lib/realloc.c -index 1145514..af03f0c 100644 ---- a/lib/realloc.c -+++ b/lib/realloc.c -@@ -3,12 +3,12 @@ - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -18,68 +18,46 @@ - - /* written by Jim Meyering and Bruno Haible */ - --#define _GL_USE_STDLIB_ALLOC 1 - #include - --/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ --#ifdef realloc --# define NEED_REALLOC_GNU 1 --/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ --#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU --# define NEED_REALLOC_GNU 1 --#endif -- --/* Infer the properties of the system's malloc function. -- The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ --#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU --# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 --#endif -- - #include - --/* A function definition is only needed if NEED_REALLOC_GNU is defined above -- or if the module 'realloc-posix' requests it. */ --#if NEED_REALLOC_GNU || (GNULIB_REALLOC_POSIX && !HAVE_REALLOC_POSIX) -+#include -+ -+#include "xalloc-oversized.h" - --# include -+/* Call the system's realloc below. This file does not define -+ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ -+#undef realloc - - /* Change the size of an allocated block of memory P to N bytes, -- with error checking. If N is zero, change it to 1. If P is NULL, -- use malloc. */ -+ with error checking. If P is NULL, use malloc. Otherwise if N is zero, -+ free P and return NULL. */ - - void * - rpl_realloc (void *p, size_t n) - { -- void *result; -+ if (p == NULL) -+ return malloc (n); - --# if NEED_REALLOC_GNU - if (n == 0) - { -- n = 1; -- -- /* In theory realloc might fail, so don't rely on it to free. */ - free (p); -- p = NULL; -+ return NULL; - } --# endif - -- if (p == NULL) -+ if (xalloc_oversized (n, 1)) - { --# if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE -- if (n == 0) -- n = 1; --# endif -- result = malloc (n); -+ errno = ENOMEM; -+ return NULL; - } -- else -- result = realloc (p, n); - --# if !HAVE_REALLOC_POSIX -+ void *result = realloc (p, n); -+ -+#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; --# endif -+#endif - - return result; - } -- --#endif -diff --git a/lib/recv.c b/lib/recv.c -index f2a342f..3eb2b4d 100644 ---- a/lib/recv.c -+++ b/lib/recv.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/recvfrom.c b/lib/recvfrom.c -index 8abda0c..25231ff 100644 ---- a/lib/recvfrom.c -+++ b/lib/recvfrom.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/regex_internal.c b/lib/regex_internal.c -index 55f6b66..aefcfa2 100644 ---- a/lib/regex_internal.c -+++ b/lib/regex_internal.c -@@ -1211,6 +1211,10 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) - - if (__glibc_unlikely (dest->nelem == 0)) - { -+ /* Although we already guaranteed above that dest->alloc != 0 and -+ therefore dest->elems != NULL, add a debug assertion to pacify -+ GCC 11.2.1's -fanalyzer. */ -+ DEBUG_ASSERT (dest->elems); - dest->nelem = src->nelem; - memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); - return REG_NOERROR; -@@ -1286,7 +1290,10 @@ re_node_set_insert (re_node_set *set, Idx elem) - - if (__glibc_unlikely (set->nelem) == 0) - { -- /* We already guaranteed above that set->alloc != 0. */ -+ /* Although we already guaranteed above that set->alloc != 0 and -+ therefore set->elems != NULL, add a debug assertion to pacify -+ GCC 11.2 -fanalyzer. */ -+ DEBUG_ASSERT (set->elems); - set->elems[0] = elem; - ++set->nelem; - return true; -diff --git a/lib/regexec.c b/lib/regexec.c -index 6309dea..5e4eb49 100644 ---- a/lib/regexec.c -+++ b/lib/regexec.c -@@ -1220,9 +1220,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, - { - re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; - re_node_set *edests = &dfa->edests[node]; -- bool ok = re_node_set_insert (eps_via_nodes, node); -- if (__glibc_unlikely (! ok)) -- return -2; -+ -+ if (! re_node_set_contains (eps_via_nodes, node)) -+ { -+ bool ok = re_node_set_insert (eps_via_nodes, node); -+ if (__glibc_unlikely (! ok)) -+ return -2; -+ } - - /* Pick a valid destination, or return -1 if none is found. */ - Idx dest_node = -1; -@@ -1414,7 +1418,7 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, - update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); - - if ((idx == pmatch[0].rm_eo && cur_node == mctx->last_node) -- || re_node_set_contains (&eps_via_nodes, cur_node)) -+ || (fs && re_node_set_contains (&eps_via_nodes, cur_node))) - { - Idx reg_idx; - cur_node = -1; -diff --git a/lib/rename.c b/lib/rename.c -index 4873025..a3b7dc6 100644 ---- a/lib/rename.c -+++ b/lib/rename.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/rmdir.c b/lib/rmdir.c -index a99fb1e..6295e41 100644 ---- a/lib/rmdir.c -+++ b/lib/rmdir.c -@@ -3,12 +3,12 @@ - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/round.c b/lib/round.c -index 47a3936..5525050 100644 ---- a/lib/round.c -+++ b/lib/round.c -@@ -1,18 +1,18 @@ - /* Round toward nearest, breaking ties away from zero. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2007. - Based heavily on code by Bruno Haible. */ -diff --git a/lib/safe-read.c b/lib/safe-read.c -index a4a1b08..e187b12 100644 ---- a/lib/safe-read.c -+++ b/lib/safe-read.c -@@ -3,12 +3,12 @@ - Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/safe-read.h b/lib/safe-read.h -index 5050124..111aff5 100644 ---- a/lib/safe-read.h -+++ b/lib/safe-read.h -@@ -1,12 +1,12 @@ - /* An interface to read() that retries after interrupts. - Copyright (C) 2002, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/safe-write.c b/lib/safe-write.c -index f8b3b8b..494de14 100644 ---- a/lib/safe-write.c -+++ b/lib/safe-write.c -@@ -1,12 +1,12 @@ - /* An interface to write that retries after interrupts. - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/safe-write.h b/lib/safe-write.h -index 459629e..25d8c71 100644 ---- a/lib/safe-write.h -+++ b/lib/safe-write.h -@@ -1,12 +1,12 @@ - /* An interface to write() that retries after interrupts. - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/same-inode.h b/lib/same-inode.h -index 45e322a8..c727777 100644 ---- a/lib/same-inode.h -+++ b/lib/same-inode.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h -index 4b17f72..8873577 100644 ---- a/lib/scratch_buffer.h -+++ b/lib/scratch_buffer.h -@@ -1,12 +1,12 @@ - /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -110,14 +110,18 @@ extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, - - /* The implementation is imported from glibc. */ - --#include -- - /* Avoid possible conflicts with symbols exported by the GNU libc. */ - #define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree - #define __libc_scratch_buffer_grow gl_scratch_buffer_grow - #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve - #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size - --#include -+#ifndef _GL_LIKELY -+/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -+# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -+# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -+#endif -+ -+#include - - #endif /* _GL_SCRATCH_BUFFER_H */ -diff --git a/lib/select.c b/lib/select.c -index 9a6fc28..eddac4b 100644 ---- a/lib/select.c -+++ b/lib/select.c -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -@@ -530,12 +530,13 @@ restart: - if (h != handle_array[nhandles]) - { - /* Perform handle->descriptor mapping. */ -- WSAEventSelect ((SOCKET) h, NULL, 0); -- if (FD_ISSET (h, &handle_rfds)) -+ SOCKET s = (SOCKET) h; -+ WSAEventSelect (s, NULL, 0); -+ if (FD_ISSET (s, &handle_rfds)) - FD_SET (i, rfds); -- if (FD_ISSET (h, &handle_wfds)) -+ if (FD_ISSET (s, &handle_wfds)) - FD_SET (i, wfds); -- if (FD_ISSET (h, &handle_xfds)) -+ if (FD_ISSET (s, &handle_xfds)) - FD_SET (i, xfds); - } - else -diff --git a/lib/send.c b/lib/send.c -index 3625864..58cb70b 100644 ---- a/lib/send.c -+++ b/lib/send.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sendto.c b/lib/sendto.c -index 5372a66..029ccd6 100644 ---- a/lib/sendto.c -+++ b/lib/sendto.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setenv.c b/lib/setenv.c -index 5374044..3ad3477 100644 ---- a/lib/setenv.c -+++ b/lib/setenv.c -@@ -1,12 +1,12 @@ - /* Copyright (C) 1992, 1995-2003, 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c -index 3cb5d47..53e231c 100644 ---- a/lib/setlocale-lock.c -+++ b/lib/setlocale-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by setlocale_null_r. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c -index 4c50472..dbfda25 100644 ---- a/lib/setlocale_null.c -+++ b/lib/setlocale_null.c -@@ -1,12 +1,12 @@ - /* Query the name of the current global locale. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h -index bf96fa4..00c42e2 100644 ---- a/lib/setlocale_null.h -+++ b/lib/setlocale_null.h -@@ -1,12 +1,12 @@ - /* Query the name of the current global locale. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/setsockopt.c b/lib/setsockopt.c -index db32996..10b1e90 100644 ---- a/lib/setsockopt.c -+++ b/lib/setsockopt.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/shutdown.c b/lib/shutdown.c -index c5527cd..70c927c 100644 ---- a/lib/shutdown.c -+++ b/lib/shutdown.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signal.in.h b/lib/signal.in.h -index b211137..275da8c 100644 ---- a/lib/signal.in.h -+++ b/lib/signal.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signbitd.c b/lib/signbitd.c -index 2992dd4..2259771 100644 ---- a/lib/signbitd.c -+++ b/lib/signbitd.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signbitf.c b/lib/signbitf.c -index 01be49a..b196d9a 100644 ---- a/lib/signbitf.c -+++ b/lib/signbitf.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/signbitl.c b/lib/signbitl.c -index 6e0f64e..f73802d 100644 ---- a/lib/signbitl.c -+++ b/lib/signbitl.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/size_max.h b/lib/size_max.h -index c6d4a18..1186ba9 100644 ---- a/lib/size_max.h -+++ b/lib/size_max.h -@@ -2,18 +2,18 @@ - Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef GNULIB_SIZE_MAX_H - #define GNULIB_SIZE_MAX_H -diff --git a/lib/snprintf.c b/lib/snprintf.c -index 357f287..a589cf1 100644 ---- a/lib/snprintf.c -+++ b/lib/snprintf.c -@@ -2,18 +2,18 @@ - Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - Written by Simon Josefsson and Paul Eggert. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/socket.c b/lib/socket.c -index 8525260..0f2e6ff 100644 ---- a/lib/socket.c -+++ b/lib/socket.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sockets.c b/lib/sockets.c -index 394b01e..934da73 100644 ---- a/lib/sockets.c -+++ b/lib/sockets.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sockets.h b/lib/sockets.h -index a13b0cb..e70c2bb 100644 ---- a/lib/sockets.h -+++ b/lib/sockets.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat-time.c b/lib/stat-time.c -index 81b83dd..7b92792 100644 ---- a/lib/stat-time.c -+++ b/lib/stat-time.c -@@ -1,3 +1,21 @@ -+/* stat-related time functions. -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE - #include "stat-time.h" -diff --git a/lib/stat-time.h b/lib/stat-time.h -index 00c9329..fe3483d 100644 ---- a/lib/stat-time.h -+++ b/lib/stat-time.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat-w32.c b/lib/stat-w32.c -index fe505cb..4164199 100644 ---- a/lib/stat-w32.c -+++ b/lib/stat-w32.c -@@ -1,12 +1,12 @@ - /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat-w32.h b/lib/stat-w32.h -index 05c9b0f..5b56c09 100644 ---- a/lib/stat-w32.h -+++ b/lib/stat-w32.h -@@ -1,12 +1,12 @@ - /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stat.c b/lib/stat.c -index 39a1269..bc9a767 100644 ---- a/lib/stat.c -+++ b/lib/stat.c -@@ -1,12 +1,12 @@ - /* Work around platform bugs in stat. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h -index 7b51043..592d58e 100644 ---- a/lib/stdalign.in.h -+++ b/lib/stdalign.in.h -@@ -2,18 +2,18 @@ - - Copyright 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Paul Eggert and Bruno Haible. */ - -diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h -index c404f8d..2a1992d 100644 ---- a/lib/stdbool.in.h -+++ b/lib/stdbool.in.h -@@ -1,18 +1,18 @@ - /* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2001. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _GL_STDBOOL_H - #define _GL_STDBOOL_H -diff --git a/lib/stddef.in.h b/lib/stddef.in.h -index 4c53e64..42290d4 100644 ---- a/lib/stddef.in.h -+++ b/lib/stddef.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake. */ - -diff --git a/lib/stdint.in.h b/lib/stdint.in.h -index a98f1c8..85c5418 100644 ---- a/lib/stdint.in.h -+++ b/lib/stdint.in.h -@@ -2,18 +2,18 @@ - Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. - This file is part of gnulib. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* - * ISO C 99 for platforms that lack it. -@@ -85,7 +85,7 @@ - - /* Override WINT_MIN and WINT_MAX if gnulib's or overrides - wint_t. */ --#if @GNULIB_OVERRIDES_WINT_T@ -+#if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # undef WINT_MIN - # undef WINT_MAX - # define WINT_MIN 0x0U -@@ -598,7 +598,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) - /* wint_t limits */ - /* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not - accurate, therefore use the definitions from above. */ --# if !@GNULIB_OVERRIDES_WINT_T@ -+# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ - # undef WINT_MIN - # undef WINT_MAX - # if @HAVE_SIGNED_WINT_T@ -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index 6e10c74..f1bf817 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -242,7 +242,7 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " - _GL_CXXALIAS_MDA (fcloseall, int, (void)); - # else - # if @HAVE_DECL_FCLOSEALL@ --# if defined __FreeBSD__ -+# if defined __FreeBSD__ || defined __DragonFly__ - _GL_CXXALIAS_SYS (fcloseall, void, (void)); - # else - _GL_CXXALIAS_SYS (fcloseall, int, (void)); -@@ -260,8 +260,9 @@ _GL_CXXALIASWARN (fcloseall); - # undef fdopen - # define fdopen rpl_fdopen - # endif --_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) -- _GL_ARG_NONNULL ((2))); -+_GL_FUNCDECL_RPL (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); - # elif defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -270,28 +271,42 @@ _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); - # endif - _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); - # endif - _GL_CXXALIASWARN (fdopen); --#elif defined GNULIB_POSIXCHECK --# undef fdopen -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen -+/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fdopen - /* Assume fdopen is always declared. */ - _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " - "use gnulib module fdopen for portability"); --#elif @GNULIB_MDA_FDOPEN@ -+# elif @GNULIB_MDA_FDOPEN@ - /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::fdopen always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef fdopen --# define fdopen _fdopen --# endif -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef fdopen -+# define fdopen _fdopen -+# endif - _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); --# else -+# else - _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); --# endif -+# endif - _GL_CXXALIASWARN (fdopen); -+# endif - #endif - - #if @GNULIB_FFLUSH@ -@@ -380,21 +395,35 @@ _GL_CXXALIASWARN (fileno); - # endif - _GL_FUNCDECL_RPL (fopen, FILE *, - (const char *restrict filename, const char *restrict mode) -- _GL_ARG_NONNULL ((1, 2))); -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (fopen, FILE *, - (const char *restrict filename, const char *restrict mode)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fopen, FILE *, -+ (const char *restrict filename, const char *restrict mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (fopen, FILE *, - (const char *restrict filename, const char *restrict mode)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (fopen); - # endif --#elif defined GNULIB_POSIXCHECK --# undef fopen -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen -+/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fopen, FILE *, -+ (const char *restrict filename, const char *restrict mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fopen - /* Assume fopen is always declared. */ - _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - " - "use gnulib module fopen for portability"); -+# endif - #endif - - #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@ -@@ -1009,22 +1038,32 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " - # undef popen - # define popen rpl_popen - # endif --_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode) -- _GL_ARG_NONNULL ((1, 2))); -+_GL_FUNCDECL_RPL (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); - _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); - # else --# if !@HAVE_POPEN@ --_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) -- _GL_ARG_NONNULL ((1, 2))); -+# if !@HAVE_POPEN@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); - # endif - _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode)); - # endif - _GL_CXXALIASWARN (popen); --#elif defined GNULIB_POSIXCHECK --# undef popen --# if HAVE_RAW_DECL_POPEN -+#else -+# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen -+/* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ -+_GL_FUNCDECL_SYS (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef popen -+# if HAVE_RAW_DECL_POPEN - _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " - "use gnulib module popen or pipe for more portability"); -+# endif - # endif - #endif - -@@ -1257,6 +1296,7 @@ _GL_CXXALIASWARN (scanf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define snprintf rpl_snprintf - # endif -+# define GNULIB_overrides_snprintf 1 - _GL_FUNCDECL_RPL (snprintf, int, - (char *restrict str, size_t size, - const char *restrict format, ...) -@@ -1302,6 +1342,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define sprintf rpl_sprintf - # endif -+# define GNULIB_overrides_sprintf 1 - _GL_FUNCDECL_RPL (sprintf, int, - (char *restrict str, const char *restrict format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) -@@ -1344,19 +1385,32 @@ _GL_CXXALIASWARN (tempnam); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define tmpfile rpl_tmpfile - # endif --_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)); -+_GL_FUNCDECL_RPL (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (tmpfile); - # endif --#elif defined GNULIB_POSIXCHECK --# undef tmpfile --# if HAVE_RAW_DECL_TMPFILE -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile -+/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef tmpfile -+# if HAVE_RAW_DECL_TMPFILE - _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " - "use gnulib module tmpfile for portability"); -+# endif - # endif - #endif - -@@ -1369,6 +1423,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define asprintf rpl_asprintf - # endif -+# define GNULIB_overrides_asprintf - _GL_FUNCDECL_RPL (asprintf, int, - (char **result, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) -@@ -1390,6 +1445,7 @@ _GL_CXXALIASWARN (asprintf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vasprintf rpl_vasprintf - # endif -+# define GNULIB_overrides_vasprintf 1 - _GL_FUNCDECL_RPL (vasprintf, int, - (char **result, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) -@@ -1573,6 +1629,7 @@ _GL_CXXALIASWARN (vscanf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vsnprintf rpl_vsnprintf - # endif -+# define GNULIB_overrides_vsnprintf 1 - _GL_FUNCDECL_RPL (vsnprintf, int, - (char *restrict str, size_t size, - const char *restrict format, va_list args) -@@ -1609,6 +1666,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vsprintf rpl_vsprintf - # endif -+# define GNULIB_overrides_vsprintf 1 - _GL_FUNCDECL_RPL (vsprintf, int, - (char *restrict str, - const char *restrict format, va_list args) -diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h -index 7e01262..d86a880 100644 ---- a/lib/stdlib.in.h -+++ b/lib/stdlib.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -149,6 +149,28 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " - #endif - - -+#if @GNULIB_FREE_POSIX@ -+# if @REPLACE_FREE@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef free -+# define free rpl_free -+# endif -+_GL_FUNCDECL_RPL (free, void, (void *ptr)); -+_GL_CXXALIAS_RPL (free, void, (void *ptr)); -+# else -+_GL_CXXALIAS_SYS (free, void, (void *ptr)); -+# endif -+# if __GLIBC__ >= 2 -+_GL_CXXALIASWARN (free); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef free -+/* Assume free is always declared. */ -+_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " -+ "use gnulib module free for portability"); -+#endif -+ -+ - /* Allocate memory with indefinite extent and specified alignment. */ - #if @GNULIB_ALIGNED_ALLOC@ - # if @REPLACE_ALIGNED_ALLOC@ -@@ -156,21 +178,37 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " - # undef aligned_alloc - # define aligned_alloc rpl_aligned_alloc - # endif --_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); -+_GL_FUNCDECL_RPL (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); - # else - # if @HAVE_ALIGNED_ALLOC@ -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); - # endif - # endif - # if @HAVE_ALIGNED_ALLOC@ - _GL_CXXALIASWARN (aligned_alloc); - # endif --#elif defined GNULIB_POSIXCHECK --# undef aligned_alloc --# if HAVE_RAW_DECL_ALIGNED_ALLOC -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc -+/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef aligned_alloc -+# if HAVE_RAW_DECL_ALIGNED_ALLOC - _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " - "use gnulib module aligned_alloc for portability"); -+# endif - # endif - #endif - -@@ -198,19 +236,35 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " - # undef calloc - # define calloc rpl_calloc - # endif --_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size)); -+_GL_FUNCDECL_RPL (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (calloc); - # endif --#elif defined GNULIB_POSIXCHECK --# undef calloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc -+/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef calloc - /* Assume calloc is always declared. */ - _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " - "use gnulib module calloc-posix for portability"); -+# endif - #endif - - #if @GNULIB_CANONICALIZE_FILE_NAME@ -@@ -218,13 +272,17 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define canonicalize_file_name rpl_canonicalize_file_name - # endif --_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name) -- _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); - # else --# if !@HAVE_CANONICALIZE_FILE_NAME@ --_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) -- _GL_ARG_NONNULL ((1))); -+# if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); - # endif -@@ -233,12 +291,22 @@ _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); - (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) - # endif - _GL_CXXALIASWARN (canonicalize_file_name); --#elif defined GNULIB_POSIXCHECK --# undef canonicalize_file_name --# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name -+/* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or -+ rpl_free. */ -+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef canonicalize_file_name -+# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME - _GL_WARN_ON_USE (canonicalize_file_name, - "canonicalize_file_name is unportable - " - "use gnulib module canonicalize-lgpl for portability"); -+# endif - # endif - #endif - -@@ -288,27 +356,6 @@ _GL_CXXALIASWARN (fcvt); - # endif - #endif - --#if @GNULIB_FREE_POSIX@ --# if @REPLACE_FREE@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef free --# define free rpl_free --# endif --_GL_FUNCDECL_RPL (free, void, (void *ptr)); --_GL_CXXALIAS_RPL (free, void, (void *ptr)); --# else --_GL_CXXALIAS_SYS (free, void, (void *ptr)); --# endif --# if __GLIBC__ >= 2 --_GL_CXXALIASWARN (free); --# endif --#elif defined GNULIB_POSIXCHECK --# undef free --/* Assume free is always declared. */ --_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " -- "use gnulib module free for portability"); --#endif -- - #if @GNULIB_MDA_GCVT@ - /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -@@ -404,19 +451,35 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " - # undef malloc - # define malloc rpl_malloc - # endif --_GL_FUNCDECL_RPL (malloc, void *, (size_t size)); -+_GL_FUNCDECL_RPL (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (malloc); - # endif --#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC --# undef malloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc -+/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -+# undef malloc - /* Assume malloc is always declared. */ - _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " - "use gnulib module malloc-posix for portability"); -+# endif - #endif - - /* Convert a multibyte character to a wide character. */ -@@ -1015,29 +1078,53 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " - # undef realloc - # define realloc rpl_realloc - # endif --_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)); -+_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (realloc); - # endif --#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC --# undef realloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc -+/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -+# undef realloc - /* Assume realloc is always declared. */ - _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " - "use gnulib module realloc-posix for portability"); -+# endif - #endif - - - #if @GNULIB_REALLOCARRAY@ --# if ! @HAVE_REALLOCARRAY@ -+# if @REPLACE_REALLOCARRAY@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef reallocarray -+# define reallocarray rpl_reallocarray -+# endif -+_GL_FUNCDECL_RPL (reallocarray, void *, -+ (void *ptr, size_t nmemb, size_t size)); -+_GL_CXXALIAS_RPL (reallocarray, void *, -+ (void *ptr, size_t nmemb, size_t size)); -+# else -+# if ! @HAVE_REALLOCARRAY@ - _GL_FUNCDECL_SYS (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); --# endif -+# endif - _GL_CXXALIAS_SYS (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); -+# endif - _GL_CXXALIASWARN (reallocarray); - #elif defined GNULIB_POSIXCHECK - # undef reallocarray -diff --git a/lib/strdup.c b/lib/strdup.c -index 2a37049..e5d4d75 100644 ---- a/lib/strdup.c -+++ b/lib/strdup.c -@@ -3,18 +3,18 @@ - - This file is part of the GNU C Library. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/streq.h b/lib/streq.h -index 2d9d4c2..adabd15 100644 ---- a/lib/streq.h -+++ b/lib/streq.h -@@ -1,15 +1,15 @@ - /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ -diff --git a/lib/strftime.h b/lib/strftime.h -index 645e8c7..790a80e 100644 ---- a/lib/strftime.h -+++ b/lib/strftime.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002, 2004, 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/striconveh.c b/lib/striconveh.c -index 82f6467..78a5e02 100644 ---- a/lib/striconveh.c -+++ b/lib/striconveh.c -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2021 Free Software Foundation, Inc. - Written by Bruno Haible and Simon Josefsson. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/striconveh.h b/lib/striconveh.h -index c9dff1e..60c6329 100644 ---- a/lib/striconveh.h -+++ b/lib/striconveh.h -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible and Simon Josefsson. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -18,7 +18,7 @@ - #ifndef _STRICONVEH_H - #define _STRICONVEH_H - --#include -+#include - #if HAVE_ICONV - #include - #endif -@@ -95,7 +95,8 @@ extern int - extern char * - str_cd_iconveh (const char *src, - const iconveh_t *cd, -- enum iconv_ilseq_handler handler); -+ enum iconv_ilseq_handler handler) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - - #endif - -@@ -129,7 +130,8 @@ extern int - extern char * - str_iconveh (const char *src, - const char *from_codeset, const char *to_codeset, -- enum iconv_ilseq_handler handler); -+ enum iconv_ilseq_handler handler) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - - - #ifdef __cplusplus -diff --git a/lib/string.in.h b/lib/string.in.h -index 1292e29..b043c75 100644 ---- a/lib/string.in.h -+++ b/lib/string.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -47,6 +47,9 @@ - /* NetBSD 5.0 mis-defines NULL. */ - #include - -+/* Get free(). */ -+#include -+ - /* MirBSD defines mbslen as a macro. */ - #if @GNULIB_MBSLEN@ && defined __MirBSD__ - # include -@@ -418,7 +421,10 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " - # undef strdup - # define strdup rpl_strdup - # endif --_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); - # elif defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -431,35 +437,47 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); - /* strdup exists as a function and as a macro. Get rid of the macro. */ - # undef strdup - # endif --# if !(@HAVE_DECL_STRDUP@ || defined strdup) --_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); -+# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup -+_GL_FUNCDECL_SYS (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); - # endif - _GL_CXXALIASWARN (strdup); --#elif defined GNULIB_POSIXCHECK --# undef strdup --# if HAVE_RAW_DECL_STRDUP -+#else -+# if __GNUC__ >= 11 && !defined strdup -+/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ -+_GL_FUNCDECL_SYS (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef strdup -+# if HAVE_RAW_DECL_STRDUP - _GL_WARN_ON_USE (strdup, "strdup is unportable - " - "use gnulib module strdup for portability"); --# endif --#elif @GNULIB_MDA_STRDUP@ -+# endif -+# elif @GNULIB_MDA_STRDUP@ - /* On native Windows, map 'creat' to '_creat', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -- platforms by defining GNULIB_NAMESPACE::creat always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef strdup --# define strdup _strdup --# endif -+ platforms by defining GNULIB_NAMESPACE::strdup always. */ -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef strdup -+# define strdup _strdup -+# endif - _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); --# else --# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup --# undef strdup --# endif -+# else -+# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup -+# undef strdup -+# endif - _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); --# endif -+# endif - _GL_CXXALIASWARN (strdup); -+# endif - #endif - - /* Append no more than N characters from SRC onto DEST. */ -diff --git a/lib/stripslash.c b/lib/stripslash.c -index b079795..99bfbe6 100644 ---- a/lib/stripslash.c -+++ b/lib/stripslash.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 2001, 2003-2006, 2009-2021 Free Software Foundation, - Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/sys-limits.h b/lib/sys-limits.h -index 1856e7f..2d9784d 100644 ---- a/lib/sys-limits.h -+++ b/lib/sys-limits.h -@@ -2,18 +2,18 @@ - - Copyright 2018-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _GL_SYS_LIMITS_H - #define _GL_SYS_LIMITS_H -diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h -index e18594f..4166082 100644 ---- a/lib/sys_file.in.h -+++ b/lib/sys_file.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Richard W.M. Jones. */ - -diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h -index 1a479e9..1abd6c5 100644 ---- a/lib/sys_random.in.h -+++ b/lib/sys_random.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2020-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h -index d82c5d1..f8ef648 100644 ---- a/lib/sys_select.in.h -+++ b/lib/sys_select.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_socket.c b/lib/sys_socket.c -index 3b261da..d90b32c 100644 ---- a/lib/sys_socket.c -+++ b/lib/sys_socket.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE - #include "sys/socket.h" - typedef int dummy; -diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h -index c0baa71..0a2c57d 100644 ---- a/lib/sys_socket.in.h -+++ b/lib/sys_socket.in.h -@@ -3,18 +3,18 @@ - Copyright (C) 2005-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* This file is supposed to be used on platforms that lack , - on platforms where cannot be included standalone, and on -diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h -index 125aca0..babe3db 100644 ---- a/lib/sys_stat.in.h -+++ b/lib/sys_stat.in.h -@@ -1,18 +1,18 @@ - /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ - -diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h -index f310ca5..8035fbe 100644 ---- a/lib/sys_time.in.h -+++ b/lib/sys_time.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h -index 3d96200..85b728f 100644 ---- a/lib/sys_times.in.h -+++ b/lib/sys_times.in.h -@@ -1,18 +1,18 @@ - /* Provide a sys/times.h header file. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Simon Josefsson , 2008. */ - -diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h -index 26e7db7..2079d72 100644 ---- a/lib/sys_types.in.h -+++ b/lib/sys_types.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h -index 1941360..507ab01 100644 ---- a/lib/sys_uio.in.h -+++ b/lib/sys_uio.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/tempname.h b/lib/tempname.h -index c91a58d..795bb49 100644 ---- a/lib/tempname.h -+++ b/lib/tempname.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/time-internal.h b/lib/time-internal.h -index b86b7a0..6bbd0a7 100644 ---- a/lib/time-internal.h -+++ b/lib/time-internal.h -@@ -2,18 +2,18 @@ - - Copyright 2015-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/time.in.h b/lib/time.in.h -index cbd2bba..a73fe59 100644 ---- a/lib/time.in.h -+++ b/lib/time.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/time_r.c b/lib/time_r.c -index 2510c4e..88d3c1c 100644 ---- a/lib/time_r.c -+++ b/lib/time_r.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2003, 2006-2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/time_rz.c b/lib/time_rz.c -index d32cce7..e772244 100644 ---- a/lib/time_rz.c -+++ b/lib/time_rz.c -@@ -2,18 +2,18 @@ - - Copyright 2015-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/times.c b/lib/times.c -index b8afa60..72b852e 100644 ---- a/lib/times.c -+++ b/lib/times.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Simon Josefsson , 2008. */ - -diff --git a/lib/trunc.c b/lib/trunc.c -index cf2adac..1c9c420 100644 ---- a/lib/trunc.c -+++ b/lib/trunc.c -@@ -1,12 +1,12 @@ - /* Round towards zero. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/tzset.c b/lib/tzset.c -index 1f423c4..7fd4936 100644 ---- a/lib/tzset.c -+++ b/lib/tzset.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2001-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* written by Jim Meyering */ - -diff --git a/lib/unistd.c b/lib/unistd.c -index 72bad1c..0763456 100644 ---- a/lib/unistd.c -+++ b/lib/unistd.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE - #include "unistd.h" - typedef int dummy; -diff --git a/lib/unistd.in.h b/lib/unistd.in.h -index 5914fd5..73c882f 100644 ---- a/lib/unistd.in.h -+++ b/lib/unistd.in.h -@@ -1,18 +1,18 @@ - /* Substitute for and wrapper around . - Copyright (C) 2003-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _ at GUARD_PREFIX@_UNISTD_H - -@@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " - # undef isatty - # define isatty rpl_isatty - # endif -+# define GNULIB_defined_isatty 1 - _GL_FUNCDECL_RPL (isatty, int, (int fd)); - _GL_CXXALIAS_RPL (isatty, int, (int fd)); - # elif defined _WIN32 && !defined __CYGWIN__ -@@ -2027,15 +2028,23 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " - #if @GNULIB_MDA_SWAB@ - /* On native Windows, map 'swab' to '_swab', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -- platforms by defining GNULIB_NAMESPACE::creat always. */ -+ platforms by defining GNULIB_NAMESPACE::swab always. */ - # if defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef swab - # define swab _swab - # endif --_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); -+/* Need to cast, because in old mingw the arguments are -+ (const char *from, char *to, size_t n). */ -+_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); - # else -+# if defined __hpux /* HP-UX */ -+_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); -+# elif defined __sun && !defined _XPG4 /* Solaris */ -+_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); -+# else - _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); -+# endif - # endif - _GL_CXXALIASWARN (swab); - #endif -diff --git a/lib/unsetenv.c b/lib/unsetenv.c -index 005fb1f..b2e910e 100644 ---- a/lib/unsetenv.c -+++ b/lib/unsetenv.c -@@ -1,12 +1,12 @@ - /* Copyright (C) 1992, 1995-2002, 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index 8d51006..d9b669d 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -1,18 +1,18 @@ - /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - VASNPRINTF The name of the function being defined. -@@ -60,10 +60,16 @@ - #ifndef VASNPRINTF - # include - #endif --#ifndef IN_LIBINTL --# include -+ -+/* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's -+ use of CHECK macros expands to code that is too complicated for gcc -+ -fanalyzer. Suppress the resulting bogus warnings. */ -+#if 10 <= __GNUC__ -+# pragma GCC diagnostic ignored "-Wanalyzer-null-argument" - #endif - -+#include -+ - /* Specification. */ - #ifndef VASNPRINTF - # if WIDE_CHAR_VERSION -@@ -1924,7 +1930,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - - /* Ensures that allocated >= needed. Aborts through a jump to - out_of_memory if needed is SIZE_MAX or otherwise too big. */ --#define ENSURE_ALLOCATION(needed) \ -+#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ - if ((needed) > allocated) \ - { \ - size_t memory_size; \ -@@ -1935,17 +1941,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - allocated = (needed); \ - memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ - if (size_overflow_p (memory_size)) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf || result == NULL) \ - memory = (DCHAR_T *) malloc (memory_size); \ - else \ - memory = (DCHAR_T *) realloc (result, memory_size); \ - if (memory == NULL) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf && length > 0) \ - DCHAR_CPY (memory, result, length); \ - result = memory; \ - } -+#define ENSURE_ALLOCATION(needed) \ -+ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) - - for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) - { -@@ -2193,7 +2201,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2317,7 +2326,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2441,7 +2451,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2944,7 +2955,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -3147,7 +3159,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -5598,7 +5611,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - CLEANUP (); - return NULL; - } -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - count = tmpdst_len; -diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h -index aaed859..9b02cdf 100644 ---- a/lib/vasnprintf.h -+++ b/lib/vasnprintf.h -@@ -1,18 +1,18 @@ - /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _VASNPRINTF_H - #define _VASNPRINTF_H -diff --git a/lib/verify.h b/lib/verify.h -index d1b4995..a8ca59b 100644 ---- a/lib/verify.h -+++ b/lib/verify.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -25,7 +25,7 @@ - works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. - - Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as -- per C2X. This is supported by GCC 9.1+. -+ per C2x. This is supported by GCC 9.1+. - - Support compilers claiming conformance to the relevant standard, - and also support GCC when not pedantic. If we were willing to slow -@@ -202,7 +202,7 @@ template - - This macro requires three or more arguments but uses at most the first - two, so that the _Static_assert macro optionally defined below supports -- both the C11 two-argument syntax and the C2X one-argument syntax. -+ both the C11 two-argument syntax and the C2x one-argument syntax. - - Unfortunately, unlike C11, this implementation must appear as an - ordinary declaration, and cannot appear inside struct { ... }. */ -diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c -index c94c5cb..4a0a3dc 100644 ---- a/lib/vsnprintf.c -+++ b/lib/vsnprintf.c -@@ -2,18 +2,18 @@ - Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - Written by Simon Josefsson and Yoann Vandoorselaere . - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Lesser General Public License along -- with this program; if not, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifdef HAVE_CONFIG_H - # include -diff --git a/lib/w32sock.h b/lib/w32sock.h -index 9b6a231..635a1b2 100644 ---- a/lib/w32sock.h -+++ b/lib/w32sock.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/wchar.in.h b/lib/wchar.in.h -index fe4171c..be5d36c 100644 ---- a/lib/wchar.in.h -+++ b/lib/wchar.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake. */ - -@@ -72,6 +72,9 @@ - # include - #endif - -+/* Get free(). */ -+#include -+ - /* Include the original if it exists. - Some builds of uClibc lack it. */ - /* The include_next requires a split double-inclusion guard. */ -@@ -111,7 +114,7 @@ - /* mingw and MSVC define wint_t as 'unsigned short' in or - . This is too small: ISO C 99 section 7.24.1.(2) says that - wint_t must be "unchanged by default argument promotions". Override it. */ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !GNULIB_defined_wint_t - # if @HAVE_CRTDEFS_H@ - # include -@@ -941,36 +944,48 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " - # endif - _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); - # else --# if !@HAVE_WCSDUP@ --_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -+# if !@HAVE_WCSDUP@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); - # endif - _GL_CXXALIASWARN (wcsdup); --#elif defined GNULIB_POSIXCHECK --# undef wcsdup --# if HAVE_RAW_DECL_WCSDUP -+#else -+# if __GNUC__ >= 11 && !defined wcsdup -+/* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef wcsdup -+# if HAVE_RAW_DECL_WCSDUP - _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " - "use gnulib module wcsdup for portability"); --# endif --#elif @GNULIB_MDA_WCSDUP@ -+# endif -+# elif @GNULIB_MDA_WCSDUP@ - /* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::wcsdup always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef wcsdup --# define wcsdup _wcsdup --# endif -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef wcsdup -+# define wcsdup _wcsdup -+# endif - _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); --# else --_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); --# if @HAVE_DECL_WCSDUP@ -+# else -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# if @HAVE_DECL_WCSDUP@ - _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -+# endif - # endif --# endif --# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ -+# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ - _GL_CXXALIASWARN (wcsdup); -+# endif - # endif - #endif - -diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c -index 76d21ae..5c9fd79 100644 ---- a/lib/wcrtomb.c -+++ b/lib/wcrtomb.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/wctype-h.c b/lib/wctype-h.c -index bb5f847..150221d 100644 ---- a/lib/wctype-h.c -+++ b/lib/wctype-h.c -@@ -1,4 +1,23 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - /* Normally this would be wctype.c, but that name's already taken. */ -+ - #include -+ - #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE - #include "wctype.h" -diff --git a/lib/wctype.in.h b/lib/wctype.in.h -index 6f0cd21..652d811 100644 ---- a/lib/wctype.in.h -+++ b/lib/wctype.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Bruno Haible and Paul Eggert. */ - -@@ -103,7 +103,7 @@ _GL_INLINE_HEADER_BEGIN - /* mingw and MSVC define wint_t as 'unsigned short' in or - . This is too small: ISO C 99 section 7.24.1.(2) says that - wint_t must be "unchanged by default argument promotions". Override it. */ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !GNULIB_defined_wint_t - # if @HAVE_CRTDEFS_H@ - # include -@@ -132,7 +132,7 @@ typedef unsigned int rpl_wint_t; - same way, or not at all. */ - # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ - --# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ - - _GL_WCTYPE_INLINE int - rpl_iswalnum (wint_t wc) -@@ -496,7 +496,7 @@ _GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); - - # endif - --# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ -+# if defined __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ - - /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. - The functions towlower and towupper are implemented in the MSVCRT library -@@ -529,7 +529,7 @@ rpl_towupper (wint_t wc) - # define towupper rpl_towupper - # endif - --# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ -+# endif /* __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ */ - - # define GNULIB_defined_wctype_functions 1 - #endif -@@ -646,7 +646,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " - The argument WC must be either a wchar_t value or WEOF. - The argument DESC must have been returned by the wctype() function. */ - #if @GNULIB_ISWCTYPE@ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef iswctype - # define iswctype rpl_iswctype -diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h -index e84051e..7999b23 100644 ---- a/lib/windows-initguard.h -+++ b/lib/windows-initguard.h -@@ -1,18 +1,18 @@ - /* Init guards, somewhat like spinlocks (native Windows implementation). - Copyright (C) 2005-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - /* Written by Bruno Haible , 2005. - Based on GCC's gthr-win32.h. */ -diff --git a/lib/write.c b/lib/write.c -index bc53d4d..614cdc6 100644 ---- a/lib/write.c -+++ b/lib/write.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h -index d255969..4184f33 100644 ---- a/lib/xalloc-oversized.h -+++ b/lib/xalloc-oversized.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. - -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. -@@ -22,33 +22,38 @@ - #include - - /* True if N * S does not fit into both ptrdiff_t and size_t. -- S must be positive and N must be nonnegative. -+ N and S should be nonnegative and free of side effects. - This expands to a constant expression if N and S are both constants. - By gnulib convention, SIZE_MAX represents overflow in size_t - calculations, so the conservative size_t-based dividend to use here - is SIZE_MAX - 1. */ - #define __xalloc_oversized(n, s) \ -- ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) -+ ((s) != 0 \ -+ && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ -+ < (n))) - --#if PTRDIFF_MAX < SIZE_MAX --typedef ptrdiff_t xalloc_count_t; --#else --typedef size_t xalloc_count_t; --#endif -+/* Return 1 if and only if an array of N objects, each of size S, -+ cannot exist reliably because its total size in bytes would exceed -+ MIN (PTRDIFF_MAX, SIZE_MAX - 1). -+ -+ N and S should be nonnegative and free of side effects. -+ -+ Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can -+ misbehave if N and S are both narrower than ptrdiff_t and size_t, -+ and can be rewritten as (xalloc_oversized (N, S) ? NULL -+ : malloc (N * (size_t) S)). - --/* Return 1 if an array of N objects, each of size S, cannot exist reliably -- because its total size in bytes exceeds MIN (PTRDIFF_MAX, SIZE_MAX). -- N must be nonnegative, S must be positive, and either N or S should be -- of type ptrdiff_t or size_t or wider. This is a macro, not a function, -- so that it works even if an argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ --#if 7 <= __GNUC__ && !defined __clang__ -+ This is a macro, not a function, so that it works even if an -+ argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ -+#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX - # define xalloc_oversized(n, s) \ -- __builtin_mul_overflow_p (n, s, (xalloc_count_t) 1) --#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ -+ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) -+#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ -+ && PTRDIFF_MAX < SIZE_MAX) - # define xalloc_oversized(n, s) \ - (__builtin_constant_p (n) && __builtin_constant_p (s) \ - ? __xalloc_oversized (n, s) \ -- : ({ xalloc_count_t __xalloc_count; \ -+ : ({ ptrdiff_t __xalloc_count; \ - __builtin_mul_overflow (n, s, &__xalloc_count); })) - - /* Other compilers use integer division; this may be slower but is -diff --git a/lib/xsize.c b/lib/xsize.c -index 4b4914c..b3d73a2 100644 ---- a/lib/xsize.c -+++ b/lib/xsize.c -@@ -1,3 +1,21 @@ -+/* Checked size_t computations. -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ - #include -+ - #define XSIZE_INLINE _GL_EXTERN_INLINE - #include "xsize.h" -diff --git a/lib/xsize.h b/lib/xsize.h -index d4d7b1c..91fa877 100644 ---- a/lib/xsize.h -+++ b/lib/xsize.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. - -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License -- along with this program; if not, see . */ -+ along with this program. If not, see . */ - - #ifndef _XSIZE_H - #define _XSIZE_H -diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 -index c4e386d..a3ba256 100644 ---- a/m4/arpa_inet_h.m4 -+++ b/m4/arpa_inet_h.m4 -@@ -1,4 +1,4 @@ --# arpa_inet_h.m4 serial 14 -+# arpa_inet_h.m4 serial 17 - dnl Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Simon Josefsson and Bruno Haible - --AC_DEFUN([gl_HEADER_ARPA_INET], -+AC_DEFUN_ONCE([gl_ARPA_INET_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) - - AC_CHECK_HEADERS_ONCE([arpa/inet.h]) -@@ -40,17 +40,32 @@ AC_DEFUN([gl_HEADER_ARPA_INET], - ]], [inet_ntop inet_pton]) - ]) - -+# gl_ARPA_INET_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_ARPA_INET_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_ARPA_INET_H_DEFAULTS], - [ -- GNULIB_INET_NTOP=0; AC_SUBST([GNULIB_INET_NTOP]) -- GNULIB_INET_PTON=0; AC_SUBST([GNULIB_INET_PTON]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_INET_NTOP=1; AC_SUBST([HAVE_DECL_INET_NTOP]) - HAVE_DECL_INET_PTON=1; AC_SUBST([HAVE_DECL_INET_PTON]) -diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 -index 6d86142..17e2a20 100644 ---- a/m4/dirent_h.m4 -+++ b/m4/dirent_h.m4 -@@ -1,4 +1,4 @@ --# dirent_h.m4 serial 16 -+# dirent_h.m4 serial 19 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Bruno Haible. - --AC_DEFUN([gl_DIRENT_H], -+AC_DEFUN_ONCE([gl_DIRENT_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) - - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -27,26 +27,41 @@ AC_DEFUN([gl_DIRENT_H], - ]], [alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir]) - ]) - -+# gl_DIRENT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_DIRENT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_DIRENT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REWINDDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSEDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DIRFD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPENDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALPHASORT]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_DIRENT_H_DEFAULTS], - [ -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR -- GNULIB_OPENDIR=0; AC_SUBST([GNULIB_OPENDIR]) -- GNULIB_READDIR=0; AC_SUBST([GNULIB_READDIR]) -- GNULIB_REWINDDIR=0; AC_SUBST([GNULIB_REWINDDIR]) -- GNULIB_CLOSEDIR=0; AC_SUBST([GNULIB_CLOSEDIR]) -- GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) -- GNULIB_FDOPENDIR=0; AC_SUBST([GNULIB_FDOPENDIR]) -- GNULIB_SCANDIR=0; AC_SUBST([GNULIB_SCANDIR]) -- GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_OPENDIR=1; AC_SUBST([HAVE_OPENDIR]) - HAVE_READDIR=1; AC_SUBST([HAVE_READDIR]) -diff --git a/m4/environ.m4 b/m4/environ.m4 -index d971770..ae53291 100644 ---- a/m4/environ.m4 -+++ b/m4/environ.m4 -@@ -1,4 +1,4 @@ --# environ.m4 serial 7 -+# environ.m4 serial 8 - dnl Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -33,7 +33,8 @@ AC_DEFUN([gt_CHECK_VAR_DECL], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[$1 -- extern struct { int foo; } $2;]], -+ typedef struct { int foo; } foo_t; -+ extern foo_t $2;]], - [[$2.foo = 1;]])], - [gt_cv_var=no], - [gt_cv_var=yes])]) -diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 -index e63a82f..aba4473 100644 ---- a/m4/fcntl_h.m4 -+++ b/m4/fcntl_h.m4 -@@ -1,4 +1,4 @@ --# serial 17 -+# serial 20 - # Configure fcntl.h. - dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Paul Eggert. - --AC_DEFUN([gl_FCNTL_H], -+AC_DEFUN_ONCE([gl_FCNTL_H], - [ - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - AC_REQUIRE([gl_FCNTL_O_FLAGS]) -@@ -26,25 +26,40 @@ AC_DEFUN([gl_FCNTL_H], - ]], [fcntl openat]) - ]) - -+# gl_FCNTL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_FCNTL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_FCNTL_H_DEFAULTS], - [ -- GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) -- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) -- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) -- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) -- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) -- GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) - HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) -diff --git a/m4/flock.m4 b/m4/flock.m4 -index eb46642..e1e5fe0 100644 ---- a/m4/flock.m4 -+++ b/m4/flock.m4 -@@ -1,4 +1,4 @@ --# flock.m4 serial 3 -+# flock.m4 serial 4 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_FLOCK], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([flock]) - if test $ac_cv_func_flock = no; then - HAVE_FLOCK=0 -diff --git a/m4/fstat.m4 b/m4/fstat.m4 -index 3b5b238..cdaca80 100644 ---- a/m4/fstat.m4 -+++ b/m4/fstat.m4 -@@ -1,4 +1,4 @@ --# fstat.m4 serial 7 -+# fstat.m4 serial 8 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], - - # Prerequisites of lib/fstat.c and lib/stat-w32.c. - AC_DEFUN([gl_PREREQ_FSTAT], [ -- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ AC_REQUIRE([gl_SYS_STAT_H]) - AC_REQUIRE([gl_PREREQ_STAT_W32]) - : - ]) -diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 -index 97889a8..3f8e04f 100644 ---- a/m4/getaddrinfo.m4 -+++ b/m4/getaddrinfo.m4 -@@ -1,4 +1,4 @@ --# getaddrinfo.m4 serial 33 -+# getaddrinfo.m4 serial 34 - dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,8 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_GETADDRINFO], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -- AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H - GETADDRINFO_LIB= - gai_saved_LIBS="$LIBS" - -@@ -156,13 +156,13 @@ const char *gai_strerror(int);]])], - # Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c. - AC_DEFUN([gl_PREREQ_GETADDRINFO], [ - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB - AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB - AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_SOCKET_FAMILIES]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - - dnl Including sys/socket.h is wrong for Windows, but Windows does not -diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 -index f2eff10..c801b3d 100644 ---- a/m4/gnulib-common.m4 -+++ b/m4/gnulib-common.m4 -@@ -1,4 +1,4 @@ --# gnulib-common.m4 serial 63 -+# gnulib-common.m4 serial 67 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -85,12 +85,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) - # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) - # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -+# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) - # ifdef _ICC - # define _GL_ATTR_may_alias 0 - # else - # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) - # endif --# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) - # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) - # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) - # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) -@@ -103,6 +103,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) - #endif - -+#ifdef __has_c_attribute -+# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) -+#else -+# define _GL_HAS_C_ATTRIBUTE(attr) 0 -+#endif -+ - ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. - [ - #if _GL_HAS_ATTRIBUTE (alloc_size) -@@ -142,7 +148,20 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_CONST - #endif - --#if 201710L < __STDC_VERSION__ -+/* _GL_ATTRIBUTE_DEALLOC (F, I) is for functions returning pointers -+ that can be freed by passing them as the Ith argument to the -+ function F. _GL_ATTRIBUTE_DEALLOC_FREE is for functions that -+ return pointers that can be freed via 'free'; it can be used -+ only after including stdlib.h. These macros cannot be used on -+ inline functions. */ -+#if _GL_GNUC_PREREQ (11, 0) -+# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -+#else -+# define _GL_ATTRIBUTE_DEALLOC(f, i) -+#endif -+#define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) -+ -+#if _GL_HAS_C_ATTRIBUTE (deprecated) - # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] - #elif _GL_HAS_ATTRIBUTE (deprecated) - # define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -@@ -168,7 +187,7 @@ AC_DEFUN([gl_COMMON_BODY], [ - #endif - - /* FALLTHROUGH is special, because it always expands to something. */ --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (fallthrough) - # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] - #elif _GL_HAS_ATTRIBUTE (fallthrough) - # define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -@@ -188,6 +207,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_LEAF - #endif - -+#if _GL_HAS_ATTRIBUTE (malloc) -+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -+#else -+# define _GL_ATTRIBUTE_MALLOC -+#endif -+ - /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ - #if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C - # define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -@@ -195,24 +220,15 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_MAY_ALIAS - #endif - --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (maybe_unused) - # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] --#elif _GL_HAS_ATTRIBUTE (unused) --# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) - #else --# define _GL_ATTRIBUTE_MAYBE_UNUSED -+# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED - #endif - /* Earlier spellings of this macro. */ --#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED - #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED - --#if _GL_HAS_ATTRIBUTE (malloc) --# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) --#else --# define _GL_ATTRIBUTE_MALLOC --#endif -- --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (nodiscard) - # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] - #elif _GL_HAS_ATTRIBUTE (warn_unused_result) - # define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -@@ -270,11 +286,19 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_SENTINEL(pos) - #endif - -+#if _GL_HAS_ATTRIBUTE (unused) -+# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#else -+# define _GL_ATTRIBUTE_UNUSED -+#endif -+/* Earlier spellings of this macro. */ -+#define _GL_UNUSED _GL_ATTRIBUTE_UNUSED -+ - ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. - [ - /* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ - #if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) --# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED -+# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED - #else - # define _GL_UNUSED_LABEL - #endif -@@ -357,6 +381,16 @@ AC_DEFUN([gl_COMMON_BODY], [ - export LIBC_FATAL_STDERR_ - ]) - -+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) -+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) -+# initializes the shell variable that indicates the presence of the given module -+# as a C preprocessor expression. -+AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], -+[ -+ GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) -+ AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) -+]) -+ - # gl_MODULE_INDICATOR_CONDITION - # expands to a C preprocessor expression that evaluates to 1 or 0, depending - # whether a gnulib module that has been requested shall be considered present -@@ -369,9 +403,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) - AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], - [ - gl_MODULE_INDICATOR_SET_VARIABLE_AUX( -- [GNULIB_[]m4_translit([[$1]], -- [abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], -+ [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], -+ [abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], - [gl_MODULE_INDICATOR_CONDITION]) - ]) - -@@ -656,6 +690,72 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], - ]) - ]) - -+# gl_CC_ALLOW_WARNINGS -+# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option -+# that reverts a preceding '-Werror' option, if available. -+# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang -+# and empty otherwise. -+AC_DEFUN([gl_CC_ALLOW_WARNINGS], -+[ -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_CACHE_CHECK([for C compiler option to allow warnings], -+ [gl_cv_cc_wallow], -+ [rm -f conftest* -+ echo 'int dummy;' > conftest.c -+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null -+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null -+ dnl Test the number of error output lines, because AIX xlc accepts the -+ dnl option '-Wno-error', just to produce a warning -+ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." -+ dnl afterwards. -+ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then -+ gl_cv_cc_wallow='-Wno-error' -+ else -+ gl_cv_cc_wallow=none -+ fi -+ rm -f conftest* -+ ]) -+ case "$gl_cv_cc_wallow" in -+ none) GL_CFLAG_ALLOW_WARNINGS='' ;; -+ *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; -+ esac -+ AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) -+]) -+ -+# gl_CXX_ALLOW_WARNINGS -+# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option -+# that reverts a preceding '-Werror' option, if available. -+AC_DEFUN([gl_CXX_ALLOW_WARNINGS], -+[ -+ dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. -+ if test -n "$CXX" && test "$CXX" != no; then -+ AC_CACHE_CHECK([for C++ compiler option to allow warnings], -+ [gl_cv_cxx_wallow], -+ [rm -f conftest* -+ echo 'int dummy;' > conftest.cc -+ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null -+ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null -+ dnl Test the number of error output lines, because AIX xlC accepts the -+ dnl option '-Wno-error', just to produce a warning -+ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." -+ dnl afterwards. -+ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then -+ gl_cv_cxx_wallow='-Wno-error' -+ else -+ gl_cv_cxx_wallow=none -+ fi -+ rm -f conftest* -+ ]) -+ case "$gl_cv_cxx_wallow" in -+ none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; -+ *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; -+ esac -+ else -+ GL_CXXFLAG_ALLOW_WARNINGS='' -+ fi -+ AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) -+]) -+ - dnl Expands to some code for use in .c programs that, on native Windows, defines - dnl the Microsoft deprecated alias function names to the underscore-prefixed - dnl actual function names. With this macro, these function names are available -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 1290d75..0ae96ea 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -142,6 +142,7 @@ AC_DEFUN([gl_EARLY], - # Code from module langinfo: - # Code from module largefile: - AC_REQUIRE([AC_SYS_LARGEFILE]) -+ AC_REQUIRE([gl_YEAR2038_EARLY]) - # Code from module ldexp: - # Code from module lib-symbol-versions: - # Code from module lib-symbol-visibility: -@@ -281,9 +282,11 @@ AC_DEFUN([gl_INIT], - m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) - m4_pushdef([gl_LIBSOURCES_LIST], []) - m4_pushdef([gl_LIBSOURCES_DIR], []) -+ m4_pushdef([GL_MACRO_PREFIX], [gl]) -+ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) - gl_COMMON - gl_source_base='lib' -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([accept]) - fi -@@ -291,9 +294,10 @@ AC_DEFUN([gl_INIT], - gl_FUNC_ACCEPT4 - gl_SYS_SOCKET_MODULE_INDICATOR([accept4]) - gl_FUNC_ALLOCA -- gl_HEADER_ARPA_INET -+ gl_ARPA_INET_H -+ gl_ARPA_INET_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([bind]) - fi -@@ -317,7 +321,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([close]) - fi - gl_UNISTD_MODULE_INDICATOR([close]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([connect]) - fi -@@ -328,6 +332,7 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([copysign]) - gl_DIRENT_H -+ gl_DIRENT_H_REQUIRE_DEFAULTS - gl_FUNC_DIRFD - if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \ - || test $REPLACE_DIRFD = 1; then -@@ -347,6 +352,7 @@ AC_DEFUN([gl_INIT], - gl_HEADER_ERRNO_H - AC_REQUIRE([gl_EXTERN_INLINE]) - gl_FCNTL_H -+ gl_FCNTL_H_REQUIRE_DEFAULTS - AC_C_FLEXIBLE_ARRAY_MEMBER - gl_FLOAT_H - if test $REPLACE_FLOAT_LDBL = 1; then -@@ -360,7 +366,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([flock]) - gl_PREREQ_FLOCK - fi -- gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) -+ gl_SYS_FILE_MODULE_INDICATOR([flock]) - AC_REQUIRE([gl_FUNC_FLOOR]) - if test $REPLACE_FLOOR = 1; then - AC_LIBOBJ([floor]) -@@ -409,17 +415,17 @@ AC_DEFUN([gl_INIT], - fi - gl_UNISTD_MODULE_INDICATOR([getlogin]) - AC_REQUIRE([gl_LIB_GETLOGIN]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getpeername]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([getpeername]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getsockname]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([getsockname]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getsockopt]) - fi -@@ -439,6 +445,7 @@ AC_DEFUN([gl_INIT], - m4_ifdef([gl_ICONV_MODULE_INDICATOR], - [gl_ICONV_MODULE_INDICATOR([iconv])]) - gl_ICONV_H -+ gl_ICONV_H_REQUIRE_DEFAULTS - gl_FUNC_ICONV_OPEN - if test $REPLACE_ICONV_OPEN = 1; then - AC_LIBOBJ([iconv_open]) -@@ -461,6 +468,7 @@ AC_DEFUN([gl_INIT], - fi - gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) - gl_INTTYPES_INCOMPLETE -+ gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_ISFINITE - if test $REPLACE_ISFINITE = 1; then - AC_LIBOBJ([isfinite]) -@@ -501,6 +509,7 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([isnanl]) - gl_LANGINFO_H -+ gl_LANGINFO_H_REQUIRE_DEFAULTS - AC_REQUIRE([gl_LARGEFILE]) - gl_FUNC_LDEXP - gl_LD_VERSION_SCRIPT -@@ -512,7 +521,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([link]) - fi - gl_UNISTD_MODULE_INDICATOR([link]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([listen]) - fi -@@ -522,6 +531,7 @@ AC_DEFUN([gl_INIT], - LOCALCHARSET_TESTS_ENVIRONMENT= - AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) - gl_LOCALE_H -+ gl_LOCALE_H_REQUIRE_DEFAULTS - gl_FUNC_LOG1P - if test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1; then - AC_LIBOBJ([log1p]) -@@ -541,15 +551,14 @@ AC_DEFUN([gl_INIT], - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi -- gl_MODULE_INDICATOR([malloc-gnu]) -- gl_FUNC_MALLOC_POSIX -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi - gl_STDLIB_MODULE_INDICATOR([malloc-posix]) -- gl_MODULE_INDICATOR([malloc-posix]) - gl_MALLOCA - gl_MATH_H -+ gl_MATH_H_REQUIRE_DEFAULTS - gl_MINMAX - gl_FUNC_MKDIR - if test $REPLACE_MKDIR = 1; then -@@ -573,7 +582,8 @@ AC_DEFUN([gl_INIT], - fi - gl_MODULE_INDICATOR([msvc-nothrow]) - gl_MULTIARCH -- gl_HEADER_NETDB -+ gl_NETDB_H -+ gl_NETDB_H_REQUIRE_DEFAULTS - gl_HEADER_NETINET_IN - AC_PROG_MKDIR_P - gl_FUNC_NL_LANGINFO -@@ -607,6 +617,7 @@ AC_DEFUN([gl_INIT], - fi - gl_POLL_MODULE_INDICATOR([poll]) - gl_POLL_H -+ gl_POLL_H_REQUIRE_DEFAULTS - gl_FUNC_PUTENV - if test $REPLACE_PUTENV = 1; then - AC_LIBOBJ([putenv]) -@@ -625,12 +636,12 @@ AC_DEFUN([gl_INIT], - gl_PREREQ_READLINK - fi - gl_UNISTD_MODULE_INDICATOR([readlink]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([recv]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([recv]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([recvfrom]) - fi -@@ -657,12 +668,12 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([select]) - fi - gl_SYS_SELECT_MODULE_INDICATOR([select]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([send]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([send]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([sendto]) - fi -@@ -672,25 +683,26 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([setenv]) - fi - gl_STDLIB_MODULE_INDICATOR([setenv]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([setsockopt]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([shutdown]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([shutdown]) - gl_SIGNAL_H -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ gl_SIGNAL_H_REQUIRE_DEFAULTS -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([socket]) - fi - # When this module is used, sockets may actually occur as file descriptors, - # hence it is worth warning if the modules 'close' and 'ioctl' are not used. -- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) -- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) -+ m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) -+ m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS]) - AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) - if test "$ac_cv_header_winsock2_h" = yes; then - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 -@@ -705,31 +717,67 @@ AC_DEFUN([gl_INIT], - gl_STDALIGN_H - AM_STDBOOL_H - gl_STDDEF_H -+ gl_STDDEF_H_REQUIRE_DEFAULTS - gl_STDINT_H - gl_STDIO_H -+ gl_STDIO_H_REQUIRE_DEFAULTS -+ dnl No need to create extra modules for these functions. Everyone who uses -+ dnl likely needs them. -+ gl_STDIO_MODULE_INDICATOR([fscanf]) -+ gl_MODULE_INDICATOR([fscanf]) -+ gl_STDIO_MODULE_INDICATOR([scanf]) -+ gl_MODULE_INDICATOR([scanf]) -+ gl_STDIO_MODULE_INDICATOR([fgetc]) -+ gl_STDIO_MODULE_INDICATOR([getc]) -+ gl_STDIO_MODULE_INDICATOR([getchar]) -+ gl_STDIO_MODULE_INDICATOR([fgets]) -+ gl_STDIO_MODULE_INDICATOR([fread]) -+ dnl No need to create extra modules for these functions. Everyone who uses -+ dnl likely needs them. -+ gl_STDIO_MODULE_INDICATOR([fprintf]) -+ gl_STDIO_MODULE_INDICATOR([printf]) -+ gl_STDIO_MODULE_INDICATOR([vfprintf]) -+ gl_STDIO_MODULE_INDICATOR([vprintf]) -+ gl_STDIO_MODULE_INDICATOR([fputc]) -+ gl_STDIO_MODULE_INDICATOR([putc]) -+ gl_STDIO_MODULE_INDICATOR([putchar]) -+ gl_STDIO_MODULE_INDICATOR([fputs]) -+ gl_STDIO_MODULE_INDICATOR([puts]) -+ gl_STDIO_MODULE_INDICATOR([fwrite]) - gl_STDLIB_H -+ gl_STDLIB_H_REQUIRE_DEFAULTS - if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" - fi -- gl_HEADER_STRING_H -- gl_HEADER_SYS_FILE_H -+ gl_STRING_H -+ gl_STRING_H_REQUIRE_DEFAULTS -+ gl_SYS_FILE_H -+ gl_SYS_FILE_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SELECT]) -+ gl_SYS_SELECT_H -+ gl_SYS_SELECT_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ gl_SYS_SOCKET_H -+ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_STAT_H -+ gl_SYS_STAT_H -+ gl_SYS_STAT_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_TIME_H -+ gl_SYS_TIME_H -+ gl_SYS_TIME_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_SYS_TIMES_H -+ gl_SYS_TIMES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_SYS_TYPES_H -+ gl_SYS_TYPES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_UIO -+ gl_SYS_UIO_H -+ gl_SYS_UIO_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_TIME_H -+ gl_TIME_H -+ gl_TIME_H_REQUIRE_DEFAULTS - gl_TIME_RZ - if test $HAVE_TIMEZONE_T = 0; then - AC_LIBOBJ([time_rz]) -@@ -746,9 +794,11 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([trunc]) - gl_UNISTD_H -+ gl_UNISTD_H_REQUIRE_DEFAULTS - gl_FUNC_VSNPRINTF - gl_STDIO_MODULE_INDICATOR([vsnprintf]) - gl_WCHAR_H -+ gl_WCHAR_H_REQUIRE_DEFAULTS - gl_FUNC_WRITE - if test $REPLACE_WRITE = 1; then - AC_LIBOBJ([write]) -@@ -771,7 +821,6 @@ AC_DEFUN([gl_INIT], - gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false - gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false - gl_gnulib_enabled_hostent=false -- gl_gnulib_enabled_idx=false - gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21=false - gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66=false - gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f=false -@@ -880,7 +929,9 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_dynarray () - { - if ! $gl_gnulib_enabled_dynarray; then -+ AC_PROG_MKDIR_P - gl_gnulib_enabled_dynarray=true -+ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - fi - } -@@ -963,12 +1014,6 @@ AC_SUBST([LTALLOCA]) - gl_gnulib_enabled_hostent=true - fi - } -- func_gl_gnulib_m4code_idx () -- { -- if ! $gl_gnulib_enabled_idx; then -- gl_gnulib_enabled_idx=true -- fi -- } - func_gl_gnulib_m4code_b1df7117b479d2da59d76deba468ee21 () - { - if ! $gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21; then -@@ -1181,7 +1226,6 @@ AC_SUBST([LTALLOCA]) - AC_LIBOBJ([realloc]) - fi - gl_STDLIB_MODULE_INDICATOR([realloc-posix]) -- gl_MODULE_INDICATOR([realloc-posix]) - gl_gnulib_enabled_61bcaca76b3e6f9ae55d57a1c3193bc4=true - fi - } -@@ -1205,7 +1249,9 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_scratch_buffer () - { - if ! $gl_gnulib_enabled_scratch_buffer; then -+ AC_PROG_MKDIR_P - gl_gnulib_enabled_scratch_buffer=true -+ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - func_gl_gnulib_m4code_61bcaca76b3e6f9ae55d57a1c3193bc4 - fi -@@ -1319,7 +1365,8 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_sys_random () - { - if ! $gl_gnulib_enabled_sys_random; then -- gl_HEADER_SYS_RANDOM -+ gl_SYS_RANDOM_H -+ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_gnulib_enabled_sys_random=true - fi -@@ -1416,6 +1463,7 @@ AC_SUBST([LTALLOCA]) - { - if ! $gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410; then - gl_WCTYPE_H -+ gl_WCTYPE_H_REQUIRE_DEFAULTS - gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410=true - fi - } -@@ -1431,9 +1479,6 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_925677f0343de64b89a9f0c790b4104c - fi - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -- func_gl_gnulib_m4code_idx -- fi -- if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - fi - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -@@ -1584,9 +1629,6 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_sockets - fi - if test $HAVE_TIMEZONE_T = 0; then -- func_gl_gnulib_m4code_idx -- fi -- if test $HAVE_TIMEZONE_T = 0; then - func_gl_gnulib_m4code_time_r - fi - if test $HAVE_TIMEZONE_T = 0; then -@@ -1621,7 +1663,6 @@ AC_SUBST([LTALLOCA]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_hostent], [$gl_gnulib_enabled_hostent]) -- AM_CONDITIONAL([gl_GNULIB_ENABLED_idx], [$gl_gnulib_enabled_idx]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_b1df7117b479d2da59d76deba468ee21], [$gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_3f0e593033d1fc2c127581960f641b66], [$gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_dbdf22868a5367f28bf18e0013ac6f8f], [$gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f]) -@@ -1673,6 +1714,8 @@ AC_SUBST([LTALLOCA]) - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) -+ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) -+ m4_popdef([GL_MACRO_PREFIX]) - m4_popdef([gl_LIBSOURCES_DIR]) - m4_popdef([gl_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) -@@ -1699,6 +1742,8 @@ AC_SUBST([LTALLOCA]) - m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) - m4_pushdef([gltests_LIBSOURCES_LIST], []) - m4_pushdef([gltests_LIBSOURCES_DIR], []) -+ m4_pushdef([GL_MACRO_PREFIX], [gltests]) -+ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) - gl_COMMON - gl_source_base='tests' - changequote(,)dnl -@@ -1720,6 +1765,8 @@ changequote([, ])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) -+ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) -+ m4_popdef([GL_MACRO_PREFIX]) - m4_popdef([gltests_LIBSOURCES_DIR]) - m4_popdef([gltests_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) -@@ -2265,6 +2312,7 @@ AC_DEFUN([gl_FILE_LIST], [ - m4/wint_t.m4 - m4/write.m4 - m4/xsize.m4 -+ m4/year2038.m4 - m4/zzgnulib.m4 - top/GNUmakefile - top/maint.mk -diff --git a/m4/hostent.m4 b/m4/hostent.m4 -index 641d72f..f1390a3 100644 ---- a/m4/hostent.m4 -+++ b/m4/hostent.m4 -@@ -1,4 +1,4 @@ --# hostent.m4 serial 3 -+# hostent.m4 serial 4 - dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ AC_DEFUN([gl_HOSTENT], - dnl - On BeOS, they are in libnet. - dnl - On native Windows, they are in ws2_32.dll. - dnl - Otherwise they are in libc. -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - HOSTENT_LIB= - gl_saved_libs="$LIBS" - AC_SEARCH_LIBS([gethostbyname], [nsl network net], -diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 -index ab8e283..2940988 100644 ---- a/m4/iconv_h.m4 -+++ b/m4/iconv_h.m4 -@@ -1,10 +1,10 @@ --# iconv_h.m4 serial 12 -+# iconv_h.m4 serial 15 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_ICONV_H], -+AC_DEFUN_ONCE([gl_ICONV_H], - [ - AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - -@@ -24,22 +24,37 @@ AC_DEFUN([gl_ICONV_H], - dnl Unconditionally enables the replacement of . - AC_DEFUN([gl_REPLACE_ICONV_H], - [ -- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+ gl_ICONV_H_REQUIRE_DEFAULTS - ICONV_H='iconv.h' - AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) - ]) - -+# gl_ICONV_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_ICONV_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_ICONV_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_ICONV_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_ICONV_H_DEFAULTS], - [ - m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) -- GNULIB_ICONV=0; AC_SUBST([GNULIB_ICONV]) - dnl Assume proper GNU behavior unless another module says otherwise. - ICONV_CONST=; AC_SUBST([ICONV_CONST]) - REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) -diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 -index f56e94a..64b1de5 100644 ---- a/m4/inttypes.m4 -+++ b/m4/inttypes.m4 -@@ -1,4 +1,4 @@ --# inttypes.m4 serial 32 -+# inttypes.m4 serial 35 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - dnl From Derek Price, Bruno Haible. - dnl Test whether is supported or must be substituted. - --AC_DEFUN([gl_INTTYPES_H], -+AC_DEFUN_ONCE([gl_INTTYPES_H], - [ - AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) - gl_INTTYPES_PRI_SCN -@@ -136,19 +136,34 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], - AC_SUBST([$1]) - ]) - -+# gl_INTTYPES_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_INTTYPES_H_DEFAULTS], - [ -- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) -- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) -- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) -- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) - HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) -diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 -index 950fe20..87959f7 100644 ---- a/m4/langinfo_h.m4 -+++ b/m4/langinfo_h.m4 -@@ -1,10 +1,10 @@ --# langinfo_h.m4 serial 9 -+# langinfo_h.m4 serial 12 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_LANGINFO_H], -+AC_DEFUN_ONCE([gl_LANGINFO_H], - [ - AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) - -@@ -104,18 +104,33 @@ int a = YESEXPR; - ]], [nl_langinfo]) - ]) - -+# gl_LANGINFO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_LANGINFO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_LANGINFO_H_DEFAULTS], - [ -- GNULIB_NL_LANGINFO=0; AC_SUBST([GNULIB_NL_LANGINFO]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_NL_LANGINFO=1; AC_SUBST([HAVE_NL_LANGINFO]) - REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO]) -diff --git a/m4/largefile.m4 b/m4/largefile.m4 -index cadb16d..fbde5e6 100644 ---- a/m4/largefile.m4 -+++ b/m4/largefile.m4 -@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - esac - ]) - --# The following implementation works around a problem in autoconf <= 2.69; -+# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ -+# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. - m4_version_prereq([2.70], [], [ -@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]];[]dnl - ]) -+])# m4_version_prereq 2.70 - - - # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], - [AC_LANG_PROGRAM([$5], [$6])], - [$3=no; break]) - m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( -- [AC_LANG_PROGRAM([#define $1 $2 -+ [AC_LANG_PROGRAM([#undef $1 -+#define $1 $2 - $5], [$6])], - [$3=$2; break]) - $3=unknown -@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl - AC_DEFUN([AC_SYS_LARGEFILE], - [AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) --if test "$enable_largefile" != no; then -- -- AC_CACHE_CHECK([for special C compiler options needed for large files], -+AS_IF([test "$enable_largefile" != no], -+ [AC_CACHE_CHECK([for special C compiler options needed for large files], - ac_cv_sys_largefile_CC, - [ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then -@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.], - [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- if test $ac_cv_sys_file_offset_bits = unknown; then -- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, -- ac_cv_sys_large_files, -- [Define for large files, on AIX-style hosts.], -- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- fi --fi -+ AS_CASE([$ac_cv_sys_file_offset_bits], -+ [unknown], -+ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], -+ [ac_cv_sys_large_files], -+ [Define for large files, on AIX-style hosts.], -+ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], -+ [64], -+ [gl_YEAR2038_BODY([])])]) - ])# AC_SYS_LARGEFILE --])# m4_version_prereq 2.70 - - # Enable large files on systems where this is implemented by Gnulib, not by the - # system headers. -diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 -index 70dbb7d..00c9fe9 100644 ---- a/m4/limits-h.m4 -+++ b/m4/limits-h.m4 -@@ -11,7 +11,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], - [ - gl_CHECK_NEXT_HEADERS([limits.h]) - -- AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], -+ AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.], - [gl_cv_header_limits_width], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( -@@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], - long long llm = LLONG_MAX; - int wb = WORD_BIT; - int ullw = ULLONG_WIDTH; -+ int bw = BOOL_WIDTH; - ]])], - [gl_cv_header_limits_width=yes], - [gl_cv_header_limits_width=no])]) -diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 -index 7b50aa7..444a381 100644 ---- a/m4/locale_h.m4 -+++ b/m4/locale_h.m4 -@@ -1,13 +1,13 @@ --# locale_h.m4 serial 25 -+# locale_h.m4 serial 28 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_LOCALE_H], -+AC_DEFUN_ONCE([gl_LOCALE_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) - - dnl Persuade glibc to define locale_t and the int_p_*, int_n_* -@@ -129,22 +129,37 @@ AC_DEFUN([gl_LOCALE_T], - AC_SUBST([HAVE_XLOCALE_H]) - ]) - -+# gl_LOCALE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_LOCALE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_LOCALE_H_DEFAULTS], - [ -- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) -- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) -- GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) -- GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) -- GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) - HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) -diff --git a/m4/malloc.m4 b/m4/malloc.m4 -index 32ab42e..972e808 100644 ---- a/m4/malloc.m4 -+++ b/m4/malloc.m4 -@@ -1,21 +1,21 @@ --# malloc.m4 serial 22 -+# malloc.m4 serial 27 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - # This is adapted with modifications from upstream Autoconf here: --# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c -+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 - AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ - AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles -- AC_CACHE_CHECK([for GNU libc compatible malloc], -+ AC_CACHE_CHECK([whether malloc (0) returns nonnull], - [ac_cv_func_malloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], -- [[char *p = malloc (0); -+ [[void *p = malloc (0); - int result = !p; - free (p); - return result;]]) -@@ -24,75 +24,151 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ac_cv_func_malloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ -+ | gnu* | *-musl* | midnightbsd* \ -+ | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - ]) - ]) -- case "$ac_cv_func_malloc_0_nonnull" in -- *yes) -- $1 -- ;; -- *) -- $2 -- ;; -- esac -+ AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) - ])# _AC_FUNC_MALLOC_IF - - # gl_FUNC_MALLOC_GNU - # ------------------ --# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if --# it is not. -+# Replace malloc if it is not compatible with GNU libc. - AC_DEFUN([gl_FUNC_MALLOC_GNU], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. -- _AC_FUNC_MALLOC_IF( -- [AC_DEFINE([HAVE_MALLOC_GNU], [1], -- [Define to 1 if your system has a GNU libc compatible 'malloc' -- function, and to 0 otherwise.])], -- [AC_DEFINE([HAVE_MALLOC_GNU], [0]) -- REPLACE_MALLOC=1 -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) -+ if test $REPLACE_MALLOC = 0; then -+ _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC=1]) -+ fi -+]) -+ -+# gl_FUNC_MALLOC_PTRDIFF -+# ---------------------- -+# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, -+# and replace malloc otherwise. -+AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], -+[ -+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) -+ test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC=1 -+]) -+ -+# Test whether malloc, realloc, calloc refuse to create objects -+# larger than what can be expressed in ptrdiff_t. -+# Set gl_cv_func_malloc_gnu to yes or no accordingly. -+AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], -+[ -+ AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], -+ [gl_cv_malloc_ptrdiff], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ ]], -+ [[/* 64-bit ptrdiff_t is so wide that no practical platform -+ can exceed it. */ -+ #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) -+ -+ /* On rare machines where size_t fits in ptrdiff_t there -+ is no problem. */ -+ #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) -+ -+ /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t -+ bounds even on 32-bit platforms. We don't know which -+ non-glibc systems are safe. */ -+ #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) -+ -+ #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE -+ return 0; -+ #else -+ #error "malloc might not be ptrdiff_t safe" -+ syntax error -+ #endif -+ ]])], -+ [gl_cv_malloc_ptrdiff=yes], -+ [gl_cv_malloc_ptrdiff=no]) - ]) - ]) - - # gl_FUNC_MALLOC_POSIX - # -------------------- - # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it --# fails), and replace malloc if it is not. -+# fails, and doesn't mess up with ptrdiff_t overflow), and replace -+# malloc if it is not. - AC_DEFUN([gl_FUNC_MALLOC_POSIX], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) - AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) -- if test $gl_cv_func_malloc_posix = yes; then -+ if test "$gl_cv_func_malloc_posix" = yes; then - AC_DEFINE([HAVE_MALLOC_POSIX], [1], -- [Define if the 'malloc' function is POSIX compliant.]) -+ [Define if malloc, realloc, and calloc set errno on allocation failure.]) - else - REPLACE_MALLOC=1 - fi - ]) - --# Test whether malloc, realloc, calloc are POSIX compliant, -+# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. - # Set gl_cv_func_malloc_posix to yes or no accordingly. - AC_DEFUN([gl_CHECK_MALLOC_POSIX], - [ -- AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], - [gl_cv_func_malloc_posix], - [ - dnl It is too dangerous to try to allocate a large amount of memory: - dnl some systems go to their knees when you do that. So assume that -- dnl all Unix implementations of the function are POSIX compliant. -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM( -- [[]], -- [[#if defined _WIN32 && ! defined __CYGWIN__ -- choke me -- #endif -- ]])], -- [gl_cv_func_malloc_posix=yes], -- [gl_cv_func_malloc_posix=no]) -+ dnl all Unix implementations of the function set errno on failure, -+ dnl except on those platforms where we have seen 'test-malloc-gnu', -+ dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. -+ case "$host_os" in -+ mingw*) -+ gl_cv_func_malloc_posix=no ;; -+ irix* | solaris*) -+ dnl On IRIX 6.5, the three functions return NULL with errno unset -+ dnl when the argument is larger than PTRDIFF_MAX. -+ dnl On Solaris 11.3, the three functions return NULL with errno set -+ dnl to EAGAIN, not ENOMEM, when the argument is larger than -+ dnl PTRDIFF_MAX. -+ dnl Here is a test program: -+m4_divert_push([KILL]) -+#include -+#include -+#include -+#define ptrdiff_t long -+#ifndef PTRDIFF_MAX -+# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) -+#endif -+ -+int main () -+{ -+ void *p; -+ -+ fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); -+ -+ errno = 0; -+ p = malloc ((unsigned long) PTRDIFF_MAX + 1); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ errno = 0; -+ p = calloc (PTRDIFF_MAX / 2 + 1, 2); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ errno = 0; -+ p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ return 0; -+} -+m4_divert_pop([KILL]) -+ gl_cv_func_malloc_posix=no ;; -+ *) -+ gl_cv_func_malloc_posix=yes ;; -+ esac - ]) - ]) -diff --git a/m4/math_h.m4 b/m4/math_h.m4 -index a9ba5e6..b3a10c3 100644 ---- a/m4/math_h.m4 -+++ b/m4/math_h.m4 -@@ -1,10 +1,10 @@ --# math_h.m4 serial 122 -+# math_h.m4 serial 125 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_MATH_H], -+AC_DEFUN_ONCE([gl_MATH_H], - [ - AC_REQUIRE([gl_MATH_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([math.h]) -@@ -53,119 +53,134 @@ AC_DEFUN([gl_MATH_H], - tanf tanl tanhf trunc truncf truncl]) - ]) - -+# gl_MATH_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_MATH_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_MATH_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_MATH_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_MATH_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_MATH_H_DEFAULTS], - [ -- GNULIB_ACOSF=0; AC_SUBST([GNULIB_ACOSF]) -- GNULIB_ACOSL=0; AC_SUBST([GNULIB_ACOSL]) -- GNULIB_ASINF=0; AC_SUBST([GNULIB_ASINF]) -- GNULIB_ASINL=0; AC_SUBST([GNULIB_ASINL]) -- GNULIB_ATANF=0; AC_SUBST([GNULIB_ATANF]) -- GNULIB_ATANL=0; AC_SUBST([GNULIB_ATANL]) -- GNULIB_ATAN2F=0; AC_SUBST([GNULIB_ATAN2F]) -- GNULIB_CBRT=0; AC_SUBST([GNULIB_CBRT]) -- GNULIB_CBRTF=0; AC_SUBST([GNULIB_CBRTF]) -- GNULIB_CBRTL=0; AC_SUBST([GNULIB_CBRTL]) -- GNULIB_CEIL=0; AC_SUBST([GNULIB_CEIL]) -- GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) -- GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) -- GNULIB_COPYSIGN=0; AC_SUBST([GNULIB_COPYSIGN]) -- GNULIB_COPYSIGNF=0; AC_SUBST([GNULIB_COPYSIGNF]) -- GNULIB_COPYSIGNL=0; AC_SUBST([GNULIB_COPYSIGNL]) -- GNULIB_COSF=0; AC_SUBST([GNULIB_COSF]) -- GNULIB_COSL=0; AC_SUBST([GNULIB_COSL]) -- GNULIB_COSHF=0; AC_SUBST([GNULIB_COSHF]) -- GNULIB_EXPF=0; AC_SUBST([GNULIB_EXPF]) -- GNULIB_EXPL=0; AC_SUBST([GNULIB_EXPL]) -- GNULIB_EXP2=0; AC_SUBST([GNULIB_EXP2]) -- GNULIB_EXP2F=0; AC_SUBST([GNULIB_EXP2F]) -- GNULIB_EXP2L=0; AC_SUBST([GNULIB_EXP2L]) -- GNULIB_EXPM1=0; AC_SUBST([GNULIB_EXPM1]) -- GNULIB_EXPM1F=0; AC_SUBST([GNULIB_EXPM1F]) -- GNULIB_EXPM1L=0; AC_SUBST([GNULIB_EXPM1L]) -- GNULIB_FABSF=0; AC_SUBST([GNULIB_FABSF]) -- GNULIB_FABSL=0; AC_SUBST([GNULIB_FABSL]) -- GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR]) -- GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) -- GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) -- GNULIB_FMA=0; AC_SUBST([GNULIB_FMA]) -- GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF]) -- GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL]) -- GNULIB_FMOD=0; AC_SUBST([GNULIB_FMOD]) -- GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF]) -- GNULIB_FMODL=0; AC_SUBST([GNULIB_FMODL]) -- GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF]) -- GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) -- GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) -- GNULIB_HYPOT=0; AC_SUBST([GNULIB_HYPOT]) -- GNULIB_HYPOTF=0; AC_SUBST([GNULIB_HYPOTF]) -- GNULIB_HYPOTL=0; AC_SUBST([GNULIB_HYPOTL]) -- GNULIB_ILOGB=0; AC_SUBST([GNULIB_ILOGB]) -- GNULIB_ILOGBF=0; AC_SUBST([GNULIB_ILOGBF]) -- GNULIB_ILOGBL=0; AC_SUBST([GNULIB_ILOGBL]) -- GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) -- GNULIB_ISINF=0; AC_SUBST([GNULIB_ISINF]) -- GNULIB_ISNAN=0; AC_SUBST([GNULIB_ISNAN]) -- GNULIB_ISNANF=0; AC_SUBST([GNULIB_ISNANF]) -- GNULIB_ISNAND=0; AC_SUBST([GNULIB_ISNAND]) -- GNULIB_ISNANL=0; AC_SUBST([GNULIB_ISNANL]) -- GNULIB_LDEXPF=0; AC_SUBST([GNULIB_LDEXPF]) -- GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) -- GNULIB_LOG=0; AC_SUBST([GNULIB_LOG]) -- GNULIB_LOGF=0; AC_SUBST([GNULIB_LOGF]) -- GNULIB_LOGL=0; AC_SUBST([GNULIB_LOGL]) -- GNULIB_LOG10=0; AC_SUBST([GNULIB_LOG10]) -- GNULIB_LOG10F=0; AC_SUBST([GNULIB_LOG10F]) -- GNULIB_LOG10L=0; AC_SUBST([GNULIB_LOG10L]) -- GNULIB_LOG1P=0; AC_SUBST([GNULIB_LOG1P]) -- GNULIB_LOG1PF=0; AC_SUBST([GNULIB_LOG1PF]) -- GNULIB_LOG1PL=0; AC_SUBST([GNULIB_LOG1PL]) -- GNULIB_LOG2=0; AC_SUBST([GNULIB_LOG2]) -- GNULIB_LOG2F=0; AC_SUBST([GNULIB_LOG2F]) -- GNULIB_LOG2L=0; AC_SUBST([GNULIB_LOG2L]) -- GNULIB_LOGB=0; AC_SUBST([GNULIB_LOGB]) -- GNULIB_LOGBF=0; AC_SUBST([GNULIB_LOGBF]) -- GNULIB_LOGBL=0; AC_SUBST([GNULIB_LOGBL]) -- GNULIB_MODF=0; AC_SUBST([GNULIB_MODF]) -- GNULIB_MODFF=0; AC_SUBST([GNULIB_MODFF]) -- GNULIB_MODFL=0; AC_SUBST([GNULIB_MODFL]) -- GNULIB_POWF=0; AC_SUBST([GNULIB_POWF]) -- GNULIB_REMAINDER=0; AC_SUBST([GNULIB_REMAINDER]) -- GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF]) -- GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL]) -- GNULIB_RINT=0; AC_SUBST([GNULIB_RINT]) -- GNULIB_RINTF=0; AC_SUBST([GNULIB_RINTF]) -- GNULIB_RINTL=0; AC_SUBST([GNULIB_RINTL]) -- GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) -- GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) -- GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) -- GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) -- GNULIB_SINF=0; AC_SUBST([GNULIB_SINF]) -- GNULIB_SINL=0; AC_SUBST([GNULIB_SINL]) -- GNULIB_SINHF=0; AC_SUBST([GNULIB_SINHF]) -- GNULIB_SQRTF=0; AC_SUBST([GNULIB_SQRTF]) -- GNULIB_SQRTL=0; AC_SUBST([GNULIB_SQRTL]) -- GNULIB_TANF=0; AC_SUBST([GNULIB_TANF]) -- GNULIB_TANL=0; AC_SUBST([GNULIB_TANL]) -- GNULIB_TANHF=0; AC_SUBST([GNULIB_TANHF]) -- GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) -- GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) -- GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_J0=1; AC_SUBST([GNULIB_MDA_J0]) -- GNULIB_MDA_J1=1; AC_SUBST([GNULIB_MDA_J1]) -- GNULIB_MDA_JN=1; AC_SUBST([GNULIB_MDA_JN]) -- GNULIB_MDA_Y0=1; AC_SUBST([GNULIB_MDA_Y0]) -- GNULIB_MDA_Y1=1; AC_SUBST([GNULIB_MDA_Y1]) -- GNULIB_MDA_YN=1; AC_SUBST([GNULIB_MDA_YN]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_ACOSF=1; AC_SUBST([HAVE_ACOSF]) - HAVE_ACOSL=1; AC_SUBST([HAVE_ACOSL]) -diff --git a/m4/memchr.m4 b/m4/memchr.m4 -index 64470de..ca08192 100644 ---- a/m4/memchr.m4 -+++ b/m4/memchr.m4 -@@ -1,4 +1,4 @@ --# memchr.m4 serial 17 -+# memchr.m4 serial 18 - dnl Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], - AC_CHECK_HEADERS_ONCE([sys/mman.h]) - AC_CHECK_FUNCS_ONCE([mprotect]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - # Detect platform-specific bugs in some versions of glibc: - # memchr should not dereference anything with length 0 - # https://bugzilla.redhat.com/show_bug.cgi?id=499689 -diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 -index c5ee2af..f9d9ec8 100644 ---- a/m4/mempcpy.m4 -+++ b/m4/mempcpy.m4 -@@ -1,4 +1,4 @@ --# mempcpy.m4 serial 11 -+# mempcpy.m4 serial 12 - dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], - dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. - AC_REQUIRE([AC_C_RESTRICT]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([mempcpy]) - if test $ac_cv_func_mempcpy = no; then - HAVE_MEMPCPY=0 -diff --git a/m4/mktime.m4 b/m4/mktime.m4 -index 245649e..721189a 100644 ---- a/m4/mktime.m4 -+++ b/m4/mktime.m4 -@@ -1,4 +1,4 @@ --# serial 35 -+# serial 36 - dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -255,7 +255,7 @@ main () - dnl Main macro of module 'mktime'. - AC_DEFUN([gl_FUNC_MKTIME], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - -diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 -index db84c78..eb7c3b8 100644 ---- a/m4/netdb_h.m4 -+++ b/m4/netdb_h.m4 -@@ -1,10 +1,10 @@ --# netdb_h.m4 serial 12 -+# netdb_h.m4 serial 15 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_NETDB], -+AC_DEFUN_ONCE([gl_NETDB_H], - [ - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([netdb.h]) -@@ -21,18 +21,33 @@ AC_DEFUN([gl_HEADER_NETDB], - [getaddrinfo freeaddrinfo gai_strerror getnameinfo]) - ]) - -+# gl_NETDB_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_NETDB_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_NETDB_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_NETDB_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_NETDB_H_DEFAULTS], - [ -- GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_STRUCT_ADDRINFO=1; AC_SUBST([HAVE_STRUCT_ADDRINFO]) - HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO]) -diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 -index 20692d8..1f0d796 100644 ---- a/m4/poll_h.m4 -+++ b/m4/poll_h.m4 -@@ -1,4 +1,4 @@ --# poll_h.m4 serial 3 -+# poll_h.m4 serial 6 - dnl Copyright (C) 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Bruno Haible. - --AC_DEFUN([gl_POLL_H], -+AC_DEFUN_ONCE([gl_POLL_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_POLL_H_DEFAULTS]) - - AC_CHECK_HEADERS_ONCE([poll.h]) -@@ -31,18 +31,33 @@ AC_DEFUN([gl_POLL_H], - [poll]) - ]) - -+# gl_POLL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_POLL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_POLL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_POLL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_POLL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_POLL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_POLL_H_DEFAULTS], - [ -- GNULIB_POLL=0; AC_SUBST([GNULIB_POLL]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POLL=1; AC_SUBST([HAVE_POLL]) - REPLACE_POLL=0; AC_SUBST([REPLACE_POLL]) -diff --git a/m4/printf.m4 b/m4/printf.m4 -index d8b3521..284c7c5 100644 ---- a/m4/printf.m4 -+++ b/m4/printf.m4 -@@ -1,4 +1,4 @@ --# printf.m4 serial 72 -+# printf.m4 serial 73 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -537,7 +537,7 @@ int main () - && strcmp (buf, "-0X6.488P-1 33") != 0 - && strcmp (buf, "-0XC.91P-2 33") != 0)) - result |= 2; -- /* This catches a FreeBSD 6.1 bug: it doesn't round. */ -+ /* This catches a FreeBSD 13.0 bug: it doesn't round. */ - if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 - || (strcmp (buf, "0x1.83p+0 33") != 0 - && strcmp (buf, "0x3.05p-1 33") != 0 -@@ -1690,6 +1690,7 @@ dnl - dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 - dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . - dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . -+dnl FreeBSD 13.0 . . . . # . . . . . . . . # . . . . . . - dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . - dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . - dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . -diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 -index f928465..452fab1 100644 ---- a/m4/rawmemchr.m4 -+++ b/m4/rawmemchr.m4 -@@ -1,4 +1,4 @@ --# rawmemchr.m4 serial 2 -+# rawmemchr.m4 serial 3 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR], - dnl Persuade glibc to declare rawmemchr(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([rawmemchr]) - if test $ac_cv_func_rawmemchr = no; then - HAVE_RAWMEMCHR=0 -diff --git a/m4/realloc.m4 b/m4/realloc.m4 -index a80a02a..0abc418 100644 ---- a/m4/realloc.m4 -+++ b/m4/realloc.m4 -@@ -1,21 +1,21 @@ --# realloc.m4 serial 20 -+# realloc.m4 serial 24 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - # This is adapted with modifications from upstream Autoconf here: --# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c -+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 - AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ - AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles -- AC_CACHE_CHECK([for GNU libc compatible realloc], -+ AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], - [ac_cv_func_realloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], -- [[char *p = realloc (0, 0); -+ [[void *p = realloc (0, 0); - int result = !p; - free (p); - return result;]]) -@@ -24,53 +24,40 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ac_cv_func_realloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ -+ | gnu* | *-musl* | midnightbsd* \ -+ | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - ]) - ]) -- case "$ac_cv_func_realloc_0_nonnull" in -- *yes) -- $1 -- ;; -- *) -- $2 -- ;; -- esac -+ AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) - ])# AC_FUNC_REALLOC - - # gl_FUNC_REALLOC_GNU - # ------------------- --# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace --# realloc if it is not. -+# Replace realloc if it is not compatible with GNU libc. - AC_DEFUN([gl_FUNC_REALLOC_GNU], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. -- _AC_FUNC_REALLOC_IF( -- [AC_DEFINE([HAVE_REALLOC_GNU], [1], -- [Define to 1 if your system has a GNU libc compatible 'realloc' -- function, and to 0 otherwise.])], -- [AC_DEFINE([HAVE_REALLOC_GNU], [0]) -- REPLACE_REALLOC=1 -- ]) -+ AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) -+ if test $REPLACE_REALLOC = 0; then -+ _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC=1]) -+ fi - ])# gl_FUNC_REALLOC_GNU - - # gl_FUNC_REALLOC_POSIX - # --------------------- - # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it --# fails), and replace realloc if it is not. -+# fails, and doesn't mess up with ptrdiff_t overflow), -+# and replace realloc if it is not. - AC_DEFUN([gl_FUNC_REALLOC_POSIX], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) -- if test $gl_cv_func_malloc_posix = yes; then -- AC_DEFINE([HAVE_REALLOC_POSIX], [1], -- [Define if the 'realloc' function is POSIX compliant.]) -- else -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) -+ if test $REPLACE_MALLOC = 1; then - REPLACE_REALLOC=1 - fi - ]) -diff --git a/m4/regex.m4 b/m4/regex.m4 -index 850c572..1c7e562 100644 ---- a/m4/regex.m4 -+++ b/m4/regex.m4 -@@ -1,4 +1,4 @@ --# serial 71 -+# serial 73 - - # Copyright (C) 1996-2001, 2003-2021 Free Software Foundation, Inc. - # -@@ -246,7 +246,7 @@ AC_DEFUN([gl_REGEX], - & ~RE_CONTEXT_INVALID_DUP - & ~RE_NO_EMPTY_RANGES); - memset (®ex, 0, sizeof regex); -- s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); -+ s = re_compile_pattern ("[[:alnum:]_-]\\\\+\$", 16, ®ex); - if (s) - result |= 32; - else -@@ -264,14 +264,50 @@ AC_DEFUN([gl_REGEX], - back reference. */ - re_set_syntax (RE_SYNTAX_POSIX_EGREP); - memset (®ex, 0, sizeof regex); -- s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); -+ s = re_compile_pattern ("0|()0|\\\\1|0", 10, ®ex); - if (!s) -- result |= 64; -+ { -+ memset (®s, 0, sizeof regs); -+ i = re_search (®ex, "x", 1, 0, 1, ®s); -+ if (i != -1) -+ result |= 64; -+ if (0 <= i) -+ { -+ free (regs.start); -+ free (regs.end); -+ } -+ regfree (®ex); -+ } - else - { - if (strcmp (s, "Invalid back reference")) - result |= 64; -+ } -+ -+ /* glibc bug 11053. */ -+ re_set_syntax (RE_SYNTAX_POSIX_BASIC); -+ memset (®ex, 0, sizeof regex); -+ static char const pat_sub2[] = "\\\\(a*\\\\)*a*\\\\1"; -+ s = re_compile_pattern (pat_sub2, sizeof pat_sub2 - 1, ®ex); -+ if (s) -+ result |= 64; -+ else -+ { -+ memset (®s, 0, sizeof regs); -+ static char const data[] = "a"; -+ int datalen = sizeof data - 1; -+ i = re_search (®ex, data, datalen, 0, datalen, ®s); -+ if (i != 0) -+ result |= 64; -+ else if (regs.num_regs < 2) -+ result |= 64; -+ else if (! (regs.start[0] == 0 && regs.end[0] == 1)) -+ result |= 64; -+ else if (! (regs.start[1] == 0 && regs.end[1] == 0)) -+ result |= 64; - regfree (®ex); -+ free (regs.start); -+ free (regs.end); - } - - #if 0 -diff --git a/m4/select.m4 b/m4/select.m4 -index c7409d2..72c068f 100644 ---- a/m4/select.m4 -+++ b/m4/select.m4 -@@ -1,4 +1,4 @@ --# select.m4 serial 12 -+# select.m4 serial 13 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_SELECT], - [ -- AC_REQUIRE([gl_HEADER_SYS_SELECT]) -+ AC_REQUIRE([gl_SYS_SELECT_H]) - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_SOCKETS]) -diff --git a/m4/servent.m4 b/m4/servent.m4 -index 2dda177..9bc3bcd 100644 ---- a/m4/servent.m4 -+++ b/m4/servent.m4 -@@ -1,4 +1,4 @@ --# servent.m4 serial 3 -+# servent.m4 serial 4 - dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -15,7 +15,7 @@ AC_DEFUN([gl_SERVENT], - dnl - On BeOS, they are in libnet. - dnl - On native Windows, they are in ws2_32.dll. - dnl - Otherwise they are in libc. -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - SERVENT_LIB= - gl_saved_libs="$LIBS" - AC_SEARCH_LIBS([getservbyname], [socket network net], -diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 -index ff9f025..8b93880 100644 ---- a/m4/signal_h.m4 -+++ b/m4/signal_h.m4 -@@ -1,10 +1,10 @@ --# signal_h.m4 serial 19 -+# signal_h.m4 serial 22 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_SIGNAL_H], -+AC_DEFUN_ONCE([gl_SIGNAL_H], - [ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) -@@ -52,22 +52,37 @@ AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], - fi - ]) - -+# gl_SIGNAL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SIGNAL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SIGNAL_H_DEFAULTS], - [ -- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) -- GNULIB_RAISE=0; AC_SUBST([GNULIB_RAISE]) -- GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) -- GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) -- GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) - HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) -diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 -index edae5d8..17e14c7 100644 ---- a/m4/sockpfaf.m4 -+++ b/m4/sockpfaf.m4 -@@ -1,4 +1,4 @@ --# sockpfaf.m4 serial 9 -+# sockpfaf.m4 serial 10 - dnl Copyright (C) 2004, 2006, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ dnl From Bruno Haible. - - AC_DEFUN([gl_SOCKET_FAMILIES], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_CHECK_HEADERS_ONCE([netinet/in.h]) - - AC_CACHE_CHECK([for IPv4 sockets], -@@ -60,7 +60,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES], - - AC_DEFUN([gl_SOCKET_FAMILY_UNIX], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_CHECK_HEADERS_ONCE([sys/un.h]) - - AC_CACHE_CHECK([for UNIX domain sockets], -diff --git a/m4/stat.m4 b/m4/stat.m4 -index 66f6c8c..9bcdb72 100644 ---- a/m4/stat.m4 -+++ b/m4/stat.m4 -@@ -1,4 +1,4 @@ --# serial 17 -+# serial 18 - - # Copyright (C) 2009-2021 Free Software Foundation, Inc. - # -@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], - - # Prerequisites of lib/stat.c and lib/stat-w32.c. - AC_DEFUN([gl_PREREQ_STAT], [ -- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ AC_REQUIRE([gl_SYS_STAT_H]) - AC_REQUIRE([gl_PREREQ_STAT_W32]) - : - ]) -diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 -index cd666c4..1303d2e 100644 ---- a/m4/stddef_h.m4 -+++ b/m4/stddef_h.m4 -@@ -1,4 +1,4 @@ --# stddef_h.m4 serial 9 -+# stddef_h.m4 serial 11 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl A placeholder for , for platforms that have issues. - --AC_DEFUN([gl_STDDEF_H], -+AC_DEFUN_ONCE([gl_STDDEF_H], - [ - AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) -@@ -68,13 +68,28 @@ AC_DEFUN([gl_STDDEF_H], - fi - ]) - -+# gl_STDDEF_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDDEF_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDDEF_H_DEFAULTS], - [ - dnl Assume proper GNU behavior unless another module says otherwise. -diff --git a/m4/stdint.m4 b/m4/stdint.m4 -index a785b44..2eb1652 100644 ---- a/m4/stdint.m4 -+++ b/m4/stdint.m4 -@@ -1,4 +1,4 @@ --# stdint.m4 serial 58 -+# stdint.m4 serial 60 - dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -170,7 +170,7 @@ struct s { - PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) - && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) - ? 1 : -1; -- /* Detect bug in FreeBSD 6.0 / ia64. */ -+ /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ - int check_SIG_ATOMIC: - SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) - && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) -@@ -527,7 +527,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], - dnl requirement that wint_t is "unchanged by default argument promotions". - dnl In this case gnulib's and override wint_t. - dnl Set the variable BITSIZEOF_WINT_T accordingly. -- if test $GNULIB_OVERRIDES_WINT_T = 1; then -+ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then - BITSIZEOF_WINT_T=32 - fi - ]) -diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 -index 4c3f24a..e704383 100644 ---- a/m4/stdio_h.m4 -+++ b/m4/stdio_h.m4 -@@ -1,11 +1,12 @@ --# stdio_h.m4 serial 52 -+# stdio_h.m4 serial 56 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_STDIO_H], -+AC_DEFUN_ONCE([gl_STDIO_H], - [ -+ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AH_VERBATIM([MINGW_ANSI_STDIO], - [/* Use GNU style printf and scanf. */ - #ifndef __USE_MINGW_ANSI_STDIO -@@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], - #endif - ]) - AC_DEFINE([__USE_MINGW_ANSI_STDIO]) -- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - gl_NEXT_HEADERS([stdio.h]) - - dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and -@@ -40,17 +40,6 @@ AC_DEFUN([gl_STDIO_H], - attribute "__gnu_printf__" instead of "__printf__"]) - fi - -- dnl No need to create extra modules for these functions. Everyone who uses -- dnl likely needs them. -- GNULIB_FSCANF=1 -- gl_MODULE_INDICATOR([fscanf]) -- GNULIB_SCANF=1 -- gl_MODULE_INDICATOR([scanf]) -- GNULIB_FGETC=1 -- GNULIB_GETC=1 -- GNULIB_GETCHAR=1 -- GNULIB_FGETS=1 -- GNULIB_FREAD=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result -@@ -64,18 +53,6 @@ AC_DEFUN([gl_STDIO_H], - fi - ]) - -- dnl No need to create extra modules for these functions. Everyone who uses -- dnl likely needs them. -- GNULIB_FPRINTF=1 -- GNULIB_PRINTF=1 -- GNULIB_VFPRINTF=1 -- GNULIB_VPRINTF=1 -- GNULIB_FPUTC=1 -- GNULIB_PUTC=1 -- GNULIB_PUTCHAR=1 -- GNULIB_FPUTS=1 -- GNULIB_PUTS=1 -- GNULIB_FWRITE=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result -@@ -116,77 +93,92 @@ AC_DEFUN([gl_STDIO_H], - fi - ]) - -+# gl_STDIO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDIO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDIO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDIO_H_DEFAULTS], - [ -- GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) -- GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) -- GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN]) -- GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) -- GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC]) -- GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS]) -- GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) -- GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) -- GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) -- GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE]) -- GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) -- GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) -- GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD]) -- GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) -- GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF]) -- GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) -- GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) -- GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) -- GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) -- GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) -- GNULIB_GETC=0; AC_SUBST([GNULIB_GETC]) -- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) -- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) -- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) -- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) -- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) -- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) -- GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) -- GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) -- GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) -- GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) -- GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) -- GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) -- GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) -- GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE]) -- GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME]) -- GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT]) -- GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF]) -- GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) -- GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) -- GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING]) -- GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) -- GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE]) -- GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) -- GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF]) -- GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF]) -- GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) -- GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) -- GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) -- GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) -- GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) -- GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) -- GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) -- GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) -- GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) -- GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) -- GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) -- GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) - HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) -diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 -index 5fdb0a7..9c1d1c7 100644 ---- a/m4/stdlib_h.m4 -+++ b/m4/stdlib_h.m4 -@@ -1,10 +1,10 @@ --# stdlib_h.m4 serial 59 -+# stdlib_h.m4 serial 63 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_STDLIB_H], -+AC_DEFUN_ONCE([gl_STDLIB_H], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - gl_NEXT_HEADERS([stdlib.h]) -@@ -46,63 +46,78 @@ AC_DEFUN([gl_STDLIB_H], - fi - ]) - -+# gl_STDLIB_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDLIB_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDLIB_H_DEFAULTS], - [ -- GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) -- GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) -- GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) -- GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) -- GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) -- GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) -- GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) -- GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) -- GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) -- GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) -- GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) -- GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) -- GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) -- GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) -- GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) -- GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) -- GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) -- GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) -- GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) -- GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) -- GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) -- GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) -- GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) -- GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) -- GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) -- GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) -- GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) -- GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) -- GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) -- GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) -- GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) -- GNULIB_STRTOL=0; AC_SUBST([GNULIB_STRTOL]) -- GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) -- GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) -- GNULIB_STRTOUL=0; AC_SUBST([GNULIB_STRTOUL]) -- GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) -- GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) -- GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) -- GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) -- GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) -- GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) -- GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) -- GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) -- GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) - HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) -@@ -164,6 +179,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], - REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) - REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) - REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) -+ REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) - REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) - REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) - REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) -diff --git a/m4/strdup.m4 b/m4/strdup.m4 -index f6f421d..5b6018f 100644 ---- a/m4/strdup.m4 -+++ b/m4/strdup.m4 -@@ -1,4 +1,4 @@ --# strdup.m4 serial 14 -+# strdup.m4 serial 15 - - dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. - -@@ -8,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_STRDUP], - [ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_DECLS_ONCE([strdup]) - if test $ac_cv_have_decl_strdup = no; then - HAVE_DECL_STRDUP=0 -@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], - - AC_DEFUN([gl_FUNC_STRDUP_POSIX], - [ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) - if test $gl_cv_func_malloc_posix != yes; then - REPLACE_STRDUP=1 -diff --git a/m4/string_h.m4 b/m4/string_h.m4 -index a4cc5b4..80d1e58 100644 ---- a/m4/string_h.m4 -+++ b/m4/string_h.m4 -@@ -5,20 +5,15 @@ - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 29 -+# serial 32 - - # Written by Paul Eggert. - --AC_DEFUN([gl_HEADER_STRING_H], -+AC_DEFUN_ONCE([gl_STRING_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_STRING_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_STRING_H_BODY], --[ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - gl_NEXT_HEADERS([string.h]) - - dnl Check for declarations of anything we want to poison if the -@@ -33,62 +28,77 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], - AC_REQUIRE([AC_C_RESTRICT]) - ]) - -+# gl_STRING_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STRING_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STRING_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_STRING_H_DEFAULTS], - [ -- GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) -- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) -- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) -- GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) -- GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) -- GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) -- GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) -- GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) -- GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) -- GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) -- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) -- GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) -- GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) -- GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) -- GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) -- GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) -- GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) -- GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) -- GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) -- GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) -- GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) -- GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) -- GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) -- GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) -- GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) -- GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) -- GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) -- GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) -- GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) -- GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) -- GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) -- GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) -- GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) -- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) -- GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) -- GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) -- GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) -- GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) -- GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) -- GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) -- GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) - HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) -- GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) - HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) -diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 -index 99c2285..bcde4d7 100644 ---- a/m4/sys_file_h.m4 -+++ b/m4/sys_file_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 6 -+# serial 9 - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,9 +8,9 @@ - - # Written by Richard W.M. Jones. - --AC_DEFUN([gl_HEADER_SYS_FILE_H], -+AC_DEFUN_ONCE([gl_SYS_FILE_H], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) - - dnl is always overridden, because of GNULIB_POSIXCHECK. - gl_CHECK_NEXT_HEADERS([sys/file.h]) -@@ -28,14 +28,29 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H], - ]], [flock]) - ]) - --AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR], -+# gl_SYS_FILE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. -+AC_DEFUN([gl_SYS_FILE_MODULE_INDICATOR], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ gl_SYS_FILE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - --AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_FILE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_SYS_FILE_H_DEFAULTS], - [ -- GNULIB_FLOCK=0; AC_SUBST([GNULIB_FLOCK]) - HAVE_FLOCK=1; AC_SUBST([HAVE_FLOCK]) - ]) -diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 -index 45e0469..37bc316 100644 ---- a/m4/sys_random_h.m4 -+++ b/m4/sys_random_h.m4 -@@ -1,10 +1,10 @@ --# sys_random_h.m4 serial 5 -+# sys_random_h.m4 serial 8 - dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_RANDOM], -+AC_DEFUN_ONCE([gl_SYS_RANDOM_H], - [ - AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -35,18 +35,33 @@ AC_DEFUN([gl_HEADER_SYS_RANDOM], - [getrandom]) - ]) - -+# gl_SYS_RANDOM_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_RANDOM_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], - [ -- GNULIB_GETRANDOM=0; AC_SUBST([GNULIB_GETRANDOM]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM]) - REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM]) -diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 -index 4b33d31..2e7d140 100644 ---- a/m4/sys_select_h.m4 -+++ b/m4/sys_select_h.m4 -@@ -1,13 +1,13 @@ --# sys_select_h.m4 serial 20 -+# sys_select_h.m4 serial 23 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_SELECT], -+AC_DEFUN_ONCE([gl_SYS_SELECT_H], - [ -- AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+ AC_REQUIRE([AC_C_RESTRICT]) - AC_CACHE_CHECK([whether is self-contained], - [gl_cv_header_sys_select_h_selfcontained], - [ -@@ -75,19 +75,34 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], - ]], [pselect select]) - ]) - -+# gl_SYS_SELECT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_SELECT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_SELECT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS], - [ -- GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT]) -- GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT]) - REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT]) -diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 -index 503cb96..5676a0d 100644 ---- a/m4/sys_socket_h.m4 -+++ b/m4/sys_socket_h.m4 -@@ -1,4 +1,4 @@ --# sys_socket_h.m4 serial 25 -+# sys_socket_h.m4 serial 28 - dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl From Simon Josefsson. - --AC_DEFUN([gl_HEADER_SYS_SOCKET], -+AC_DEFUN_ONCE([gl_SYS_SOCKET_H], - [ - AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) -@@ -156,32 +156,47 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], - AC_SUBST([HAVE_WS2TCPIP_H]) - ]) - -+# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], - [ -- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) -- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) -- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) -- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) -- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) -- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) -- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) -- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) -- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) -- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) -- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) -- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) -- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) -- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) -- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) - HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) - HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; - AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) -diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 -index 23cbdd2..ac91d42 100644 ---- a/m4/sys_stat_h.m4 -+++ b/m4/sys_stat_h.m4 -@@ -1,4 +1,4 @@ --# sys_stat_h.m4 serial 38 -*- Autoconf -*- -+# sys_stat_h.m4 serial 41 -*- Autoconf -*- - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - dnl From Eric Blake. - dnl Provide a GNU-like . - --AC_DEFUN([gl_HEADER_SYS_STAT_H], -+AC_DEFUN_ONCE([gl_SYS_STAT_H], - [ - AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - -@@ -52,38 +52,53 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], - AC_REQUIRE([AC_C_RESTRICT]) - ]) - -+# gl_SYS_STAT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_STAT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], - [ -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR -- GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) -- GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) -- GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) -- GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) -- GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) -- GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) -- GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) -- GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) -- GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) -- GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) -- GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) -- GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) -- GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) -- GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) -- GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) -- GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) -- GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) -- GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) - HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) -diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 -index 64f133d..c425a96 100644 ---- a/m4/sys_time_h.m4 -+++ b/m4/sys_time_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 9 -+# serial 12 - - # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,18 +8,13 @@ - - # Written by Paul Eggert and Martin Lambers. - --AC_DEFUN([gl_HEADER_SYS_TIME_H], -+AC_DEFUN_ONCE([gl_SYS_TIME_H], - [ - dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement - dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1 - dnl statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], --[ -+ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) - AC_CHECK_HEADERS_ONCE([sys/time.h]) - gl_CHECK_NEXT_HEADERS([sys/time.h]) - -@@ -89,18 +84,33 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], - ]], [gettimeofday]) - ]) - -+# gl_SYS_TIME_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_TIME_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_SYS_TIME_H_DEFAULTS], - [ -- GNULIB_GETTIMEOFDAY=0; AC_SUBST([GNULIB_GETTIMEOFDAY]) - dnl Assume POSIX behavior unless another module says otherwise. - HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) - HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) -diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4 -index b9daaa7..577ead6 100644 ---- a/m4/sys_times_h.m4 -+++ b/m4/sys_times_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 8 -+# serial 11 - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,7 +8,7 @@ - - # Written by Simon Josefsson. - --AC_DEFUN([gl_SYS_TIMES_H], -+AC_DEFUN_ONCE([gl_SYS_TIMES_H], - [ - AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) - -@@ -36,16 +36,31 @@ AC_DEFUN([gl_SYS_TIMES_H], - ]], [times]) - ]) - -+# gl_SYS_TIMES_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_TIMES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TIMES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS], - [ -- GNULIB_TIMES=0; AC_SUBST([GNULIB_TIMES]) - HAVE_STRUCT_TMS=1; AC_SUBST([HAVE_STRUCT_TMS]) - HAVE_TIMES=1; AC_SUBST([HAVE_TIMES]) - ]) -diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 -index 2172c83..6dd6fee 100644 ---- a/m4/sys_types_h.m4 -+++ b/m4/sys_types_h.m4 -@@ -1,4 +1,4 @@ --# sys_types_h.m4 serial 11 -+# sys_types_h.m4 serial 13 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN_ONCE([gl_SYS_TYPES_H], - [ -+ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -+ - dnl Use sane struct stat types in OpenVMS 8.2 and later. - AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) - -- AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) - gl_NEXT_HEADERS([sys/types.h]) - - dnl Ensure the type pid_t gets defined. -@@ -30,6 +31,17 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], - AC_SUBST([WINDOWS_STAT_INODES]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], - [ - ]) -diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 -index 503de4d..fa176e0 100644 ---- a/m4/sys_uio_h.m4 -+++ b/m4/sys_uio_h.m4 -@@ -1,10 +1,10 @@ --# sys_uio_h.m4 serial 1 -+# sys_uio_h.m4 serial 3 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_UIO], -+AC_DEFUN_ONCE([gl_SYS_UIO_H], - [ - AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -17,15 +17,30 @@ AC_DEFUN([gl_HEADER_SYS_UIO], - AC_SUBST([HAVE_SYS_UIO_H]) - ]) - -+# gl_SYS_UIO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_UIO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_UIO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_UIO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_UIO_H_DEFAULTS], - [ - ]) -diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 -index 8fc3dfd..37b797c 100644 ---- a/m4/threadlib.m4 -+++ b/m4/threadlib.m4 -@@ -1,4 +1,4 @@ --# threadlib.m4 serial 30 -+# threadlib.m4 serial 31 - dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -212,6 +212,27 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - LIBS=$save_LIBS - test $gl_pthread_api = yes && break - done -+ echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: LIBPTHREAD=$LIBPTHREAD" >&AS_MESSAGE_LOG_FD -+ -+ gl_pthread_in_glibc=no -+ # On Linux with glibc >= 2.34, libc contains the fully functional -+ # pthread functions. -+ case "$host_os" in -+ linux*) -+ AC_EGREP_CPP([Lucky user], -+ [#include -+ #ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) || (__GLIBC__ > 2) -+ Lucky user -+ #endif -+ #endif -+ ], -+ [gl_pthread_in_glibc=yes], -+ []) -+ ;; -+ esac -+ echo "$as_me:__oline__: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&AS_MESSAGE_LOG_FD - - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) -@@ -219,18 +240,22 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB([pthread], [pthread_kill], -- [LIBPMULTITHREAD=-lpthread -- # On Solaris and HP-UX, most pthread functions exist also in libc. -- # Therefore pthread_in_use() needs to actually try to create a -- # thread: pthread_create from libc will fail, whereas -- # pthread_create will actually create a thread. -- # On Solaris 10 or newer, this test is no longer needed, because -- # libc contains the fully functional pthread functions. -- case "$host_os" in -- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], -- [Define if the pthread_in_use() detection is hard.]) -- esac -+ [if test $gl_pthread_in_glibc = yes; then -+ LIBPMULTITHREAD= -+ else -+ LIBPMULTITHREAD=-lpthread -+ # On Solaris and HP-UX, most pthread functions exist also in libc. -+ # Therefore pthread_in_use() needs to actually try to create a -+ # thread: pthread_create from libc will fail, whereas -+ # pthread_create will actually create a thread. -+ # On Solaris 10 or newer, this test is no longer needed, because -+ # libc contains the fully functional pthread functions. -+ case "$host_os" in -+ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -+ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], -+ [Define if the pthread_in_use() detection is hard.]) -+ esac -+ fi - ]) - elif test $gl_pthread_api != yes; then - # Some library is needed. Try libpthread and libc_r. -@@ -246,6 +271,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - LIBPMULTITHREAD=-lc_r]) - fi - fi -+ echo "$as_me:__oline__: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&AS_MESSAGE_LOG_FD - fi - AC_MSG_CHECKING([whether POSIX threads API is available]) - AC_MSG_RESULT([$gl_pthread_api]) -@@ -311,7 +337,8 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], - dnl glibc >= 2.29 has thrd_create in libpthread. - dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends - dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). -- dnl AIX >= 7.1 and Solaris >= 11.4 have thrd_create in libc. -+ dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in -+ dnl libc. - AC_CHECK_FUNCS([thrd_create]) - if test $ac_cv_func_thrd_create = yes; then - LIBSTDTHREAD= -@@ -481,7 +508,10 @@ AC_DEFUN([gl_THREADLIB_BODY], - gl_threads_api=posix - AC_DEFINE([USE_POSIX_THREADS], [1], - [Define if the POSIX multithreading library can be used.]) -- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then -+ if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then -+ AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1], -+ [Define if references to the POSIX multithreading library are satisfied by libc.]) -+ else - if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then - AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], - [Define if references to the POSIX multithreading library should be made weak.]) -@@ -576,7 +606,9 @@ dnl flavours option weak result - dnl --------------- --------- --------- -------- --------- - dnl Linux 2.4/glibc posix -lpthread Y OK - dnl --dnl GNU Hurd/glibc posix -+dnl Linux/glibc 2.34 posix Y OK -+dnl -+dnl GNU Hurd/glibc posix -lpthread Y OK - dnl - dnl Ubuntu 14.04 posix -pthread Y OK - dnl -diff --git a/m4/time_h.m4 b/m4/time_h.m4 -index b6a1aa3..b57474b 100644 ---- a/m4/time_h.m4 -+++ b/m4/time_h.m4 -@@ -2,7 +2,7 @@ - - # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. - --# serial 15 -+# serial 18 - - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -10,16 +10,11 @@ - - # Written by Paul Eggert and Jim Meyering. - --AC_DEFUN([gl_HEADER_TIME_H], -+AC_DEFUN_ONCE([gl_TIME_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_TIME_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_TIME_H_BODY], --[ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - - gl_NEXT_HEADERS([time.h]) - AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) -@@ -111,30 +106,45 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], - AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) - ]) - -+# gl_TIME_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_TIME_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_TIME_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_TIME_H_DEFAULTS], - [ -- GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) -- GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) -- GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) -- GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) -- GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) -- GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) -- GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) -- GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) -- GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) -- GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) -- GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) - HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) -diff --git a/m4/time_r.m4 b/m4/time_r.m4 -index 713e93a..2d49b64 100644 ---- a/m4/time_r.m4 -+++ b/m4/time_r.m4 -@@ -12,7 +12,7 @@ AC_DEFUN([gl_TIME_R], - dnl Persuade glibc and Solaris to declare localtime_r. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) - - dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is -diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 -index 34ef0ba..c5e85dc 100644 ---- a/m4/time_rz.m4 -+++ b/m4/time_rz.m4 -@@ -10,7 +10,7 @@ dnl Written by Paul Eggert. - AC_DEFUN([gl_TIME_RZ], - [ - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_STRUCT_TIMEZONE]) - - # On Mac OS X 10.6, localtime loops forever with some time_t values. -diff --git a/m4/timegm.m4 b/m4/timegm.m4 -index 098c857..58123be 100644 ---- a/m4/timegm.m4 -+++ b/m4/timegm.m4 -@@ -1,4 +1,4 @@ --# timegm.m4 serial 12 -+# timegm.m4 serial 13 - dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_TIMEGM], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - REPLACE_TIMEGM=0 - AC_CHECK_FUNCS_ONCE([timegm]) -diff --git a/m4/tzset.m4 b/m4/tzset.m4 -index 8eaf41f..8a4f285 100644 ---- a/m4/tzset.m4 -+++ b/m4/tzset.m4 -@@ -1,4 +1,4 @@ --# serial 15 -+# serial 16 - - # Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -9,7 +9,7 @@ - - AC_DEFUN([gl_FUNC_TZSET], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - REPLACE_TZSET=0 - case "$host_os" in -diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 -index 0f26fb9..0ce4ea4 100644 ---- a/m4/unistd_h.m4 -+++ b/m4/unistd_h.m4 -@@ -1,4 +1,4 @@ --# unistd_h.m4 serial 85 -+# unistd_h.m4 serial 89 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Simon Josefsson, Bruno Haible. - --AC_DEFUN([gl_UNISTD_H], -+AC_DEFUN_ONCE([gl_UNISTD_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - - gl_CHECK_NEXT_HEADERS([unistd.h]) -@@ -59,100 +59,116 @@ AC_DEFUN([gl_UNISTD_H], - fi - ]) - -+# gl_UNISTD_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_UNISTD_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_UNISTD_H_DEFAULTS], - [ -- GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) -- GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) -- GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) -- GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) -- GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) -- GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) -- GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) -- GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) -- GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) -- GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) -- GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) -- GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) -- GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) -- GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) -- GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) -- GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) -- GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) -- GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) -- GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) -- GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) -- GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) -- GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) -- GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) -- GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) -- GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) -- GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) -- GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) -- GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) -- GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) -- GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) -- GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) -- GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) -- GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) -- GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) -- GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) -- GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) -- GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) -- GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) -- GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) -- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) -- GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) -- GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) -- GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) -- GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) -- GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) -- GNULIB_READ=0; AC_SUBST([GNULIB_READ]) -- GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) -- GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) -- GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) -- GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) -- GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) -- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) -- GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) -- GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) -- GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) -- GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) -- GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) -- GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) -- GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) -- GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) -- GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) -- GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) -- GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) -- GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) -- GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) -- GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) -- GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) -- GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) -- GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) -- GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) -- GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) -- GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) -- GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) -- GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) -- GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) -- GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) -- GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) -- GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) -- GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) -- GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) -- GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) - HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) -diff --git a/m4/visibility.m4 b/m4/visibility.m4 -index 8f27a12..d161bd7 100644 ---- a/m4/visibility.m4 -+++ b/m4/visibility.m4 -@@ -1,4 +1,4 @@ --# visibility.m4 serial 7 -+# visibility.m4 serial 8 - dnl Copyright (C) 2005, 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -59,6 +59,10 @@ AC_DEFUN([gl_VISIBILITY], - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); - void dummyfunc (void); -+ int hiddenvar; -+ int exportedvar; -+ int hiddenfunc (void) { return 51; } -+ int exportedfunc (void) { return 1225736919; } - void dummyfunc (void) {} - ]], - [[]])], -diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 -index 59c55fc..818b319 100644 ---- a/m4/wchar_h.m4 -+++ b/m4/wchar_h.m4 -@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Eric Blake. - --# wchar_h.m4 serial 50 -+# wchar_h.m4 serial 53 - --AC_DEFUN([gl_WCHAR_H], -+AC_DEFUN_ONCE([gl_WCHAR_H], - [ - AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) - AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) -@@ -125,60 +125,75 @@ Configuration aborted.]) - fi - ]) - -+# gl_WCHAR_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_WCHAR_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_WCHAR_H_DEFAULTS], - [ -- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) -- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) -- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) -- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) -- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) -- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) -- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) -- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) -- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) -- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) -- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) -- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) -- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) -- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) -- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) -- GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) -- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) -- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) -- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) -- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) -- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) -- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) -- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) -- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) -- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) -- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) -- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) -- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) -- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) -- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) -- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) -- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) -- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) -- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) -- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) -- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) -- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) -- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) -- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) -- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) -- GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) - HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) -diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 -index 1ab0bc9..7d74212 100644 ---- a/m4/wctype_h.m4 -+++ b/m4/wctype_h.m4 -@@ -1,4 +1,4 @@ --# wctype_h.m4 serial 26 -+# wctype_h.m4 serial 30 - - dnl A placeholder for ISO C99 , for platforms that lack it. - -@@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Paul Eggert. - --AC_DEFUN([gl_WCTYPE_H], -+AC_DEFUN_ONCE([gl_WCTYPE_H], - [ - AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) - AC_REQUIRE([AC_PROG_CC]) -@@ -62,7 +62,7 @@ AC_DEFUN([gl_WCTYPE_H], - fi - AC_SUBST([HAVE_WCTYPE_H]) - -- if test $GNULIB_OVERRIDES_WINT_T = 1; then -+ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then - REPLACE_ISWCNTRL=1 - else - case "$gl_cv_func_iswcntrl_works" in -@@ -157,24 +157,39 @@ AC_DEFUN([gl_WCTYPE_H], - ]) - ]) - -+# gl_WCTYPE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_WCTYPE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_WCTYPE_H_DEFAULTS], - [ -- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) -- GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) -- GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) -- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) -- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) -- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) -- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) - HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) -diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 -index 2fc7467..a49c508 100644 ---- a/m4/wint_t.m4 -+++ b/m4/wint_t.m4 -@@ -1,4 +1,4 @@ --# wint_t.m4 serial 10 -+# wint_t.m4 serial 11 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,14 +34,14 @@ AC_DEFUN([gt_TYPE_WINT_T], - [gl_cv_type_wint_t_large_enough=yes], - [gl_cv_type_wint_t_large_enough=no])]) - if test $gl_cv_type_wint_t_large_enough = no; then -- GNULIB_OVERRIDES_WINT_T=1 -+ GNULIBHEADERS_OVERRIDE_WINT_T=1 - else -- GNULIB_OVERRIDES_WINT_T=0 -+ GNULIBHEADERS_OVERRIDE_WINT_T=0 - fi - else -- GNULIB_OVERRIDES_WINT_T=0 -+ GNULIBHEADERS_OVERRIDE_WINT_T=0 - fi -- AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+ AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) - ]) - - dnl Prerequisites of the 'wint_t' override. -diff --git a/m4/year2038.m4 b/m4/year2038.m4 -new file mode 100644 -index 0000000..da0f8d7 ---- /dev/null -+++ b/m4/year2038.m4 -@@ -0,0 +1,124 @@ -+# year2038.m4 serial 7 -+dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl Attempt to ensure that 'time_t' can go past the year 2038 and that -+dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. -+ -+AC_DEFUN([gl_YEAR2038_EARLY], -+[ -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ case "$host_os" in -+ mingw*) -+ AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], -+ [For 64-bit time_t on 32-bit mingw.]) -+ ;; -+ esac -+]) -+ -+# gl_YEAR2038_TEST_INCLUDES -+# ------------------------- -+AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], -+[[ -+ #include -+ /* Check that time_t can represent 2**32 - 1 correctly. */ -+ #define LARGE_TIME_T \\ -+ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) -+ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 -+ && LARGE_TIME_T % 65537 == 0) -+ ? 1 : -1]; -+]]) -+ -+# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) -+----------------------------------------- -+AC_DEFUN([gl_YEAR2038_BODY], -+[ -+ AC_ARG_ENABLE([year2038], -+ [ --disable-year2038 omit support for timestamps past the year 2038]) -+ AS_IF([test "$enable_year2038" != no], -+ [ -+ dnl On many systems, time_t is already a 64-bit type. -+ dnl On those systems where time_t is still 32-bit, it requires kernel -+ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, -+ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. -+ dnl -+ dnl On native Windows, the system include files define types __time32_t -+ dnl and __time64_t. By default, time_t is an alias of -+ dnl - __time32_t on 32-bit mingw, -+ dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). -+ dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an -+ dnl alias of __time64_t. -+ dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of -+ dnl __time32_t. -+ AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) -+ ]) -+ if test "$gl_cv_type_time_t_y2038" = no; then -+ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], -+ [gl_cv_type_time_t_bits_macro], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([[#define _TIME_BITS 64 -+ #define _FILE_OFFSET_BITS 64 -+ ]gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_bits_macro=yes], -+ [gl_cv_type_time_t_bits_macro=no]) -+ ]) -+ if test "$gl_cv_type_time_t_bits_macro" = yes; then -+ AC_DEFINE([_TIME_BITS], [64], -+ [Number of bits in a timestamp, on hosts where this is settable.]) -+ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. -+ AC_DEFINE([_FILE_OFFSET_BITS], [64], -+ [Number of bits in a file offset, on hosts where this is settable.]) -+ gl_cv_type_time_t_y2038=yes -+ fi -+ fi -+ if test $gl_cv_type_time_t_y2038 = no; then -+ AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE( -+ [[#ifdef _USE_32BIT_TIME_T -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], -+ [AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038. -+ Remove _USE_32BIT_TIME_T from the compiler flags.])], -+ [# If not cross-compiling and $1 says we should check, -+ # and 'touch' works with a large timestamp, then evidently wider time_t -+ # is desired and supported, so fail and ask the builder to fix the -+ # problem. Otherwise, just warn the builder. -+ m4_ifval([$1], -+ [if test $cross_compiling = no \ -+ && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then -+ case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in -+ *'Feb 7 2106'* | *'Feb 7 17:10'*) -+ AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038, -+ and your system appears to support a wider 'time_t'. -+ Try configuring with 'CC="${CC} -m64"'. -+ To build with a 32-bit time_t anyway (not recommended), -+ configure with '--disable-year2038'.]);; -+ esac -+ rm -f conftest.time -+ fi]) -+ if test "$gl_warned_about_y2038" != yes; then -+ AC_MSG_WARN( -+ [The 'time_t' type stops working after January 2038, -+ and this package needs a wider 'time_t' type -+ if there is any way to access timestamps after that. -+ Configure with 'CC="${CC} -m64"' perhaps?]) -+ gl_warned_about_y2038=yes -+ fi -+ ]) -+ fi]) -+]) -+ -+AC_DEFUN([gl_YEAR2038], -+[ -+ gl_YEAR2038_BODY([require-year2038-safe]) -+]) -diff --git a/maint.mk b/maint.mk -index ae3a817..6a3ea96 100644 ---- a/maint.mk -+++ b/maint.mk -@@ -1409,7 +1409,7 @@ announcement_mail_headers_alpha = \ - announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) - announcement_mail_headers_beta = $(announcement_mail_headers_alpha) - --announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type)) -+announcement_Cc_ ?= $(announcement_Cc_$(release-type)) - announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) - announcement: NEWS ChangeLog $(rel-files) - # Not $(AM_V_GEN) since the output of this command serves as -@@ -1426,7 +1426,6 @@ announcement: NEWS ChangeLog $(rel-files) - --bootstrap-tools=$(bootstrap-tools) \ - $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ - echo --gnulib-version=$(gnulib-version);; esac) \ -- --no-print-checksums \ - $(addprefix --url-dir=, $(url_dir_list)) - - .PHONY: release-commit --- -cgit v1.1 - -- 2.25.1 From yann.morin.1998 at free.fr Sun Mar 20 23:24:31 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 21 Mar 2022 00:24:31 +0100 Subject: [Buildroot] [PATCH 2/2] packages/guile: remove patches not needed in 3.0.8 In-Reply-To: <20220320221445.10259-2-paguilar@paguilar.org> References: <20220320221445.10259-1-paguilar@paguilar.org> <20220320221445.10259-2-paguilar@paguilar.org> Message-ID: <20220320232431.GJ1566358@scaer> Pedro, All, On 2022-03-20 23:14 +0100, Pedro Aguilar spake thusly: > These patches are already part of Guile's source code in > version 3.0.8. Let's remove them to avoid errors while > patching the package. Then this should have been part of the patch that bumps the version. No need to resend, as this is a big patch; this can be squashed locally when applying. Regards, Yann E. MORIN. > 0003-module-system-base-target.scm-support-riscv32.patch > 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch > > Signed-off-by: Pedro Aguilar > --- [--SNIP--] -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From buildroot at busybox.net Mon Mar 21 00:55:31 2022 From: buildroot at busybox.net (busybox.net) Date: 21 Mar 2022 01:55:31 +0100 Subject: [Buildroot] ACTION REQUIRED Message-ID: <20220321015530.507203A9004534EC@busybox.net> An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Mon Mar 21 05:53:37 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 21 Mar 2022 08:53:37 +0300 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 In-Reply-To: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> References: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Message-ID: <9c95f18f-fcfc-47a2-4522-95eac502c73f@inbox.ru> On 20.03.2022 19:39, Fabrice Fontaine wrote: > Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may > allow privilege escalation during extension installation. The > installation process uses commands such as CREATE x IF NOT EXIST that > allow an unprivileged user to precreate objects. These objects will be > used by the installer (which executes as Superuser), leading to > privilege escalation. In order to be able to take advantage of this, an > unprivileged user would need to be able to create objects in a database > and then get a Superuser to install TimescaleDB into their database. (In > the fixed versions, the installation aborts when it finds that an object > already exists.) > > "This release contains bug fixes since the 2.5.1 release. > This release is high priority for upgrade. We strongly recommend that > you upgrade as soon as possible." > > https://github.com/timescale/timescaledb/releases/tag/2.5.2 > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From peter at korsgaard.com Mon Mar 21 07:12:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:12:20 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: strengthen version check in check_package_get_latest_version_by_distro() In-Reply-To: <20220320113553.43bf3c6f@windsurf> (Thomas Petazzoni's message of "Sun, 20 Mar 2022 11:35:53 +0100") References: <20220316215654.8E8188424D@busybox.osuosl.org> <20220320113553.43bf3c6f@windsurf> Message-ID: <871qyvlqy3.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni writes: > Hello Peter, > Could you cherry-pick this commit into the currently maintained stable > branches? Sure, applied to 2021.02.x / 2021.11.x / 2022.02.x. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:23:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:23:10 +0100 Subject: [Buildroot] [PATCH v1 00/12] package/gstreamer1/*: bump version to 1.20.1 In-Reply-To: <20220316221046.GD283544@scaer> (Yann E. MORIN's message of "Wed, 16 Mar 2022 23:10:46 +0100") References: <20220316213614.16878-1-ps.report@gmx.net> <20220316221046.GD283544@scaer> Message-ID: <87tubrkbvl.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Peter, All, > On 2022-03-16 22:36 +0100, Peter Seiderer spake thusly: >> For details see [1] and [2]. >> >> [1] https://lists.freedesktop.org/archives/gstreamer-devel/2022-March/079724.html >> [2] https://gstreamer.freedesktop.org/releases/1.20/#1.20.1 >> >> Peter Seiderer (12): >> package/gstreamer1: bump version to 1.20.1 >> package/gst1-plugins-base: bump version to 1.20.1 >> package/gst1-plugins-good: bump version to 1.20.1 >> package/gst1-plugins-bad: bump version to 1.20.1 >> package/gst1-plugins-ugly: bump version to 1.20.1 >> package/gst1-devtools: bump version to 1.20.1 >> package/gst1-libav: bump version to 1.20.1 >> package/gst1-vaapi: bump version to 1.20.1 >> package/gst1-rtsp-server: bump version to 1.20.1 >> package/gstreamer1-editing-services: bump version to 1.20.1 >> package/gst-omx: bump version to 1.20.1 >> package/gst1-python: bump version to 1.20.1 > Whole series applied to master, thanks. And to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:30:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:30:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: bump version to 3.3.3 Message-ID: <20220321072912.C72AD84710@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6481753b2de93bb1c781068619e0fdd0cee40d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 711a83624c8a80217dd0ce9328235120dc9d4be8) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 94b50103f0..5f6b22aede 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 7c32ff037597ce471c7cfd9dcb8471cda3a02983aeba3315059362ceb3934b84 libressl-3.2.7.tar.gz +sha256 a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066 libressl-3.3.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 9e91fea19c..f1f5e1974d 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.2.7 +LIBRESSL_VERSION = 3.3.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:31:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:31:39 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: always expose SSL_OP_NO_TLSv1_3 Message-ID: <20220321072912.CFF8384711@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b1b2c3b77371fcda26c9f49738570b22d04b9a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes the build of vsftpd 3.0.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 181a5e229b347c1996eeca7d7727ee66bc566f01) Signed-off-by: Peter Korsgaard --- .../0001-always-expose-SSL_OP_NO_TLSv1_3.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch new file mode 100644 index 0000000000..f34ae85834 --- /dev/null +++ b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch @@ -0,0 +1,37 @@ +always expose SSL_OP_NO_TLSv1_3 + +like in OpenSSL, see https://github.com/openssl/openssl/blob/master/include/openssl/ssl.h.in#L399 + +like SSL_OP_NO_DTLSv1_2, see commit "Expose various DTLSv1.2 specific functions and defines" + +this change fixes the compilation of vsftpd 3.0.4 & 3.0.5, which fails with the following error: +``` +ssl.c: In function 'ssl_init': +ssl.c:98:18: error: 'SSL_OP_NO_TLSv1_3' undeclared (first use in this function); did you mean 'SSL_OP_NO_TLSv1_1'? +``` + +Signed-off-by: Francois Perrad +Fetched from: https://github.com/libressl-portable/openbsd/pull/124 +--- + include/openssl/ssl.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h +index 46f24b2ea..4048a6e63 100644 +--- a/include/openssl/ssl.h ++++ b/include/openssl/ssl.h +@@ -516,11 +516,7 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, + #define SSL_OP_NO_TLSv1 0x04000000L + #define SSL_OP_NO_TLSv1_2 0x08000000L + #define SSL_OP_NO_TLSv1_1 0x10000000L +- +-#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) + #define SSL_OP_NO_TLSv1_3 0x20000000L +-#endif +- + #define SSL_OP_NO_DTLSv1 0x40000000L + #define SSL_OP_NO_DTLSv1_2 0x80000000L + +-- +2.30.2 + From peter at korsgaard.com Mon Mar 21 07:36:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:36:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: security bump to version 3.3.6 Message-ID: <20220321072912.EF4D084711@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6eca04a4ecbfe2e545853b17b37b57efb4933f14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x It includes the following security fix: * A malicious certificate can cause an infinite loop. Reported by and fix from Tavis Ormandy and David Benjamin, Google. https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.6-relnotes.txt Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index d046e89518..e35e52bf4d 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 0a51393f0df1cf27e070054a2788a4d073339f363d79cd594076a1b4c48be9a5 libressl-3.3.5.tar.gz +sha256 3f28849365e1190db2baf9014ff9686012c25b1ca6df8b3a085f789e24fe4b9a libressl-3.3.6.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 268ded69af..b415708b46 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.3.5 +LIBRESSL_VERSION = 3.3.6 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:32:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:32:01 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: bump to version 3.3.5 Message-ID: <20220321072912.E48097FD02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba8df4289069a365c3c092979bbb8f6f6f371183 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Bugfix release, fixing a stack overread issue: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.5-relnotes.txt Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ec87e249237ed0ece942c277e15fcfaa4901e2e9) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 45afd04dca..d046e89518 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 bcce767a3fed252bfd1210f8a7e3505a2b54d3008f66e43d9b95e3f30c072931 libressl-3.3.4.tar.gz +sha256 0a51393f0df1cf27e070054a2788a4d073339f363d79cd594076a1b4c48be9a5 libressl-3.3.5.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index f1847b18dd..268ded69af 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.3.4 +LIBRESSL_VERSION = 3.3.5 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:31:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:31:53 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libressl: bump to version 3.3.4 Message-ID: <20220321072912.DA11384712@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb318bb611644209960dc7c1d4007b9c5d59731e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3c056db673430f5f85b0a6c7c1133bcde3f4c095) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 5f6b22aede..45afd04dca 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066 libressl-3.3.3.tar.gz +sha256 bcce767a3fed252bfd1210f8a7e3505a2b54d3008f66e43d9b95e3f30c072931 libressl-3.3.4.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index f1f5e1974d..f1847b18dd 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.3.3 +LIBRESSL_VERSION = 3.3.4 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:23:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:23:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libressl: security bump to 3.4.3 Message-ID: <20220321072922.08D8F84713@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1602ff300478aea29f71d86a45b0197ca5a4b522 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit b92210ce36588038aa728e48f3826f6b32d471c0) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda8..e923998713 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda9..0bb468cedb 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:39:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:39:00 +0100 Subject: [Buildroot] [PATCH] package/libressl: security bump to 3.4.3 In-Reply-To: <20220316105753.1134088-1-francois.perrad@gadz.org> (Francois Perrad's message of "Wed, 16 Mar 2022 11:57:53 +0100") References: <20220316105753.1134088-1-francois.perrad@gadz.org> Message-ID: <87pmmfkb57.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 > Signed-off-by: Francois Perrad Committed to 2022.02.x and 2021.11.x, thanks. For 2021.02.x I will instead bump to 3.3.6, which contains the same fix. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gstreamer1: bump version to 1.20.1 Message-ID: <20220321073042.0F54484756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5d8eda986ca683a0765435bdcd382d2009ab805 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 05b0f785cec573092b5292237a03dc756c6b9d5b) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f4a74a6125..128bb564d4 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.1.tar.xz.sha256sum +sha256 de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 gstreamer-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf6..995c5b118b 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.20.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-base: bump version to 1.20.1 Message-ID: <20220321073042.1CBC8846D3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a34ed56dfd5a23b209431b7f1d4c6bbe534b8ab branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 1f0a550b6d8dedc04fbcd94df0c45effbec6ec1b) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cda..748d951966 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.1.tar.xz.sha256sum +sha256 96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 gst-plugins-base-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 08aac850cd..766af88e96 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.0 +GST1_PLUGINS_BASE_VERSION = 1.20.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-good: bump version to 1.20.1 Message-ID: <20220321073042.2675F84756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=86e8e12143c02db510f476236e685175cd8f0e5d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 69b7c008fa154b5174d8c67006002f48a686086b) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf46..cccd07dd2d 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.1.tar.xz.sha256sum +sha256 3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa gst-plugins-good-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6298d578ed..1168feb293 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.20.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-libav: bump version to 1.20.1 Message-ID: <20220321073042.4E0E184756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b66c5d001ece0b95c4e226587b62ca7d42443c1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 9763aab6a0bd9f53343b3ecd37d00efef777379a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14..3f9c849729 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.1.tar.xz.sha256sum +sha256 91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 gst-libav-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4..4e99de45f9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.20.0 +GST1_LIBAV_VERSION = 1.20.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-python: bump version to 1.20.1 Message-ID: <20220321073042.7884E84756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05f62c6a080d2d18c6111148c653c083885be0ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit fd7ebd2ca426aeacd0e509461d1d94962e65a8bf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fd..fe1e2068b1 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.1.tar.xz.sha256sum +sha256 ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 gst-python-1.20.1.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d7..3fd8059bee 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.20.0 +GST1_PYTHON_VERSION = 1.20.1 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:23:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:23:30 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libressl: security bump to 3.4.3 Message-ID: <20220321073042.817B284758@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=881575856a742346aecdabea65baef106b9a188e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x see https://marc.info/?l=openbsd-announce&m=164736531714549&w=2 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit b92210ce36588038aa728e48f3826f6b32d471c0) Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda8..e923998713 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d libressl-3.4.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda9..0bb468cedb 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.4.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-rtsp-server: bump version to 1.20.1 Message-ID: <20220321073042.5E7428475F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b597419ddd01f18ac9c3b3322f5f50bf2b0c147b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit bb3a4e313a8ff70644f0702ac84d2ba877e1ca08) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 00ff974c6e..1e66ed7246 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.20.1.tar.xz.sha256sum +sha256 4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509 gst-rtsp-server-1.20.1.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index d22dd5e7cc..978f7b4491 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.20.0 +GST1_RTSP_SERVER_VERSION = 1.20.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst-omx: bump version to 1.20.1 Message-ID: <20220321073042.6F63484762@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88b6bb5129b0ddbefb3eeb98c1221cb68bd7e6b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit f62284487af114fdf2cb4069d62c8b6a7f90268c) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f..33c20defbc 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.1.tar.xz.sha256sum +sha256 86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c gst-omx-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff..462c88765b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.20.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-devtools: bump version to 1.20.1 Message-ID: <20220321073042.4092384756@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c219b85f7dbc95ce730dc0e26a72b5991c08908 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit a70131455b59487864358eadc9ff34263f6670ff) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9c..7173dbe266 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.20.1.tar.xz.sha256sum +sha256 81f1c7ef105b8bdb63412638952f6320723b3161c96a80f113b020e2de554b2b gst-devtools-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index f72df9cf71..8c430800d2 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.20.0 +GST1_DEVTOOLS_VERSION = 1.20.1 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:01 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-bad: bump version to 1.20.1 Message-ID: <20220321073042.2EE3C8475D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aa78bc78899d48ac0d805fe0bea510d80cf0793 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 3e3971565263385a4d2947bf74e20386838f3094) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b94..2874d955f4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.1.tar.xz.sha256sum +sha256 09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 gst-plugins-bad-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 24fd9dd312..343a53a3c5 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.20.0 +GST1_PLUGINS_BAD_VERSION = 1.20.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gstreamer1-editing-services: bump version to 1.20.1 Message-ID: <20220321073042.66DCD84761@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=870c1db51b91a0b769f3ca314e4249bdbc7c69f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit eed6566513fd17950a11b06db15477860e42353e) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb..5d77a9bb72 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.1.tar.xz.sha256sum +sha256 6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df gst-editing-services-1.20.1.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae7..dbdf2abca0 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.20.1 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-vaapi: bump version to 1.20.1 Message-ID: <20220321073042.563148475D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c99676913ee415d5cb8bdf6478fb58ed500f8fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 4d0a14b039c4c073baae5b0d4f88c3ed4b7d00d1) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e2..26a1f52ba0 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.1.tar.xz.sha256sum +sha256 87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 gstreamer-vaapi-1.20.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 19ee625703..e0502914b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.20.0 +GST1_VAAPI_VERSION = 1.20.1 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Mon Mar 21 07:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:21:02 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/gst1-plugins-ugly: bump version to 1.20.1 Message-ID: <20220321073042.3778584758@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4258840cb9646838328cda60995ffff43b5ea11e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit fd865dc6fcd049cf0c20bdbc5b26ab2acf055ecb) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24b..d022ba3180 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.1.tar.xz.sha256sum +sha256 42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 gst-plugins-ugly-1.20.1.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 05b1fab304..be45d183f3 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.20.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Mon Mar 21 07:46:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:46:15 +0100 Subject: [Buildroot] [git commit] package/gcr: depends on !gnupg In-Reply-To: <87czigmpsx.fsf@dell.be.48ers.dk> (Peter Korsgaard's message of "Sun, 20 Mar 2022 19:39:26 +0100") References: <20220315211222.E6D258408A@busybox.osuosl.org> <87czigmpsx.fsf@dell.be.48ers.dk> Message-ID: <87lex3kat4.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) writes: >> commit: https://git.buildroot.net/buildroot/commit/?id=5783a418f4b30931068b81f850fc06cd8d3d9732 >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master >> Since gcr selects gnupg2, it's incompatible with gnupg. Add this >> dependency and corresponding comment. >> While we're at it, also hide the existing comment when >> !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) > Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. Hmm, this doesn't work with the v1/v2 rework, so I'll revert: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:46:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:46:32 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Revert "package/gcr: depends on !gnupg" Message-ID: <20220321073806.2106A8475F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff5471d6983158cb5ad51e4eab577b72b601e461 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This reverts commit 816861524a079658040d6e059743697affdeafce. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS - -comment "gcr is incompatible with gnupg, gnupg2 only" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Mon Mar 21 07:45:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:45:44 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Revert "package/gcr: depends on !gnupg" Message-ID: <20220321073844.3865F84767@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4b78a0f8a9736ff555bd4accc29361df265dd6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This reverts commit 5c05744eca4a2453fe4403c97cee3229152f50e2. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS - -comment "gcr is incompatible with gnupg, gnupg2 only" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_GNUPG # gnupg2 From clement.leger at bootlin.com Mon Mar 21 07:46:22 2022 From: clement.leger at bootlin.com (=?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?=) Date: Mon, 21 Mar 2022 08:46:22 +0100 Subject: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 In-Reply-To: <20220318224031.GV283544@scaer> References: <20220318132427.48737-1-clement.leger@bootlin.com> <20220318132427.48737-5-clement.leger@bootlin.com> <20220318224031.GV283544@scaer> Message-ID: <20220321084622.4b14b1c8@fixe.home> Le Fri, 18 Mar 2022 23:40:31 +0100, "Yann E. MORIN" a ?crit : > 3.16.0 now needs the dependency on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS, > so if that is not met, there will only be the custom git as a fallback. > > This is not so nice that the latest has to, well, be the latest, and > that we don;t keep 3.15.0 around for those that can't have a host rustc > compiler. > > But then, who are we kidding? Builds on non-x86 are pretty rare yet; > even if some people might be on PPC or AArch64, they still are to be > no much more than two-handful (1023). > > Also, check-package whines; > > $ make check-package > boot/optee-os/Config.in:22: attributes order: type, default, depends > on, select, help (http://nightly.buildroot.org/#_config_files) Hi Yann, Sorry for the errors and thanks for the hint, I will use that next time I submit a patch for a package. > > And a hidden one: > > boot/optee-os/optee-os.hash:4: separation does not match expectation > (http://nightly.buildroot.org/#adding-packages-hash) > > Applied to master with those fixed, thanks. > > Regards, > Yann E. MORIN. -- Cl?ment L?ger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com From peter at korsgaard.com Mon Mar 21 07:43:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:43:35 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] Revert "package/gcr: depends on !gnupg" Message-ID: <20220321074138.579E484773@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ff60335b573f7bd8fa67511450ba542a5d45c8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This reverts commit cf0c9830c0eef17116081d04ccc10a1aa0850553. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS - -comment "gcr is incompatible with gnupg, gnupg2 only" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_GNUPG # gnupg2 From peter at korsgaard.com Mon Mar 21 07:50:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:50:46 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libminiupnpc: disable sample and tests Message-ID: <20220321074528.0B48784778@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1c068c11aa05aef561bbcc3b00abb5d5a43bcca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e1d0ac062cd65794a39e90b5f7abae354aa69be9) Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 21 07:50:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:50:41 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libminiupnpc: disable sample and tests Message-ID: <20220321074532.AE40584783@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33fe8c54921d2086705c435d418b561e87e7ae63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e1d0ac062cd65794a39e90b5f7abae354aa69be9) Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 21 07:50:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:50:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libminiupnpc: disable sample and tests Message-ID: <20220321074537.6C95884798@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=073bba9c3339eb864bb0314aced574395bcc1403 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Disable sample and tests (which are built by default since version 2.1: https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit e1d0ac062cd65794a39e90b5f7abae354aa69be9) Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cf..0633ccd234 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -16,5 +16,6 @@ LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF $(eval $(cmake-package)) From peter at korsgaard.com Mon Mar 21 07:54:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:54:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/libminiupnpc: disable sample and tests In-Reply-To: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 16 Mar 2022 21:39:21 +0100") References: <20220316203922.3081843-1-fontaine.fabrice@gmail.com> Message-ID: <87h77rkafc.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable sample and tests (which are built by default since version 2.1: > https://github.com/miniupnp/miniupnp/commit/530b2723500c4a708546815f5593b5c819ab5f76) > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:56:30 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:56:30 +0100 Subject: [Buildroot] [PATCH] package/pango: bump to version 1.50.5 In-Reply-To: <20220310114211.920001-1-francois.perrad@gadz.org> (Francois Perrad's message of "Thu, 10 Mar 2022 12:42:11 +0100") References: <20220310114211.920001-1-francois.perrad@gadz.org> Message-ID: <87czifkac1.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 07:55:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 08:55:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pango: bump to version 1.50.5 Message-ID: <20220321074948.C588E847A3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fb15224712d881c952e6d485c706acb5c00f93b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75) Signed-off-by: Peter Korsgaard --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c9..319d9778c1 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.5.sha256sum +sha256 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5 pango-1.50.5.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228f..69ec5bb490 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).5 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From bruno.seifert at 3brain.com Mon Mar 21 11:47:26 2022 From: bruno.seifert at 3brain.com (Bruno Seifert) Date: Mon, 21 Mar 2022 12:47:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: update site link In-Reply-To: References: <20220317095027.8939-1-bruno.seifert@3brain.com> Message-ID: Hi, This can absolutely wait for the next expat bump. I simply had to write this fix as I'm still on buildroot 2019.11 and the corresponding expat version isn't available on sourceforge anymore, only the new github location. I just guessed you guys weren't aware of the upcoming change yet. And since I had to figure out the solution anyway, I might as well tell you about it. Best regards, Bruno Fabrice Fontaine Thu, Mar 17, 11:17 AM (4 days ago) to me, Buildroot On Thu, Mar 17, 2022 at 11:17 AM Fabrice Fontaine < fontaine.fabrice at gmail.com> wrote: > Hello, > > Le jeu. 17 mars 2022 ? 10:51, bruno seifert a > ?crit : > > > > expat is currently in the process of changing the file hosting site from > > sourceforge to github. This adjusts the site URL to the new github > > location. Old versions are already not available on sourceforge anymore. > > > > Signed-off-by: bruno seifert > > --- > > Backport to: all versions > > I think the hashes don't need to be changed, but someone who actually > > knows stuff should confirm that. > > Indeed, the hash is the same. > > > Feel free to adjust the name and syntax. I've just started working a > month a go and really don't know what I'm doing. > > > > Signed-off-by: bruno seifert > > --- > > package/expat/expat.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/expat/expat.mk b/package/expat/expat.mk > > index b29b0e1d26..3dba920083 100644 > > --- a/package/expat/expat.mk > > +++ b/package/expat/expat.mk > > @@ -5,7 +5,8 @@ > > > ################################################################################ > > > > EXPAT_VERSION = 2.4.7 > > -EXPAT_SITE = > http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) > > +EXPAT_VERSION_TO_URL = $(subst .,_,$(EXPAT_VERSION)) > > +EXPAT_SITE = > https://github.com/libexpat/libexpat/releases/download/R_$(EXPAT_VERSION_TO_URL) > > A single liner would be better: > EXPAT_SITE = > https://github.com/libexpat/libexpat/releases/download/R_$(subst > .,_,$(EXPAT_VERSION)) > > > However, I don't understand why we have to update the URL now? > Can't we wait for the next expat bump? > > > EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz > > EXPAT_INSTALL_STAGING = YES > > EXPAT_DEPENDENCIES = host-pkgconf > > -- > > 2.25.1 > > > > > > -- > > > > 3Brain AG > > Einsiedlerstrasse 30 > > 8820 W?denswil > > Switzerland > > +41 81 322 70 86 > > > > www.3brain.com > > > > > > > > > > > > > > > > > > > > > > > > > > > Best Regards, > > Fabrice > -- 3Brain AG Einsiedlerstrasse 30 8820 W?denswil Switzerland +41 81 322 70 86 www.3brain.com ???? ???? ???? -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Mon Mar 21 12:21:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:21:40 +0100 Subject: [Buildroot] [PATCH v2 2/5] package/wget: use explicit --with/without-libuuid option In-Reply-To: <20220318202044.10413-2-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 21:20:41 +0100") References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-2-ps.report@gmx.net> Message-ID: <878rt3jy23.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - use explicit --with/without-libuuid option > Signed-off-by: Peter Seiderer Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:21:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:21:53 +0100 Subject: [Buildroot] [PATCH v2 3/5] package/wget: add optional libpsl dependency In-Reply-To: <20220318202044.10413-3-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 21:20:42 +0100") References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-3-ps.report@gmx.net> Message-ID: <874k3rjy1q.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add optional libpsl dependency > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:22:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:22:06 +0100 Subject: [Buildroot] [PATCH v2 4/5] package/wget: add optional c-ares dependency In-Reply-To: <20220318202044.10413-4-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 21:20:43 +0100") References: <20220318202044.10413-1-ps.report@gmx.net> <20220318202044.10413-4-ps.report@gmx.net> Message-ID: <87zgljijgx.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add optional c-ares dependency > Signed-off-by: Peter Seiderer > --- > Changes v1 -> v2: > - split out from original patch Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:20:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:20:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: use explicit --with/without-libuuid option Message-ID: <20220321121344.297FD847B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=967bd6de557dfa2bf585f880493dc5b210b7f351 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This has been like tht for ages (probably an implicit dependency check in older versions), but now wget has explicit flags, so let's use them. Signed-off-by: Peter Seiderer [yann.morin.1998 at free.fr: expand commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit b0fc0a811ba198288a3aef8413466d9a61d1dfd4) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa39917..58e04e3040 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -34,7 +34,10 @@ WGET_CONF_OPTS += --without-libidn endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) From peter at korsgaard.com Mon Mar 21 12:20:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:20:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: add optional libpsl dependency Message-ID: <20220321121344.37EDC847B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=677c47b83332134da179d548559099e63139e905 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 0554aa59d7a27193f5b39f96ae0dbe6987723c1d) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 58e04e3040..795c2a2ccd 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,6 +12,13 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls From peter at korsgaard.com Mon Mar 21 12:20:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:20:41 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: add optional c-ares dependency Message-ID: <20220321121344.45E33847B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58c0ead1723686a911d4718ebbe0d983ccd69173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 0f2eb453321d227a9965a459c33a8fcbca4b2b4f) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 795c2a2ccd..8a73c33699 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -54,6 +54,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 From peter at korsgaard.com Mon Mar 21 13:09:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:09:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/wavpack: fix CVE-2021-44269 In-Reply-To: <20220318194058.760799-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Mar 2022 20:40:58 +0100") References: <20220318194058.760799-1-fontaine.fabrice@gmail.com> Message-ID: <87v8w7iha3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV > files. This issue triggered in function WavpackPackSamples of file > src/pack_utils.c, tainted variable cnt is too large, that makes pointer > sptr read beyond heap bound. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 12:59:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:59:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/wavpack: fix CVE-2021-44269 Message-ID: <20220321130035.9C28B847BB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79f90ac0d352001d36053e7ac3e8a1936a9daab9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26) Signed-off-by: Peter Korsgaard --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From peter at korsgaard.com Mon Mar 21 12:59:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:59:14 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wavpack: fix CVE-2021-44269 Message-ID: <20220321130111.C76C7847EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=404d4bcc66374c08425f810db3c41add65b2ac87 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26) Signed-off-by: Peter Korsgaard --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From peter at korsgaard.com Mon Mar 21 12:58:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 13:58:55 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wavpack: fix CVE-2021-44269 Message-ID: <20220321130124.F3E6B84849@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d24d77e3e16fa26b5e729a3bb4c86650d1799de6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x An out of bounds read was found in Wavpack 5.4.0 in processing *.WAV files. This issue triggered in function WavpackPackSamples of file src/pack_utils.c, tainted variable cnt is too large, that makes pointer sptr read beyond heap bound. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9bff8a0b0f68f070a5ae0e94cbffefb9b455b26) Signed-off-by: Peter Korsgaard --- ...nitize-DSD-file-types-for-invalid-lengths.patch | 42 ++++++++++++++++++++++ package/wavpack/wavpack.mk | 3 ++ 2 files changed, 45 insertions(+) diff --git a/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch new file mode 100644 index 0000000000..76c1e81674 --- /dev/null +++ b/package/wavpack/0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch @@ -0,0 +1,42 @@ +From 773f9d0803c6888ae7d5391878d7337f24216f4a Mon Sep 17 00:00:00 2001 +From: David Bryant +Date: Tue, 23 Nov 2021 13:14:35 -0800 +Subject: [PATCH] issue #110: sanitize DSD file types for invalid lengths + +[Retrieved from: +https://github.com/dbry/WavPack/commit/773f9d0803c6888ae7d5391878d7337f24216f4a] +Signed-off-by: Fabrice Fontaine +--- + cli/dsdiff.c | 6 ++++++ + cli/dsf.c | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/cli/dsdiff.c b/cli/dsdiff.c +index d7adb6a..5bdcae3 100644 +--- a/cli/dsdiff.c ++++ b/cli/dsdiff.c +@@ -278,6 +278,12 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa + } + + total_samples = dff_chunk_header.ckDataSize / config->num_channels; ++ ++ if (total_samples <= 0 || total_samples > MAX_WAVPACK_SAMPLES) { ++ error_line ("%s is not a valid .DFF file!", infilename); ++ return WAVPACK_SOFT_ERROR; ++ } ++ + break; + } + else { // just copy unknown chunks to output file +diff --git a/cli/dsf.c b/cli/dsf.c +index e1d7973..dddd488 100644 +--- a/cli/dsf.c ++++ b/cli/dsf.c +@@ -113,6 +113,7 @@ int ParseDsfHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackC + + if (format_chunk.ckSize != sizeof (DSFFormatChunk) || format_chunk.formatVersion != 1 || + format_chunk.formatID != 0 || format_chunk.blockSize != DSF_BLOCKSIZE || format_chunk.reserved || ++ format_chunk.sampleCount <= 0 || format_chunk.sampleCount > MAX_WAVPACK_SAMPLES * 8 || + (format_chunk.bitsPerSample != 1 && format_chunk.bitsPerSample != 8) || + format_chunk.numChannels < 1 || format_chunk.numChannels > 6 || + format_chunk.chanType < 1 || format_chunk.chanType > NUM_CHAN_TYPES) { diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae..2e0438ac80 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -14,6 +14,9 @@ WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING WAVPACK_CPE_ID_VENDOR = wavpack +# 0001-issue-110-sanitize-DSD-file-types-for-invalid-lengths.patch +WAVPACK_IGNORE_CVES += CVE-2021-44269 + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From peter at korsgaard.com Mon Mar 21 13:10:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:10:25 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220321130152.6E66E848C0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=548921598db5fad0f517934c78048f0effcc1d35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 0e41f883b800846435cd13081fa86abbc4e330d7) Signed-off-by: Peter Korsgaard --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..1d7d6d0538 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From peter at korsgaard.com Mon Mar 21 13:10:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:10:53 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220321130203.6BF1D848D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11374e363a42a8efb0bb87e3bbd01cd6cbfc755b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 0e41f883b800846435cd13081fa86abbc4e330d7) Signed-off-by: Peter Korsgaard --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618..1d7d6d0538 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From peter at korsgaard.com Mon Mar 21 13:11:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:11:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: add OPENBLAS_CPE_ID_VENDOR In-Reply-To: <20220317220121.21498-1-ju.o@free.fr> (Julien Olivain's message of "Thu, 17 Mar 2022 23:01:21 +0100") References: <20220317220121.21498-1-ju.o@free.fr> Message-ID: <87r16vih6y.fsf@dell.be.48ers.dk> >>>>> "Julien" == Julien Olivain writes: > cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas > Signed-off-by: Julien Olivain Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 13:11:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 14:11:20 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openblas: add OPENBLAS_CPE_ID_VENDOR Message-ID: <20220321130230.2758F848DE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a12e8ddad2fada4e26525b1a98901761e887275a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x cpe:2.3:a:openblas_project:openblas is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopenblas_project%3Aopenblas Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 0e41f883b800846435cd13081fa86abbc4e330d7) Signed-off-by: Peter Korsgaard --- package/openblas/openblas.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 2a9bd8b18c..330f7d42e0 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,6 +9,7 @@ OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) From vincent.stehle at laposte.net Mon Mar 21 14:53:22 2022 From: vincent.stehle at laposte.net (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Mon, 21 Mar 2022 15:53:22 +0100 Subject: [Buildroot] [PATCH] package/busybox: fix udhcpc options in minimal config Message-ID: <20220321145322.23881-1-vincent.stehle@laposte.net> The busybox-minimal.config, which is used by systems without an MMU, specifies the "-b" command line option for udhcpc. However, this option is not supported by BusyBox udhcpc anymore since version 1.27.0 when building for systems without an MMU. Remove the "-b" option from busybox-minimal.config to repair network initialization on systems without an MMU. This fixes the following network initialization failure: udhcpc: invalid option -- b FAIL Signed-off-by: Vincent Stehl? --- Hi, I have verified on qemu that this patch does fix the network initialization for qemu_arm_versatile_nommu_defconfig and qemu_m68k_mcf5208_defconfig. I could only verify the build for stm32f429_disco_xip_defconfig, stm32f469_disco_sd_defconfig and stm32f469_disco_xip_defconfig. Best regards, Vincent. package/busybox/busybox-minimal.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4..1fb4e39e21 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities -- 2.34.1 From peter at korsgaard.com Mon Mar 21 16:16:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:16:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/wireplumber: fix introspection build Message-ID: <20220321160938.4083C84924@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60a54bc0e88dc534c830996db3642cfd1dd1979f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Doxygen is required to build just the bare minimal (not the full documentation) since https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374 Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3e1de2ef067575ee33b55cfe02ffed09f7e3fe6b) Signed-off-by: Peter Korsgaard --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..37a8de5364 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled From peter at korsgaard.com Mon Mar 21 16:18:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:18:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix introspection build In-Reply-To: <20220318193310.752282-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 18 Mar 2022 20:33:10 +0100") References: <20220318193310.752282-1-fontaine.fabrice@gmail.com> Message-ID: <87ils7i8j0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > introspection needs host-doxygen and host-python-lxml since the addition > of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 > ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml > Fixes: > - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x and 2021.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:15:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:15:58 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/wireplumber: fix introspection build Message-ID: <20220321160948.B12688492A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14a8b811e57bbc6b04cfd13b0ceef214d1414048 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x introspection needs host-doxygen and host-python-lxml since the addition of the package in commit c9a3c10417aadce9ee4922e30235776409ce8eb3 and https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/2e5b13f970fe3dd28a4ce75868d46403034c6822 ../output-1/build/wireplumber-0.4.8/docs/meson.build:14:0: ERROR: python3 is missing modules: lxml Doxygen is required to build just the bare minimal (not the full documentation) since https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/93c2e7d686ba678991185e711533ce29826b5374 Fixes: - http://autobuild.buildroot.org/results/24c524d86a3e2e67305f698644be9b15d4562488 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3e1de2ef067575ee33b55cfe02ffed09f7e3fe6b) Signed-off-by: Peter Korsgaard --- package/wireplumber/wireplumber.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea..37a8de5364 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -17,7 +17,7 @@ WIREPLUMBER_CONF_OPTS = \ -Dsystem-lua-version= ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled From peter at korsgaard.com Mon Mar 21 16:20:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:20:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/rtl_433: fix CVE-2022-25051 In-Reply-To: <20220317214203.258736-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Mar 2022 22:42:03 +0100") References: <20220317214203.258736-1-fontaine.fabrice@gmail.com> Message-ID: <87ee2vi8g0.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when > decoding a crafted file. > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:22:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:22:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/minidlna: fix CVE-2022-26505 In-Reply-To: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:41:18 +0100") References: <20220313114118.1127008-1-fontaine.fabrice@gmail.com> Message-ID: <87a6dji8cm.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 > allows a remote web server to exfiltrate media files. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:21:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:21:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/minidlna: fix CVE-2022-26505 Message-ID: <20220321161327.BD48684987@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bbaac16fcae7bd4030f640e7cbfa2d8ffc001423 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c7520b7ea1d4276fa762fa3be971155fcf2b2d01) Signed-off-by: Peter Korsgaard --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 86a2bb368d..b302423cae 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -11,6 +11,9 @@ MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From peter at korsgaard.com Mon Mar 21 16:20:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:20:56 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/minidlna: fix CVE-2022-26505 Message-ID: <20220321161333.D5DBE8498E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a13ada770aab7132f994cb0ab8791df9e7fa90ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c7520b7ea1d4276fa762fa3be971155fcf2b2d01) Signed-off-by: Peter Korsgaard --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From peter at korsgaard.com Mon Mar 21 16:19:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:19:00 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rtl_433: fix CVE-2022-25051 Message-ID: <20220321161338.2AADD84996@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60cf8eb4314dba952d183eb83246bebfa1f486bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x An Off-by-one Error occurs in cmr113_decode of rtl_433 21.12 when decoding a crafted file. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0368e0abd00529bd6af0f22c2b52abc3f53a5779) Signed-off-by: Peter Korsgaard --- ...overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ++++++++++++++++++++++ package/rtl_433/rtl_433.mk | 3 ++ 2 files changed, 61 insertions(+) diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch new file mode 100644 index 0000000000..e2088b29e7 --- /dev/null +++ b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch @@ -0,0 +1,58 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] +Signed-off-by: Fabrice Fontaine +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index a5139ddae6..d1c28adbf5 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -17,6 +17,9 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF +# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +RTL_433_IGNORE_CVES += CVE-2022-25051 + ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON From peter at korsgaard.com Mon Mar 21 16:20:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:20:48 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/minidlna: fix CVE-2022-26505 Message-ID: <20220321161338.344A9849A7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6654e556c441eee5dc1ce759efc27613d9501f9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x A DNS rebinding issue in ReadyMedia (formerly MiniDLNA) before 1.3.1 allows a remote web server to exfiltrate media files. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c7520b7ea1d4276fa762fa3be971155fcf2b2d01) Signed-off-by: Peter Korsgaard --- ...ttp-Protect-against-DNS-rebinding-attacks.patch | 66 ++++++++++++++++++++++ package/minidlna/minidlna.mk | 3 + 2 files changed, 69 insertions(+) diff --git a/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch new file mode 100644 index 0000000000..6d601f53b9 --- /dev/null +++ b/package/minidlna/0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch @@ -0,0 +1,66 @@ +From c21208508dbc131712281ec5340687e5ae89e940 Mon Sep 17 00:00:00 2001 +From: Justin Maggard +Date: Wed, 9 Feb 2022 18:32:50 -0800 +Subject: [PATCH] upnphttp: Protect against DNS rebinding attacks + +Validate HTTP requests to protect against DNS rebinding. + +[Retrieved from: +https://sourceforge.net/p/minidlna/git/ci/c21208508dbc131712281ec5340687e5ae89e940/] +Signed-off-by: Fabrice Fontaine +--- + upnphttp.c | 17 +++++++++++++++++ + upnphttp.h | 2 ++ + 2 files changed, 19 insertions(+) + +diff --git a/upnphttp.c b/upnphttp.c +index c8b5e99..62db89a 100644 +--- a/upnphttp.c ++++ b/upnphttp.c +@@ -273,6 +273,11 @@ ParseHttpHeaders(struct upnphttp * h) + p = colon + 1; + while(isspace(*p)) + p++; ++ n = 0; ++ while(p[n] >= ' ') ++ n++; ++ h->req_Host = p; ++ h->req_HostLen = n; + for(n = 0; n < n_lan_addr; n++) + { + for(i = 0; lan_addr[n].str[i]; i++) +@@ -909,6 +914,18 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) + } + + DPRINTF(E_DEBUG, L_HTTP, "HTTP REQUEST: %.*s\n", h->req_buflen, h->req_buf); ++ if(h->req_Host && h->req_HostLen > 0) { ++ const char *ptr = h->req_Host; ++ DPRINTF(E_MAXDEBUG, L_HTTP, "Host: %.*s\n", h->req_HostLen, h->req_Host); ++ for(i = 0; i < h->req_HostLen; i++) { ++ if(*ptr != ':' && *ptr != '.' && (*ptr > '9' || *ptr < '0')) { ++ DPRINTF(E_ERROR, L_HTTP, "DNS rebinding attack suspected (Host: %.*s)", h->req_HostLen, h->req_Host); ++ Send404(h);/* 403 */ ++ return; ++ } ++ ptr++; ++ } ++ } + if(strcmp("POST", HttpCommand) == 0) + { + h->req_command = EPost; +diff --git a/upnphttp.h b/upnphttp.h +index e28a943..57eb2bb 100644 +--- a/upnphttp.h ++++ b/upnphttp.h +@@ -89,6 +89,8 @@ struct upnphttp { + struct client_cache_s * req_client; + const char * req_soapAction; + int req_soapActionLen; ++ const char * req_Host; /* Host: header */ ++ int req_HostLen; + const char * req_Callback; /* For SUBSCRIBE */ + int req_CallbackLen; + const char * req_NT; +-- +2.34.1 + diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f..01ee8d0028 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -12,6 +12,9 @@ MINIDLNA_CPE_ID_VENDOR = readymedia_project MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_SELINUX_MODULES = minidlna +# 0001-upnphttp-Protect-against-DNS-rebinding-attacks.patch +MINIDLNA_IGNORE_CVES += CVE-2022-26505 + MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ From peter at korsgaard.com Mon Mar 21 16:25:20 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:25:20 +0100 Subject: [Buildroot] [git commit] package/pkg-generic: host variant inherits target download settings In-Reply-To: <20220318223159.059C983944@busybox.osuosl.org> (Yann E. MORIN's message of "Fri, 18 Mar 2022 23:21:44 +0100") References: <20220318223159.059C983944@busybox.osuosl.org> Message-ID: <875yo7i87j.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=efa7712b092950c92f994e2ee30c120a64e5451b > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > It seems reasonable to expect that the download of the host and target > variants should usually be exactly the same and thus reuse the target > package values for the host package. This commits add support to > inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and > _DOwNLOAD_POST_PROCESS variables from target ones. These variables can > still be overriden if necessary for the host package. > Signed-off-by: Yann E. MORIN > Signed-off-by: Cl?ment L?ger > Signed-off-by: Yann E. MORIN Committed to 2022.02.x to make future backports easier, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:34:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:34:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/openvpn: security bump version to 2.5.6 In-Reply-To: <20220320115956.3242683-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 12:59:56 +0100") References: <20220320115956.3242683-1-bernd.kuhls@t-online.de> Message-ID: <871qyvi7t0.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Switched _SITE to https and _SOURCE to .gz because upstream does not > provide a .xz tarball anymore. > Fixes CVE 2022-0547, changelog: > https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst > Signed-off-by: Bernd Kuhls Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:33:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: bump version to 2.5.3 Message-ID: <20220321162529.9ADFF84A58@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=178b77073e1eceb0542f7b1e76cf488dea170582 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release note: https://forums.openvpn.net/viewtopic.php?f=20&t=32497 CVE-2021-3606 fixed by this release is only relevant for Windows. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit e9f13a76eec48ac67af33d8d3ef6d068ff40e7ff) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 36f90ff111..1d365eeab4 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8 openvpn-2.5.2.tar.xz +sha256 fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e openvpn-2.5.3.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 9b3802fd80..c07f8b4ff5 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.2 +OPENVPN_VERSION = 2.5.3 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:33:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:21 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: bump version to 2.5.4 Message-ID: <20220321162529.A463884A59@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e453e1e4161d8db61dbc3a480ad0f4f07f566be9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 13e2912403361b6ff02a460ef8017a9927365a44) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 1d365eeab4..58751da277 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e openvpn-2.5.3.tar.xz +sha256 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436 openvpn-2.5.4.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index c07f8b4ff5..c0086b5b17 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.3 +OPENVPN_VERSION = 2.5.4 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:33:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:33 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: bump version to 2.5.5 Message-ID: <20220321162529.ADB7484A5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a26d685ee22f7d9b5ac4309b541e102ed0187ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 54ee9363f62de602690c193e2139e0dca5c46303) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 58751da277..f8e0493b54 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436 openvpn-2.5.4.tar.xz +sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index c0086b5b17..209de797b0 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.4 +OPENVPN_VERSION = 2.5.5 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:33:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:33:40 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/openvpn: security bump version to 2.5.6 Message-ID: <20220321162529.B9EBF84A58@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b414e0fd9d161d605dec4508f891ad356997694 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f9c448a016f07951a41e5c0938e3dbd8630a704b) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 209de797b0..6dd88e8e91 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From peter at korsgaard.com Mon Mar 21 16:32:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:32:46 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openvpn: bump version to 2.5.5 Message-ID: <20220321162534.C8B8D84A78@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a72aa869977513924a48463b0dac5976075b1cf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 54ee9363f62de602690c193e2139e0dca5c46303) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 58751da277..f8e0493b54 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436 openvpn-2.5.4.tar.xz +sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 678b024551..d6bcad62ba 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.4 +OPENVPN_VERSION = 2.5.5 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Mon Mar 21 16:32:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:32:50 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/openvpn: security bump version to 2.5.6 Message-ID: <20220321162534.D217D84A7C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e82b555a3d7ec4b5530966b2e231218683783f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f9c448a016f07951a41e5c0938e3dbd8630a704b) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From peter at korsgaard.com Mon Mar 21 16:23:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:23:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-generic: host variant inherits target download settings Message-ID: <20220321162539.6A05C84AB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d804e2ce8e57bb46f0a1bc1858e09c0c7bd4cbdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x It seems reasonable to expect that the download of the host and target variants should usually be exactly the same and thus reuse the target package values for the host package. This commits add support to inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and _DOwNLOAD_POST_PROCESS variables from target ones. These variables can still be overriden if necessary for the host package. Signed-off-by: Yann E. MORIN Signed-off-by: Cl??ment L??ger Signed-off-by: Yann E. MORIN (cherry picked from commit efa7712b092950c92f994e2ee30c120a64e5451b) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e..79fcf603d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) From peter at korsgaard.com Mon Mar 21 16:32:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:32:34 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/openvpn: security bump version to 2.5.6 Message-ID: <20220321162539.7446684AB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afbdc9e32cc62a20bbb26d49b88e852c3011a35e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Switched _SITE to https and _SOURCE to .gz because upstream does not provide a .xz tarball anymore. Fixes CVE 2022-0547, changelog: https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f9c448a016f07951a41e5c0938e3dbd8630a704b) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b54..bd598a5186 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d openvpn-2.5.6.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba..db2f53a5f3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.6 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL From peter at korsgaard.com Mon Mar 21 16:36:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:36:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: bump version to 14.2 In-Reply-To: <20220320120428.3294529-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 13:04:28 +0100") References: <20220320120428.3294529-1-bernd.kuhls@t-online.de> Message-ID: <87wngngt4x.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.postgresql.org/docs/release/14.2/ > Updated license hash due to copyright year bump: > https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e > Signed-off-by: Bernd Kuhls Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:37:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:37:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.15.6 In-Reply-To: <20220320121708.3679262-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 13:17:08 +0100") References: <20220320121708.3679262-1-bernd.kuhls@t-online.de> Message-ID: <87sfrbgt2f.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.15.6.html > Added new answer to samba4-cache.txt needed due to upstream commit: > https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc > Signed-off-by: Bernd Kuhls Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:38:27 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:38:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.0.17 In-Reply-To: <20220320122800.430173-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Sun, 20 Mar 2022 13:28:00 +0100") References: <20220320122800.430173-1-bernd.kuhls@t-online.de> Message-ID: <87o81zgt18.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 > Signed-off-by: Bernd Kuhls Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:54:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:54:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: security bump to version 2.5.2 In-Reply-To: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 17:39:30 +0100") References: <20220320163930.1566656-1-fontaine.fabrice@gmail.com> Message-ID: <87k0cngsa7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may > allow privilege escalation during extension installation. The > installation process uses commands such as CREATE x IF NOT EXIST that > allow an unprivileged user to precreate objects. These objects will be > used by the installer (which executes as Superuser), leading to > privilege escalation. In order to be able to take advantage of this, an > unprivileged user would need to be able to create objects in a database > and then get a Superuser to install TimescaleDB into their database. (In > the fixed versions, the installation aborts when it finds that an object > already exists.) > "This release contains bug fixes since the 2.5.1 release. > This release is high priority for upgrade. We strongly recommend that > you upgrade as soon as possible." > https://github.com/timescale/timescaledb/releases/tag/2.5.2 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:44:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:44:41 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.1.1 Message-ID: <20220321164603.D5DEF849D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bba91f5b6eb3b7a9bed1445bbea43ae0c9f556a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.1.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 990b14768cd36663245b8a583aab0d8d6adac636) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index f84bd04cc0..98f966ee3d 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6de2af2ecfd7bff9b3634b6c5c29b209b25e147858d460469e8eb88e6d198692 timescaledb-2.1.0.tar.gz +sha256 e928c939803706d0d5b11d6751d4f0d0514e540ceffc74a46a9732f9a111d313 timescaledb-2.1.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 783017636b..d2a48a0f63 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.1.0 +TIMESCALEDB_VERSION = 2.1.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:44:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:44:47 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.3.0 Message-ID: <20220321164603.E3C3784BB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3b7654bcd800d2365815bd60390bad3b1aee830 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 2c61b1acfce416a0318a61ededa82a257f87e21f) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 98f966ee3d..e97045f7d5 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e928c939803706d0d5b11d6751d4f0d0514e540ceffc74a46a9732f9a111d313 timescaledb-2.1.1.tar.gz +sha256 730e61e48f471c1d643494421d21e43766128cbcb62a5c4b138c171379195cf2 timescaledb-2.3.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index d2a48a0f63..27e9142b0c 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.1.1 +TIMESCALEDB_VERSION = 2.3.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:45:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:31 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.4.0 Message-ID: <20220321164603.F046D849D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64f550116bdee300a68569361e6b2c89b8bc44fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.4.0 Starting from 2.4.0 timescaledb runs TAP tests by default so disable it by -DTAP_CHECKS=OFF. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 0610d838d82a46141d762a498b09762e8f423c68) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index e97045f7d5..4b6d6f77a8 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 730e61e48f471c1d643494421d21e43766128cbcb62a5c4b138c171379195cf2 timescaledb-2.3.0.tar.gz +sha256 1adbff3ae7f8f39d1b5ac2189d60b9bd0a8154c0c3603e53b030a204f72d86af timescaledb-2.4.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 27e9142b0c..900bac5a7e 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.3.0 +TIMESCALEDB_VERSION = 2.4.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE @@ -16,6 +16,7 @@ TIMESCALEDB_DEPENDENCIES = postgresql # pg_config replacement doesn't implement --cppflags --cflags # --ldflags and --libs. TIMESCALEDB_CONF_OPTS = \ + -DTAP_CHECKS=OFF \ -DREGRESS_CHECKS=OFF \ -DWARNINGS_AS_ERRORS=OFF \ -DPG_PKGLIBDIR=lib/postgresql \ From peter at korsgaard.com Mon Mar 21 16:45:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:43 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.4.2 Message-ID: <20220321164604.0709684AF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=affff7566faaf78ebee8ee7352a4ca301fb8d79d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.4.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d799b658c94d1567d0f86e61c7be6da62b4c011d) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4b6d6f77a8..4e3e91e152 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1adbff3ae7f8f39d1b5ac2189d60b9bd0a8154c0c3603e53b030a204f72d86af timescaledb-2.4.0.tar.gz +sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 900bac5a7e..4adf2bdbb3 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.0 +TIMESCALEDB_VERSION = 2.4.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:43:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:43:33 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.1.0 Message-ID: <20220321164603.CAA1784AE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=543187098e61189d34444e53aefbad4c80efc227 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Remove all PG13 upstream patches. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.1.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit db547e8b79a73d6766bec7523182ade58d79ad3e) Signed-off-by: Peter Korsgaard --- .../0001-Allow-building-against-PG13-source.patch | 85 ---- ...bilty-wrapper-functions-for-base64-encodi.patch | 73 ---- .../0003-Add-missing-utils-acl.h-includes.patch | 149 ------- ...-Add-support-for-PG13-List-implementation.patch | 473 --------------------- ...005-Adjust-code-to-PG13-list-sort-changes.patch | 59 --- ...t-copy-code-to-PG13-addRTEtoQuery-changes.patch | 37 -- ...-to-PG13-convert_tuples_by_name-signature.patch | 65 --- ...ust-code-to-PG13-tuple-conversion-changes.patch | 259 ----------- ...just-hypertable-expansion-to-PG13-changes.patch | 88 ---- ...just-decompress-code-to-Var-field-renames.patch | 41 -- .../0011-Adjust-jsonb_utils-to-PG13-changes.patch | 39 -- ...ndle-AT_DropExpression-in-process_utility.patch | 48 --- .../0013-Adjust-copy-code-to-PG13-changes.patch | 34 -- ...de-to-PG13-command-completion-tag-changes.patch | 186 -------- ...-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch | 51 --- ...ner-code-to-PG13-planner_hook-signature-c.patch | 58 --- ...17-Adjust-code-to-deparse_context-changes.patch | 34 -- package/timescaledb/0018-Update-compat.h.patch | 27 -- ...19-Adjust-code-to-PG13-tuptoaster-changes.patch | 70 --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 21 files changed, 2 insertions(+), 1878 deletions(-) Patch is too large, so refusing to show it From peter at korsgaard.com Mon Mar 21 16:45:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.5.0 Message-ID: <20220321164604.1160884AE9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=23694bac90106340d4669e0ffb2516847c1491bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x This version adds support for PostgreSQL 14. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f250847551b4f1314ea69e026125c225605fd840) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4e3e91e152..88390bc674 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz +sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 4adf2bdbb3..39ba9e6ef4 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.2 +TIMESCALEDB_VERSION = 2.5.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:45:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:45:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: bump version to 2.5.1 Message-ID: <20220321164604.1CA8384AF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7625b75fe69231a016ff28af021ceec143d211e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 8efb7beaa8bf536443e8de98773c6642c73cabef) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 88390bc674..5690ce65b3 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz +sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 39ba9e6ef4..b1e4342fe9 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.0 +TIMESCALEDB_VERSION = 2.5.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:46:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:46:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220321164604.25B8D84BB5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82a4ae0e9b74c539bf43c3acd79f465ac8742706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:41:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:41:03 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/timescaledb: bump version to 2.5.1 Message-ID: <20220321164609.22D1D84A65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3d550b6f78b4fb3d5060818392c23124db43dd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 8efb7beaa8bf536443e8de98773c6642c73cabef) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 88390bc674..5690ce65b3 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz +sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 39ba9e6ef4..b1e4342fe9 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.0 +TIMESCALEDB_VERSION = 2.5.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:40:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:40:58 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/timescaledb: bump version to 2.5.0 Message-ID: <20220321164609.1A91C84BBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5616b4ce5e3b36949cf7e72056598bee2e97493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x This version adds support for PostgreSQL 14. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f250847551b4f1314ea69e026125c225605fd840) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4e3e91e152..88390bc674 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz +sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 4adf2bdbb3..39ba9e6ef4 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.2 +TIMESCALEDB_VERSION = 2.5.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:41:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:41:11 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220321164609.2B15184BC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71c72f6b49440a979cd7c9b827575d984301b539 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:36:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:36:54 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/samba4: bump version to 4.15.6 Message-ID: <20220321164613.2D65384BCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5410fa69c67768718fc00d441e260349e80caa0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://www.samba.org/samba/history/samba-4.15.6.html Added new answer to samba4-cache.txt needed due to upstream commit: https://gitlab.com/samba-team/samba/-/commit/f7e31127e7f8beb12294c5187cca9e191589ddcc Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3eea7df286004430844bc9bd1d9b6c449b877d96) Signed-off-by: Peter Korsgaard --- package/samba4/samba4-cache.txt | 1 + package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e..d95776a03e 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37..20e5f00b21 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.6.tar.asc +sha256 0575b999a9048445820428dc540ba8a9527ce596fa66af02ea2ba1ea9578bcb4 samba-4.15.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742..688aaac3eb 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.15.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 16:34:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:34:52 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/postgresql: bump version to 14.2 Message-ID: <20220321164613.2417A84BCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=943299ecf5671958f62d67914084d911cb5a128f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Release notes: https://www.postgresql.org/docs/release/14.2/ Updated license hash due to copyright year bump: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=61c8da50cb39ab41c3a7a0122d6943f72bb0798e Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e8c436902bfac25074677858853f23d40bca8c0) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c2017a1226..2ba3b07563 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.2/postgresql-14.2.tar.bz2.sha256 +sha256 2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a postgresql-14.2.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c..c389246f80 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 14.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From peter at korsgaard.com Mon Mar 21 16:38:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:38:11 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/php: bump version to 8.0.17 Message-ID: <20220321164613.362A784BCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d31474b95c823757b231950369b29121eb272fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changelog: https://www.php.net/ChangeLog-8.php#8.0.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ff867be0302b0abbb629a751eabf45c7a7b218fd) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb..3d73e60f90 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5 php-8.0.17.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94..6454d6fe87 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.0.17 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Mon Mar 21 16:39:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:39:36 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/timescaledb: security bump to version 2.5.2 Message-ID: <20220321164613.3F25684BCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a1adaa78b4df8c3cfce3e525192dc01293e1481 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-24128: Timescale TimescaleDB 1.x and 2.x before 2.5.2 may allow privilege escalation during extension installation. The installation process uses commands such as CREATE x IF NOT EXIST that allow an unprivileged user to precreate objects. These objects will be used by the installer (which executes as Superuser), leading to privilege escalation. In order to be able to take advantage of this, an unprivileged user would need to be able to create objects in a database and then get a Superuser to install TimescaleDB into their database. (In the fixed versions, the installation aborts when it finds that an object already exists.) "This release contains bug fixes since the 2.5.1 release. This release is high priority for upgrade. We strongly recommend that you upgrade as soon as possible." https://github.com/timescale/timescaledb/releases/tag/2.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3398e8e6d4ecb3e06be6e41daf0a7a6542dc5116) Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b3..556cdaf329 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c timescaledb-2.5.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe9..1d8b2a69a7 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.5.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Mar 21 16:57:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:57:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/raptor: fix CVE-2020-25713 In-Reply-To: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 18:23:26 +0100") References: <20220320172326.1592463-1-fontaine.fabrice@gmail.com> Message-ID: <87fsnbgs5e.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > A malformed input file can lead to a segfault due to an out of bounds > array access in raptor_xml_writer_start_element_common. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 21 16:57:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:57:13 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/raptor: fix CVE-2020-25713 Message-ID: <20220321164846.130DA84BCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11bd7ac38e1fbbb6bd3d3216bed1135c84a5ff90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fca33462b8ed4ed7c54d5d0640ddb64723b3dae) Signed-off-by: Peter Korsgaard --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From peter at korsgaard.com Mon Mar 21 16:57:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:57:05 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/raptor: fix CVE-2020-25713 Message-ID: <20220321164851.67FBC84BD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a8e6b4b546f895651f1c48ed3f91ea3810d60de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fca33462b8ed4ed7c54d5d0640ddb64723b3dae) Signed-off-by: Peter Korsgaard --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From peter at korsgaard.com Mon Mar 21 16:56:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 21 Mar 2022 17:56:56 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/raptor: fix CVE-2020-25713 Message-ID: <20220321164857.4B29484BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91510a411b0124b278ebe1dc1d650a5f795f9bfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x A malformed input file can lead to a segfault due to an out of bounds array access in raptor_xml_writer_start_element_common. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fca33462b8ed4ed7c54d5d0640ddb64723b3dae) Signed-off-by: Peter Korsgaard --- ...-compare-namespace-declarations-correctly.patch | 33 ++++++++++++++++++++++ package/raptor/raptor.mk | 3 ++ 2 files changed, 36 insertions(+) diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 0000000000..a48a583cb1 --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e..69ac121300 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config From ps.report at gmx.net Mon Mar 21 19:29:47 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Mon, 21 Mar 2022 20:29:47 +0100 Subject: [Buildroot] [PATCH v3] package/wget: bump version to 1.21.3 Message-ID: <20220321192947.20712-1-ps.report@gmx.net> - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split out from original patch - fix iri option enable dependency Changes v2 -> v3: - fix libiconv handling --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -- 2.35.1 From arnout at mind.be Mon Mar 21 20:56:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:56:34 +0100 Subject: [Buildroot] [git commit] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220321205120.E404F84C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d6e5a8501ff509760dca5c1477281d3f3430ddf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From arnout at mind.be Mon Mar 21 20:57:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:57:26 +0100 Subject: [Buildroot] [git commit] package/libodb-boost: add host variant Message-ID: <20220321205121.0051D84CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2f1f28efd4236431b333fabe6c75aceba9678bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Mon Mar 21 20:58:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:58:53 +0100 Subject: [Buildroot] [git commit] package/odb: add dependency on host-libodb Message-ID: <20220321205121.09C2484C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88471fe4fdc3d25d81b5b6898415a0550d06b90b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From arnout at mind.be Mon Mar 21 20:56:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 21:56:40 +0100 Subject: [Buildroot] [git commit] package/libodb: add host variant Message-ID: <20220321205120.EB54D84C9F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b9c81cc4eefd0972b91abced472e2bce8b53fa2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From arnout at mind.be Mon Mar 21 21:01:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:01:40 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <20220310095602.2435745-4-kamel.bouhara@bootlin.com> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-4-kamel.bouhara@bootlin.com> Message-ID: <990140a5-a769-2f7b-5786-c08557db4b6b@mind.be> On 10/03/2022 10:56, Kamel Bouhara via buildroot wrote: > Add host variant of libodb-boost required by the ODB compiler. > The libodb-boost headers are needed at compile time, and > therefore installed in $(HOST_DIR). > > Signed-off-by: Kamel Bouhara > --- > package/libodb-boost/libodb-boost.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > index bac5f1e78f..39c9f91030 100644 > --- a/package/libodb-boost/libodb-boost.mk > +++ b/package/libodb-boost/libodb-boost.mk > @@ -12,6 +12,8 @@ LIBODB_BOOST_INSTALL_STAGING = YES > LIBODB_BOOST_LICENSE = GPL-2.0 > LIBODB_BOOST_LICENSE_FILES = LICENSE > LIBODB_BOOST_DEPENDENCIES = boost libodb > +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb > LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" I have not double-checked (since I don't know for which GCC version exactly this -std=c++11 is needed), but I expect that if -std=c++11 is needed for target build, it's also going to be needed for host build. So I added HOST_LIBODB_BOOST_CONF_ENV. Series applied to master with that fixed, thanks. Regards, Arnout > > $(eval $(autotools-package)) > +$(eval $(host-autotools-package)) From arnout at mind.be Mon Mar 21 21:09:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:09:06 +0100 Subject: [Buildroot] [PATCH v2, 1/3] package/cmake: bump to version 3.18.6 In-Reply-To: <20220309220018.786891-1-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> Message-ID: <49aefc4a-d973-5ed0-0e8c-c74607de9ff2@mind.be> On 09/03/2022 23:00, Fabrice Fontaine wrote: > Update hash of Copyright.txt (year updated and Qt Company Ltd. added: > https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50 > https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716) > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. This may create some fallout, but the autobuilders will tell us. Regards, Arnout > --- > package/cmake/cmake.hash | 6 +++--- > package/cmake/cmake.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash > index 97e83a274c..da514a6d6b 100644 > --- a/package/cmake/cmake.hash > +++ b/package/cmake/cmake.hash > @@ -1,5 +1,5 @@ > -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt > -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz > +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt > +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz > > # Locally calculated > -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt > +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt > diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk > index b1b214982e..4177b119ab 100644 > --- a/package/cmake/cmake.mk > +++ b/package/cmake/cmake.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -CMAKE_VERSION_MAJOR = 3.16 > -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 > +CMAKE_VERSION_MAJOR = 3.18 > +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 > CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) > CMAKE_LICENSE = BSD-3-Clause > CMAKE_LICENSE_FILES = Copyright.txt From arnout at mind.be Mon Mar 21 21:09:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:09:15 +0100 Subject: [Buildroot] [PATCH v2, 2/3] support/dependencies: requires cmake >= 3.18 In-Reply-To: <20220309220018.786891-2-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> <20220309220018.786891-2-fontaine.fabrice@gmail.com> Message-ID: <36d042a3-4b87-bd04-8895-3496d1c0b91a@mind.be> On 09/03/2022 23:00, Fabrice Fontaine wrote: > gerbera requires cmake 3.18 since version 1.10.0 and > https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > support/dependencies/check-host-cmake.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk > index dfc252e919..5760e4ded1 100644 > --- a/support/dependencies/check-host-cmake.mk > +++ b/support/dependencies/check-host-cmake.mk > @@ -1,9 +1,9 @@ > -# Set this to either 3.16 or higher, depending on the highest minimum > +# Set this to either 3.18 or higher, depending on the highest minimum > # version required by any of the packages bundled in Buildroot. If a > # package is bumped or a new one added, and it requires a higher > # version, our cmake infra will catch it and build its own. > # > -BR2_CMAKE_VERSION_MIN = 3.16 > +BR2_CMAKE_VERSION_MIN = 3.18 > > BR2_CMAKE_CANDIDATES ?= cmake cmake3 > BR2_CMAKE ?= $(call suitable-host-package,cmake,\ From arnout at mind.be Mon Mar 21 21:09:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:09:52 +0100 Subject: [Buildroot] [PATCH v2, 3/3] package/gerbera: bump to version 1.10.0 In-Reply-To: <20220309220018.786891-3-fontaine.fabrice@gmail.com> References: <20220309220018.786891-1-fontaine.fabrice@gmail.com> <20220309220018.786891-3-fontaine.fabrice@gmail.com> Message-ID: <3223aa54-91c0-c5f6-fda6-b4c6c781d426@mind.be> On 09/03/2022 23:00, Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/gerbera/gerbera/releases/tag/v1.10.0 > > Signed-off-by: Fabrice Fontaine I applied [1] instead, which also updates the config.xml file. Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20220320185144.10894-1-joerg.krause at embedded.rocks/ > --- > Changes v1 -> v2: > - Add cmake patches to the serie > > package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------------- > package/gerbera/gerbera.hash | 2 +- > package/gerbera/gerbera.mk | 2 +- > 3 files changed, 2 insertions(+), 46 deletions(-) > delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch > > diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch > deleted file mode 100644 > index c4419209a5..0000000000 > --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 > -From: kyak > -Date: Wed, 12 Jan 2022 19:41:37 +0300 > -Subject: [PATCH] Fix for fmt > 8.0 > - > -[Retrieved from: > -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] > -Signed-off-by: Fabrice Fontaine > ---- > - src/util/logger.h | 15 +++++++++++++++ > - 1 file changed, 15 insertions(+) > - > -diff --git a/src/util/logger.h b/src/util/logger.h > -index 58696e52f..ba64afa79 100644 > ---- a/src/util/logger.h > -+++ b/src/util/logger.h > -@@ -32,7 +32,9 @@ > - #ifndef __LOGGER_H__ > - #define __LOGGER_H__ > - > -+#include > - #include > -+#include > - > - #define log_debug SPDLOG_DEBUG > - #define log_info SPDLOG_INFO > -@@ -40,4 +42,17 @@ > - #define log_error SPDLOG_ERROR > - #define log_js SPDLOG_INFO > - > -+#if FMT_VERSION >= 80100 > -+template > -+struct fmt::formatter, char>> > -+ : formatter> { > -+ template > -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) > -+ { > -+ return fmt::formatter>::format( > -+ static_cast>(value), ctx); > -+ } > -+}; > -+#endif > -+ > - #endif // __LOGGER_H__ > diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash > index 5dcd364c33..89ac9ad55a 100644 > --- a/package/gerbera/gerbera.hash > +++ b/package/gerbera/gerbera.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz > +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz > sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md > diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk > index ab49f661ac..6acdfb86ac 100644 > --- a/package/gerbera/gerbera.mk > +++ b/package/gerbera/gerbera.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GERBERA_VERSION = 1.9.2 > +GERBERA_VERSION = 1.10.0 > GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) > GERBERA_LICENSE = GPL-2.0 > GERBERA_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:13:17 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:13:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/gerbera: bump to version 1.10.0 In-Reply-To: <20220320185144.10894-1-joerg.krause@embedded.rocks> References: <20220320185144.10894-1-joerg.krause@embedded.rocks> Message-ID: <109b1e93-1483-ad75-df49-6c04cbe5dc94@mind.be> On 20/03/2022 19:51, J?rg Krause wrote: > Drop patch wich is included in the new version. > > Also recreate config.xml by building and running Gerbera using: > > ``` > ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml > ``` > > Note, that Gerbera sets the `` parameter to the runtime user's home by > default when generating the script. This is not appropriate when running Gerbera > on an embedded Linux system as we usually do not have multiple users or even > users at all. Therefore, we set the home directory to /var/lib/gerbera`. > > Signed-off-by: J?rg Krause This also required an update of CMake, as observed by Francois. However, this patch also updates config.xml so I applied this one. I don't know if it's worth it, but would it be possible to build a minimal host-gerbera to automatically generate config.xml? Applied to master, thanks. Regards, Arnout > --- > package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ---------------- > package/gerbera/config.xml | 58 ++++++++++++++++++---- > package/gerbera/gerbera.hash | 2 +- > package/gerbera/gerbera.mk | 2 +- > 4 files changed, 51 insertions(+), 55 deletions(-) > delete mode 100644 package/gerbera/0001-Fix-for-fmt-8-0.patch > > diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch > deleted file mode 100644 > index c4419209a5..0000000000 > --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 > -From: kyak > -Date: Wed, 12 Jan 2022 19:41:37 +0300 > -Subject: [PATCH] Fix for fmt > 8.0 > - > -[Retrieved from: > -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] > -Signed-off-by: Fabrice Fontaine > ---- > - src/util/logger.h | 15 +++++++++++++++ > - 1 file changed, 15 insertions(+) > - > -diff --git a/src/util/logger.h b/src/util/logger.h > -index 58696e52f..ba64afa79 100644 > ---- a/src/util/logger.h > -+++ b/src/util/logger.h > -@@ -32,7 +32,9 @@ > - #ifndef __LOGGER_H__ > - #define __LOGGER_H__ > - > -+#include > - #include > -+#include > - > - #define log_debug SPDLOG_DEBUG > - #define log_info SPDLOG_INFO > -@@ -40,4 +42,17 @@ > - #define log_error SPDLOG_ERROR > - #define log_js SPDLOG_INFO > - > -+#if FMT_VERSION >= 80100 > -+template > -+struct fmt::formatter, char>> > -+ : formatter> { > -+ template > -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) > -+ { > -+ return fmt::formatter>::format( > -+ static_cast>(value), ctx); > -+ } > -+}; > -+#endif > -+ > - #endif // __LOGGER_H__ > diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml > index 30d70e21f7..e6261f25d0 100644 > --- a/package/gerbera/config.xml > +++ b/package/gerbera/config.xml > @@ -1,7 +1,7 @@ > > > > > @@ -11,7 +11,7 @@ > > > Gerbera > - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 > + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 > /var/lib/gerbera > /usr/share/gerbera/web > > - 1800 > + 180 > > > gerbera.db > > > + > + > + upnp:class derivedfrom "object.item" and last_updated > "@last7" > + > + > + upnp:class derivedfrom "object.item" and last_modified > "@last7" > + > + > > > * > @@ -45,12 +53,15 @@ > > > > - > - > - > + > + > + > + > > > > + > + > > > > @@ -98,14 +109,42 @@ > > > > + > + > > + > > + > + > + > > > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > > - > - > - > > > > @@ -133,3 +172,4 @@ > > > > + > diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash > index 5dcd364c33..89ac9ad55a 100644 > --- a/package/gerbera/gerbera.hash > +++ b/package/gerbera/gerbera.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz > +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz > sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md > diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk > index ab49f661ac..6acdfb86ac 100644 > --- a/package/gerbera/gerbera.mk > +++ b/package/gerbera/gerbera.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GERBERA_VERSION = 1.9.2 > +GERBERA_VERSION = 1.10.0 > GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) > GERBERA_LICENSE = GPL-2.0 > GERBERA_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:03:54 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:03:54 +0100 Subject: [Buildroot] [git commit] package/cmake: bump to version 3.18.6 Message-ID: <20220321210440.1E40884D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d32a0992bd03b1f7a96be78c5942bda574c36dcb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of Copyright.txt (year updated and Qt Company Ltd. added: https://gitlab.kitware.com/cmake/cmake/-/commit/1edc4a8a7e759c4047dd1a1b9864b34f6cb4cc50 https://gitlab.kitware.com/cmake/cmake/-/commit/f8c505d4b30aa636b013486913591060b2040716) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 97e83a274c..da514a6d6b 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz +# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt +sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz # Locally calculated -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt +sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index b1b214982e..4177b119ab 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.16 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 3.18 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From arnout at mind.be Mon Mar 21 21:08:02 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:08:02 +0100 Subject: [Buildroot] [git commit] package/gerbera: bump to version 1.10.0 Message-ID: <20220321210440.2FDA284D85@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=585cf07e905dc61118bcdc15b49762f6aa0230a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch wich is included in the new version. Also recreate config.xml by building and running Gerbera using: ``` ~/buildroot/output/target/usr/bin/gerbera --create-config > package/gerbera/config.xml ``` Note, that Gerbera sets the `` parameter to the runtime user's home by default when generating the script. This is not appropriate when running Gerbera on an embedded Linux system as we usually do not have multiple users or even users at all. Therefore, we set the home directory to /var/lib/gerbera`. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gerbera/0001-Fix-for-fmt-8-0.patch | 44 ----------------------- package/gerbera/config.xml | 58 +++++++++++++++++++++++++----- package/gerbera/gerbera.hash | 2 +- package/gerbera/gerbera.mk | 2 +- 4 files changed, 51 insertions(+), 55 deletions(-) diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5..0000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index 30d70e21f7..e6261f25d0 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ Gerbera - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 /var/lib/gerbera /usr/share/gerbera/web - 1800 + 180 gerbera.db + + + upnp:class derivedfrom "object.item" and last_updated > "@last7" + + + upnp:class derivedfrom "object.item" and last_modified > "@last7" + + * @@ -45,12 +53,15 @@ - - - + + + + + + @@ -98,14 +109,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -133,3 +172,4 @@ + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c33..89ac9ad55a 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac..6acdfb86ac 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:04:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:04:16 +0100 Subject: [Buildroot] [git commit] support/dependencies: requires cmake >= 3.18 Message-ID: <20220321210440.268EA84D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee860ce3dc3dada4ee4af41dd0d0eee7c0489a28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gerbera requires cmake 3.18 since version 1.10.0 and https://github.com/gerbera/gerbera/commit/ac05976dda335ce1c28a5cc78e4e009a145e3559 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/dependencies/check-host-cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index dfc252e919..5760e4ded1 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,9 @@ -# Set this to either 3.16 or higher, depending on the highest minimum +# Set this to either 3.18 or higher, depending on the highest minimum # version required by any of the packages bundled in Buildroot. If a # package is bumped or a new one added, and it requires a higher # version, our cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.16 +BR2_CMAKE_VERSION_MIN = 3.18 BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ From arnout at mind.be Mon Mar 21 21:17:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:17:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnetfilter_conntrack: fix musl build with headers >= 5.15 In-Reply-To: <20220313090209.161433-1-fontaine.fabrice@gmail.com> References: <20220313090209.161433-1-fontaine.fabrice@gmail.com> Message-ID: <42a78132-a0d1-b735-db43-10f23dc6407b@mind.be> On 13/03/2022 10:02, Fabrice Fontaine wrote: > Fix the following build failure with musl and headers >= 5.15 raised > since bump to version 1.0.9 in commit > 9af9dfa543907c46091c706b0f3a0eb89445ae74: > > In file included from /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/arpa/inet.h:9, > from ../../include/internal/internal.h:14, > from proto.c:2: > /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' > 23 | struct in6_addr { > | ^~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-fix-build-with-kernel-5-15-and-musl.patch | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch > > diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch > new file mode 100644 > index 0000000000..9e96594120 > --- /dev/null > +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch > @@ -0,0 +1,60 @@ > +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 > +From: Robert Marko > +Date: Thu, 24 Feb 2022 15:01:11 +0100 > +Subject: conntrack: fix build with kernel 5.15 and musl > + > +Currently, with kernel 5.15 headers and musl building is failing with > +redefinition errors due to a conflict between the kernel and musl headers. > + > +Musl is able to suppres the conflicting kernel header definitions if they > +are included after the standard libc ones, however since ICMP definitions > +were moved into a separate internal header to avoid duplication this has > +stopped working and is breaking the builds. > + > +It seems that the issue is that which contains the UAPI > +suppression defines is included in the internal.h header and not in the > +proto.h which actually includes the kernel ICMP headers and thus UAPI > +supression defines are not present. > + > +Solve this by moving the include before the ICMP kernel > +includes in the proto.h > + > +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") > +Signed-off-by: Robert Marko > +Signed-off-by: Florian Westphal > + > +[Retrieved from: > +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] > +Signed-off-by: Fabrice Fontaine > +--- > + include/internal/internal.h | 1 - > + include/internal/proto.h | 1 + > + 2 files changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/include/internal/internal.h b/include/internal/internal.h > +index 2ef8a90..7cd7c44 100644 > +--- a/include/internal/internal.h > ++++ b/include/internal/internal.h > +@@ -14,7 +14,6 @@ > + #include > + #include > + #include > +-#include > + > + #include > + #include > +diff --git a/include/internal/proto.h b/include/internal/proto.h > +index 40e7bfe..60a5f4e 100644 > +--- a/include/internal/proto.h > ++++ b/include/internal/proto.h > +@@ -2,6 +2,7 @@ > + #define _NFCT_PROTO_H_ > + > + #include > ++#include > + #include > + #include > + > +-- > +cgit v1.2.3 > + From arnout at mind.be Mon Mar 21 21:17:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:17:42 +0100 Subject: [Buildroot] [PATCH 1/2] package/bind: reorder openssl variables In-Reply-To: <20220313092148.353432-1-fontaine.fabrice@gmail.com> References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> Message-ID: <32557300-c9ef-288e-46de-ed6f5bce6357@mind.be> On 13/03/2022 10:21, Fabrice Fontaine wrote: > openssl is mandatory since bump to version 9.16.26 in commit > 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in > the beginning of bind.mk instead of keeping them in the middle of the > file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as > host-pkgconf is already mandatory > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/bind/bind.mk | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index 5ddf7652eb..e0c81152e1 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen > BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate > BIND_CONF_ENV = \ > BUILD_CC="$(TARGET_CC)" \ > - BUILD_CFLAGS="$(TARGET_CFLAGS)" > + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ > + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` > BIND_CONF_OPTS = \ > $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ > --without-lmdb \ > @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ > --with-randomdev=/dev/urandom \ > --enable-epoll \ > --enable-filter-aaaa \ > - --disable-backtrace > + --disable-backtrace \ > + --with-openssl=$(STAGING_DIR)/usr \ > + --with-ecdsa=yes \ > + --with-eddsa=no \ > + --with-aes=yes > > -BIND_DEPENDENCIES = libuv > +BIND_DEPENDENCIES = host-pkgconf libuv openssl > > ifeq ($(BR2_PACKAGE_ZLIB),y) > BIND_CONF_OPTS += --with-zlib > BIND_DEPENDENCIES += zlib > -BIND_DEPENDENCIES += host-pkgconf zlib > else > BIND_CONF_OPTS += --without-zlib > endif > @@ -76,13 +80,6 @@ else > BIND_CONF_OPTS += --with-libxml2=no > endif > > -BIND_DEPENDENCIES += host-pkgconf openssl > -BIND_CONF_OPTS += \ > - --with-openssl=$(STAGING_DIR)/usr \ > - --with-ecdsa=yes \ > - --with-eddsa=no \ > - --with-aes=yes > -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` > # GOST cipher support requires openssl extra engines > ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) > BIND_CONF_OPTS += --with-gost=yes From arnout at mind.be Mon Mar 21 21:17:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:17:59 +0100 Subject: [Buildroot] [PATCH 1/3] package/intel-gmmlib: bump version to 22.0.3 In-Reply-To: <20220313095206.1266409-1-bernd.kuhls@t-online.de> References: <20220313095206.1266409-1-bernd.kuhls@t-online.de> Message-ID: <50da868e-57e2-9137-52a9-a4baf2c4ed19@mind.be> On 13/03/2022 10:52, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied series to master, thanks. Regards, Arnout > --- > package/intel-gmmlib/intel-gmmlib.hash | 2 +- > package/intel-gmmlib/intel-gmmlib.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash > index 71a153e0a3..beb3cfd6ae 100644 > --- a/package/intel-gmmlib/intel-gmmlib.hash > +++ b/package/intel-gmmlib/intel-gmmlib.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz > +sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz > sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md > diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk > index 235f71341c..06628132a2 100644 > --- a/package/intel-gmmlib/intel-gmmlib.mk > +++ b/package/intel-gmmlib/intel-gmmlib.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -INTEL_GMMLIB_VERSION = 22.0.2 > +INTEL_GMMLIB_VERSION = 22.0.3 > INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive > INTEL_GMMLIB_LICENSE = MIT > INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:18:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:18:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/tree: fix build with gcc 4.8 In-Reply-To: <20220313092821.357580-1-fontaine.fabrice@gmail.com> References: <20220313092821.357580-1-fontaine.fabrice@gmail.com> Message-ID: <78b67931-ad98-a385-d250-e259ed045f21@mind.be> On 13/03/2022 10:28, Fabrice Fontaine wrote: > Fix the following build failure with gcc 4.8 raised since bump to > version 2.0.2 in commit 11a3989dbf7ac2535fac04b24ab3d959da3686b3: > > color.c: In function 'parse_dir_colors': > color.c:103:11: error: redeclaration of 'i' with no linkage > for(int i=0; i < DOT_EXTENSION; i++) color_code[i] = NULL; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/e05595696727622eaf517944d4ff4414baf66bb2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/tree/tree.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/tree/tree.mk b/package/tree/tree.mk > index 7c111b47d2..da0acbae49 100644 > --- a/package/tree/tree.mk > +++ b/package/tree/tree.mk > @@ -11,7 +11,8 @@ TREE_LICENSE = GPL-2.0+ > TREE_LICENSE_FILES = LICENSE > > define TREE_BUILD_CMDS > - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) > + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ > + -C $(@D) > endef > > define TREE_INSTALL_TARGET_CMDS From arnout at mind.be Mon Mar 21 21:15:16 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:15:16 +0100 Subject: [Buildroot] [git commit] package/bind: fix libxml2 build Message-ID: <20220321210932.7AFD384E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33413b7e5326591dbfc29050a0d1136dcae868c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with libxml2 raised since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead Fixes: - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 72f1e4dcdc..a595baabc5 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -67,7 +67,7 @@ BIND_CONF_OPTS += --with-gssapi=no endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-libxml2 BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no From arnout at mind.be Mon Mar 21 21:13:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:13:50 +0100 Subject: [Buildroot] [git commit] package/libnetfilter_conntrack: fix musl build with headers >= 5.15 Message-ID: <20220321210932.62A7D84E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52686b220d0c3c081f8259fc0ff6a307c519ec2f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with musl and headers >= 5.15 raised since bump to version 1.0.9 in commit 9af9dfa543907c46091c706b0f3a0eb89445ae74: In file included from /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/arpa/inet.h:9, from ../../include/internal/internal.h:14, from proto.c:2: /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/19931aba8bee8867a53130ca4a53cfadbc4c5bfd Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...track-fix-build-with-kernel-5-15-and-musl.patch | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch new file mode 100644 index 0000000000..9e96594120 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch @@ -0,0 +1,60 @@ +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko +Signed-off-by: Florian Westphal + +[Retrieved from: +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] +Signed-off-by: Fabrice Fontaine +--- + include/internal/internal.h | 1 - + include/internal/proto.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/internal.h b/include/internal/internal.h +index 2ef8a90..7cd7c44 100644 +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/include/internal/proto.h b/include/internal/proto.h +index 40e7bfe..60a5f4e 100644 +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include ++#include + #include + #include + +-- +cgit v1.2.3 + From arnout at mind.be Mon Mar 21 21:15:57 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:15:57 +0100 Subject: [Buildroot] [git commit] package/intel-gmmlib: bump version to 22.0.3 Message-ID: <20220321210932.92A3A84D6A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=376f1b0b73b2af0b8d2a9a767416dcf033dc3528 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 71a153e0a3..beb3cfd6ae 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz +sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 235f71341c..06628132a2 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.2 +INTEL_GMMLIB_VERSION = 22.0.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:15:38 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:15:38 +0100 Subject: [Buildroot] [git commit] package/tree: fix build with gcc 4.8 Message-ID: <20220321210932.8695784EA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5a4f6c497a5f90833509096ddd520037cede7272 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc 4.8 raised since bump to version 2.0.2 in commit 11a3989dbf7ac2535fac04b24ab3d959da3686b3: color.c: In function 'parse_dir_colors': color.c:103:11: error: redeclaration of 'i' with no linkage for(int i=0; i < DOT_EXTENSION; i++) color_code[i] = NULL; ^ Fixes: - http://autobuild.buildroot.org/results/e05595696727622eaf517944d4ff4414baf66bb2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tree/tree.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 7c111b47d2..da0acbae49 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -11,7 +11,8 @@ TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE define TREE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + -C $(@D) endef define TREE_INSTALL_TARGET_CMDS From arnout at mind.be Mon Mar 21 21:16:11 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:16:11 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.2.2 Message-ID: <20220321210932.9C70F84D6A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=370249646872b5e4d1a60141357e6d69c0851a63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 7c615620ae..044b9d7013 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1a0277306d7bb3a1e20c7693ff090fa4ae5c0b68981aa13452ed1c6df9062854 intel-media-22.2.1.tar.gz +sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index e286a8b2c5..f0e9f46f07 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,8 +6,8 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.1 -INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive +INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause INTEL_MEDIADRIVER_LICENSE_FILES = LICENSE.md From arnout at mind.be Mon Mar 21 21:16:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:16:34 +0100 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 22.2.2 Message-ID: <20220321210932.A6A0E84E82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f3476b1dedfbd6892b82e096a48199111032ba72 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Rebased patch 0001. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch | 2 +- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch index a7e3b70294..b3ecfc98b7 100644 --- a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch +++ b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -40,7 +40,7 @@ index 7e36ae2d..5b8b9b9d 100644 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) if( ARGV1 MATCHES hw AND Linux ) -@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) +@@ -452,7 +452,7 @@ function(configure_dependencies target dependencies variant) endforeach() set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index ee4f317242..d9acf49637 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ae56d4fe69856ff4e184a2863f23d0e861a16add225fd3e159a5440774d5c80a intel-mediasdk-22.2.1.tar.gz +sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7589ff9737..698d2348b2 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.1 +INTEL_MEDIASDK_VERSION = 22.2.2 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From arnout at mind.be Mon Mar 21 21:13:59 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:13:59 +0100 Subject: [Buildroot] [git commit] package/bind: reorder openssl variables Message-ID: <20220321210932.704ED84D6A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b127b0c1b653b0e2ce3c1996a7eb370a258e712 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master openssl is mandatory since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in the beginning of bind.mk instead of keeping them in the middle of the file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as host-pkgconf is already mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bind/bind.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5b4c60b14c..72f1e4dcdc 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr \ + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes -BIND_DEPENDENCIES = libuv +BIND_DEPENDENCIES = host-pkgconf libuv openssl ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib -BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -69,13 +73,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes From arnout at mind.be Mon Mar 21 21:32:44 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:32:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: <20220316060219.3448648-1-james.hilliard1@gmail.com> References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: Hi James, On 16/03/2022 07:02, James Hilliard wrote: > Currently pillow doesn't correctly search pkg-config system paths > for some libraries which can prevent some libraries from being > properly detected/enabled in pillow. > > Signed-off-by: James Hilliard > --- > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ > package/python-pillow/python-pillow.mk | 23 +++---------- > 2 files changed, 37 insertions(+), 19 deletions(-) > create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > new file mode 100644 > index 0000000000..9f979b048f > --- /dev/null > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > @@ -0,0 +1,33 @@ > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > +Subject: [PATCH] Search pkg-config system libs/cflags. > + > +We need to search the system paths as well from pkg-config for > +some packages to be found properly. > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/python-pillow/Pillow/pull/6138] > +--- > + setup.py | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/setup.py b/setup.py > +index 3468b260..59d65ce2 100755 > +--- a/setup.py > ++++ b/setup.py > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > + def _pkg_config(name): > + try: > + command = os.environ.get("PKG_CONFIG", "pkg-config") > +- command_libs = [command, "--libs-only-L", name] > +- command_cflags = [command, "--cflags-only-I", name] > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] > ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] You gave an additional explanation why this is needed in the upstream PR: Zlib and anything that has headers in the normal system libs/include folders seems to not get their headers picked up without this change. I think this issue is mostly going to be something people hit when cross compiling since the prefix based system libs/include folder would probably work in most of the usual cases(searching in sys.prefix will not work when cross compiling since it points to the host toolchain prefix rather than the target toolchain sysroot prefix): However, that implies that either we have to make sure that sys.prefix is set correctly (i.e. point it to staging instead of host), or pillow is using sys.prefix incorrectly. Before that, still, I don't understand how this can be an issue. Unless if pillow also passes something like -nostdinc, our toolchain wrapper should make sure that staging/usr/include is in the search path. There also doesn't seem to be an autobuilder failure due to this... But maybe it builds successfully, just without some optional dependency? Please provide more details about the failure in the commit message. > + if not DEBUG: > + command_libs.append("--silence-errors") > + command_cflags.append("--silence-errors") > +-- > +2.35.1 > + > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index 901876e0ee..ef677855b2 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > PYTHON_PILLOW_CPE_ID_VENDOR = python > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" This change isn't explained in the commit message, and seems unrelated. > + > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing The need for these two changes is also not clear at all from the commit message. I've marked the patch as Changes Requested. Regards, Arnout > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > @@ -68,22 +71,4 @@ else > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > endif > > -define PYTHON_PILLOW_BUILD_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) > -endef > - > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > - cd $(PYTHON_PILLOW_BUILDDIR); \ > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > -endef > - > $(eval $(python-package)) From arnout at mind.be Mon Mar 21 21:33:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:33:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support In-Reply-To: <20220314185945.2823356-1-bernd.kuhls@t-online.de> References: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Message-ID: <8ff7a156-e970-919e-9dd9-3876dfc724f4@mind.be> On 14/03/2022 19:59, Bernd Kuhls wrote: > Contrary to the helptext > https://github.com/curl/curl/blob/master/configure.ac#L152 > > the configure option is called --with-libgsasl: > https://github.com/curl/curl/blob/master/configure.ac#L1989 > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/libcurl/libcurl.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 0db0c088cb..a6e5b06b8f 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -128,9 +128,9 @@ endif > > ifeq ($(BR2_PACKAGE_LIBGSASL),y) > LIBCURL_DEPENDENCIES += libgsasl > -LIBCURL_CONF_OPTS += --with-gsasl > +LIBCURL_CONF_OPTS += --with-libgsasl > else > -LIBCURL_CONF_OPTS += --without-gsasl > +LIBCURL_CONF_OPTS += --without-libgsasl > endif > > ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From arnout at mind.be Mon Mar 21 21:18:32 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:18:32 +0100 Subject: [Buildroot] [git commit] package/libcurl: fix libgsasl support Message-ID: <20220321212436.DCDBA84EAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b98d8bba7c1358938f8930a0167abe7a3f6c521 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f271..4b2e52829c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From arnout at mind.be Mon Mar 21 21:49:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 21 Mar 2022 22:49:41 +0100 Subject: [Buildroot] [git commit] package/rpi-firmware: fix missing files in overlays Message-ID: <20220321214630.36DD784F2F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..d4d1d07b3f 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -48,6 +48,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From james.hilliard1 at gmail.com Mon Mar 21 21:56:27 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 21 Mar 2022 15:56:27 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle wrote: > > Hi James, > > On 16/03/2022 07:02, James Hilliard wrote: > > Currently pillow doesn't correctly search pkg-config system paths > > for some libraries which can prevent some libraries from being > > properly detected/enabled in pillow. > > > > Signed-off-by: James Hilliard > > --- > > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ > > package/python-pillow/python-pillow.mk | 23 +++---------- > > 2 files changed, 37 insertions(+), 19 deletions(-) > > create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > > diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > new file mode 100644 > > index 0000000000..9f979b048f > > --- /dev/null > > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > @@ -0,0 +1,33 @@ > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > > +From: James Hilliard > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > > +Subject: [PATCH] Search pkg-config system libs/cflags. > > + > > +We need to search the system paths as well from pkg-config for > > +some packages to be found properly. > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/python-pillow/Pillow/pull/6138] > > +--- > > + setup.py | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/setup.py b/setup.py > > +index 3468b260..59d65ce2 100755 > > +--- a/setup.py > > ++++ b/setup.py > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > > + def _pkg_config(name): > > + try: > > + command = os.environ.get("PKG_CONFIG", "pkg-config") > > +- command_libs = [command, "--libs-only-L", name] > > +- command_cflags = [command, "--cflags-only-I", name] > > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] > > ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] > > You gave an additional explanation why this is needed in the upstream PR: > > Zlib and anything that has headers in the normal system libs/include folders > seems to not get their headers picked up without this change. > > I think this issue is mostly going to be something people hit when cross > compiling since the prefix based system libs/include folder would probably work > in most of the usual cases(searching in sys.prefix will not work when cross > compiling since it points to the host toolchain prefix rather than the target > toolchain sysroot prefix): > > > However, that implies that either we have to make sure that sys.prefix is set > correctly (i.e. point it to staging instead of host), or pillow is using > sys.prefix incorrectly. I think pillow is using sys.prefix in a way that is not really cross compilation compatible, however using pkg-config with sysm libs/cflags seems to be sufficient for it to pass its non-standard header checks. > > Before that, still, I don't understand how this can be an issue. Unless if > pillow also passes something like -nostdinc, our toolchain wrapper should make > sure that staging/usr/include is in the search path. It's due to pillow having custom header checks like this: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 > > There also doesn't seem to be an autobuilder failure due to this... But maybe > it builds successfully, just without some optional dependency? Please provide > more details about the failure in the commit message. The failure was getting hidden by the non-standard build/install cmd overrides it would appear, it seemed pillow was getting built for the host instead of the target with those, I didn't investigate in too much detail as those custom build/install overrides are not actually needed. > > > > > + if not DEBUG: > > + command_libs.append("--silence-errors") > > + command_cflags.append("--silence-errors") > > +-- > > +2.35.1 > > + > > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > > index 901876e0ee..ef677855b2 100644 > > --- a/package/python-pillow/python-pillow.mk > > +++ b/package/python-pillow/python-pillow.mk > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > > PYTHON_PILLOW_CPE_ID_VENDOR = python > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > > PYTHON_PILLOW_SETUP_TYPE = setuptools > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" > > This change isn't explained in the commit message, and seems unrelated. > > > + > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > > The need for these two changes is also not clear at all from the commit message. > > > I've marked the patch as Changes Requested. > > Regards, > Arnout > > > > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > > PYTHON_PILLOW_DEPENDENCIES += freetype > > @@ -68,22 +71,4 @@ else > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > > endif > > > > -define PYTHON_PILLOW_BUILD_CMDS > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) > > -endef > > - > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > > -endef > > - > > $(eval $(python-package)) From arnout at mind.be Mon Mar 21 21:56:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 21 Mar 2022 22:56:41 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: On 17/03/2022 12:06, Sassen, Rutger wrote: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. I've added a reference to the documentation. > > Signed-off-by: Rutger Sassen > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) > > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > > Signed-off-by: Rutger Sassen > --- > package/rpi-firmware/Config.in | 12 ++++++++++++ > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > 2 files changed, 19 insertions(+) > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > index 8070dc3019..36054353f8 100644 > --- a/package/rpi-firmware/Config.in > +++ b/package/rpi-firmware/Config.in > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > overlays, to support HATs (Hardware Attached on Top, add-on > modules). > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP In the end, I don't think this option is very useful. So I removed it... > + bool "Install DTB overlay map" > + default n > + help > + Say 'y' here if you need to support multiple hardware targets > + and you need overlay_map.dtb for target dependent mapping of > + overlay names to one of several overlay implementations. > + > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > + > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > bool "vcdbg" > depends on BR2_arm # prebuilt arm binary, rpi-userland > diff --git a/package/rpi-firmware/rpi-firmware.mk > b/package/rpi-firmware/rpi-firmware.mk > index b46a7f5270..800b560070 100644 > --- a/package/rpi-firmware/rpi-firmware.mk > +++ b/package/rpi-firmware/rpi-firmware.mk > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > endef > endif > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > $(BINARIES_DIR)/rpi-firmware/overlays/ ... reducing the patch to just this single line. Please check if the commit [1] does what you need, if not I can recover the original patch with the Config.in option. Applied to master, thanks. Regards, Arnout [1] https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 > +endef > +endif > + > # Install prebuilt libraries if RPI_USERLAND not enabled > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > define RPI_FIRMWARE_INSTALL_TARGET_LIB > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > $(RPI_FIRMWARE_INSTALL_CONFIG) > $(RPI_FIRMWARE_INSTALL_DTB) > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > endef > > $(eval $(generic-package)) > -- > 2.20.1 > > > *Disclaimer* > > This email communication is CONFIDENTIAL. If you are not the intended recipient, > you may not use, copy or disclose to anyone the message or any information > contained in the message and I ask that you please notify me by return email and > delete this communication immediately. Thank you. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Mon Mar 21 22:05:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 21 Mar 2022 16:05:22 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220321220522.283163-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. This is due to pillow implementing custom header validation checks which need system paths present to function correctly: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 Removed custom BUILD_CMDS and INSTALL_TARGET_CMDS which were causing python-pillow to be installed for the host, they are not required, we just need to set build_ext at the start of PYTHON_PILLOW_BUILD_OPTS instead. Signed-off-by: James Hilliard --- Changes v1 -> v2: - remove unrelated MAX_CONCURRENCY env variable --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 23 +++---------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..ef677855b2 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Mar 21 22:07:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 21 Mar 2022 16:07:04 -0600 Subject: [Buildroot] [PATCH v3 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220321220704.284635-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. This is due to pillow implementing custom header validation checks which need system paths present to function correctly: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 Removed custom BUILD_CMDS and INSTALL_TARGET_CMDS which were causing python-pillow to be installed for the host, they are not required, we just need to set build_ext at the start of PYTHON_PILLOW_BUILD_OPTS instead. Signed-off-by: James Hilliard --- Changes v2 -> v3: - actually remove MAX_CONCURRENCY env variable Changes v1 -> v2: - remove unrelated MAX_CONCURRENCY env variable --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 22 ++----------- 2 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..bea129889b 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,9 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +70,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From angelo at amarulasolutions.com Mon Mar 21 22:10:54 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 21 Mar 2022 23:10:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 10:56 PM James Hilliard wrote: > On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle > wrote: > > > > Hi James, > > > > On 16/03/2022 07:02, James Hilliard wrote: > > > Currently pillow doesn't correctly search pkg-config system paths > > > for some libraries which can prevent some libraries from being > > > properly detected/enabled in pillow. > > > > > > Signed-off-by: James Hilliard > > > --- > > > ...Search-pkg-config-system-libs-cflags.patch | 33 > +++++++++++++++++++ > > > package/python-pillow/python-pillow.mk | 23 +++---------- > > > 2 files changed, 37 insertions(+), 19 deletions(-) > > > create mode 100644 > package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > > > > diff --git > a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > new file mode 100644 > > > index 0000000000..9f979b048f > > > --- /dev/null > > > +++ > b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch > > > @@ -0,0 +1,33 @@ > > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 > > > +From: James Hilliard > > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 > > > +Subject: [PATCH] Search pkg-config system libs/cflags. > > > + > > > +We need to search the system paths as well from pkg-config for > > > +some packages to be found properly. > > > + > > > +Signed-off-by: James Hilliard > > > +[Upstream status: > > > +https://github.com/python-pillow/Pillow/pull/6138] > > > +--- > > > + setup.py | 4 ++-- > > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > > + > > > +diff --git a/setup.py b/setup.py > > > +index 3468b260..59d65ce2 100755 > > > +--- a/setup.py > > > ++++ b/setup.py > > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): > > > + def _pkg_config(name): > > > + try: > > > + command = os.environ.get("PKG_CONFIG", "pkg-config") > > > +- command_libs = [command, "--libs-only-L", name] > > > +- command_cflags = [command, "--cflags-only-I", name] > > > ++ command_libs = [command, "--libs-only-L", > "--keep-system-libs", name] > > > ++ command_cflags = [command, "--cflags-only-I", > "--keep-system-cflags", name] > > > > You gave an additional explanation why this is needed in the upstream > PR: > > > > Zlib and anything that has headers in the normal system libs/include > folders > > seems to not get their headers picked up without this change. > > > > I think this issue is mostly going to be something people hit when cross > > compiling since the prefix based system libs/include folder would > probably work > > in most of the usual cases(searching in sys.prefix will not work when > cross > > compiling since it points to the host toolchain prefix rather than the > target > > toolchain sysroot prefix): > > > > > > However, that implies that either we have to make sure that sys.prefix > is set > > correctly (i.e. point it to staging instead of host), or pillow is using > > sys.prefix incorrectly. > > I think pillow is using sys.prefix in a way that is not really cross > compilation > compatible, however using pkg-config with sysm libs/cflags seems to be > sufficient > for it to pass its non-standard header checks. > I remember having added the --disable-platform-guessing exactly to overcome this problem. All the setting should be provided by buildroot. Probably, the logic behind this is slightly changed, and the mechanism doesn't work anymore. I'll try to have a look. > > > > > Before that, still, I don't understand how this can be an issue. > Unless if > > pillow also passes something like -nostdinc, our toolchain wrapper > should make > > sure that staging/usr/include is in the search path. > > It's due to pillow having custom header checks like this: > https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 > > > > > There also doesn't seem to be an autobuilder failure due to this... > But maybe > > it builds successfully, just without some optional dependency? Please > provide > > more details about the failure in the commit message. > > The failure was getting hidden by the non-standard build/install cmd > overrides it > would appear, it seemed pillow was getting built for the host instead > of the target with > those, I didn't investigate in too much detail as those custom > build/install overrides > are not actually needed. > > > > > > > > > > + if not DEBUG: > > > + command_libs.append("--silence-errors") > > > + command_cflags.append("--silence-errors") > > > +-- > > > +2.35.1 > > > + > > > diff --git a/package/python-pillow/python-pillow.mk > b/package/python-pillow/python-pillow.mk > > > index 901876e0ee..ef677855b2 100644 > > > --- a/package/python-pillow/python-pillow.mk > > > +++ b/package/python-pillow/python-pillow.mk > > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE > > > PYTHON_PILLOW_CPE_ID_VENDOR = python > > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > > > PYTHON_PILLOW_SETUP_TYPE = setuptools > > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing > > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" > > > > This change isn't explained in the commit message, and seems unrelated. > > > > > + > > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > > > > The need for these two changes is also not clear at all from the > commit message. > > > > > > I've marked the patch as Changes Requested. > > > > Regards, > > Arnout > > > > > > > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > > > PYTHON_PILLOW_DEPENDENCIES += freetype > > > @@ -68,22 +71,4 @@ else > > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > > > endif > > > > > > -define PYTHON_PILLOW_BUILD_CMDS > > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) > $(PYTHON_PILLOW_BUILD_OPTS) > > > -endef > > > - > > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS > > > - cd $(PYTHON_PILLOW_BUILDDIR); \ > > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ > > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ > > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ > > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ > > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ > > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) > > > -endef > > > - > > > $(eval $(python-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From angelo at amarulasolutions.com Mon Mar 21 22:35:25 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Mon, 21 Mar 2022 23:35:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 11:10 PM Angelo Compagnucci < angelo at amarulasolutions.com> wrote: > > > On Mon, Mar 21, 2022 at 10:56 PM James Hilliard > wrote: > >> On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle >> wrote: >> > >> > Hi James, >> > >> > On 16/03/2022 07:02, James Hilliard wrote: >> > > Currently pillow doesn't correctly search pkg-config system paths >> > > for some libraries which can prevent some libraries from being >> > > properly detected/enabled in pillow. >> > > >> > > Signed-off-by: James Hilliard >> > > --- >> > > ...Search-pkg-config-system-libs-cflags.patch | 33 >> +++++++++++++++++++ >> > > package/python-pillow/python-pillow.mk | 23 +++---------- >> > > 2 files changed, 37 insertions(+), 19 deletions(-) >> > > create mode 100644 >> package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> > > >> > > diff --git >> a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> > > new file mode 100644 >> > > index 0000000000..9f979b048f >> > > --- /dev/null >> > > +++ >> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >> > > @@ -0,0 +1,33 @@ >> > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 >> 2001 >> > > +From: James Hilliard >> > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 >> > > +Subject: [PATCH] Search pkg-config system libs/cflags. >> > > + >> > > +We need to search the system paths as well from pkg-config for >> > > +some packages to be found properly. >> > > + >> > > +Signed-off-by: James Hilliard >> > > +[Upstream status: >> > > +https://github.com/python-pillow/Pillow/pull/6138] >> > > +--- >> > > + setup.py | 4 ++-- >> > > + 1 file changed, 2 insertions(+), 2 deletions(-) >> > > + >> > > +diff --git a/setup.py b/setup.py >> > > +index 3468b260..59d65ce2 100755 >> > > +--- a/setup.py >> > > ++++ b/setup.py >> > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): >> > > + def _pkg_config(name): >> > > + try: >> > > + command = os.environ.get("PKG_CONFIG", "pkg-config") >> > > +- command_libs = [command, "--libs-only-L", name] >> > > +- command_cflags = [command, "--cflags-only-I", name] >> > > ++ command_libs = [command, "--libs-only-L", >> "--keep-system-libs", name] >> > > ++ command_cflags = [command, "--cflags-only-I", >> "--keep-system-cflags", name] >> > >> > You gave an additional explanation why this is needed in the upstream >> PR: >> > >> > Zlib and anything that has headers in the normal system libs/include >> folders >> > seems to not get their headers picked up without this change. >> > >> > I think this issue is mostly going to be something people hit when cross >> > compiling since the prefix based system libs/include folder would >> probably work >> > in most of the usual cases(searching in sys.prefix will not work when >> cross >> > compiling since it points to the host toolchain prefix rather than the >> target >> > toolchain sysroot prefix): >> > >> > >> > However, that implies that either we have to make sure that >> sys.prefix is set >> > correctly (i.e. point it to staging instead of host), or pillow is using >> > sys.prefix incorrectly. >> >> I think pillow is using sys.prefix in a way that is not really cross >> compilation >> compatible, however using pkg-config with sysm libs/cflags seems to be >> sufficient >> for it to pass its non-standard header checks. >> > > I remember having added the --disable-platform-guessing exactly to > overcome this problem. All the setting should be provided by buildroot. > Probably, the logic behind this is slightly changed, and the mechanism > doesn't work anymore. I'll try to have a look. > Yes, basically the paths leaks some host directories: [...] Checking for include file %s in %s ('libimagequant.h', '/usr/local/include') Checking for include file %s in %s ('libimagequant.h', '/usr/include') Looking forward for a fix. > >> >> > >> > Before that, still, I don't understand how this can be an issue. >> Unless if >> > pillow also passes something like -nostdinc, our toolchain wrapper >> should make >> > sure that staging/usr/include is in the search path. >> >> It's due to pillow having custom header checks like this: >> https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 >> >> > >> > There also doesn't seem to be an autobuilder failure due to this... >> But maybe >> > it builds successfully, just without some optional dependency? Please >> provide >> > more details about the failure in the commit message. >> >> The failure was getting hidden by the non-standard build/install cmd >> overrides it >> would appear, it seemed pillow was getting built for the host instead >> of the target with >> those, I didn't investigate in too much detail as those custom >> build/install overrides >> are not actually needed. >> >> > >> > >> > >> > > + if not DEBUG: >> > > + command_libs.append("--silence-errors") >> > > + command_cflags.append("--silence-errors") >> > > +-- >> > > +2.35.1 >> > > + >> > > diff --git a/package/python-pillow/python-pillow.mk >> b/package/python-pillow/python-pillow.mk >> > > index 901876e0ee..ef677855b2 100644 >> > > --- a/package/python-pillow/python-pillow.mk >> > > +++ b/package/python-pillow/python-pillow.mk >> > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE >> > > PYTHON_PILLOW_CPE_ID_VENDOR = python >> > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow >> > > PYTHON_PILLOW_SETUP_TYPE = setuptools >> > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing >> > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" >> > >> > This change isn't explained in the commit message, and seems >> unrelated. >> > >> > > + >> > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf >> > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing >> > >> > The need for these two changes is also not clear at all from the >> commit message. >> > >> > >> > I've marked the patch as Changes Requested. >> > >> > Regards, >> > Arnout >> > >> > > >> > > ifeq ($(BR2_PACKAGE_FREETYPE),y) >> > > PYTHON_PILLOW_DEPENDENCIES += freetype >> > > @@ -68,22 +71,4 @@ else >> > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux >> > > endif >> > > >> > > -define PYTHON_PILLOW_BUILD_CMDS >> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >> > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) >> $(PYTHON_PILLOW_BUILD_OPTS) >> > > -endef >> > > - >> > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS >> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >> > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ >> > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ >> > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) >> > > -endef >> > > - >> > > $(eval $(python-package)) >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> > > > -- > > Angelo Compagnucci > > Software Engineer > > angelo at amarulasolutions.com > __________________________________ > Amarula Solutions SRL > > Via le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 (0)42 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com > [`as] https://www.amarulasolutions.com| > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Mon Mar 21 23:04:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 00:04:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/ola: fix host build Message-ID: <20220321230452.1901382-1-fontaine.fabrice@gmail.com> host-bison and host-flex are mandatory dependencies of host-ola since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: bison not found, please install it Fixes: - http://autobuild.buildroot.org/results/ac089629a58d55ec5d1aa83fd77bd487bc9d76de Signed-off-by: Fabrice Fontaine --- package/ola/ola.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 471ae8ed9b..cde90dbd5b 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -25,7 +25,7 @@ OLA_CONF_OPTS = \ --disable-unittests \ --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex # When building the host part, disable as much as possible to speed up # the configure step and avoid missing host dependencies. -- 2.35.1 From angelo at amarulasolutions.com Mon Mar 21 23:10:13 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Tue, 22 Mar 2022 00:10:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 11:35 PM Angelo Compagnucci < angelo at amarulasolutions.com> wrote: > > > On Mon, Mar 21, 2022 at 11:10 PM Angelo Compagnucci < > angelo at amarulasolutions.com> wrote: > >> >> >> On Mon, Mar 21, 2022 at 10:56 PM James Hilliard < >> james.hilliard1 at gmail.com> wrote: >> >>> On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle >>> wrote: >>> > >>> > Hi James, >>> > >>> > On 16/03/2022 07:02, James Hilliard wrote: >>> > > Currently pillow doesn't correctly search pkg-config system paths >>> > > for some libraries which can prevent some libraries from being >>> > > properly detected/enabled in pillow. >>> > > >>> > > Signed-off-by: James Hilliard >>> > > --- >>> > > ...Search-pkg-config-system-libs-cflags.patch | 33 >>> +++++++++++++++++++ >>> > > package/python-pillow/python-pillow.mk | 23 +++---------- >>> > > 2 files changed, 37 insertions(+), 19 deletions(-) >>> > > create mode 100644 >>> package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> > > >>> > > diff --git >>> a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> > > new file mode 100644 >>> > > index 0000000000..9f979b048f >>> > > --- /dev/null >>> > > +++ >>> b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>> > > @@ -0,0 +1,33 @@ >>> > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 >>> 2001 >>> > > +From: James Hilliard >>> > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 >>> > > +Subject: [PATCH] Search pkg-config system libs/cflags. >>> > > + >>> > > +We need to search the system paths as well from pkg-config for >>> > > +some packages to be found properly. >>> > > + >>> > > +Signed-off-by: James Hilliard >>> > > +[Upstream status: >>> > > +https://github.com/python-pillow/Pillow/pull/6138] >>> > > +--- >>> > > + setup.py | 4 ++-- >>> > > + 1 file changed, 2 insertions(+), 2 deletions(-) >>> > > + >>> > > +diff --git a/setup.py b/setup.py >>> > > +index 3468b260..59d65ce2 100755 >>> > > +--- a/setup.py >>> > > ++++ b/setup.py >>> > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): >>> > > + def _pkg_config(name): >>> > > + try: >>> > > + command = os.environ.get("PKG_CONFIG", "pkg-config") >>> > > +- command_libs = [command, "--libs-only-L", name] >>> > > +- command_cflags = [command, "--cflags-only-I", name] >>> > > ++ command_libs = [command, "--libs-only-L", >>> "--keep-system-libs", name] >>> > > ++ command_cflags = [command, "--cflags-only-I", >>> "--keep-system-cflags", name] >>> > >>> > You gave an additional explanation why this is needed in the >>> upstream PR: >>> > >>> > Zlib and anything that has headers in the normal system libs/include >>> folders >>> > seems to not get their headers picked up without this change. >>> > >>> > I think this issue is mostly going to be something people hit when >>> cross >>> > compiling since the prefix based system libs/include folder would >>> probably work >>> > in most of the usual cases(searching in sys.prefix will not work when >>> cross >>> > compiling since it points to the host toolchain prefix rather than the >>> target >>> > toolchain sysroot prefix): >>> > >>> > >>> > However, that implies that either we have to make sure that >>> sys.prefix is set >>> > correctly (i.e. point it to staging instead of host), or pillow is >>> using >>> > sys.prefix incorrectly. >>> >>> I think pillow is using sys.prefix in a way that is not really cross >>> compilation >>> compatible, however using pkg-config with sysm libs/cflags seems to be >>> sufficient >>> for it to pass its non-standard header checks. >>> >> >> I remember having added the --disable-platform-guessing exactly to >> overcome this problem. All the setting should be provided by buildroot. >> Probably, the logic behind this is slightly changed, and the mechanism >> doesn't work anymore. I'll try to have a look. >> > > Yes, basically the paths leaks some host directories: > > [...] > Checking for include file %s in %s ('libimagequant.h', > '/usr/local/include') > Checking for include file %s in %s ('libimagequant.h', '/usr/include') > > Looking forward for a fix. > I came to the conclusion that James setup.py patch is necessary, pillow doesn't use sys.prefix but builds the paths from the pkg-config output. Withouth the patch, include and libraries directories are wrong. It misses a piece anyway +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) install target install options should match the build ones to have a correct library installation. > >> >>> >>> > >>> > Before that, still, I don't understand how this can be an issue. >>> Unless if >>> > pillow also passes something like -nostdinc, our toolchain wrapper >>> should make >>> > sure that staging/usr/include is in the search path. >>> >>> It's due to pillow having custom header checks like this: >>> https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 >>> >>> > >>> > There also doesn't seem to be an autobuilder failure due to this... >>> But maybe >>> > it builds successfully, just without some optional dependency? Please >>> provide >>> > more details about the failure in the commit message. >>> >>> The failure was getting hidden by the non-standard build/install cmd >>> overrides it >>> would appear, it seemed pillow was getting built for the host instead >>> of the target with >>> those, I didn't investigate in too much detail as those custom >>> build/install overrides >>> are not actually needed. >>> >>> > >>> > >>> > >>> > > + if not DEBUG: >>> > > + command_libs.append("--silence-errors") >>> > > + command_cflags.append("--silence-errors") >>> > > +-- >>> > > +2.35.1 >>> > > + >>> > > diff --git a/package/python-pillow/python-pillow.mk >>> b/package/python-pillow/python-pillow.mk >>> > > index 901876e0ee..ef677855b2 100644 >>> > > --- a/package/python-pillow/python-pillow.mk >>> > > +++ b/package/python-pillow/python-pillow.mk >>> > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE >>> > > PYTHON_PILLOW_CPE_ID_VENDOR = python >>> > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow >>> > > PYTHON_PILLOW_SETUP_TYPE = setuptools >>> > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing >>> > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" >>> > >>> > This change isn't explained in the commit message, and seems >>> unrelated. >>> > >>> > > + >>> > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf >>> > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing >>> > >>> > The need for these two changes is also not clear at all from the >>> commit message. >>> > >>> > >>> > I've marked the patch as Changes Requested. >>> > >>> > Regards, >>> > Arnout >>> > >>> > > >>> > > ifeq ($(BR2_PACKAGE_FREETYPE),y) >>> > > PYTHON_PILLOW_DEPENDENCIES += freetype >>> > > @@ -68,22 +71,4 @@ else >>> > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux >>> > > endif >>> > > >>> > > -define PYTHON_PILLOW_BUILD_CMDS >>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext >>> \ >>> > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) >>> $(PYTHON_PILLOW_BUILD_OPTS) >>> > > -endef >>> > > - >>> > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS >>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext >>> \ >>> > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ >>> > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ >>> > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) >>> > > -endef >>> > > - >>> > > $(eval $(python-package)) >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >> >> >> -- >> >> Angelo Compagnucci >> >> Software Engineer >> >> angelo at amarulasolutions.com >> __________________________________ >> Amarula Solutions SRL >> >> Via le Canevare 30, 31100 Treviso, Veneto, IT >> >> T. +39 (0)42 243 5310 >> info at amarulasolutions.com >> >> www.amarulasolutions.com >> [`as] https://www.amarulasolutions.com| >> > > > -- > > Angelo Compagnucci > > Software Engineer > > angelo at amarulasolutions.com > __________________________________ > Amarula Solutions SRL > > Via le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 (0)42 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com > [`as] https://www.amarulasolutions.com| > -- Angelo Compagnucci Software Engineer angelo at amarulasolutions.com __________________________________ Amarula Solutions SRL Via le Canevare 30, 31100 Treviso, Veneto, IT T. +39 (0)42 243 5310 info at amarulasolutions.com www.amarulasolutions.com [`as] https://www.amarulasolutions.com| -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at paral.in Tue Mar 22 05:14:48 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:14:48 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 Message-ID: <20220322051448.2589854-1-christian@paral.in> The latest Go release, version 1.18, is a significant release, including changes to the language, implementation of the toolchain, runtime, and libraries. https://go.dev/doc/go1.18 Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 85e6adfb8c..e03050b1d3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz +sha256 38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 go1.18.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 3df16c9a68..049f846220 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.8 +GO_VERSION = 1.18 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.35.1 From christian at paral.in Tue Mar 22 05:18:58 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:18:58 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: <20220322051448.2589854-1-christian@paral.in> References: <20220322051448.2589854-1-christian@paral.in> Message-ID: Hi all, On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > The latest Go release, version 1.18, is a significant release, including changes > to the language, implementation of the toolchain, runtime, and libraries. > > https://go.dev/doc/go1.18 > > # From https://golang.org/dl/ > -sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz > +sha256 38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 go1.18.src.tar.gz > sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE I should note that this upgrade also will change a lot of the Go package hashes... Due to the way the "go mod vendor" step works, there's some incompatibility with the go 1.17 vendor format: go: inconsistent vendoring in /build/containerd-1.5.9: github.com/containerd/containerd: is marked as replaced in vendor/modules.txt, but not replaced in go.mod To ignore the vendor directory, use -mod=readonly or -mod=mod. To sync the vendor directory, run: go mod vendor We will need to update the hashes and the archives for these packages. Unfortunately I don't know of any way to avoid this, other than re-running "go mod vendor" if there's any conflict. Thanks & best regards, Christian Stewart From christian at paral.in Tue Mar 22 05:38:13 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:38:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: References: <20220322051448.2589854-1-christian@paral.in> Message-ID: All, On Mon, Mar 21, 2022 at 10:18 PM Christian Stewart wrote: > On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > > > The latest Go release, version 1.18, is a significant release, including changes > > to the language, implementation of the toolchain, runtime, and libraries. > > > > https://go.dev/doc/go1.18 > I should note that this upgrade also will change a lot of the Go > package hashes... > > Due to the way the "go mod vendor" step works, there's some > incompatibility with the go 1.17 vendor format: > > go: inconsistent vendoring in /build/containerd-1.5.9: > github.com/containerd/containerd: is marked as replaced in > vendor/modules.txt, but not replaced in go.mod > > To ignore the vendor directory, use -mod=readonly or -mod=mod. > To sync the vendor directory, run: > go mod vendor > > We will need to update the hashes and the archives for these packages. Something weird is going on here... https://asciinema.org/a/guJyOQeqbG5PIL1daVYQoyyef With containerd checked out at v1.6.1 with Go 1.18, "go mod vendor" -> "go build" ... always results in the error shown above, even after deleting the vendor/ tree. This issue might be one with Go 1.18 itself. Thanks, Christian Stewart From christian at paral.in Tue Mar 22 05:46:30 2022 From: christian at paral.in (Christian Stewart) Date: Mon, 21 Mar 2022 22:46:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: References: <20220322051448.2589854-1-christian@paral.in> Message-ID: All, On Mon, Mar 21, 2022 at 10:38 PM Christian Stewart wrote: > On Mon, Mar 21, 2022 at 10:18 PM Christian Stewart wrote: > > On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > > > > > The latest Go release, version 1.18, is a significant release, including changes > > > to the language, implementation of the toolchain, runtime, and libraries. > > > > > > https://go.dev/doc/go1.18 > > > I should note that this upgrade also will change a lot of the Go > > package hashes... > > > > Due to the way the "go mod vendor" step works, there's some > > incompatibility with the go 1.17 vendor format: > > > > go: inconsistent vendoring in /build/containerd-1.5.9: > > github.com/containerd/containerd: is marked as replaced in > > vendor/modules.txt, but not replaced in go.mod > > > > To ignore the vendor directory, use -mod=readonly or -mod=mod. > > To sync the vendor directory, run: > > go mod vendor > > > > We will need to update the hashes and the archives for these packages. > > Something weird is going on here... > > https://asciinema.org/a/guJyOQeqbG5PIL1daVYQoyyef > > With containerd checked out at v1.6.1 with Go 1.18, This was indeed an incompatibility between containerd 1.6.1 and go 1.18: - https://github.com/golang/go/issues/51285 - https://github.com/containerd/containerd/pull/6605 The fix has not yet been released (for containerd). ... so we should delay updating Go to 1.18 until all the packages in the tree support it w/ tagged releases. Thanks & best, Christian Stewart From peter at korsgaard.com Tue Mar 22 07:51:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:51:01 +0100 Subject: [Buildroot] [PATCH] support/scripts/graph-build-time: add support for timeline graphing In-Reply-To: <20220209203026.3724993-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 9 Feb 2022 21:30:26 +0100") References: <20220209203026.3724993-1-yann.morin.1998@free.fr> Message-ID: <878rt2h1cq.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > From: Thomas Petazzoni > This commit adds support for a new type of graph, showing the timeline > of a build. It shows, with one line per package, when each of this > package steps started/ended, and therefore allows to see the > sequencing of the package builds. > For a fully serialized build like we have today, this is not super > useful (except to show that everything is serialized), but it becomes > much more useful in the context of top-level parallel build. > We chose to order the graph by the time-of-configure, as it is the > closest to the actual cascade-style of a true dependency graph, which is > tiny bit more complex to achieve properly. The actual result still looks > pretty good. > The graph-build make target is extended to also generate this new > timeline graph. > Signed-off-by: Thomas Petazzoni > [yann.morin.1998 at free.fr: > - sort by start-of-configure time > - re-use existing colorsets (default or alternate) > - fix python2isms > - fix check-package > ] > Signed-off-by: Yann E. MORIN Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:50:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:50:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] support/scripts/graph-build-time: add support for timeline graphing Message-ID: <20220322074218.6AD1584F5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96b346cb56ccf5ef52b29d367db5149d212c45df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This commit adds support for a new type of graph, showing the timeline of a build. It shows, with one line per package, when each of this package steps started/ended, and therefore allows to see the sequencing of the package builds. For a fully serialized build like we have today, this is not super useful (except to show that everything is serialized), but it becomes much more useful in the context of top-level parallel build. We chose to order the graph by the time-of-configure, as it is the closest to the actual cascade-style of a true dependency graph, which is tiny bit more complex to achieve properly. The actual result still looks pretty good. The graph-build make target is extended to also generate this new timeline graph. Signed-off-by: Thomas Petazzoni [yann.morin.1998 at free.fr: - sort by start-of-configure time - re-use existing colorsets (default or alternate) - fix python2isms - fix check-package ] Signed-off-by: Yann E. MORIN (cherry picked from commit 5e8b01afd5d8d8af8f4ce334073df9b15497cf36) Signed-off-by: Peter Korsgaard --- Makefile | 3 ++ support/scripts/graph-build-time | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 71f8096b71..db2ac30b10 100644 --- a/Makefile +++ b/Makefile @@ -873,6 +873,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a50..1edc3b3c00 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) From peter at korsgaard.com Tue Mar 22 07:54:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:54:17 +0100 Subject: [Buildroot] [PATCH 2021.02.x] DEVELOPERS: drop libqrtr-glib from Yegor Yefremov In-Reply-To: <20220320151649.767880-1-thomas.petazzoni@bootlin.com> (Thomas Petazzoni via buildroot's message of "Sun, 20 Mar 2022 16:16:49 +0100") References: <20220320151649.767880-1-thomas.petazzoni@bootlin.com> Message-ID: <874k3qh17a.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > Commit 73ce754531b5e45bd42b56c58718fbacc754406f in master added the > libqrtr-glib package to Yegor Yefremov. > This commit was backported as fad154253deb5b5399ea52a19ed6608dcd00ee4d > in the LTS 2021.02.x branch, but this branch does not have the > libqrtr-glib package, as it was added after 2021.02. > Due to this, the DEVELOPERS file is bogus in 2021.02.x, which causes > the following warning when running pkg-stats: > WARNING: 'package/libqrtr-glib/' doesn't match any file > This commit fixes this by dropping the bogus line from the DEVELOPERS > file. > Signed-off-by: Thomas Petazzoni Ups, committed to 2021.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:53:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:53:07 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: drop libqrtr-glib from Yegor Yefremov Message-ID: <20220322074531.A929B84FCB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d51fb936f655dde1c68d54a9535541823ed59aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 73ce754531b5e45bd42b56c58718fbacc754406f in master added the libqrtr-glib package to Yegor Yefremov. This commit was backported as fad154253deb5b5399ea52a19ed6608dcd00ee4d in the LTS 2021.02.x branch, but this branch does not have the libqrtr-glib package, as it was added after 2021.02. Due to this, the DEVELOPERS file is bogus in 2021.02.x, which causes the following warning when running pkg-stats: WARNING: 'package/libqrtr-glib/' doesn't match any file This commit fixes this by dropping the bogus line from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index fad5c13844..3397565457 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2755,7 +2755,6 @@ F: package/libmbim/ F: package/libndp/ F: package/libnftnl/ F: package/libqmi/ -F: package/libqrtr-glib/ F: package/libsoc/ F: package/libsocketcan/ F: package/libubox/ From peter at korsgaard.com Tue Mar 22 07:56:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:56:24 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3 In-Reply-To: <20220315090209.206025-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:09 +0100") References: <20220315090209.206025-1-angelo@amarulasolutions.com> Message-ID: <87zglifmjb.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:56:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:56:38 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3-rt3 In-Reply-To: <20220315090220.206426-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:20 +0100") References: <20220315090220.206426-1-angelo@amarulasolutions.com> Message-ID: <87v8w6fmix.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci s/CIP/CIP-RT/ Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:55:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:55:33 +0100 Subject: [Buildroot] [git commit] linux: bump CIP kernel to version 5.10.104-cip3 Message-ID: <20220322074824.70E07850D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=781a01c9f3d8c7d970d75ca56198161352a91d4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 043e7c6574..c6590b31ee 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.104-cip3)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf856..18480a87bf 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz +sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes From peter at korsgaard.com Tue Mar 22 07:56:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:56:04 +0100 Subject: [Buildroot] [git commit] linux: bump CIP-RT kernel to version 5.10.104-cip3-rt3 Message-ID: <20220322074824.8000884F2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2b6bd9b0de8c60f8acd87bb7ffaefc59be6d8dae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c6590b31ee..f21beb4222 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.104-cip3-rt3)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 18480a87bf..976f1d07c0 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From peter at korsgaard.com Tue Mar 22 07:57:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:57:04 +0100 Subject: [Buildroot] [git commit] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220322074824.8A505850F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52c372446f034cf8277951ad083abe5e1c10f52d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Tue Mar 22 07:57:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:57:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiec61850: security bump to version 1.5.1 In-Reply-To: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 18:34:29 +0100") References: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> Message-ID: <87r16ufmhu.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Retrieve official tarball > - Fix CVE-2021-45769: A NULL pointer dereference in > AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 > v1.5.0 can lead to a segmentation fault or application crash. > - Fix many other vulnerabilities: > https://libiec61850.com/new-release-1-5-1-of-libiec61850 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From rsassen at comecer.com Tue Mar 22 08:16:49 2022 From: rsassen at comecer.com (Sassen, Rutger) Date: Tue, 22 Mar 2022 08:16:49 +0000 Subject: [Buildroot] [External] Re: [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: Hi Arnout, > > When supporting multiple hardware targets, overlay_map.dtb might > > be needed to map overlay names to one of several implementations. > > > > Signed-off-by: Rutger Sassen > > --- > > package/rpi-firmware/Config.in | 12 ++++++++++++ > > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > > index 8070dc3019..36054353f8 100644 > > --- a/package/rpi-firmware/Config.in > > +++ b/package/rpi-firmware/Config.in > > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > overlays, to support HATs (Hardware Attached on Top, add-on > > modules). > > > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > + > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > In the end, I don't think this option is very useful. So I removed it... ... > ... reducing the patch to just this single line. Almost back to the first iteration of my patch, where overlay_map.dtb and README were copied unconditionally ? > Please check if the commit [1] does what you need, if not I can recover the > original patch with the http://Config.in option. I've checked, and it works for me. Thanks. > Applied to master, thanks. > > Regards, > Arnout > > [1] > https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 Regards, Rutger This email communication is CONFIDENTIAL. If you are not the intended recipient, you may not use, copy or disclose to anyone the message or any information contained in the message and I ask that you please notify me by return email and delete this communication immediately. Thank you. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Mar 22 08:21:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 09:21:17 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/apache: security bump version to 2.4.53 In-Reply-To: <20220314212000.2949718-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Mon, 14 Mar 2022 22:20:00 +0100") References: <20220314212000.2949718-1-bernd.kuhls@t-online.de> Message-ID: <87mthifldu.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 > Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. > Switch from pcre to pcre2 following upstream commit: > https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 > Signed-off-by: Bernd Kuhls > --- > v2: switch from pcre to pcre2 (Peter S.) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 22 07:59:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 08:59:18 +0100 Subject: [Buildroot] [git commit] package/apache: security bump version to 2.4.53 Message-ID: <20220322081231.402448513F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eaa8fcf546d84e38990566e49f4730c530d2577c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Tue Mar 22 08:29:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 22 Mar 2022 09:29:38 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220322082939.2153092-1-peter@korsgaard.com> 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f21beb4222..f25b662aa5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.30" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 976f1d07c0..87a0f0465b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 cca7d6e053e33f44af1b39f7becec73a387911d81ede5a84ecf671692533138f linux-5.16.16.tar.xz +sha256 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132 linux-5.15.30.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831..479f64b72e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -381,13 +381,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 + default "5.15.30" if BR2_KERNEL_HEADERS_5_15 + default "5.16.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ -- 2.30.2 From kamel.bouhara at bootlin.com Tue Mar 22 09:40:41 2022 From: kamel.bouhara at bootlin.com (Kamel Bouhara) Date: Tue, 22 Mar 2022 10:40:41 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <990140a5-a769-2f7b-5786-c08557db4b6b@mind.be> References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-4-kamel.bouhara@bootlin.com> <990140a5-a769-2f7b-5786-c08557db4b6b@mind.be> Message-ID: On Mon, Mar 21, 2022 at 10:01:40PM +0100, Arnout Vandecappelle wrote: > > > On 10/03/2022 10:56, Kamel Bouhara via buildroot wrote: > > Add host variant of libodb-boost required by the ODB compiler. > > The libodb-boost headers are needed at compile time, and > > therefore installed in $(HOST_DIR). > > > > Signed-off-by: Kamel Bouhara > > --- > > package/libodb-boost/libodb-boost.mk | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk > > index bac5f1e78f..39c9f91030 100644 > > --- a/package/libodb-boost/libodb-boost.mk > > +++ b/package/libodb-boost/libodb-boost.mk > > @@ -12,6 +12,8 @@ LIBODB_BOOST_INSTALL_STAGING = YES > > LIBODB_BOOST_LICENSE = GPL-2.0 > > LIBODB_BOOST_LICENSE_FILES = LICENSE > > LIBODB_BOOST_DEPENDENCIES = boost libodb > > +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb > > LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" > > I have not double-checked (since I don't know for which GCC version exactly > this -std=c++11 is needed), but I expect that if -std=c++11 is needed for > target build, it's also going to be needed for host build. So I added > HOST_LIBODB_BOOST_CONF_ENV. > It seems required seems GCC 11: http://lists.busybox.net/pipermail/buildroot/2021-August/618575.html Thanks, Kamel > > Series applied to master with that fixed, thanks. > > Regards, > Arnout > > > > $(eval $(autotools-package)) > > +$(eval $(host-autotools-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Kamel Bouhara, Bootlin Embedded Linux and kernel engineering https://bootlin.com From bugzilla at busybox.net Tue Mar 22 12:35:05 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Mar 2022 12:35:05 +0000 Subject: [Buildroot] [Bug 14676] New: BRCMFMAC SDIO firmware doesn't copy to target Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 Bug ID: 14676 Summary: BRCMFMAC SDIO firmware doesn't copy to target Product: buildroot Version: 2022.02 Hardware: PC OS: Linux Status: NEW Severity: major Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dmanlfc at gmail.com CC: buildroot at uclibc.org Target Milestone: --- package BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI doesn't copy the firmware to the target directory. My workaround: config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI bool "brcmfmac-sdio-firmware-rpi" depends on BR2_arm || BR2_aarch64 select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT # batocera - BR fix select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI # batocera - BR fix help Raspberry Broadcom Bluetooth and Wifi firmware. Alternatively remove the ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) & ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) conditionals from the makefile. Dan -- You are receiving this mail because: You are on the CC list for the bug. From giulio.benetti at benettiengineering.com Tue Mar 22 12:40:25 2022 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 22 Mar 2022 13:40:25 +0100 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220322110313.4061782-1-neal.frager@amd.com> References: <20220322110313.4061782-1-neal.frager@amd.com> Message-ID: <70D87B9E-978A-49CE-BECE-500C876CE13D@benettiengineering.com> Hi Neal, > Il giorno 22 mar 2022, alle ore 12:03, Neal Frager ha scritto: > > ?This patch migrates Xilinx Linux kernel and U-Boot from git:// to > https:// because git:// is no longer supported. > > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > > Signed-off-by: Neal Frager > --- > DEVELOPERS | 2 +- > configs/zynqmp_zcu102_defconfig | 4 ++-- > configs/zynqmp_zcu106_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 942bb8fe9c..58ed4f81cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2089,7 +2089,7 @@ F: package/libevdev/ > F: package/pkg-qmake.mk > F: package/qt5/qt5opcua/ > > -N: Neal Frager > +N: Neal Frager > F: board/zynqmp/ > F: configs/zynqmp_zcu102_defconfig This ^^^ should be splitted into another patch. Best regards ?- Giulio Benetti Benetti Engineering sas > > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index 4e96489179..2dd0817bd8 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index 0a97975aa0..d836edfaf0 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" > -- > 2.17.1 > From johan.oudinet at gmail.com Tue Mar 22 16:07:25 2022 From: johan.oudinet at gmail.com (Johan Oudinet) Date: Tue, 22 Mar 2022 17:07:25 +0100 Subject: [Buildroot] [PATCH] package/forge: new package Message-ID: <20220322160725.636205-1-johan.oudinet@gmail.com> A native implementation of TLS (and various other cryptographic tools) in JavaScript. Signed-off-by: Johan Oudinet --- DEVELOPERS | 1 + package/Config.in | 1 + package/forge/Config.in | 7 +++++++ package/forge/forge.hash | 3 +++ package/forge/forge.mk | 23 +++++++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/forge/Config.in create mode 100644 package/forge/forge.hash create mode 100644 package/forge/forge.mk diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..5830b45018 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1475,6 +1475,7 @@ F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ +F: package/forge/ F: package/nginx-dav-ext/ F: package/vuejs/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..f2587b5c66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1653,6 +1653,7 @@ endif source "package/duktape/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" + source "package/forge/Config.in" source "package/jquery/Config.in" if BR2_PACKAGE_JQUERY menu "External jQuery plugins" diff --git a/package/forge/Config.in b/package/forge/Config.in new file mode 100644 index 0000000000..86d4832101 --- /dev/null +++ b/package/forge/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FORGE + bool "forge" + help + A native implementation of TLS (and various other + cryptographic tools) in JavaScript. + + https://github.com/digitalbazaar/forge diff --git a/package/forge/forge.hash b/package/forge/forge.hash new file mode 100644 index 0000000000..256ac5b451 --- /dev/null +++ b/package/forge/forge.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 97f0276c32b39411ad85c5762bf546ca281451eeaa93bdd383ff082e8e0181b4 node-forge-1.3.0.tgz +sha256 f63ff0e4e239244aa79280da2dd4811a0469e5e201caf5cbc0d97c3a1dff8e82 LICENSE diff --git a/package/forge/forge.mk b/package/forge/forge.mk new file mode 100644 index 0000000000..1872cb4e70 --- /dev/null +++ b/package/forge/forge.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# forge +# +################################################################################ + +FORGE_VERSION = 1.3.0 +FORGE_SOURCE = node-forge-$(FORGE_VERSION).tgz +FORGE_SITE = https://registry.npmjs.org/node-forge/- +FORGE_LICENSE = BSD-3-Clause, GPL-2.0 +FORGE_LICENSE_FILES = LICENSE + +# Install .min.js as .js +define FORGE_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/dist/forge.all.min.js \ + $(TARGET_DIR)/var/www/forge.all.js + $(INSTALL) -m 644 -D $(@D)/dist/forge.min.js \ + $(TARGET_DIR)/var/www/forge.js + $(INSTALL) -m 644 -D $(@D)/dist/prime.worker.min.js \ + $(TARGET_DIR)/var/www/prime.worker.js +endef + +$(eval $(generic-package)) -- 2.32.0 From huth at tuxfamily.org Tue Mar 22 16:28:20 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Tue, 22 Mar 2022 17:28:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add s390x support In-Reply-To: <20220317223928.508338-1-fontaine.fabrice@gmail.com> References: <20220317223928.508338-1-fontaine.fabrice@gmail.com> Message-ID: <20220322172820.3d5763b9@tuxfamily.org> Am Thu, 17 Mar 2022 23:39:28 +0100 schrieb Fabrice Fontaine : > s390x is supported since > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a > > Signed-off-by: Fabrice Fontaine > --- > package/kvm-unit-tests/Config.in | 1 + > package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157..a3d6756fb9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > BR2_cortex_a17 || BR2_cortex_a17_a7 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_s390x > > config BR2_PACKAGE_KVM_UNIT_TESTS > bool "kvm-unit-tests" > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e03..2d05d08067 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 > else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > KVM_UNIT_TESTS_ARCH = ppc64 > +else ifeq ($(BR2_s390x),y) > +KVM_UNIT_TESTS_ARCH = s390x > else ifeq ($(BR2_x86_64),y) > KVM_UNIT_TESTS_ARCH = x86_64 > endif Reviewed-by: Thomas Huth From yann.morin.1998 at free.fr Tue Mar 22 17:05:45 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 22 Mar 2022 18:05:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/go: bump to version 1.18 In-Reply-To: References: <20220322051448.2589854-1-christian@paral.in> Message-ID: <20220322170545.GA3355310@scaer> On 2022-03-21 22:18 -0700, Christian Stewart spake thusly: > On Mon, Mar 21, 2022 at 10:14 PM Christian Stewart wrote: > > The latest Go release, version 1.18, is a significant release, including changes > > to the language, implementation of the toolchain, runtime, and libraries. > I should note that this upgrade also will change a lot of the Go > package hashes... > > Due to the way the "go mod vendor" step works, there's some > incompatibility with the go 1.17 vendor format: > > go: inconsistent vendoring in /build/containerd-1.5.9: > github.com/containerd/containerd: is marked as replaced in > vendor/modules.txt, but not replaced in go.mod > > To ignore the vendor directory, use -mod=readonly or -mod=mod. > To sync the vendor directory, run: > go mod vendor > > We will need to update the hashes and the archives for these packages. This is a no-go. We can't change hashes, otherwise there will be a conflict with the hashes of the backup download we store on sources.buildroot.org. Probably, the best solution forward would be to introduce a version suffix for the post-process. I quickly hacked something around: diff --git a/package/pkg-download.mk b/package/pkg-download.mk index a15e21e110..74369fc946 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -22,6 +22,7 @@ export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # download backend: BR_FMT_VERSION_git = -br1 BR_FMT_VERSION_svn = -br2 +BR_FMT_POST_PROCESS_go = -brgo1 DL_WRAPPER = support/download/dl-wrapper diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 7d1aea7710..e317750967 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -43,7 +43,7 @@ pkgname = $(lastword $(subst /, ,$(pkgdir))) # Helper to build the extension for a package archive, based on various # conditions. # $(1): upper-case package name -pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD)).tar.gz +pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD))$(BR_FMT_POST_PROCESS_$($(1)_DOWNLOAD_POST_PROCESS)).tar.gz # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) So, basically, we would need a series that does: 1. introduces the post-process versionning as shown above, and update the hashes accordingly 2. update go to 1.18, which at the same time updates the newly introduced post-process versionning, and update the hashes yet again. Regards, Yann E. MORIN. > Unfortunately I don't know of any way to avoid this, other than > re-running "go mod vendor" if there's any conflict. > > Thanks & best regards, > Christian Stewart -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From cohuck at redhat.com Tue Mar 22 17:08:00 2022 From: cohuck at redhat.com (Cornelia Huck) Date: Tue, 22 Mar 2022 18:08:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add more arm support Message-ID: <20220322170800.1872403-1-cohuck@redhat.com> Add some more cortexes with VHE, and enable aarch64. Signed-off-by: Cornelia Huck --- Resent because I was subscribed with a different email address. Sorry about the spam. --- package/kvm-unit-tests/Config.in | 5 ++++- package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157f0..b084375e62e9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS # On ARM, it uses virtualization extensions default y if BR2_cortex_a7 || BR2_cortex_a12 || \ BR2_cortex_a15 || BR2_cortex_a15_a7 || \ - BR2_cortex_a17 || BR2_cortex_a17_a7 + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ + BR2_cortex_a55 || BR2_cortex_a75 || \ + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ + BR2_cortex_a76_a55 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d610442e039f..d72eba02bc3b 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -ifeq ($(BR2_arm),y) +ifeq ($(BR2_aarch64),y) +KVM_UNIT_TESTS_ARCH = aarch64 +else ifeq ($(BR2_arm),y) KVM_UNIT_TESTS_ARCH = arm else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 -- 2.34.1 From fontaine.fabrice at gmail.com Tue Mar 22 17:48:38 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 18:48:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/jack2: fix build with libexecinfo Message-ID: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': sigsegv.c:(.text+0x98): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc Signed-off-by: Fabrice Fontaine --- package/jack2/jack2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 2e55169984..127c99eed1 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 22 17:48:39 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 18:48:39 +0100 Subject: [Buildroot] [PATCH 2/2] package/jack2: explicitly {dis, en}able opus and readline In-Reply-To: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Message-ID: <20220322174839.2189015-2-fontaine.fabrice@gmail.com> Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 127c99eed1..6939aac9a6 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -21,10 +21,16 @@ endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) -- 2.35.1 From bernd.kuhls at t-online.de Tue Mar 22 18:12:54 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Mar 2022 19:12:54 +0100 Subject: [Buildroot] [PATCH 2/3] package/intel-gmmlib: bump version to 22.1.1 In-Reply-To: <20220322181255.1325476-1-bernd.kuhls@t-online.de> References: <20220322181255.1325476-1-bernd.kuhls@t-online.de> Message-ID: <20220322181255.1325476-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index beb3cfd6ae..7e7b570bd1 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz +sha256 b448d83bcd7e155c627a0cdfd666c6a86f3655dfe6001ebb9b52d8a89564cf55 intel-gmmlib-22.1.1.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 06628132a2..dcb3857e8f 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.3 +INTEL_GMMLIB_VERSION = 22.1.1 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From bernd.kuhls at t-online.de Tue Mar 22 18:12:53 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Mar 2022 19:12:53 +0100 Subject: [Buildroot] [PATCH 1/3] package/intel-mediadriver: bump version to 22.3.0 Message-ID: <20220322181255.1325476-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 044b9d7013..57499830b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 84eda811ae..c22aeecc77 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_VERSION = 22.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.30.2 From bernd.kuhls at t-online.de Tue Mar 22 18:12:55 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Tue, 22 Mar 2022 19:12:55 +0100 Subject: [Buildroot] [PATCH 3/3] package/intel-mediasdk: bump version to 22.3.0 In-Reply-To: <20220322181255.1325476-1-bernd.kuhls@t-online.de> References: <20220322181255.1325476-1-bernd.kuhls@t-online.de> Message-ID: <20220322181255.1325476-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d9acf49637..802131a772 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz +sha256 e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 intel-mediasdk-22.3.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 698d2348b2..b90d252b4f 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.2 +INTEL_MEDIASDK_VERSION = 22.3.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From buildroot at busybox.net Tue Mar 22 18:27:42 2022 From: buildroot at busybox.net (E-mail Administrator) Date: 22 Mar 2022 19:27:42 +0100 Subject: [Buildroot] buildroot@busybox.net Password Expired Message-ID: <20220322192741.45326DF6CBE7C803@busybox.net> An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Tue Mar 22 18:29:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 12:29:52 -0600 Subject: [Buildroot] [PATCH v4 1/1] package/python-pillow: fix pkg-config search paths Message-ID: <20220322182952.935255-1-james.hilliard1@gmail.com> Currently pillow doesn't correctly search pkg-config system paths for some libraries which can prevent some libraries from being properly detected/enabled in pillow. This is due to pillow implementing custom header validation checks which need system paths present to function correctly: https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 Removed custom BUILD_CMDS and INSTALL_TARGET_CMDS which were causing python-pillow to be installed for the host, they are not required, we just need to set build_ext at the start of PYTHON_PILLOW_BUILD_OPTS instead. Signed-off-by: James Hilliard --- Changes v3 -> v4: - pass BUILD_OPTS to INSTALL_TARGET_OPTS Changes v2 -> v3: - actually remove MAX_CONCURRENCY env variable Changes v1 -> v2: - remove unrelated MAX_CONCURRENCY env variable --- ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ package/python-pillow/python-pillow.mk | 23 +++---------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch new file mode 100644 index 0000000000..9f979b048f --- /dev/null +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch @@ -0,0 +1,33 @@ +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 15 Mar 2022 23:31:59 -0600 +Subject: [PATCH] Search pkg-config system libs/cflags. + +We need to search the system paths as well from pkg-config for +some packages to be found properly. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/python-pillow/Pillow/pull/6138] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 3468b260..59d65ce2 100755 +--- a/setup.py ++++ b/setup.py +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): + def _pkg_config(name): + try: + command = os.environ.get("PKG_CONFIG", "pkg-config") +- command_libs = [command, "--libs-only-L", name] +- command_cflags = [command, "--cflags-only-I", name] ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] + if not DEBUG: + command_libs.append("--silence-errors") + command_cflags.append("--silence-errors") +-- +2.35.1 + diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 901876e0ee..1d99f44fa1 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) -- 2.25.1 From fontaine.fabrice at gmail.com Tue Mar 22 18:29:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 19:29:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 2.1.1 Message-ID: <20220322182946.2446236-1-fontaine.fabrice@gmail.com> - Switch to new active fork: https://github.com/enzo1982/mp4v2/discussions/1 https://github.com/TechSmith/mp4v2/commit/461abd2b1365e14ba28dd0e4a0cb6c3bee1bab41 - C++11 is not needed anymore thanks to https://github.com/enzo1982/mp4v2/commit/5a57bc2ce8948f6ffa96761286921ab3e2ebe467 - Drop patch (not needed since https://github.com/enzo1982/mp4v2/commit/23f8b907d4a221e1dae9e8b859cb6b1161206866) - Update license (minor fix: https://github.com/enzo1982/mp4v2/commit/0c37402d9d3644ea0b7d55db1d901bfad9723dfc) - Version 2.1.1 was never released before so no issue is expected (except a misunderstanding of users but new upstream is aware of this: https://github.com/enzo1982/mp4v2/discussions/1#discussioncomment-2399344) https://github.com/enzo1982/mp4v2/releases/tag/v2.1.1 https://github.com/enzo1982/mp4v2/releases/tag/v2.1.0 Signed-off-by: Fabrice Fontaine --- ...tatic-cast-to-unsigned-int-for-cases.patch | 99 ------------------- package/mp4v2/Config.in | 8 +- package/mp4v2/mp4v2.hash | 4 +- package/mp4v2/mp4v2.mk | 5 +- 4 files changed, 8 insertions(+), 108 deletions(-) delete mode 100644 package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch deleted file mode 100644 index 6c9b13bed8..0000000000 --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Thu, 6 Aug 2020 15:22:04 +0200 -Subject: [PATCH] Static cast to unsigned int for cases - -Signed-off-by: Jason A. Donenfeld -[Retrieved from: -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] -Signed-off-by: Fabrice Fontaine ---- - libutil/Utility.cpp | 2 +- - util/mp4art.cpp | 2 +- - util/mp4chaps.cpp | 2 +- - util/mp4file.cpp | 2 +- - util/mp4subtitle.cpp | 2 +- - util/mp4track.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp -index 76cdd12..d6739d4 100644 ---- a/libutil/Utility.cpp -+++ b/libutil/Utility.cpp -@@ -493,7 +493,7 @@ Utility::process_impl() - if( codes.find( code ) == codes.end() ) - continue; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case 'z': - _optimize = true; - break; -diff --git a/util/mp4art.cpp b/util/mp4art.cpp -index add935e..6e7f531 100644 ---- a/util/mp4art.cpp -+++ b/util/mp4art.cpp -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case LC_ART_ANY: - _artFilter = numeric_limits::max(); - break; -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp -index 98400f8..ccc8b70 100644 ---- a/util/mp4chaps.cpp -+++ b/util/mp4chaps.cpp -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case 'A': - case LC_CHPT_ANY: - _ChapterType = MP4ChapterTypeAny; -diff --git a/util/mp4file.cpp b/util/mp4file.cpp -index c27844b..b127cd1 100644 ---- a/util/mp4file.cpp -+++ b/util/mp4file.cpp -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &FileUtility::actionList; - break; -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp -index 7462153..19d977d 100644 ---- a/util/mp4subtitle.cpp -+++ b/util/mp4subtitle.cpp -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &SubtitleUtility::actionList; - break; -diff --git a/util/mp4track.cpp b/util/mp4track.cpp -index d550506..cd63d7e 100644 ---- a/util/mp4track.cpp -+++ b/util/mp4track.cpp -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_TRACK_WILDCARD: - _trackMode = TM_WILDCARD; - break; --- -2.28.0 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 00e80cd358..705a8c9d24 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,12 +1,11 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. - https://github.com/TechSmith/mp4v2/ + https://mp4v2.org/ if BR2_PACKAGE_MP4V2 @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 +comment "mp4v2 needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 7aa5402c8f..d3f0243650 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 6d29228a13..7de837c170 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,9 +4,10 @@ # ################################################################################ -MP4V2_VERSION = 5.0.1 +MP4V2_VERSION = 2.1.1 MP4V2_SITE = \ - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING -- 2.35.1 From james.hilliard1 at gmail.com Tue Mar 22 18:33:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 12:33:14 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: fix pkg-config search paths In-Reply-To: References: <20220316060219.3448648-1-james.hilliard1@gmail.com> Message-ID: On Mon, Mar 21, 2022 at 5:10 PM Angelo Compagnucci wrote: > > > > On Mon, Mar 21, 2022 at 11:35 PM Angelo Compagnucci wrote: >> >> >> >> On Mon, Mar 21, 2022 at 11:10 PM Angelo Compagnucci wrote: >>> >>> >>> >>> On Mon, Mar 21, 2022 at 10:56 PM James Hilliard wrote: >>>> >>>> On Mon, Mar 21, 2022 at 3:32 PM Arnout Vandecappelle wrote: >>>> > >>>> > Hi James, >>>> > >>>> > On 16/03/2022 07:02, James Hilliard wrote: >>>> > > Currently pillow doesn't correctly search pkg-config system paths >>>> > > for some libraries which can prevent some libraries from being >>>> > > properly detected/enabled in pillow. >>>> > > >>>> > > Signed-off-by: James Hilliard >>>> > > --- >>>> > > ...Search-pkg-config-system-libs-cflags.patch | 33 +++++++++++++++++++ >>>> > > package/python-pillow/python-pillow.mk | 23 +++---------- >>>> > > 2 files changed, 37 insertions(+), 19 deletions(-) >>>> > > create mode 100644 package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>>> > > >>>> > > diff --git a/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>>> > > new file mode 100644 >>>> > > index 0000000000..9f979b048f >>>> > > --- /dev/null >>>> > > +++ b/package/python-pillow/0001-Search-pkg-config-system-libs-cflags.patch >>>> > > @@ -0,0 +1,33 @@ >>>> > > +From 89c9c347bb7437d5ea559930e315f42a0236761f Mon Sep 17 00:00:00 2001 >>>> > > +From: James Hilliard >>>> > > +Date: Tue, 15 Mar 2022 23:31:59 -0600 >>>> > > +Subject: [PATCH] Search pkg-config system libs/cflags. >>>> > > + >>>> > > +We need to search the system paths as well from pkg-config for >>>> > > +some packages to be found properly. >>>> > > + >>>> > > +Signed-off-by: James Hilliard >>>> > > +[Upstream status: >>>> > > +https://github.com/python-pillow/Pillow/pull/6138] >>>> > > +--- >>>> > > + setup.py | 4 ++-- >>>> > > + 1 file changed, 2 insertions(+), 2 deletions(-) >>>> > > + >>>> > > +diff --git a/setup.py b/setup.py >>>> > > +index 3468b260..59d65ce2 100755 >>>> > > +--- a/setup.py >>>> > > ++++ b/setup.py >>>> > > +@@ -252,8 +252,8 @@ def _cmd_exists(cmd): >>>> > > + def _pkg_config(name): >>>> > > + try: >>>> > > + command = os.environ.get("PKG_CONFIG", "pkg-config") >>>> > > +- command_libs = [command, "--libs-only-L", name] >>>> > > +- command_cflags = [command, "--cflags-only-I", name] >>>> > > ++ command_libs = [command, "--libs-only-L", "--keep-system-libs", name] >>>> > > ++ command_cflags = [command, "--cflags-only-I", "--keep-system-cflags", name] >>>> > >>>> > You gave an additional explanation why this is needed in the upstream PR: >>>> > >>>> > Zlib and anything that has headers in the normal system libs/include folders >>>> > seems to not get their headers picked up without this change. >>>> > >>>> > I think this issue is mostly going to be something people hit when cross >>>> > compiling since the prefix based system libs/include folder would probably work >>>> > in most of the usual cases(searching in sys.prefix will not work when cross >>>> > compiling since it points to the host toolchain prefix rather than the target >>>> > toolchain sysroot prefix): >>>> > >>>> > >>>> > However, that implies that either we have to make sure that sys.prefix is set >>>> > correctly (i.e. point it to staging instead of host), or pillow is using >>>> > sys.prefix incorrectly. >>>> >>>> I think pillow is using sys.prefix in a way that is not really cross compilation >>>> compatible, however using pkg-config with sysm libs/cflags seems to be >>>> sufficient >>>> for it to pass its non-standard header checks. >>> >>> >>> I remember having added the --disable-platform-guessing exactly to overcome this problem. All the setting should be provided by buildroot. Probably, the logic behind this is slightly changed, and the mechanism doesn't work anymore. I'll try to have a look. >> >> >> Yes, basically the paths leaks some host directories: >> >> [...] >> Checking for include file %s in %s ('libimagequant.h', '/usr/local/include') >> Checking for include file %s in %s ('libimagequant.h', '/usr/include') >> >> Looking forward for a fix. > > > I came to the conclusion that James setup.py patch is necessary, pillow doesn't use sys.prefix but builds the paths from the pkg-config output. Withouth the patch, include and libraries directories are wrong. > It misses a piece anyway > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) install https://patchwork.ozlabs.org/project/buildroot/patch/20220322182952.935255-1-james.hilliard1 at gmail.com/ The install part isn't needed here since it will still get passed by _BASE_INSTALL_TARGET_CMD. See: https://github.com/buildroot/buildroot/blob/eaa8fcf546d84e38990566e49f4730c530d2577c/package/pkg-python.mk#L199 https://github.com/buildroot/buildroot/blob/eaa8fcf546d84e38990566e49f4730c530d2577c/package/pkg-python.mk#L285 > > target install options should match the build ones to have a correct library installation. > >> >>> >>>> >>>> >>>> > >>>> > Before that, still, I don't understand how this can be an issue. Unless if >>>> > pillow also passes something like -nostdinc, our toolchain wrapper should make >>>> > sure that staging/usr/include is in the search path. >>>> >>>> It's due to pillow having custom header checks like this: >>>> https://github.com/python-pillow/Pillow/blob/9.0.1/setup.py#L633 >>>> >>>> > >>>> > There also doesn't seem to be an autobuilder failure due to this... But maybe >>>> > it builds successfully, just without some optional dependency? Please provide >>>> > more details about the failure in the commit message. >>>> >>>> The failure was getting hidden by the non-standard build/install cmd >>>> overrides it >>>> would appear, it seemed pillow was getting built for the host instead >>>> of the target with >>>> those, I didn't investigate in too much detail as those custom >>>> build/install overrides >>>> are not actually needed. >>>> >>>> > >>>> > >>>> > >>>> > > + if not DEBUG: >>>> > > + command_libs.append("--silence-errors") >>>> > > + command_cflags.append("--silence-errors") >>>> > > +-- >>>> > > +2.35.1 >>>> > > + >>>> > > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk >>>> > > index 901876e0ee..ef677855b2 100644 >>>> > > --- a/package/python-pillow/python-pillow.mk >>>> > > +++ b/package/python-pillow/python-pillow.mk >>>> > > @@ -12,7 +12,10 @@ PYTHON_PILLOW_LICENSE_FILES = LICENSE >>>> > > PYTHON_PILLOW_CPE_ID_VENDOR = python >>>> > > PYTHON_PILLOW_CPE_ID_PRODUCT = pillow >>>> > > PYTHON_PILLOW_SETUP_TYPE = setuptools >>>> > > -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing >>>> > > +PYTHON_PILLOW_ENV = MAX_CONCURRENCY="$(PARALLEL_JOBS)" >>>> > >>>> > This change isn't explained in the commit message, and seems unrelated. >>>> > >>>> > > + >>>> > > +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf >>>> > > +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing >>>> > >>>> > The need for these two changes is also not clear at all from the commit message. >>>> > >>>> > >>>> > I've marked the patch as Changes Requested. >>>> > >>>> > Regards, >>>> > Arnout >>>> > >>>> > > >>>> > > ifeq ($(BR2_PACKAGE_FREETYPE),y) >>>> > > PYTHON_PILLOW_DEPENDENCIES += freetype >>>> > > @@ -68,22 +71,4 @@ else >>>> > > PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux >>>> > > endif >>>> > > >>>> > > -define PYTHON_PILLOW_BUILD_CMDS >>>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >>>> > > - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) >>>> > > -endef >>>> > > - >>>> > > -define PYTHON_PILLOW_INSTALL_TARGET_CMDS >>>> > > - cd $(PYTHON_PILLOW_BUILDDIR); \ >>>> > > - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ >>>> > > - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ >>>> > > - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ >>>> > > - $(PYTHON_PILLOW_BUILD_OPTS) install \ >>>> > > - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ >>>> > > - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) >>>> > > -endef >>>> > > - >>>> > > $(eval $(python-package)) >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> >>> >>> -- >>> >>> Angelo Compagnucci >>> >>> Software Engineer >>> >>> angelo at amarulasolutions.com >>> __________________________________ >>> Amarula Solutions SRL >>> >>> Via le Canevare 30, 31100 Treviso, Veneto, IT >>> >>> T. +39 (0)42 243 5310 >>> info at amarulasolutions.com >>> >>> www.amarulasolutions.com >>> >>> [`as] https://www.amarulasolutions.com| >> >> >> >> -- >> >> Angelo Compagnucci >> >> Software Engineer >> >> angelo at amarulasolutions.com >> __________________________________ >> Amarula Solutions SRL >> >> Via le Canevare 30, 31100 Treviso, Veneto, IT >> >> T. +39 (0)42 243 5310 >> info at amarulasolutions.com >> >> www.amarulasolutions.com >> >> [`as] https://www.amarulasolutions.com| > > > > -- > > Angelo Compagnucci > > Software Engineer > > angelo at amarulasolutions.com > __________________________________ > Amarula Solutions SRL > > Via le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 (0)42 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com > > [`as] https://www.amarulasolutions.com| From bugzilla at busybox.net Tue Mar 22 18:55:11 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Mar 2022 18:55:11 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 --- Comment #1 from Fabrice Fontaine --- Hi, Thanks for your bug report, however this is not a bug but an expected behavior. With your proposal, the user won't be able to select if we wants to install bluetooth firmware, wifi firmware or both firmwares. Moreover, the Wifi firmware can't always be installed as it conflicts with linux-firmware Broadcom BRCM bcm43xx. So, I would advise to update the batocera defconfigs (e.g. https://github.com/batocera-linux/batocera.linux/tree/master/configs) with: BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y Best Regards, Fabrice -- You are receiving this mail because: You are on the CC list for the bug. From fontaine.fabrice at gmail.com Tue Mar 22 19:00:32 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 22 Mar 2022 20:00:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 6eaf023789..69bb34b0cb 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE -- 2.35.1 From ju.o at free.fr Tue Mar 22 21:27:50 2022 From: ju.o at free.fr (Julien Olivain) Date: Tue, 22 Mar 2022 22:27:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: new package Message-ID: <20220322212750.2271424-1-ju.o@free.fr> This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. https://github.com/linux-rdma/rdma-core Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + package/Config.in | 1 + package/rdma-core/Config.in | 28 +++++++ package/rdma-core/linux-rdma.fragment | 9 +++ package/rdma-core/rdma-core.hash | 5 ++ package/rdma-core/rdma-core.mk | 24 ++++++ package/rdma-core/readme.txt | 74 +++++++++++++++++++ .../testing/tests/package/test_rdma_core.py | 41 ++++++++++ 8 files changed, 183 insertions(+) create mode 100644 package/rdma-core/Config.in create mode 100644 package/rdma-core/linux-rdma.fragment create mode 100644 package/rdma-core/rdma-core.hash create mode 100644 package/rdma-core/rdma-core.mk create mode 100644 package/rdma-core/readme.txt create mode 100644 support/testing/tests/package/test_rdma_core.py diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..8fea5e31aa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1615,6 +1615,7 @@ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ F: package/python-pyalsa/ +F: package/rdma-core/ F: package/riscv-isa-sim/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py diff --git a/package/Config.in b/package/Config.in index 0d5d763180..f21f1fbc66 100644 --- a/package/Config.in +++ b/package/Config.in @@ -555,6 +555,7 @@ endmenu source "package/pulseview/Config.in" source "package/qoriq-cadence-dp-firmware/Config.in" source "package/raspi-gpio/Config.in" + source "package/rdma-core/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" source "package/rockchip-mali/Config.in" diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in new file mode 100644 index 0000000000..8fc2e4b8a1 --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_RDMA_CORE + bool "rdma-core" + depends on BR2_USE_MMU # fork() used in rstream example + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBNL + help + This is the userspace components for the Linux Kernel's + drivers/infiniband subsystem. + + https://github.com/linux-rdma/rdma-core + +if BR2_PACKAGE_RDMA_CORE + +# The "rdma" binary is not a runtime dependency of this package, so it +# is not selected. Since a Buildroot user might want to add this +# command, and the condition to enable it is not trivial, we give a +# hint here. +comment "Note: The 'rdma' command is provided by the 'iproute2' package when compiled with 'libmnl'." + depends on !BR2_PACKAGE_IPROUTE2 || !BR2_PACKAGE_LIBMNL + +endif # BR2_PACKAGE_RDMA_CORE + +comment "rdma-core needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/rdma-core/linux-rdma.fragment b/package/rdma-core/linux-rdma.fragment new file mode 100644 index 0000000000..e305f27e62 --- /dev/null +++ b/package/rdma-core/linux-rdma.fragment @@ -0,0 +1,9 @@ +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y +CONFIG_INFINIBAND_RTRS_CLIENT=m +CONFIG_INFINIBAND_RTRS_SERVER=m diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 0000000000..2dd01d749e --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 40737df5158abdfdbf79ea744a74251aedff92fdf8ab7aa637125de6a1cf7e1c rdma-core-39.0.tar.gz +sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 +sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk new file mode 100644 index 0000000000..a69c1b22d5 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 39.0 +RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) +RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause +RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md +RDMA_CORE_DEPENDENCIES = libnl +RDMA_CORE_INSTALL_STAGING = YES + +RDMA_CORE_CONF_OPTS = \ + -DNO_MAN_PAGES=1 \ + -DNO_PYVERBS=1 + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +RDMA_CORE_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + +$(eval $(cmake-package)) diff --git a/package/rdma-core/readme.txt b/package/rdma-core/readme.txt new file mode 100644 index 0000000000..4f90720ca3 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,74 @@ +Testing rdma-core userspace tools +================================= + +Testing rdma-core using Linux software RoCE implementation: +https://en.wikipedia.org/wiki/RDMA_over_Converged_Ethernet + +Using two systems with working TCP/IP conficutation, for example: +- Server IP: 192.168.123.10 +- Client IP: 192.168.123.20 + +Make sure firewall configurations are appropriate. Routable RoCE v2 +uses udp/4791. ibv_rc_pingpong uses tcp/18515 for initial +synchronization. + +Note: this test can be executed in two qemu virtual machines with +bridged networking. + + +Kernel configuration +-------------------- + +The Linux Kernel needs some Infiniband configuration. In this example +the kernel "rdma_rxe" driver is needed (CONFIG_RDMA_RXE=y). See the +example fragment file provided: + + package/rdma-core/linux-rdma.fragment + + +Buildroot package configuration +------------------------------- + +For setting up a software RoCE link, the "rdma" program is needed. It +is provided by the "iproute2" package, when "libmnl" is also +selected. Make sure to have in your Buildroot configuration: + + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_LIBMNL=y + BR2_PACKAGE_RDMA_CORE=y + + +Setting up the rdma link +------------------------ + +On both server and client: + + modprobe rdma_rxe + rdma link add rxe0 type rxe netdev eth0 + + +Testing with rping +------------------ + +On the server side, run the command: + + rping -s -v + +On the client side, run the command: + + rping -c -v -a 192.168.123.10 + + +Testing with ibv_rc_pingpong +---------------------------- + +To test with the pingpong example using the reliable connected (RC) +transport: + +On the server side, run the command: + + ibv_rc_pingpong -g rxe0 -g 1 + +On the client side, run the command: + + ibv_rc_pingpong -d rxe0 -g 1 192.168.123.10 diff --git a/support/testing/tests/package/test_rdma_core.py b/support/testing/tests/package/test_rdma_core.py new file mode 100644 index 0000000000..783146202d --- /dev/null +++ b/support/testing/tests/package/test_rdma_core.py @@ -0,0 +1,41 @@ +import os + +import infra.basetest + + +class TestRdmaCore(infra.basetest.BRTest): + + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.30" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="package/rdma-core/linux-rdma.fragment" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_LIBMNL=y + BR2_PACKAGE_RDMA_CORE=y + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + # Add the rxe0 interface + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # ibv_devinfo returns 255 if no devices are found + self.assertRunOk("ibv_devinfo -v") -- 2.35.1 From f.fainelli at gmail.com Tue Mar 22 22:21:04 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 22 Mar 2022 15:21:04 -0700 Subject: [Buildroot] [PATCH 0/2] External GCC12 toolchain support Message-ID: <20220322222106.42347-1-f.fainelli@gmail.com> This patch series allows us to use Linaro's GCC12 snapshot that can be downloaded from here: https://snapshots.linaro.org/gnu-toolchain/12.0-2021.10-1/aarch64-linux-gnu/ Florian Fainelli (2): toolchain/Config.in: add BR2_TOOLCHAIN_GCC_AT_LEAST_12 blind option toolchain/toolchain-external/toolchain-external-custom: add gcc 12 version selection toolchain/Config.in | 11 +++++++++-- .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) -- 2.25.1 From f.fainelli at gmail.com Tue Mar 22 22:21:05 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 22 Mar 2022 15:21:05 -0700 Subject: [Buildroot] [PATCH 1/2] toolchain/Config.in: add BR2_TOOLCHAIN_GCC_AT_LEAST_12 blind option In-Reply-To: <20220322222106.42347-1-f.fainelli@gmail.com> References: <20220322222106.42347-1-f.fainelli@gmail.com> Message-ID: <20220322222106.42347-2-f.fainelli@gmail.com> In order to add gcc 12 support for internal and external toolchain in follow-up commits, introduce BR2_TOOLCHAIN_GCC_AT_LEAST_12 symbol. Signed-off-by: Florian Fainelli --- toolchain/Config.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index d2c81217c84a..b572a89f2f85 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -117,7 +117,8 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ - BR2_TOOLCHAIN_GCC_AT_LEAST_11 + BR2_TOOLCHAIN_GCC_AT_LEAST_11 || \ + BR2_TOOLCHAIN_GCC_AT_LEAST_12 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. @@ -150,7 +151,8 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 config BR2_TOOLCHAIN_HAS_GCC_BUG_83143 bool default y if BR2_sh - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || BR2_TOOLCHAIN_GCC_AT_LEAST_11 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || BR2_TOOLCHAIN_GCC_AT_LEAST_11 || \ + BR2_TOOLCHAIN_GCC_AT_LEAST_12 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. This bug no # longer exists in gcc 8.x. @@ -698,10 +700,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_11 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_10 +config BR2_TOOLCHAIN_GCC_AT_LEAST_12 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 default "10" if BR2_TOOLCHAIN_GCC_AT_LEAST_10 default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9 -- 2.25.1 From f.fainelli at gmail.com Tue Mar 22 22:21:06 2022 From: f.fainelli at gmail.com (Florian Fainelli) Date: Tue, 22 Mar 2022 15:21:06 -0700 Subject: [Buildroot] [PATCH 2/2] toolchain/toolchain-external/toolchain-external-custom: add gcc 12 version selection In-Reply-To: <20220322222106.42347-1-f.fainelli@gmail.com> References: <20220322222106.42347-1-f.fainelli@gmail.com> Message-ID: <20220322222106.42347-3-f.fainelli@gmail.com> This patch allows to use an external toolchain based on gcc 12. Signed-off-by: Florian Fainelli --- .../toolchain-external-custom/Config.in.options | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 9346fa3feb75..683204e56ebd 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -31,6 +31,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_12 + bool "12.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + config BR2_TOOLCHAIN_EXTERNAL_GCC_11 bool "11.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_11 -- 2.25.1 From bugzilla at busybox.net Tue Mar 22 22:34:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 22 Mar 2022 22:34:04 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 --- Comment #2 from Daniel Martin --- Thanks Fabrice. Yeah that makes sense - we don't use linux-firmware. Tested. Please close. -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Tue Mar 22 23:22:14 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:14 -0600 Subject: [Buildroot] [PATCH v12 01/11] package/llvm: bump to version 11.1.0 Message-ID: <20220322232224.2842266-1-james.hilliard1@gmail.com> From: Matt Weber Signed-off-by: Matthew Weber Signed-off-by: James Hilliard --- Changes v11 -> v12: - add gcc 5 dependency due to c++14 requirement - propagate gcc 5 reverse dependency - remove unsupported config options --- package/clang/Config.in | 6 +++--- package/llvm/Config.in | 6 +++--- package/llvm/llvm.hash | 2 +- package/llvm/llvm.mk | 20 ++++++-------------- package/mesa3d/Config.in | 6 +++--- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/package/clang/Config.in b/package/clang/Config.in index a67e7631a8..7c732c7af7 100644 --- a/package/clang/Config.in +++ b/package/clang/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CLANG bool "clang" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -14,10 +14,10 @@ config BR2_PACKAGE_CLANG http://clang.llvm.org -comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "clang needs a toolchain not affected by GCC bug 64735" diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 6ec2ffcfe6..c1887e36dd 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_LLVM_TARGET_ARCH config BR2_PACKAGE_LLVM bool "llvm" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -55,10 +55,10 @@ config BR2_PACKAGE_LLVM_BPF endif -comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm needs a toolchain not affected by GCC bug 64735" diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash index 6bf2755777..e93a922492 100644 --- a/package/llvm/llvm.hash +++ b/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a llvm-9.0.1.src.tar.xz +sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 6c721c30b9..825de96392 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -5,7 +5,7 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -LLVM_VERSION = 9.0.1 +LLVM_VERSION = 11.1.0 LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions @@ -157,15 +157,9 @@ LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON HOST_LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release -# Disable C++1y (ISO C++ 2014 standard) -# Disable C++1z (ISO C++ 2017 standard) -# Compile llvm with the C++11 (ISO C++ 2011 standard) which is the fallback. -HOST_LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_CXX1Y=OFF \ - -DLLVM_ENABLE_CXX1Z=OFF -LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_CXX1Y=OFF \ - -DLLVM_ENABLE_CXX1Z=OFF +# Compile llvm with the C++14 (ISO C++ 2014 standard). +HOST_LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 +LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 # Disabled, requires sys/ndir.h header # Disable debug in module @@ -237,13 +231,11 @@ endif HOST_LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - -DLLVM_POLLY_BUILD=OFF + -DLLVM_INCLUDE_RUNTIMES=OFF LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - -DLLVM_POLLY_BUILD=OFF + -DLLVM_INCLUDE_RUNTIMES=OFF HOST_LLVM_CONF_OPTS += \ -DLLVM_ENABLE_WARNINGS=ON \ diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e41da562dc..b0ebc09212 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -32,10 +32,10 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_USE_WCHAR # std::wstring select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm support needs a toolchain not affected by GCC bug 64735" -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:15 -0600 Subject: [Buildroot] [PATCH v12 02/11] package/clang: bump to version 11.1.0 In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-2-james.hilliard1@gmail.com> From: Matt Weber Signed-off-by: Matthew Weber --- package/clang/clang.hash | 2 +- package/clang/clang.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/clang/clang.hash b/package/clang/clang.hash index 067a2c0470..32a19c1659 100644 --- a/package/clang/clang.hash +++ b/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253 clang-9.0.1.src.tar.xz +sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 939f000cbd..d1667d79b6 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -5,7 +5,8 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -CLANG_VERSION = 9.0.1 +CLANG_VERSION_MAJOR = 11 +CLANG_VERSION = $(CLANG_VERSION_MAJOR).1.0 CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CLANG_VERSION) CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:16 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:16 -0600 Subject: [Buildroot] [PATCH v12 03/11] package/lld: bump to version 11.1.0 In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-3-james.hilliard1@gmail.com> From: Matt Weber --- package/lld/lld.hash | 2 +- package/lld/lld.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lld/lld.hash b/package/lld/lld.hash index 2144cc5666..17b8d18997 100644 --- a/package/lld/lld.hash +++ b/package/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 86262bad3e2fd784ba8c5e2158d7aa36f12b85f2515e95bc81d65d75bb9b0c82 lld-9.0.1.src.tar.xz +sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/lld/lld.mk b/package/lld/lld.mk index cd1a03c1d3..4bf903cda0 100644 --- a/package/lld/lld.mk +++ b/package/lld/lld.mk @@ -5,7 +5,7 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -LLD_VERSION = 9.0.1 +LLD_VERSION = 11.1.0 LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:17 -0600 Subject: [Buildroot] [PATCH v12 04/11] package/spirv-llvm-translator: new package In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-4-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- .../spirv-llvm-translator.hash | 3 +++ .../spirv-llvm-translator.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/spirv-llvm-translator/spirv-llvm-translator.hash create mode 100644 package/spirv-llvm-translator/spirv-llvm-translator.mk diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash new file mode 100644 index 0000000000..e6f9de3cad --- /dev/null +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 a121579379ac3c7b63294b5274e0c4787b76003c89f7702a651384c3915464e9 spirv-llvm-translator-llvm_release_110.tar.gz +sha256 e3bc36440fc927c62d5cc24efeefe225a14d4e34ffeb0c92e430625cce9ee444 LICENSE.TXT diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk new file mode 100644 index 0000000000..fcc482027c --- /dev/null +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# spirv-llvm-translator +# +################################################################################ + +SPIRV_LLVM_TRANSLATOR_VERSION = llvm_release_110 +SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) +SPIRV_LLVM_TRANSLATOR_LICENSE = Apache-2.0 with exceptions +SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm +HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(host-cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:18 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:18 -0600 Subject: [Buildroot] [PATCH v12 05/11] support/misc/toolchainfile.cmake.in: allow variables to be overridden In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-5-james.hilliard1@gmail.com> Some packages such as libclc need to override cmake toolchain variables, to avoid errors caused by trying to set overriden variables ensure that they are not defined before being set. This prevents difficult to debug silent dropping of overriden variables. Signed-off-by: James Hilliard --- support/misc/toolchainfile.cmake.in | 108 +++++++++++++++++++++------- 1 file changed, 81 insertions(+), 27 deletions(-) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index be575566a4..30c0e63bf2 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR # so that it can find our custom platform description. list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -set(CMAKE_SYSTEM_NAME Buildroot) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +if(NOT DEFINED CMAKE_SYSTEM_NAME) + set(CMAKE_SYSTEM_NAME Buildroot) +endif() +if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION 1) +endif() +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +endif() # Set the {C,CXX}FLAGS appended by CMake depending on the build type # defined by Buildroot. CMake defaults these variables with -g and/or @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # Note: # if the project forces some of these flag variables, Buildroot is # screwed up and there is nothing Buildroot can do about that :( -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") +endif() +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +endif() # Build type from the Buildroot configuration -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") +if(NOT DEFINED CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") +endif() # Buildroot defaults flags. # If you are using this toolchainfile.cmake file outside of Buildroot and @@ -41,33 +53,75 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... # * and make sure the project's CMake code extends them like this if needed: # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") +if(NOT DEFINED CMAKE_C_FLAGS) + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") +endif() +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") +endif() +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") +endif() +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") +endif() -set(CMAKE_INSTALL_SO_NO_EXE 0) +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + set(CMAKE_INSTALL_SO_NO_EXE 0) +endif() -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +if(NOT DEFINED CMAKE_PROGRAM_PATH) + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") +endif() +if(NOT DEFINED CMAKE_SYSROOT) + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") # This toolchain file can be used both inside and outside Buildroot. -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") +if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") +endif() if(@@TOOLCHAIN_HAS_CXX@@) - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_FLAGS) + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") + endif() endif() if(@@TOOLCHAIN_HAS_FORTRAN@@) - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_FLAGS) + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_COMPILER) + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") + endif() endif() -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:19 -0600 Subject: [Buildroot] [PATCH v12 06/11] package/libclc: bump version to 13.0.1 In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-6-james.hilliard1@gmail.com> From: Matt Weber * Converts to the cmake pkg type * Updates download site * Adds a crosscompile fixups patch * Allow prepare_builtins utility to be directly called (it isn't installed into the path when cross compiling) * Fix file_find() for root search limitation Signed-off-by: Matthew Weber Signed-off-by: James Hilliard --- Changes v11 -> v12: - update to 13.0.1 instead of 11.1.0 - pass required host cmake options for C/CXX compilers --- .../0001-support-out-of-tree-build.patch | 71 +++++++++++++++++++ package/libclc/libclc.hash | 2 +- package/libclc/libclc.mk | 56 +++++++-------- 3 files changed, 98 insertions(+), 31 deletions(-) create mode 100644 package/libclc/0001-support-out-of-tree-build.patch diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch new file mode 100644 index 0000000000..de7207bedb --- /dev/null +++ b/package/libclc/0001-support-out-of-tree-build.patch @@ -0,0 +1,71 @@ +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Tue, 9 Mar 2021 15:55:17 -0600 +Subject: [PATCH] support out of tree build + +(1) The package has a prepare_builtins tool which is built +but not placed in the path for later use in the build. This +fix allows the later build steps to use the binary in-place. + +(2) With cmake, find_file() when used for non-host builds is +limited by CMAKE_FIND_ROOT_PATH* scope. + +In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the +following target settings for CMAKE_FIND_ROOT_PATH* which +limit the scope. +set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + + +Signed-off-by: Matthew Weber +--- + CMakeLists.txt | 2 +- + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9472f19..a784519 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) + + # Add prepare target + add_custom_command( OUTPUT "${obj_suffix}" +- COMMAND prepare_builtins -o ++ COMMAND ./prepare_builtins -o + "${obj_suffix}" + "builtins.opt.${obj_suffix}" + DEPENDS "opt.${obj_suffix}" +diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake +index 94d85d9..5de6a48 100644 +--- a/cmake/CMakeDetermineCLCCompiler.cmake ++++ b/cmake/CMakeDetermineCLCCompiler.cmake +@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) + + set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") + set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") +-find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) ++set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) + # configure all variables set in this file + configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) + mark_as_advanced(clc_comp_in) +diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake +index 1c424c7..dd3bfb6 100644 +--- a/cmake/CMakeDetermineLLAsmCompiler.cmake ++++ b/cmake/CMakeDetermineLLAsmCompiler.cmake +@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) + set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") + set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") + set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") +-find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) ++set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) + # configure all variables set in this file + configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) + mark_as_advanced(ll_comp_in) +-- +2.17.1 + diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash index 2af64bc8e8..c496291d81 100644 --- a/package/libclc/libclc.hash +++ b/package/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk index 6fe8e10a77..5d246cf4f8 100644 --- a/package/libclc/libclc.mk +++ b/package/libclc/libclc.mk @@ -4,43 +4,39 @@ # ################################################################################ -# Use the latest commit from release_90 branch. -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 -LIBCLC_SITE = https://github.com/llvm-mirror/libclc -LIBCLC_SITE_METHOD = git +LIBCLC_VERSION = 13.0.1 +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT -LIBCLC_DEPENDENCIES = host-clang host-llvm +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator LIBCLC_INSTALL_STAGING = YES -# C++ compiler is used to build a small tool (prepare-builtins) for the host. -# It must be built with the C++ compiler from the host. +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes +# llvm-config provided values +# +# CMAKE_*_COMPILER has to be set to the host compiler to build a host +# 'prepare_builtins' tool used during the build process # # The headers are installed in /usr/share and not /usr/include, # because they are needed at runtime on the target to build the OpenCL # kernels. LIBCLC_CONF_OPTS = \ - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ - --prefix=/usr \ - --includedir=/usr/share \ - --pkgconfigdir=/usr/lib/pkgconfig \ - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) - -define LIBCLC_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) -endef - -define LIBCLC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define LIBCLC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -define LIBCLC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -$(eval $(generic-package)) + -DCMAKE_SYSROOT="" \ + -DCMAKE_C_COMPILER_FORCED=ON \ + -DCMAKE_CXX_COMPILER_FORCED=ON \ + -DCMAKE_CLC_COMPILER_FORCED=ON \ + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ + -DCMAKE_INSTALL_DATADIR="share" \ + -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ + -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" + +$(eval $(cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:20 -0600 Subject: [Buildroot] [PATCH v12 07/11] package/compiler-rt: new package In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-7-james.hilliard1@gmail.com> From: Matt Weber This patch adds support for the compiler-rt (CLANG runtime) library. It builds a set of static libraries and installs them into the CLANG/LLVM toolchain resource folder. These libraries can then be used by developers in the SDK for building target applications for analysis. What is fuzzing and why libfuzzer? https://www.moritz.systems/blog/an-introduction-to-llvm-libfuzzer/ The compiler-rt fuzzer and address sanitizer tools require additional LLVM binary tools installed to allow stack trace decoding actively during executable analysis. This patch conditionally enables these tools. https://github.com/google/sanitizers/wiki/AddressSanitizerCallStack Signed-off-by: Matthew Weber Signed-off-by: James Hilliard Cc: Romain Naour Cc: Ricardo Martincoski Cc: Valentin Korenblit Cc: Michael Drake --- Changes v1 -> v2 [Romain - Removed unnecessary host-cmake dependency v2 -> v3 [Romain - Update to use COMPILER_RT_INSTALL_PATH for library install [Ricardo - Fixed check-package extra line - Spelling in commit message v3 -> v4 [Valentin - Pointed out that non-glibc libraries won't build. Further investigation shows that the lib asan support in compiler-rt doesn't have the libc checks yet to support multiple libraries. (https://patchwork.ozlabs.org/patch/339938/ was the best example I could find and it doesn't look like anything has changed in the recent codebase) v4 -> v5 [Thomas P - Revisited staging install step and found a cleaner way to use the default and then a hook to setup the runtime library path v6 - Bumped to 7.0.1 to match current LLVM/Clang version v7 - Rebased on master for 8.0 LLVM/Clang version - Added comment about bumping verions of LLVM/Clang and Compiler-rt together [Romain - Disabled test cases (-DCOMPILER_RT_INCLUDE_TESTS=OFF) v8 - Rebased and updated version to 9.x to match llvm/clang [Romain - Squashed "[v7,1/5]package/llvm: install target binary/debug tools" to be included in this patch [Michael D - compiler-rt symlink creation to include shared folder such that control flow lists work v9 - Rebased post 2020.05 v10 - Switched compiler-rt site to point towards new github project - Updated compiler-rt version to 11.0.0 - Tested against master[8640e8ffde3f61c5838] using support/testing/run-tests -o runtest -k \ tests.package.test_clang.TestClangCompilerRT v11 - Updated compiler-rt version to 11.1.0 v12 - overwrite target llvm-config in staging with host llvm-config --- DEVELOPERS | 1 + package/Config.in | 1 + package/compiler-rt/Config.in | 14 +++++++++++ package/compiler-rt/compiler-rt.hash | 3 +++ package/compiler-rt/compiler-rt.mk | 37 ++++++++++++++++++++++++++++ package/llvm/llvm.mk | 20 ++++++++++++--- 6 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 package/compiler-rt/Config.in create mode 100644 package/compiler-rt/compiler-rt.hash create mode 100644 package/compiler-rt/compiler-rt.mk diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..5219626e45 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1886,6 +1886,7 @@ F: package/bridge-utils/ F: package/checkpolicy/ F: package/checksec/ F: package/cgroupfs-mount/ +F: package/compiler-rt/ F: package/crda/ F: package/cunit/ F: package/dacapo/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..e3ef75b0da 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1928,6 +1928,7 @@ menu "Other" source "package/cereal/Config.in" source "package/clang/Config.in" source "package/cmocka/Config.in" + source "package/compiler-rt/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" diff --git a/package/compiler-rt/Config.in b/package/compiler-rt/Config.in new file mode 100644 index 0000000000..9afc0d9d60 --- /dev/null +++ b/package/compiler-rt/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_COMPILER_RT + bool "compiler-rt" + depends on BR2_PACKAGE_LLVM + depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires + help + A collection of runtime libraries primarily used by clang and + llvm to provide builtins, sanitizer runtimes, and profiling + at runtime. + + https://compiler-rt.llvm.org/ + +comment "compiler-rt requires llvm to be enabled and a glibc toolchain" + depends on !BR2_PACKAGE_LLVM + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/compiler-rt/compiler-rt.hash b/package/compiler-rt/compiler-rt.hash new file mode 100644 index 0000000000..0689ec3d2a --- /dev/null +++ b/package/compiler-rt/compiler-rt.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz +sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/compiler-rt/compiler-rt.mk b/package/compiler-rt/compiler-rt.mk new file mode 100644 index 0000000000..57f9c26854 --- /dev/null +++ b/package/compiler-rt/compiler-rt.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# compiler-rt +# +################################################################################ + +# Compiler-RT should be bumped together with LLVM and Clang as the run-time is +# tied to the version of those tools +COMPILER_RT_VERSION = 11.1.0 +COMPILER_RT_SOURCE = compiler-rt-$(COMPILER_RT_VERSION).src.tar.xz +COMPILER_RT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(COMPILER_RT_VERSION) +COMPILER_RT_LICENSE = NCSA MIT +COMPILER_RT_LICENSE_FILES = LICENSE.TXT +COMPILER_RT_DEPENDENCIES = host-clang llvm + +COMPILER_RT_INSTALL_STAGING = YES +COMPILER_RT_INSTALL_TARGET = NO + +COMPILER_RT_CONF_OPTS=-DCOMPILER_RT_STANDALONE_BUILD=OFF \ + -DCOMPILER_RT_STANDALONE_BUILD=ON \ + -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \ + -DLLVM_CONFIG_PATH=$(HOST_DIR)/usr/bin/llvm-config + +# The installation of the target runtime libraries defaults to DESTDIR, however +# host-clang resources directory needs a link so Clang can find the runtime +# libraries in the same location they would be if built as part of the Clang +# build. The "resources" directory is loosely documented and seems to be +# assumed, as compiler-rt is usually build at the same time as Clang and not +# standalone. +define COMPILER_RT_SETUP_RUNTIME_LIBS + mkdir -p $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/lib/linux $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/lib/linux + ln -sf ../../../../$(GNU_TARGET_NAME)/sysroot/usr/share $(HOST_DIR)/lib/clang/$(HOST_CLANG_VERSION)/share +endef +COMPILER_RT_POST_INSTALL_STAGING_HOOKS += COMPILER_RT_SETUP_RUNTIME_LIBS + +$(eval $(cmake-package)) diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 825de96392..7c73d5b564 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -214,8 +214,7 @@ HOST_LLVM_CONF_OPTS += \ # We need to activate LLVM_INCLUDE_TOOLS, otherwise it does not generate # libLLVM.so LLVM_CONF_OPTS += \ - -DLLVM_INCLUDE_TOOLS=ON \ - -DLLVM_BUILD_TOOLS=OFF + -DLLVM_INCLUDE_TOOLS=ON ifeq ($(BR2_PACKAGE_LLVM_RTTI),y) HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=ON @@ -278,11 +277,24 @@ LLVM_CONF_OPTS += \ # directories from STAGING_DIR. # output/staging/usr/bin/llvm-config --includedir # output/staging/usr/include -define HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +define LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR $(INSTALL) -D -m 0755 $(HOST_DIR)/bin/llvm-config \ $(STAGING_DIR)/usr/bin/llvm-config endef -HOST_LLVM_POST_INSTALL_HOOKS = HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +HOST_LLVM_POST_INSTALL_HOOKS = LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR + +# The llvm-symbolizer binary is used by the Compiler-RT Fuzzer +# and AddressSanitizer tools for stack traces. +# If we set -DLLVM_BUILD_TOOLS=ON we need to re-copy host llvm-config to +# replace the target llvm-config variant in staging that gets installed. +ifeq ($(BR2_PACKAGE_COMPILER_RT),y) +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_TOOLS=ON +LLVM_POST_INSTALL_STAGING_HOOKS = LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +else +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_TOOLS=OFF +endif # By default llvm-tblgen is built and installed on the target but it is # not necessary. Also erase LLVMHello.so from /usr/lib -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:21 -0600 Subject: [Buildroot] [PATCH v12 08/11] testing/tests: CLANG compiler-rt runtime test In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-8-james.hilliard1@gmail.com> From: Matt Weber This patch adds a test case that 1) Builds the complete LLVM and CLANG set of host tools 2) Cross-compiles the compiler-rt runtime using CLANG 3) Builds a cross-compiled application using CLANG and the libfuzzer compiler-rt library. 4) Executes the fuzz application (part of the libfuzzer package) on target and checks expected output for a heap-buffer-overflow. Note: The libfuzzer package is just a tutorial example of how to use the toolkit provided by llvm (Thus not adding it as a full Buildroot package). Signed-off-by: Matthew Weber Cc: Ricardo Martincoski Cc: Romain Naour --- Changes v1 -> v2 [Ricardo - updated yml with test case - moved emulator launch cmd to test case from infra - defconfig in the order provided by savedefconfig - indent defconfig - add full package for test code to the test br2-external - consolidated to one class only v2 -> v3 - Added Review/tested by Ricardo's [with the entire series applied on next branch: https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/121908178 NOTE: this test case takes longer than test_rust, ~2 hours in my host machine with all tarballs previously downloaded] v4 - None v5 - Rebased post 2018.11 on master v6 - Testing of LLVM/Clang bump v7 - Rebase on master and testing of LLVM/Clang bump to 8.0 - Updated hashes for archive and legal info (legal info changed because of spelling cleanup) v8 - Cleaned up wording the 4th item of the message above. [Romain - Removes a hardcoded toolchain/sysroot path "b option" for libfuzzer pkg build, however requires this series applied. http://patchwork.ozlabs.org/project/buildroot/list/?series=129565 - updated test case to check for heap overflow string to keep arch generic - Removed the fixed mcpu arg from clang++ build and dropped --sysroot as cross compiler wrapper now provides this for libfuzzer build v9 - Rebased post 2020.05 v10 - Updated site for libfuzzer test case and bumped version - Switched back to have no dependency on clang as cross compiler series - Fixed a libfuzzer link time gcc ld error by adding sysroot and -B to the BUILD_CMDS since we don't depend on the cross wrapper. - Tested against master[8640e8ffde3f61c583] using support/testing/run-tests -o runtest -k \ tests.package.test_clang.TestClangCompilerRT v11 - Updated compiler-rt version to 11.1.0 --- .../br2-external/clang-compiler-rt/Config.in | 1 + .../clang-compiler-rt/external.desc | 1 + .../clang-compiler-rt/external.mk | 1 + .../package/libfuzzer/Config.in | 8 ++++ .../package/libfuzzer/libfuzzer.hash | 2 + .../package/libfuzzer/libfuzzer.mk | 24 ++++++++++ support/testing/tests/package/test_clang.py | 46 +++++++++++++++++++ 7 files changed, 83 insertions(+) create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/Config.in create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/external.desc create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/external.mk create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash create mode 100644 support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk create mode 100644 support/testing/tests/package/test_clang.py diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in b/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in new file mode 100644 index 0000000000..e1f9f8c598 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_CLANG_COMPILER_RT_PATH/package/libfuzzer/Config.in" diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc b/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc new file mode 100644 index 0000000000..92df85911d --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc @@ -0,0 +1 @@ +name: CLANG_COMPILER_RT diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk new file mode 100644 index 0000000000..6fa55c1211 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_CLANG_COMPILER_RT_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in new file mode 100644 index 0000000000..2d335fd3c7 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBFUZZER + bool "libfuzzer" + help + This project aims at hosting tutorials, + examples, discussions, research proposals, + and other resources related to fuzzing. + + https://github.com/google/fuzzing diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash new file mode 100644 index 0000000000..9287005ed9 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash @@ -0,0 +1,2 @@ +sha256 c71360c3b1ba1d88b28b0b3cb3a1744d251b87a12f2881224cc53ec26eb7a2db libfuzzer-cec02db916d21baa4db5b8d262d78848b3a35f4b.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk new file mode 100644 index 0000000000..6c6371bea7 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# libfuzzer +# +################################################################################ + +LIBFUZZER_VERSION = cec02db916d21baa4db5b8d262d78848b3a35f4b +LIBFUZZER_SITE = $(call github,google,fuzzing,$(LIBFUZZER_VERSION)) +LIBFUZZER_LICENSE = Apache-2.0 +LIBFUZZER_LICENSE_FILES = LICENSE +LIBFUZZER_DEPENDENCIES = compiler-rt + +define LIBFUZZER_BUILD_CMDS + $(HOST_DIR)/bin/clang++ --sysroot=$(STAGING_DIR) \ + -B $(HOST_DIR)/opt/ext-toolchain -fsanitize=address,fuzzer \ + $(@D)/tutorial/libFuzzer/fuzz_me.cc \ + -o $(@D)/fuzz_me +endef + +define LIBFUZZER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/fuzz_me $(TARGET_DIR)/usr/bin/fuzz_me +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py new file mode 100644 index 0000000000..df3990c6be --- /dev/null +++ b/support/testing/tests/package/test_clang.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + +FUZZ_TIMEOUT = 120 + + +class TestClangCompilerRT(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/clang-compiler-rt")] + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_COMPILER_RT=y + BR2_PACKAGE_LLVM=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_LIBFUZZER=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + # Sanitizers overallocate memory and the minimum that seemed to work was 512MB + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a53", "-m", "512", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + # The test case verifies the application executes and that + # the symbolizer is working to decode the stack trace. + cmd = "fuzz_me 2>&1 | grep heap-buffer-overflow" + _, exit_code = self.emulator.run(cmd, FUZZ_TIMEOUT) + self.assertEqual(exit_code, 0) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:22 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:22 -0600 Subject: [Buildroot] [PATCH v12 09/11] package/clang: help host-clang to find our external toolchain In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-9-james.hilliard1@gmail.com> From: Romain Naour To build libfuzzer package Matthew Weber noticed that (host) clang doesn't run on the host without "-B $(HOST_DIR)/opt/ext-toolchain" option. This option add a new search path for binaries and object files used implicitly. Without -B clang fail to link due to missing crtbeging.o file and libgcc: output/host/bin/aarch64-linux-gnu-ld: cannot find crtbegin.o: No such file or directory output/host/bin/aarch64-linux-gnu-ld: cannot find -lgcc Indeed, clang search path doesn't include the dafault cross-gcc's search paths: $ output/host/bin/clang -print-search-dirs programs: = output/host/bin:output/host/bin:/..//bin libraries: = output/host/lib/clang/8.0.0: output/host/bin/../lib64: /lib/../lib64: /usr/lib/../lib64: output/host/bin/../lib: /lib:/usr/lib Here is the same command for cross-gcc: $ output/host/bin/aarch64-linux-gnu-gcc -print-search-dirs install: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/ programs: = output/host/opt/ext-toolchain/bin/../libexec/gcc/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../libexec/gcc/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/ libraries: = output/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../lib/gcc/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/aarch64-linux-gnu/8.3.0/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/../lib64/: output/host/aarch64-buildroot-linux-gnu/sysroot/lib/aarch64-linux-gnu/8.3.0/: output/host/aarch64-buildroot-linux-gnu/sysroot/lib/../lib64/: output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/8.3.0/: output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/../lib64/: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/: output/host/aarch64-buildroot-linux-gnu/sysroot/lib/: output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/ We can see that gcc default search path contains "output/host/opt/ext-toolchain" directory where the external toolchain has been extracted. Since we want to use clang without additional option like -B, patch clang in order to use GCC_INSTALL_PREFIX instead of using automatic detection (which doesn't work for Buildroot). We eventually want to relocate the Buildroot SDK containing the clang cross-compiler, so we provide a relative path to GCC_INSTALL_PREFIX in order to avoid to hardcode the path to the GCC toolchain. Also the path between clang and the GCC external toolchain is not always the same, we have the following case: * Toolchain to be downloaded and installed The toolchain is extracted into $(HOST_DIR)/opt/ext-toolchain, so the path is "../opt/ext-toolchain". * Pre-installed toolchain The toolchain is localed somewhere in the host filesystem and defined by the user using BR2_TOOLCHAIN_EXTERNAL_PATH. So, set GCC_INSTALL_PREFIX using realpath: -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` When we use a Buildroot's internal toolchain, clang will find theses crt*.o files and libgcc. http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html Signed-off-by: Romain Naour Cc: Matthew Weber Cc: Valentin Korenblit Tested-by: Matt Weber --- Changes v1 -> v2 [Arnout - Can't dropped ":PATH" from "-DGCC_INSTALL_PREFIX:PATH=" as suggested, The string isn't set correctly and results in "cannot find crtbegin.o" - Attempting to post patch upstream - I did not address the relative vs absolute path comment. The current approach seemed correct per my understanding for handling the two toolchain install location cases --- ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 78 +++++++++++++++++++ package/clang/clang.mk | 7 ++ 2 files changed, 85 insertions(+) create mode 100644 package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch new file mode 100644 index 0000000000..08371154d5 --- /dev/null +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch @@ -0,0 +1,78 @@ +From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 5 Aug 2019 16:06:48 +0200 +Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set + of prefixes for searching the gcc toolchain + +By default, the Gnu Toolchains driver is looking at the parent +directory while looking for the gcc toolchain when clang is installed +at "D.InstalledDir" + +But this doesn't work with Buildroot since the external +toolchain is installed in host/opt/ext-toolchain and the sysroot is +moved to host/-buildroot-linux-gnu/sysroot/ directory. + +We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang +but it doesn't work since we already provide a sysroot [1]. + +Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. + +Since we want to be able to relocate the clang toolchain, +allow to use a relative path with GCC_INSTALL_PREFIX. + +Buildroot will provide such relative path by using: +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` + +Doing so allow to use clang without providing additional search +paths with -B option on the clang's command line. + +[1] https://reviews.llvm.org/D49244 +[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html + +Signed-off-by: Romain Naour +Signed-off-by: Matthew Weber +--- +Pending, access to llvm mailing lists to submit it is pending. They +seem to be having issues with their listserv. +--- + lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index 2ad45097dc..90d6b5b748 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( + + Prefixes.push_back(GCCToolchainDir); + } else { ++ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; ++ + // If we have a SysRoot, try that first. + if (!D.SysRoot.empty()) { + Prefixes.push_back(D.SysRoot); +@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( + // Then look for gcc installed alongside clang. + Prefixes.push_back(D.InstalledDir + "/.."); + ++ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. ++ if (!GccIinstallPrefix.empty()) ++ { ++ if (llvm::sys::path::is_relative(GccIinstallPrefix)) ++ { ++ // Use a relative path to gcc from clang install path. ++ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); ++ } ++ else ++ { ++ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. ++ Prefixes.push_back(GCC_INSTALL_PREFIX); ++ } ++ } ++ + // Next, look for prefix(es) that correspond to distribution-supplied gcc + // installations. + if (D.SysRoot.empty()) { +-- +2.20.1 + diff --git a/package/clang/clang.mk b/package/clang/clang.mk index d1667d79b6..95b4964be3 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -105,5 +105,12 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all +# Help host-clang to find our external toolchain, use a relative path from the clang +# installation directory to the external toolchain installation directory in order to +# not hardcode the toolchain absolute path. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:23 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:23 -0600 Subject: [Buildroot] [PATCH v12 10/11] package/clang: install a toolchain-wrapper for the host clang cross-compiler In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-10-james.hilliard1@gmail.com> From: Romain Naour In order to use Clang as a host cross-compiler for Buildroot, we need to provide at least the path to the sysroot (using --sysroot) and some other compiler flags. This series looks to reuse the toolchain wrapper for GCC since Clang support most of the gcc flags used in the Buildroot's toolchain wrapper. The only flag -mfused-madd (deprecated since gcc 4.6) for mips is not supported by clang. Since Clang require gcc >= 5.x this flag can never be used. host-clang refers to an existing GCC-based toolchain (internal or external) for libstdc++. However, a Buildroot external toolchain gets a different BR_CROSS_PATH_SUFFIX. Therefore, we can't reuse the toolchain-wrapper that gets built for the GCC-based toolchain, but instead have to compile an additional clang-specific wrapper, called toolchain-wrapper-clang. After building the clang toolchain wrapper, create the symlinks needed to force package infrastructure to use clang througt the wrapper. Initially clang install the clang-8 binary and create all other symlinks: # clang -> clang-8 # clang++ -> clang # clang-8 # clang-cl -> clang # clang-cpp -> clang Use a post install hook to rename the clang-8 binary to clang-8.br_real and recreate all symlinks: # clang -> toolchain-wrapper-clang # clang++ -> toolchain-wrapper-clang # clang-8 -> toolchain-wrapper-clang # clang-8.br_real # clang++.br_real -> clang-8.br_real # clang.br_real -> clang-8.br_real # clang-cl -> toolchain-wrapper-clang # clang-cl.br_real -> clang-8.br_real # clang-cpp -> toolchain-wrapper-clang # clang-cpp.br_real -> clang-8.br_real NOTE: *.br_real symlinks are needed as the wrapper references them Use the previously introduced CLANG_VERSION_MAJOR variable to create theses symlinks. Set BR_CROSS_PATH_SUFFIX to ".br_real" as for the Buildroot's internal GCC toolchain backend to find the "real" clang binary installed in $(HOST_DIR)/bin. Borrow TOOLCHAIN_WRAPPER_BUILD and TOOLCHAIN_WRAPPER_INSTALL to build and install the specific clang toolchain wrapper. Signed-off-by: Romain Naour Cc: Valentin Korenblit Signed-off-by: Matthew Weber --- Changes v1 -> v2 [Arnout - Fixup commit description and clarified *.br_real - Simplified loop --- package/clang/clang.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 95b4964be3..3c75f8d6b1 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -112,5 +112,33 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` endif +define HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS + $(Q)cd $(HOST_DIR)/bin; \ + rm -f clang-$(CLANG_VERSION_MAJOR).br_real; \ + mv clang-$(CLANG_VERSION_MAJOR) clang-$(CLANG_VERSION_MAJOR).br_real; \ + ln -sf toolchain-wrapper-clang clang-$(CLANG_VERSION_MAJOR); \ + for i in clang clang++ clang-cl clang-cpp; do \ + ln -snf toolchain-wrapper-clang $$i; \ + ln -snf clang-$(CLANG_VERSION_MAJOR).br_real $$i.br_real; \ + done +endef + +define HOST_CLANG_TOOLCHAIN_WRAPPER_BUILD + $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ + -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ + toolchain/toolchain-wrapper.c \ + -o $(@D)/toolchain-wrapper-clang +endef + +define HOST_CLANG_TOOLCHAIN_WRAPPER_INSTALL + $(INSTALL) -D -m 0755 $(@D)/toolchain-wrapper-clang \ + $(HOST_DIR)/bin/toolchain-wrapper-clang +endef + +HOST_CLANG_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' +HOST_CLANG_POST_BUILD_HOOKS += HOST_CLANG_TOOLCHAIN_WRAPPER_BUILD +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_TOOLCHAIN_WRAPPER_INSTALL +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS + $(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:22:24 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:22:24 -0600 Subject: [Buildroot] [PATCH v12 11/11] package/compiler-rt: runtime test use toolchain-wrapper In-Reply-To: <20220322232224.2842266-1-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> Message-ID: <20220322232224.2842266-11-james.hilliard1@gmail.com> From: Matt Weber The toolchain wrapper for clang allows the build of the libfuzzer package to not point at "-B $(HOST_DIR)/opt/ext-toolchain" which prevents a build failure to link due to missing crtbeging.o and libgcc. Signed-off-by: Matthew Weber --- .../clang-compiler-rt/package/libfuzzer/libfuzzer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk index 6c6371bea7..0515b9da35 100644 --- a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk @@ -12,7 +12,7 @@ LIBFUZZER_DEPENDENCIES = compiler-rt define LIBFUZZER_BUILD_CMDS $(HOST_DIR)/bin/clang++ --sysroot=$(STAGING_DIR) \ - -B $(HOST_DIR)/opt/ext-toolchain -fsanitize=address,fuzzer \ + -fsanitize=address,fuzzer \ $(@D)/tutorial/libFuzzer/fuzz_me.cc \ -o $(@D)/fuzz_me endef -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 22 23:25:48 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 17:25:48 -0600 Subject: [Buildroot] [PATCH v11 4/9] package/libclc: bump version to 11.1.0 In-Reply-To: References: <20210311142932.44985-1-matthew.weber@rockwellcollins.com> <20210311142932.44985-4-matthew.weber@rockwellcollins.com> Message-ID: On Tue, May 18, 2021 at 3:04 PM Arnout Vandecappelle wrote: > > Hi Matt, > > I was going to apply this series to next... > > On 11/03/2021 20:37, Matthew Weber via buildroot wrote: > [snip] > >>> -# C++ compiler is used to build a small tool (prepare-builtins) for the host. > >>> -# It must be built with the C++ compiler from the host. > >>> +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes > >>> +# llvm-config provided values > >>> # > >>> -# The headers are installed in /usr/share and not /usr/include, > >>> -# because they are needed at runtime on the target to build the OpenCL > >>> -# kernels. > >>> +# CMAKE_CXX_COMPILER has to be set to the host compiler to build a host > >>> +# 'prepare_builtins' tool used during the build process > >>> LIBCLC_CONF_OPTS = \ > >>> - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ > >>> - --prefix=/usr \ > >>> - --includedir=/usr/share \ > >>> - --pkgconfigdir=/usr/lib/pkgconfig \ > >>> - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) > >>> + -DCMAKE_CLC_COMPILER_FORCED=ON \ > >>> + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ > >>> + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" > > > > Looks like I have a couple of bugs (I didn't have opencl checked in menuconfig) > > ... but then I saw this. So I didn't. Instead, I've marked the series as Changes > Requested. If you think it should be applied after all, please repost (or just > update patchwork if unchanged). > > Oh, and 12.0.0 has been released now... > > > > > 1) mesa3d.mk needs MESA3D_MESON_EXTRA_BINARIES += > > llvm-config='$(STAGING_DIR)/bin/llvm-config' updated to point to the > > Normally, the foo-config programs are script, so it's OK to use the one in > staging. If it's an actual binary, we have to somehow patch it so it has target > config but compiles for host. > > I'd expect llvm and related to be cross-compile friendly though... > > > HOST_DIR llvm-config because it needs to be able to execute the tool. > > However this doesn't work since then you get the > > "host/lib/libLLVM-11.so when searching for -lLLVM-11 " error which > > makes sense since that's the host llvm-config we pointed at..... > > Unsure how to solve this one and we don't notice it in x86 builds. > > When you enable the AMD Radeon to build for aarch64 you can cause this > > error. > > > > 2) mesa3d doesn't quite build (pkgconfig can't find libclc). I didn't > > catch that CMAKE_INSTALL_PREFIX is getting ignored (we set it in the > > pkg-cmake.mk infra) so the libclc.pc is getting installed in > > $HOST_DIR/usr/local/share vs $HOST_DIR/usr/share . I haven't been > > able to figure out why the value doesn't take hold (ie after the > > configuration step libclc-11.1.0/CMakeCache.txt still shows /usr/local > > unless I force set the CMAKE_INSTALL_PREFIX value in > > libclc-11.1.0/CMakeList.txt before project(). > > That *is* weird... This should fix the CMAKE_INSTALL_PREFIX issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > > Regards, > Arnout > > > > > > > Matt > > _______________________________________________ > > buildroot mailing list > > buildroot at busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From joel at jms.id.au Wed Mar 23 02:32:08 2022 From: joel at jms.id.au (Joel Stanley) Date: Wed, 23 Mar 2022 02:32:08 +0000 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le In-Reply-To: <20220315130737.428449-1-joel@jms.id.au> References: <20220315130737.428449-1-joel@jms.id.au> Message-ID: On Tue, 15 Mar 2022 at 13:07, Joel Stanley wrote: > > When generating a filesystem image on a power10 build machine running > Ubuntu, we see a segfault when fakeroot is running chmod. > > This has been reported and fixed upstream in Debian in version 1.26-1.2: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 > > Add the samae patch to resolve the segfault. ping > > Signed-off-by: Joel Stanley > --- > This isn't a commit in the fakeroot tree, rather a patch from the Debian > packaging. > > I would appreciate if this was added to the 2022.02 stable tree. > > Signed-off-by: Joel Stanley > --- > .../fakeroot/fix-prototype-generation.patch | 59 +++++++++++++++++++ > 1 file changed, 59 insertions(+) > create mode 100644 package/fakeroot/fix-prototype-generation.patch > > diff --git a/package/fakeroot/fix-prototype-generation.patch b/package/fakeroot/fix-prototype-generation.patch > new file mode 100644 > index 000000000000..38d32ff3b22c > --- /dev/null > +++ b/package/fakeroot/fix-prototype-generation.patch > @@ -0,0 +1,59 @@ > +Subject: Fix prototype generation for openat > +Author: Christoph Biedl > +Date: 2021-12-30 > +Bug-Debian: https://bugs.debian.org/995393 > +Forwarded: Yes (implicitely) > + > + As jrtc27 pointed out in IRC, ppc64el is more strict than other > + architectures when it comes to va_arg handling: > + > + it's that ppc64le uses the elfv2 abi, and for variadic calls you > + must reserve space for a parameter save area > + > + So enhance wrapawk to create a proper prototype and argument > + handling although it's specific to the openat call. Also add the > + missing documentation for the sixth column to wrapfunc.inp. > + > +--- a/wrapawk > ++++ b/wrapawk > +@@ -37,7 +37,25 @@ > + argtype=$3; > + argname=$4; > + MACRO=$5; > +- if(MACRO){ > ++ openat_extra=$6; > ++ if(openat_extra){ > ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; > ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; > ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; > ++ > ++ print ret " tmp_" name, openat_extra "{" > tmpffile; > ++ print " mode_t mode = 0;" > tmpffile; > ++ print " if (flags & O_CREAT) {" > tmpffile; > ++ print " va_list args;" > tmpffile; > ++ print " va_start(args, flags);" > tmpffile; > ++ print " mode = va_arg(args, int);" > tmpffile; > ++ print " va_end(args);" > tmpffile; > ++ print " }" > tmpffile; > ++ print " load_library_symbols();" > tmpffile; > ++ print " return next_" name, argname ";" > tmpffile; > ++ print "}" > tmpffile; > ++ print "" > tmpffile; > ++ } else if(MACRO){ > + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; > + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; > + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; > +--- a/wrapfunc.inp > ++++ b/wrapfunc.inp > +@@ -9,8 +9,10 @@ > + /**/ */ > + /* each line of this file lists 4 fields, seperated by a ";". */ > + /* The first field is the name of the wrapped function, then it's return */ > +-/* value. After that come the function arguments with types, and the last */ > ++/* value. After that come the function arguments with types, and the fifth */ > + /* field contains the function arguments without types. */ > ++/* A sixth field is a special needed when wrapping the openat syscall. */ > ++/* Otherwise it's like the third (function arguments with types). */ > + /**/ > + > + /* __*xstat are used on glibc systems instead of just *xstat. */ > -- > 2.35.1 > From Jason at zx2c4.com Wed Mar 23 03:52:33 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 22 Mar 2022 21:52:33 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220323035233.140997-1-Jason@zx2c4.com> Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising to you, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. I fixed this in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/S20urandom | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..f971ea905a 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,26 +17,16 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { @@ -44,7 +34,9 @@ save_random_seed() { if touch "$URANDOM_SEED" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" + rm "$URANDOM_SEED.new" status=$? umask "$old_umask" if [ "$status" -eq 0 ]; then -- 2.35.1 From bugzilla at busybox.net Wed Mar 23 04:16:34 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 04:16:34 +0000 Subject: [Buildroot] [Bug 14681] New: QT5WEBENGINE not building Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14681 Bug ID: 14681 Summary: QT5WEBENGINE not building Product: buildroot Version: 2022.02 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: dmanlfc at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Seems this package needs host-python3 instead of host-python for the latest buildroot changes. -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Wed Mar 23 04:47:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 22 Mar 2022 22:47:51 -0600 Subject: [Buildroot] [Bug 14681] New: QT5WEBENGINE not building In-Reply-To: References: Message-ID: On Tue, Mar 22, 2022 at 10:16 PM wrote: > > https://bugs.busybox.net/show_bug.cgi?id=14681 > > Bug ID: 14681 > Summary: QT5WEBENGINE not building > Product: buildroot > Version: 2022.02 > Hardware: PC > OS: Linux > Status: NEW > Severity: normal > Priority: P5 > Component: Other > Assignee: unassigned at buildroot.uclibc.org > Reporter: dmanlfc at gmail.com > CC: buildroot at uclibc.org > Target Milestone: --- > > Seems this package needs host-python3 instead of host-python for the latest > buildroot changes. This series switches qt5webengine to python3: https://patchwork.ozlabs.org/project/buildroot/list/?series=&submitter=&state=*&q=&archive=both&delegate=&series=286165 > > -- > You are receiving this mail because: > You are on the CC list for the bug. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From Jason at zx2c4.com Wed Mar 23 05:10:14 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 22 Mar 2022 23:10:14 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323035233.140997-1-Jason@zx2c4.com> References: <20220323035233.140997-1-Jason@zx2c4.com> Message-ID: Hi Christoph, Yann, I realized I should have CC'd you on the below. Sorry about that. Jason On Tue, Mar 22, 2022 at 9:52 PM Jason A. Donenfeld wrote: > > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. > > As a result of this behavior, which may be understandably surprising to > you, writing a good seed file into /dev/urandom and then saving a new > seed file immediately after is dangerous, because the new seed file may > wind up being entirely deterministic, even if the old seed file was > quite good. > > I fixed this in systemd with > , > and fortunately it's possible to do the same thing in shell script here. > Specifically, instead of just saving new /dev/urandom output straight > up, we hash the new /dev/urandom together with the old seed, in order to > produce the new seed. This way the amount of entropy in the new seed > will stay the same or get better, but not appreciably regress. > > At the same time, the pool size check in this script is useless. Writing > to /dev/urandom never credits bits anyway, so no matter what, writing > into /dev/urandom is useful and not harmful. There's also not much of a > point in seeding with more than 256 bits, which is what the hashing > operation above produces. So this commit removes the file size check. > > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. > > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/S20urandom | 30 +++++++++++------------------- > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..f971ea905a 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -17,26 +17,16 @@ else > pool_size=512 > fi > > -check_file_size() { > - [ -f "$URANDOM_SEED" ] || return 1 > - # Try to read two blocks but exactly one will be read if the file has > - # the correct size. > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > - test "$size" -eq "$pool_size" > -} > - > init_rng() { > - if check_file_size; then > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > + printf 'Initializing random number generator: ' > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > fi > + return "$status" > } > > save_random_seed() { > @@ -44,7 +34,9 @@ save_random_seed() { > if touch "$URANDOM_SEED" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" > + rm "$URANDOM_SEED.new" > status=$? > umask "$old_umask" > if [ "$status" -eq 0 ]; then > -- > 2.35.1 > From bugzilla at busybox.net Wed Mar 23 08:13:06 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 08:13:06 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |yann.morin.1998 at free.fr --- Comment #3 from Yann E. MORIN --- Daniel, All, As Fabrice explained, the goal is for a user to be able to choose either firmware to install. However, when that the package does nothing by default is indeed not very nice; it might be good to ensure that at least one of the firmwares is installed, with something like (elided for brevity): config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI bool "brcmfmac-sdio-firmware-rpi" select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI \ if !BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT Care to send a proper patch to the list, please? -- You are receiving this mail because: You are on the CC list for the bug. From nicolas.cavallari at green-communications.fr Wed Mar 23 08:43:36 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Wed, 23 Mar 2022 09:43:36 +0100 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323035233.140997-1-Jason@zx2c4.com> References: <20220323035233.140997-1-Jason@zx2c4.com> Message-ID: <3211011a-129a-da72-a359-75bd72c7ad4b@green-communications.fr> On 23/03/2022 04:52, Jason A. Donenfeld wrote: > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. > > As a result of this behavior, which may be understandably surprising to > you, writing a good seed file into /dev/urandom and then saving a new > seed file immediately after is dangerous, because the new seed file may > wind up being entirely deterministic, even if the old seed file was > quite good. > > I fixed this in systemd with > , > and fortunately it's possible to do the same thing in shell script here. > Specifically, instead of just saving new /dev/urandom output straight > up, we hash the new /dev/urandom together with the old seed, in order to > produce the new seed. This way the amount of entropy in the new seed > will stay the same or get better, but not appreciably regress. > > At the same time, the pool size check in this script is useless. Writing > to /dev/urandom never credits bits anyway, so no matter what, writing > into /dev/urandom is useful and not harmful. There's also not much of a > point in seeding with more than 256 bits, which is what the hashing > operation above produces. So this commit removes the file size check. > > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. > > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/S20urandom | 30 +++++++++++------------------- > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..f971ea905a 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -17,26 +17,16 @@ else > pool_size=512 > fi > > -check_file_size() { > - [ -f "$URANDOM_SEED" ] || return 1 > - # Try to read two blocks but exactly one will be read if the file has > - # the correct size. > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > - test "$size" -eq "$pool_size" > -} > - > init_rng() { > - if check_file_size; then > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > + printf 'Initializing random number generator: ' > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null This will fail if the seed does not exist. Either because it's the first boot or because the system is read-only. The [ -f ] test is still useful in the first case, because init_rng must return 0 for save_random_seed to be called during boot. And if save_random_seed is not called during boot the seed might never be created (you cannot expect stop to be called). > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > fi > + return "$status" > } > > save_random_seed() { > @@ -44,7 +34,9 @@ save_random_seed() { > if touch "$URANDOM_SEED" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" > + rm "$URANDOM_SEED.new" > status=$? This breaks the error check. Either these commands must be chained by && or each of them should be tested. Also, i'm not sure why stderr is supressed for cat. In this case it is not supposed to fail or print anything to stderr. From yann.morin.1998 at free.fr Wed Mar 23 09:13:36 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 10:13:36 +0100 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323035233.140997-1-Jason@zx2c4.com> References: <20220323035233.140997-1-Jason@zx2c4.com> Message-ID: <20220323091336.GL1566358@scaer> Jason, All, On 2022-03-22 21:52 -0600, Jason A. Donenfeld spake thusly: > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. Thanks for this patch. I will blindly trust whatever you state about the kernel RNG. https://www.zx2c4.com/projects/linux-rng-5.17-5.18/ Still, I have a few comments about this change, see below... > As a result of this behavior, which may be understandably surprising to > you, writing a good seed file into /dev/urandom and then saving a new s/to you// (no "personal" address in a commit message) > seed file immediately after is dangerous, because the new seed file may > wind up being entirely deterministic, even if the old seed file was > quite good. > > I fixed this in systemd with s/I fixed this/This has been fixed/ (but "we" as you used later is ok) [--SNIP--] > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. Is there a way to do that within a shell script? If so, would you be kind enough to send a followup patch, please? > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/S20urandom | 30 +++++++++++------------------- > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..f971ea905a 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom [--SNIP--] > @@ -44,7 +34,9 @@ save_random_seed() { > if touch "$URANDOM_SEED" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > + dd if=/dev/urandom of="$URANDOM_SEED.new" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" $ shellcheck package/urandom-scripts/S20urandom In package/urandom-scripts/S20urandom line 38: cat "$URANDOM_SEED" "$URANDOM_SEED.new" 2>/dev/null | sha256sum | cut -d ' ' -f 1 > "$URANDOM_SEED" ^-------------^ SC2094: Make sure not to read and write the same file in the same pipeline. > + rm "$URANDOM_SEED.new" > status=$? This status now only gets the result of the 'rm', which is not very interesting. I guess what we really need is whether the initial 'dd' that extracts from the pool succeeded. If that fails, then we should probably not update the saved seed, should we? Here's what I suggest instead: save_random_seed() { printf 'Saving random seed: ' status=1 if touch "$URANDOM_SEED" 2> /dev/null; then old_umask=$(umask) umask 077 dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null new_seed_len="$(wc -c "$URANDOM_SEED.tmp" 2> /dev/null |cut -d ' ' -f 1)" if [ "$new_seed_len" -eq "$pool_size" ]; then cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ | sha256sum \ | cut -d ' ' -f 1 > "$URANDOM_SEED.new" mv "$URANDOM_SEED.new" "$URANDOM_SEED" echo "OK" status=0 else echo "FAIL" fi rm -f "$URANDOM_SEED.tmp" umask "$old_umask" else echo "SKIP (read-only file system detected)" fi return "$status" } What do you think about that? Since this is a bit critical, I did not want to just do that change when applying. I do note that urandom should always return something, but this script will also need to work on older kernels, sometimes way back to oldish 3.x series, and my recollection of how urandom worked back then is a bit fuzzy. Are we sure it will always have returned enough? If so, then we can ditch the sanity check altogether. But then, if we failed to read anything from urandom, we'd just hash the old seed, which should not decrease the entropy it had, as the hash has the same size as the seed. Thoughts? Regards, Yann E. MORIN. > umask "$old_umask" > if [ "$status" -eq 0 ]; then > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From huth at tuxfamily.org Wed Mar 23 10:15:05 2022 From: huth at tuxfamily.org (Thomas Huth) Date: Wed, 23 Mar 2022 11:15:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add more arm support In-Reply-To: <20220322170800.1872403-1-cohuck@redhat.com> References: <20220322170800.1872403-1-cohuck@redhat.com> Message-ID: <20220323111505.29ced52e@tuxfamily.org> Am Tue, 22 Mar 2022 18:08:00 +0100 schrieb Cornelia Huck : > Add some more cortexes with VHE, and enable aarch64. > > Signed-off-by: Cornelia Huck > --- > > Resent because I was subscribed with a different email address. > Sorry about the spam. > > --- > package/kvm-unit-tests/Config.in | 5 ++++- > package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157f0..b084375e62e9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > # On ARM, it uses virtualization extensions > default y if BR2_cortex_a7 || BR2_cortex_a12 || \ > BR2_cortex_a15 || BR2_cortex_a15_a7 || \ > - BR2_cortex_a17 || BR2_cortex_a17_a7 > + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ > + BR2_cortex_a55 || BR2_cortex_a75 || \ > + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ > + BR2_cortex_a76_a55 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e039f..d72eba02bc3b 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive > KVM_UNIT_TESTS_LICENSE = LGPL-2.0 > KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT > > -ifeq ($(BR2_arm),y) > +ifeq ($(BR2_aarch64),y) > +KVM_UNIT_TESTS_ARCH = aarch64 > +else ifeq ($(BR2_arm),y) > KVM_UNIT_TESTS_ARCH = arm > else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 Reviewed-by: Thomas Huth Note: This will likely have a contextual conflict with : https://lists.buildroot.org/pipermail/buildroot/2022-March/638940.html ... but I hope this will easy to sort out. Thomas From yann.morin.1998 at free.fr Wed Mar 23 11:07:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:07:06 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: add s390x support Message-ID: <20220323110309.58F65851C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f9a011ab2c125b70c93e510812f00465a929142 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master s390x is supported since https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a Signed-off-by: Fabrice Fontaine Reviewed-by: Thomas Huth Signed-off-by: Yann E. MORIN --- package/kvm-unit-tests/Config.in | 1 + package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157..a3d6756fb9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS BR2_cortex_a17 || BR2_cortex_a17_a7 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index d610442e03..2d05d08067 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 +else ifeq ($(BR2_s390x),y) +KVM_UNIT_TESTS_ARCH = s390x else ifeq ($(BR2_x86_64),y) KVM_UNIT_TESTS_ARCH = x86_64 endif From yann.morin.1998 at free.fr Wed Mar 23 11:11:40 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:11:40 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: add more arm support Message-ID: <20220323110309.65464851CA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f7228dadd3719876c623cb95e611c6ec9ebf9346 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add some more cortexes with VHE, and enable aarch64. Signed-off-by: Cornelia Huck Reviewed-by: Thomas Huth Signed-off-by: Yann E. MORIN --- package/kvm-unit-tests/Config.in | 5 ++++- package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index a3d6756fb9..2b797e13b4 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS # On ARM, it uses virtualization extensions default y if BR2_cortex_a7 || BR2_cortex_a12 || \ BR2_cortex_a15 || BR2_cortex_a15_a7 || \ - BR2_cortex_a17 || BR2_cortex_a17_a7 + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ + BR2_cortex_a55 || BR2_cortex_a75 || \ + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ + BR2_cortex_a76_a55 default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le default y if BR2_s390x diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 2d05d08067..e56436f802 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -ifeq ($(BR2_arm),y) +ifeq ($(BR2_aarch64),y) +KVM_UNIT_TESTS_ARCH = aarch64 +else ifeq ($(BR2_arm),y) KVM_UNIT_TESTS_ARCH = arm else ifeq ($(BR2_i386),y) KVM_UNIT_TESTS_ARCH = i386 From yann.morin.1998 at free.fr Wed Mar 23 11:12:52 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:12:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add s390x support In-Reply-To: <20220317223928.508338-1-fontaine.fabrice@gmail.com> References: <20220317223928.508338-1-fontaine.fabrice@gmail.com> Message-ID: <20220323111252.GM1566358@scaer> Fabrice, All, On 2022-03-17 23:39 +0100, Fabrice Fontaine spake thusly: > s390x is supported since > https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/commit/3934308046e5f113e19ed0ada002e2ec33335b8a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kvm-unit-tests/Config.in | 1 + > package/kvm-unit-tests/kvm-unit-tests.mk | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157..a3d6756fb9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > BR2_cortex_a17 || BR2_cortex_a17_a7 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_s390x > > config BR2_PACKAGE_KVM_UNIT_TESTS > bool "kvm-unit-tests" > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e03..2d05d08067 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -16,6 +16,8 @@ else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 > else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) > KVM_UNIT_TESTS_ARCH = ppc64 > +else ifeq ($(BR2_s390x),y) > +KVM_UNIT_TESTS_ARCH = s390x > else ifeq ($(BR2_x86_64),y) > KVM_UNIT_TESTS_ARCH = x86_64 > endif > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Mar 23 11:13:23 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 12:13:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/kvm-unit-tests: add more arm support In-Reply-To: <20220322170800.1872403-1-cohuck@redhat.com> References: <20220322170800.1872403-1-cohuck@redhat.com> Message-ID: <20220323111323.GN1566358@scaer> Cornelia, All, On 2022-03-22 18:08 +0100, Cornelia Huck spake thusly: > Add some more cortexes with VHE, and enable aarch64. > > Signed-off-by: Cornelia Huck Applied to master, thanks. Regards, Yann E. MORIN. > --- > > Resent because I was subscribed with a different email address. > Sorry about the spam. > > --- > package/kvm-unit-tests/Config.in | 5 ++++- > package/kvm-unit-tests/kvm-unit-tests.mk | 4 +++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in > index e470dd6157f0..b084375e62e9 100644 > --- a/package/kvm-unit-tests/Config.in > +++ b/package/kvm-unit-tests/Config.in > @@ -3,7 +3,10 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS > # On ARM, it uses virtualization extensions > default y if BR2_cortex_a7 || BR2_cortex_a12 || \ > BR2_cortex_a15 || BR2_cortex_a15_a7 || \ > - BR2_cortex_a17 || BR2_cortex_a17_a7 > + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ > + BR2_cortex_a55 || BR2_cortex_a75 || \ > + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ > + BR2_cortex_a76_a55 > default y if BR2_i386 || BR2_x86_64 > default y if BR2_powerpc64 || BR2_powerpc64le > > diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk > index d610442e039f..d72eba02bc3b 100644 > --- a/package/kvm-unit-tests/kvm-unit-tests.mk > +++ b/package/kvm-unit-tests/kvm-unit-tests.mk > @@ -10,7 +10,9 @@ KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive > KVM_UNIT_TESTS_LICENSE = LGPL-2.0 > KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT > > -ifeq ($(BR2_arm),y) > +ifeq ($(BR2_aarch64),y) > +KVM_UNIT_TESTS_ARCH = aarch64 > +else ifeq ($(BR2_arm),y) > KVM_UNIT_TESTS_ARCH = arm > else ifeq ($(BR2_i386),y) > KVM_UNIT_TESTS_ARCH = i386 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Wed Mar 23 12:47:53 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 12:47:53 +0000 Subject: [Buildroot] [Bug 14686] New: genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14686 Bug ID: 14686 Summary: genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension Product: buildroot Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: minor Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: roman at romanlebg.fr CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9251 --> https://bugs.busybox.net/attachment.cgi?id=9251&action=edit Last portion of the log Hello, I tried to build an image with a btrfs filesystem for a raspberry pi but at the end of the make command the genimage script look for a file ending by a .ext4 extension where it should be a .btrfs in my case. Setting the desired extension make the build succeed. Please note that I'm new to the embedded world so I may be missing a configuration somewhere, you can find the relevant part of the log attached. Thank you very much. -- You are receiving this mail because: You are on the CC list for the bug. From nicolas.cavallari at green-communications.fr Wed Mar 23 13:39:53 2022 From: nicolas.cavallari at green-communications.fr (Nicolas Cavallari) Date: Wed, 23 Mar 2022 14:39:53 +0100 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323091336.GL1566358@scaer> References: <20220323035233.140997-1-Jason@zx2c4.com> <20220323091336.GL1566358@scaer> Message-ID: <8ee34df1-a616-f9e4-a12d-777c055e83cf@green-communications.fr> On 23/03/2022 10:13, Yann E. MORIN wrote: >> As a final note, while this commit improves upon the status quo by >> removing a vulnerability, this shell script still does not actually >> initialize the RNG like it says it does. For initialization via a seed >> file, the RNDADDENTROPY ioctl must be used. > Is there a way to do that within a shell script? If so, would you be > kind enough to send a followup patch, please? No busybox applet is using RNDADDENTROPY, so it cannot probably be done in a shell script :( It's also unfortunate that the urandom(4) man page's example script tells people to write to /dev/urandom exactly the way S20urandom does. From jacques.samoun33 at gmail.com Wed Mar 23 14:01:23 2022 From: jacques.samoun33 at gmail.com (Jacques Samoun) Date: Wed, 23 Mar 2022 16:01:23 +0200 Subject: [Buildroot] cannot make the device_table In-Reply-To: <6aaa39df-836f-055e-6f40-a077f690b669@mind.be> References: <6aaa39df-836f-055e-6f40-a077f690b669@mind.be> Message-ID: Hi Arnout sorry for this delay. Indeed i was meaning doing a "ls -ls /dev/tty*" after boot. I was expecting to see there that the rights and group are like in the device_table.txt But it is not. Jacques On Tue, Mar 8, 2022 at 12:36 AM Arnout Vandecappelle wrote: > > > On 06/03/2022 13:46, Jacques Samoun wrote: > > Hello, > > despite all my tries, i just cannot make the "device_table" feature work > as > > described in the manual. > > Basically, i am trying to set 666 rights to /dev/tty + add a dialout > group, so i > > created the following file (device_table.txt" > > > > /dev/tty c 666 root dialout 5 0 - - - > > > > and have set the correct variable in menuconfig. I know for sure that > the build > > has handled this file ... but looking at the /dev/tty, it is clear that > nothing > > has happened, the permissions are still 600 and the dialout group has > not been set. > > When you say "looking at /dev/tty", do you mean looking at the contents > of the > tarball (or rootfs), or do you mean what appears after boot? Unless you > have a > very specific configuration (i.e. device managemnt: Static using device > table), > /dev will be a devtmpfs and the kernel will override anything you have set > in > device_table. So in that case you need dynamic handling using udev or mdev. > > > Regards, > Arnout > > > > > Am I missing something ? > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: From neal.frager at amd.com Wed Mar 23 07:20:29 2022 From: neal.frager at amd.com (Neal Frager) Date: Wed, 23 Mar 2022 01:20:29 -0600 Subject: [Buildroot] [PATCH v1 1/1] DEVELOPERS: update email address Message-ID: <20220323072029.260340-1-neal.frager@amd.com> This patch updates my email address in the DEVELOPERS file. Signed-off-by: Neal Frager --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..58ed4f81cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2089,7 +2089,7 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager F: board/zynqmp/ F: configs/zynqmp_zcu102_defconfig -- 2.17.1 From yann.morin.1998 at free.fr Wed Mar 23 17:01:29 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 18:01:29 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update email address Message-ID: <20220323165239.4D09485212@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae1deebb9e78b5338f5f30fe4765e3eb9e5be3d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch updates my email address in the DEVELOPERS file. Signed-off-by: Neal Frager Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..58ed4f81cd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2089,7 +2089,7 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager F: board/zynqmp/ F: configs/zynqmp_zcu102_defconfig From yann.morin.1998 at free.fr Wed Mar 23 17:02:35 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 18:02:35 +0100 Subject: [Buildroot] [PATCH v1 1/1] DEVELOPERS: update email address In-Reply-To: <20220323072029.260340-1-neal.frager@amd.com> References: <20220323072029.260340-1-neal.frager@amd.com> Message-ID: <20220323170235.GO1566358@scaer> Neal, All, On 2022-03-23 01:20 -0600, Neal Frager via buildroot spake thusly: > This patch updates my email address in the DEVELOPERS file. > > Signed-off-by: Neal Frager Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 942bb8fe9c..58ed4f81cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2089,7 +2089,7 @@ F: package/libevdev/ > F: package/pkg-qmake.mk > F: package/qt5/qt5opcua/ > > -N: Neal Frager > +N: Neal Frager > F: board/zynqmp/ > F: configs/zynqmp_zcu102_defconfig > > -- > 2.17.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Wed Mar 23 18:58:19 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 18:58:19 +0000 Subject: [Buildroot] [Bug 14676] BRCMFMAC SDIO firmware doesn't copy to target In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14676 --- Comment #4 from Peter Seiderer --- (In reply to Yann E. MORIN from comment #3) As Fabrice said the user 'wants to install bluetooth firmware, wifi firmware or both firmwares', the user should select which one he would like to install... Why select one by default? Why handle differently as e.g. linux-firmware options? -- You are receiving this mail because: You are on the CC list for the bug. From bernd.kuhls at t-online.de Wed Mar 23 18:06:14 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 23 Mar 2022 19:06:14 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-19 References: <20220320082201.6612060B1F__26257.1082961344$1647764544$gmane$org@smtp3.osuosl.org> Message-ID: Am Sun, 20 Mar 2022 08:21:56 -0000 schrieb Thomas Petazzoni via buildroot: > Hello, > > Autobuild statistics for 2022-03-19 > =================================== Hi Thomas, it seems that there could be a problem with mails sent by the autobuilders. Since the beginning of March many days went by without the daily results: https://lore.kernel.org/buildroot/?q=Daily+results Regards, Bernd From yann.morin.1998 at free.fr Wed Mar 23 19:13:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 23 Mar 2022 20:13:47 +0100 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-19 In-Reply-To: References: <20220320082201.6612060B1F__26257.1082961344$1647764544$gmane$org@smtp3.osuosl.org> Message-ID: <20220323191347.GA3631434@scaer> Bernd, All, On 2022-03-23 19:06 +0100, Bernd Kuhls spake thusly: > Am Sun, 20 Mar 2022 08:21:56 -0000 schrieb Thomas Petazzoni via buildroot: > > Autobuild statistics for 2022-03-19 > it seems that there could be a problem with mails sent by the autobuilders. > Since the beginning of March many days went by without the daily results: > https://lore.kernel.org/buildroot/?q=Daily+results Yes, we are aware of the issue. The script is more often than not killed by OOM... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ps.report at gmx.net Wed Mar 23 19:35:35 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 23 Mar 2022 20:35:35 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: References: Message-ID: <20220323203535.307d504a@gmx.net> Hello Arnout, On Mon, 21 Mar 2022 22:56:41 +0100, Arnout Vandecappelle wrote: > On 17/03/2022 12:06, Sassen, Rutger wrote: > > When supporting multiple hardware targets, overlay_map.dtb might > > be needed to map overlay names to one of several implementations. > > I've added a reference to the documentation. > > > > > Signed-off-by: Rutger Sassen > > --- > > Changes v2 -> v3: > > - in Config.in use if statement instead of depends (suggested by Peter > > Seiderer) > > - mention the filename overlay_map.dtb in the help text (suggested by > > Peter Seiderer) > > > > Changes v1 -> v2: > > - instead of always copying overlay_map.dtb, make it configurable > > (suggested by Peter Seiderer) > > - do not copy README since it a special case, only needed when > > installing overlays to a non-standard location (suggested by Peter > > Seiderer) > > > > When supporting multiple hardware targets, overlay_map.dtb might > > be needed to map overlay names to one of several implementations. > > > > Signed-off-by: Rutger Sassen > > --- > > package/rpi-firmware/Config.in | 12 ++++++++++++ > > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > > index 8070dc3019..36054353f8 100644 > > --- a/package/rpi-firmware/Config.in > > +++ b/package/rpi-firmware/Config.in > > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > overlays, to support HATs (Hardware Attached on Top, add-on > > modules). > > > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > + > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > In the end, I don't think this option is very useful. So I removed it... Why to you think so? I am still convinced the overlay map should be optional (in favor of explicit overlay/feature loading/enabling instead of firmware magic) and the overlay map is only one way to achieve a hardware dependent feature loading (the other way is via Model Filters in config.txt, see [2])... > > > + bool "Install DTB overlay map" > > + default n > > + help > > + Say 'y' here if you need to support multiple hardware targets > > + and you need overlay_map.dtb for target dependent mapping of > > + overlay names to one of several overlay implementations. > > + > > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > + > > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > > bool "vcdbg" > > depends on BR2_arm # prebuilt arm binary, rpi-userland > > diff --git a/package/rpi-firmware/rpi-firmware.mk > > b/package/rpi-firmware/rpi-firmware.mk > > index b46a7f5270..800b560070 100644 > > --- a/package/rpi-firmware/rpi-firmware.mk > > +++ b/package/rpi-firmware/rpi-firmware.mk > > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > endef > > endif > > > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > > $(BINARIES_DIR)/rpi-firmware/overlays/ > > ... reducing the patch to just this single line. Which renders the review process to void (as the option was introduced by Rutger on my request and this is what I reviewed/acknowledged by the Reviewed-by tag)... > > Please check if the commit [1] does what you need, if not I can recover the > original patch with the Config.in option. +1 for the Config.in option ;-) Regards, Peter > > Applied to master, thanks. > > Regards, > Arnout > > [1] > https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 > > > > > +endef > > +endif > > + > > # Install prebuilt libraries if RPI_USERLAND not enabled > > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > > define RPI_FIRMWARE_INSTALL_TARGET_LIB > > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > > $(RPI_FIRMWARE_INSTALL_CONFIG) > > $(RPI_FIRMWARE_INSTALL_DTB) > > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > > endef > > > > $(eval $(generic-package)) > > -- > > 2.20.1 > > > > > > *Disclaimer* > > > > This email communication is CONFIDENTIAL. If you are not the intended recipient, > > you may not use, copy or disclose to anyone the message or any information > > contained in the message and I ask that you please notify me by return email and > > delete this communication immediately. Thank you. > > > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Wed Mar 23 19:49:04 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Wed, 23 Mar 2022 20:49:04 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: <20220323203535.307d504a@gmx.net> References: <20220323203535.307d504a@gmx.net> Message-ID: <20220323204904.3ebaeeb3@gmx.net> Hello *, On Wed, 23 Mar 2022 20:35:35 +0100, Peter Seiderer wrote: > Hello Arnout, > > On Mon, 21 Mar 2022 22:56:41 +0100, Arnout Vandecappelle wrote: > > > On 17/03/2022 12:06, Sassen, Rutger wrote: > > > When supporting multiple hardware targets, overlay_map.dtb might > > > be needed to map overlay names to one of several implementations. > > > > I've added a reference to the documentation. > > > > > > > > Signed-off-by: Rutger Sassen > > > --- > > > Changes v2 -> v3: > > > - in Config.in use if statement instead of depends (suggested by Peter > > > Seiderer) > > > - mention the filename overlay_map.dtb in the help text (suggested by > > > Peter Seiderer) > > > > > > Changes v1 -> v2: > > > - instead of always copying overlay_map.dtb, make it configurable > > > (suggested by Peter Seiderer) > > > - do not copy README since it a special case, only needed when > > > installing overlays to a non-standard location (suggested by Peter > > > Seiderer) > > > > > > When supporting multiple hardware targets, overlay_map.dtb might > > > be needed to map overlay names to one of several implementations. > > > > > > Signed-off-by: Rutger Sassen > > > --- > > > package/rpi-firmware/Config.in | 12 ++++++++++++ > > > package/rpi-firmware/rpi-firmware.mk | 7 +++++++ > > > 2 files changed, 19 insertions(+) > > > > > > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in > > > index 8070dc3019..36054353f8 100644 > > > --- a/package/rpi-firmware/Config.in > > > +++ b/package/rpi-firmware/Config.in > > > @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > overlays, to support HATs (Hardware Attached on Top, add-on > > > modules). > > > > > > +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > + > > > +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > > > In the end, I don't think this option is very useful. So I removed it... > > Why to you think so? > > I am still convinced the overlay map should be optional (in favor of explicit > overlay/feature loading/enabling instead of firmware magic) and the > overlay map is only one way to achieve a hardware dependent feature loading > (the other way is via Model Filters in config.txt, see [2])... Missed to add the link [2] https://www.raspberrypi.com/documentation/computers/config_txt.html#model-filters Regards, Peter > > > > > > + bool "Install DTB overlay map" > > > + default n > > > + help > > > + Say 'y' here if you need to support multiple hardware targets > > > + and you need overlay_map.dtb for target dependent mapping of > > > + overlay names to one of several overlay implementations. > > > + > > > +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > + > > > config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG > > > bool "vcdbg" > > > depends on BR2_arm # prebuilt arm binary, rpi-userland > > > diff --git a/package/rpi-firmware/rpi-firmware.mk > > > b/package/rpi-firmware/rpi-firmware.mk > > > index b46a7f5270..800b560070 100644 > > > --- a/package/rpi-firmware/rpi-firmware.mk > > > +++ b/package/rpi-firmware/rpi-firmware.mk > > > @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS > > > endef > > > endif > > > > > > +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) > > > +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP > > > + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb > > > $(BINARIES_DIR)/rpi-firmware/overlays/ > > > > ... reducing the patch to just this single line. > > Which renders the review process to void (as the option was introduced by > Rutger on my request and this is what I reviewed/acknowledged by the Reviewed-by tag)... > > > > > Please check if the commit [1] does what you need, if not I can recover the > > original patch with the Config.in option. > > +1 for the Config.in option ;-) > > Regards, > Peter > > > > > Applied to master, thanks. > > > > Regards, > > Arnout > > > > [1] > > https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 > > > > > > > > > +endef > > > +endif > > > + > > > # Install prebuilt libraries if RPI_USERLAND not enabled > > > ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) > > > define RPI_FIRMWARE_INSTALL_TARGET_LIB > > > @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS > > > $(RPI_FIRMWARE_INSTALL_CONFIG) > > > $(RPI_FIRMWARE_INSTALL_DTB) > > > $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) > > > + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) > > > endef > > > > > > $(eval $(generic-package)) > > > -- > > > 2.20.1 > > > > > > > > > *Disclaimer* > > > > > > This email communication is CONFIDENTIAL. If you are not the intended recipient, > > > you may not use, copy or disclose to anyone the message or any information > > > contained in the message and I ask that you please notify me by return email and > > > delete this communication immediately. Thank you. > > > > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot at buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bugzilla at busybox.net Wed Mar 23 19:49:25 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 23 Mar 2022 19:49:25 +0000 Subject: [Buildroot] [Bug 14686] genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14686 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Arnout Vandecappelle --- The genimage.cfg that is shipped with Buildroot is only meant for the Buildroot configuration. If you change the configuration, you're also expected to change other parts accordingly. -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Wed Mar 23 20:06:14 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:06:14 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: <20220323203535.307d504a@gmx.net> References: <20220323203535.307d504a@gmx.net> Message-ID: <140ba00d-9876-4d53-e00a-c6469551b7a7@mind.be> On 23/03/2022 20:35, Peter Seiderer wrote: > Hello Arnout, > > On Mon, 21 Mar 2022 22:56:41 +0100, Arnout Vandecappelle wrote: > >> On 17/03/2022 12:06, Sassen, Rutger wrote: >>> When supporting multiple hardware targets, overlay_map.dtb might >>> be needed to map overlay names to one of several implementations. >> >> I've added a reference to the documentation. >> >>> >>> Signed-off-by: Rutger Sassen >>> --- >>> Changes v2 -> v3: >>> - in Config.in use if statement instead of depends (suggested by Peter >>> Seiderer) >>> - mention the filename overlay_map.dtb in the help text (suggested by >>> Peter Seiderer) >>> >>> Changes v1 -> v2: >>> - instead of always copying overlay_map.dtb, make it configurable >>> (suggested by Peter Seiderer) >>> - do not copy README since it a special case, only needed when >>> installing overlays to a non-standard location (suggested by Peter >>> Seiderer) >>> >>> When supporting multiple hardware targets, overlay_map.dtb might >>> be needed to map overlay names to one of several implementations. >>> >>> Signed-off-by: Rutger Sassen >>> --- >>> package/rpi-firmware/Config.in | 12 ++++++++++++ >>> package/rpi-firmware/rpi-firmware.mk | 7 +++++++ >>> 2 files changed, 19 insertions(+) >>> >>> diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in >>> index 8070dc3019..36054353f8 100644 >>> --- a/package/rpi-firmware/Config.in >>> +++ b/package/rpi-firmware/Config.in >>> @@ -93,6 +93,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> overlays, to support HATs (Hardware Attached on Top, add-on >>> modules). >>> >>> +if BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> + >>> +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP >> >> In the end, I don't think this option is very useful. So I removed it... > > Why to you think so? > > I am still convinced the overlay map should be optional (in favor of explicit > overlay/feature loading/enabling instead of firmware magic) and the > overlay map is only one way to achieve a hardware dependent feature loading > (the other way is via Model Filters in config.txt, see [2])... But AFAIU the presence of the overlay map doesn't stop you from using the other mechanisms, right? It's similar to how we install all the dtbo files even though maybe only one of them is relevant for you. If the presence of the overlay map does have an effect (i.e. if you'd need to remove it in the post-build script to get a correctly booting system), then the option indeed does make sense. Context: we want to avoid adding too many Config.in options, to make the complexity of the menus manageable. We make something a Config.in option only if it has a significant impact on rootfs size, or if it makes the difference between working and non-working system. Regards, Arnout > >> >>> + bool "Install DTB overlay map" >>> + default n >>> + help >>> + Say 'y' here if you need to support multiple hardware targets >>> + and you need overlay_map.dtb for target dependent mapping of >>> + overlay names to one of several overlay implementations. >>> + >>> +endif # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> + >>> config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG >>> bool "vcdbg" >>> depends on BR2_arm # prebuilt arm binary, rpi-userland >>> diff --git a/package/rpi-firmware/rpi-firmware.mk >>> b/package/rpi-firmware/rpi-firmware.mk >>> index b46a7f5270..800b560070 100644 >>> --- a/package/rpi-firmware/rpi-firmware.mk >>> +++ b/package/rpi-firmware/rpi-firmware.mk >>> @@ -57,6 +57,12 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS >>> endef >>> endif >>> >>> +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP),y) >>> +define RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP >>> + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb >>> $(BINARIES_DIR)/rpi-firmware/overlays/ >> >> ... reducing the patch to just this single line. > > Which renders the review process to void (as the option was introduced by > Rutger on my request and this is what I reviewed/acknowledged by the Reviewed-by tag)... > >> >> Please check if the commit [1] does what you need, if not I can recover the >> original patch with the Config.in option. > > +1 for the Config.in option ;-) > > Regards, > Peter > >> >> Applied to master, thanks. >> >> Regards, >> Arnout >> >> [1] >> https://git.buildroot.org/buildroot/commit/?id=da38cdead909aa133b9c468ddebf3f67c8d198f2 >> >> >> >>> +endef >>> +endif >>> + >>> # Install prebuilt libraries if RPI_USERLAND not enabled >>> ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) >>> define RPI_FIRMWARE_INSTALL_TARGET_LIB >>> @@ -83,6 +89,7 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS >>> $(RPI_FIRMWARE_INSTALL_CONFIG) >>> $(RPI_FIRMWARE_INSTALL_DTB) >>> $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) >>> + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAY_MAP) >>> endef >>> >>> $(eval $(generic-package)) >>> -- >>> 2.20.1 >>> >>> >>> *Disclaimer* >>> >>> This email communication is CONFIDENTIAL. If you are not the intended recipient, >>> you may not use, copy or disclose to anyone the message or any information >>> contained in the message and I ask that you please notify me by return email and >>> delete this communication immediately. Thank you. >>> >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > From Jason at zx2c4.com Wed Mar 23 20:06:31 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 23 Mar 2022 14:06:31 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323091336.GL1566358@scaer> References: <20220323035233.140997-1-Jason@zx2c4.com> <20220323091336.GL1566358@scaer> Message-ID: Hi Yann, On Wed, Mar 23, 2022 at 3:13 AM Yann E. MORIN wrote: > > As a result of this behavior, which may be understandably surprising to > > you, writing a good seed file into /dev/urandom and then saving a new > > s/to you// > > (no "personal" address in a commit message) Ack. > > > seed file immediately after is dangerous, because the new seed file may > > wind up being entirely deterministic, even if the old seed file was > > quite good. > > > > I fixed this in systemd with > > s/I fixed this/This has been fixed/ Ack. > > As a final note, while this commit improves upon the status quo by > > removing a vulnerability, this shell script still does not actually > > initialize the RNG like it says it does. For initialization via a seed > > file, the RNDADDENTROPY ioctl must be used. > > Is there a way to do that within a shell script? If so, would you be > kind enough to send a followup patch, please? No, there isn't, at all. But I'm writing some code now that I hope to release as a standalone utility, and upstream into busybox/util-linux that should make it accessible. When that happens, I'll keep this mailing list informed, and we can move forward then. > Here's what I suggest instead: Your suggestion looks good, with a few small tweaks that I'll put in v2. > I do note that urandom should always return something, but this script > will also need to work on older kernels, sometimes way back to oldish > 3.x series, and my recollection of how urandom worked back then is a bit > fuzzy. Are we sure it will always have returned enough? If so, then we > can ditch the sanity check altogether. > > But then, if we failed to read anything from urandom, we'd just hash the > old seed, which should not decrease the entropy it had, as the hash has > the same size as the seed. Since this isn't crediting anything anyway, I don't think the sanity check matters. The randomness might be total junk. It might not. We might get enough. There might be a bug. We don't care, because there's nothing we can do if it fails from shell, and we're not crediting, so it's not a security risk so long as we don't regress. v2 coming up. Jason From Jason at zx2c4.com Wed Mar 23 20:07:31 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 23 Mar 2022 14:07:31 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: Message-ID: <20220323200731.170409-1-Jason@zx2c4.com> Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/S20urandom | 39 +++++++++++++----------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" -- 2.35.1 From arnout at mind.be Wed Mar 23 20:24:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:24:15 +0100 Subject: [Buildroot] [PATCH 1/2] Revert "package/ola: drop autoreconf" In-Reply-To: <20220313103737.751528-1-fontaine.fabrice@gmail.com> References: <20220313103737.751528-1-fontaine.fabrice@gmail.com> Message-ID: <84a7799a-3b41-3253-d5af-e664e68ee215@mind.be> On 13/03/2022 11:37, Fabrice Fontaine wrote: > This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because > for an unknown reason, the build fails if autoreconf is dropped: > > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) > > Fixes: > - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 > Signed-off-by: Fabrice Fontaine Both applied to master. I also added a commit that adds a comment to AUTORECONF, as suggested by Thomas. Regards, Arnout > --- > package/ola/ola.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 1874350784..5090076175 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE > OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) > OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE > OLA_INSTALL_STAGING = YES > +OLA_AUTORECONF = YES > > # util-linux provides uuid lib > OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola From arnout at mind.be Wed Mar 23 20:24:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:24:47 +0100 Subject: [Buildroot] [PATCH 1/4] package/poco: reorder options alphabetically In-Reply-To: <20220312201627.690544-1-ju.o@free.fr> References: <20220312201627.690544-1-ju.o@free.fr> Message-ID: <66140637-e996-c494-aab2-52fcd102eda0@mind.be> On 12/03/2022 21:16, Julien Olivain wrote: > This commit reorders dependencies and Kconfig package options > alphabetically for better maintainability. > > This commit does not change anything else. > > Signed-off-by: Julien Olivain All four applied to master, thanks! Nice series! Regards, Arnout > --- > package/poco/Config.in | 82 +++++++++++++++++++++--------------------- > package/poco/poco.mk | 28 +++++++-------- > 2 files changed, 55 insertions(+), 55 deletions(-) > > diff --git a/package/poco/Config.in b/package/poco/Config.in > index dd87ee36bb..df3d3cbc66 100644 > --- a/package/poco/Config.in > +++ b/package/poco/Config.in > @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO > > comment "poco components" > > +config BR2_PACKAGE_POCO_CPP_PARSER > + bool "cpp_parser" > + > +config BR2_PACKAGE_POCO_CRYPTO > + bool "crypto" > + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL > + select BR2_PACKAGE_OPENSSL > + > +config BR2_PACKAGE_POCO_DATA > + bool > + > +config BR2_PACKAGE_POCO_DATA_MYSQL > + bool "mysql" > + depends on BR2_USE_MMU # mysql > + select BR2_PACKAGE_MYSQL > + select BR2_PACKAGE_POCO_DATA > + > +config BR2_PACKAGE_POCO_DATA_SQLITE > + bool "sqlite" > + select BR2_PACKAGE_POCO_DATA > + select BR2_PACKAGE_SQLITE > + > config BR2_PACKAGE_POCO_JSON > bool "json" > > -config BR2_PACKAGE_POCO_XML > - bool "xml" > - select BR2_PACKAGE_EXPAT > +config BR2_PACKAGE_POCO_JWT > + bool "jwt" > + select BR2_PACKAGE_POCO_CRYPTO > + select BR2_PACKAGE_POCO_JSON > > -config BR2_PACKAGE_POCO_UTIL > - bool "util" > - select BR2_PACKAGE_POCO_XML > +config BR2_PACKAGE_POCO_MONGODB > + bool "mongodb" > + select BR2_PACKAGE_POCO_NET > > config BR2_PACKAGE_POCO_NET > bool "net" > > -config BR2_PACKAGE_POCO_CRYPTO > - bool "crypto" > - select BR2_PACKAGE_OPENSSL > - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL > - > config BR2_PACKAGE_POCO_NETSSL_OPENSSL > bool "netssl_openssl" > - select BR2_PACKAGE_POCO_NET > - select BR2_PACKAGE_POCO_CRYPTO > - select BR2_PACKAGE_POCO_UTIL > select BR2_PACKAGE_OPENSSL > - > -config BR2_PACKAGE_POCO_ZIP > - bool "zip" > - select BR2_PACKAGE_POCO_XML > + select BR2_PACKAGE_POCO_CRYPTO > select BR2_PACKAGE_POCO_NET > select BR2_PACKAGE_POCO_UTIL > > -config BR2_PACKAGE_POCO_CPP_PARSER > - bool "cpp_parser" > - > config BR2_PACKAGE_POCO_PDF > bool "pdf" > select BR2_PACKAGE_POCO_JSON > @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS > bool "redis" > select BR2_PACKAGE_POCO_NET > > -config BR2_PACKAGE_POCO_MONGODB > - bool "mongodb" > - select BR2_PACKAGE_POCO_NET > - > -config BR2_PACKAGE_POCO_DATA > - bool > - > -config BR2_PACKAGE_POCO_DATA_SQLITE > - bool "sqlite" > - select BR2_PACKAGE_POCO_DATA > - select BR2_PACKAGE_SQLITE > +config BR2_PACKAGE_POCO_UTIL > + bool "util" > + select BR2_PACKAGE_POCO_XML > > -config BR2_PACKAGE_POCO_DATA_MYSQL > - bool "mysql" > - depends on BR2_USE_MMU # mysql > - select BR2_PACKAGE_POCO_DATA > - select BR2_PACKAGE_MYSQL > +config BR2_PACKAGE_POCO_XML > + bool "xml" > + select BR2_PACKAGE_EXPAT > > -config BR2_PACKAGE_POCO_JWT > - bool "jwt" > - select BR2_PACKAGE_POCO_JSON > - select BR2_PACKAGE_POCO_CRYPTO > +config BR2_PACKAGE_POCO_ZIP > + bool "zip" > + select BR2_PACKAGE_POCO_NET > + select BR2_PACKAGE_POCO_UTIL > + select BR2_PACKAGE_POCO_XML > > endif # BR2_PACKAGE_POCO > > diff --git a/package/poco/poco.mk b/package/poco/poco.mk > index 857f215e3a..81409ffec4 100644 > --- a/package/poco/poco.mk > +++ b/package/poco/poco.mk > @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE > POCO_CPE_ID_VENDOR = pocoproject > POCO_INSTALL_STAGING = YES > > -POCO_DEPENDENCIES = zlib pcre \ > - $(if $(BR2_PACKAGE_POCO_XML),expat) \ > +POCO_DEPENDENCIES = pcre zlib \ > $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ > - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ > + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ > $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ > - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) > + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ > + $(if $(BR2_PACKAGE_POCO_XML),expat) > > POCO_OMIT = Data/ODBC PageCompiler \ > + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ > + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ > + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ > + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ > + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ > $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ > - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ > - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ > + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ > + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ > $(if $(BR2_PACKAGE_POCO_NET),,Net) \ > $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ > - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ > - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ > - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ > $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ > $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ > - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ > - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ > - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ > - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ > - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) > + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ > + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ > + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) > > ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) > POCO_CONF_OPTS += --no-fpenvironment --no-wstring From arnout at mind.be Wed Mar 23 20:25:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:25:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix CVE comments In-Reply-To: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> References: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> Message-ID: <9ce22670-b709-9046-2107-a475e763d43e@mind.be> On 13/03/2022 12:19, Fabrice Fontaine wrote: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE > comments > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5base/qt5base.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index a703481aed..f8edfe0847 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -14,8 +14,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib > QT5BASE_INSTALL_STAGING = YES > QT5BASE_SYNC_QT_HEADERS = YES > > -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > > # A few comments: From arnout at mind.be Wed Mar 23 20:25:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build on sparc v8 In-Reply-To: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> References: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> Message-ID: On 13/03/2022 12:26, Fabrice Fontaine wrote: > Fix the following build failure on sparc v8 raised since commit > 5770a645a3a49a3f0f02972131a4ff5283b4c11e: > > ERROR: detected a std::atomic implementation that fails for function pointers. > Please apply the patch corresponding to your Standard Library vendor, found in > qtbase/config.tests/atomicfptr > > Fixes: > - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...figure.json-fix-atomicfptr-detection.patch | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch > > diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch > new file mode 100644 > index 0000000000..5f0f81a4bd > --- /dev/null > +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch > @@ -0,0 +1,48 @@ > +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 13 Mar 2022 12:05:04 +0100 > +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection > + > +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed > +to avoid the following build failure: > + > +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp > +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl > +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': > +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' > +> collect2: error: ld returned 1 exit status > +> make[1]: *** [Makefile:69: atomicfptr] Error 1 > + > +[...] > + > +ERROR: detected a std::atomic implementation that fails for function pointers. > +Please apply the patch corresponding to your Standard Library vendor, found in > + qtbase/config.tests/atomicfptr > + > +Fixes: > + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] > +--- > + src/corelib/configure.json | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/src/corelib/configure.json b/src/corelib/configure.json > +index 9b5d19d41b..ac88f5856c 100644 > +--- a/src/corelib/configure.json > ++++ b/src/corelib/configure.json > +@@ -309,7 +309,8 @@ > + "test(fptr);" > + ], > + "qmake": "CONFIG += c++11" > +- } > ++ }, > ++ "use": "libatomic" > + }, > + "clock-monotonic": { > + "label": "POSIX monotonic clock", > +-- > +2.34.1 > + From arnout at mind.be Wed Mar 23 20:26:02 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:26:02 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/nbd: security bump to version 3.24 In-Reply-To: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> References: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> Message-ID: <29dfce7f-a6f5-415b-aaf0-3efca36fa8d8@mind.be> On 13/03/2022 12:33, Fabrice Fontaine wrote: > Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an > integer overflow with a resultant heap-based buffer overflow. A value of > 0xffffffff in the name length field will cause a zero-sized buffer to be > allocated for the name, resulting in a write to a dangling pointer. This > issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME > messages. > > Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a > stack-based buffer overflow. An attacker can cause a buffer overflow in > the parsing of the name field by sending a crafted NBD_OPT_INFO or > NBD_OPT_GO message with an large value as the length of the name. > > https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - Tag as a security bump and add CVEs > > package/nbd/nbd.hash | 8 ++++---- > package/nbd/nbd.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash > index f0df35bc27..f58a89bf9a 100644 > --- a/package/nbd/nbd.hash > +++ b/package/nbd/nbd.hash > @@ -1,7 +1,7 @@ > -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ > -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz > -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz > +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ > +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz > +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz > > # Locally calculated > -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz > +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk > index 0a7f08b2cf..f0fb23910e 100644 > --- a/package/nbd/nbd.mk > +++ b/package/nbd/nbd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NBD_VERSION = 3.21 > +NBD_VERSION = 3.24 > NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz > NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) > NBD_CONF_OPTS = --enable-lfs From arnout at mind.be Wed Mar 23 20:26:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:26:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 In-Reply-To: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> References: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> Message-ID: <89244aaa-9676-4dab-70ed-0be5e5ab5c8d@mind.be> On 13/03/2022 12:47, Fabrice Fontaine wrote: > Fix CVE-2022-21716: Twisted is an event-based framework for internet > applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH > client and server implement is able to accept an infinite amount of data > for the peer's SSH version identifier. This ends up with a buffer using > all the available memory. The attach is a simple as `nc -rv localhost 22 > < /dev/zero`. A patch is available in version 22.2.0. There are > currently no known workarounds. > > https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-twisted/python-twisted.hash | 4 ++-- > package/python-twisted/python-twisted.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash > index 8f0935e4f0..63da0125b8 100644 > --- a/package/python-twisted/python-twisted.hash > +++ b/package/python-twisted/python-twisted.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/twisted/json > -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz > -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz > +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz > +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz > # Locally computed sha256 > sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE > diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk > index 8e867cfb58..e5d643ec05 100644 > --- a/package/python-twisted/python-twisted.mk > +++ b/package/python-twisted/python-twisted.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TWISTED_VERSION = 22.1.0 > +PYTHON_TWISTED_VERSION = 22.2.0 > PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz > -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 > +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 > PYTHON_TWISTED_SETUP_TYPE = setuptools > PYTHON_TWISTED_LICENSE = MIT > PYTHON_TWISTED_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 23 20:26:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:26:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/dovecot: bump version to 2.3.18 In-Reply-To: <20220313125540.3017299-1-bernd.kuhls@t-online.de> References: <20220313125540.3017299-1-bernd.kuhls@t-online.de> Message-ID: On 13/03/2022 13:55, Bernd Kuhls wrote: > Release notes: > https://dovecot.org/pipermail/dovecot-news/2022-February/000470.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Arnout > --- > package/dovecot/dovecot.hash | 2 +- > package/dovecot/dovecot.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash > index 0363b6e922..e70b266d92 100644 > --- a/package/dovecot/dovecot.hash > +++ b/package/dovecot/dovecot.hash > @@ -1,5 +1,5 @@ > # Locally computed after checking signature > -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz > +sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz > sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL > sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT > diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk > index fb299a8e45..053462c6dd 100644 > --- a/package/dovecot/dovecot.mk > +++ b/package/dovecot/dovecot.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > DOVECOT_VERSION_MAJOR = 2.3 > -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 > +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 > DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) > DOVECOT_INSTALL_STAGING = YES > DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From arnout at mind.be Wed Mar 23 20:08:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:08:58 +0100 Subject: [Buildroot] [git commit] package/poco: reorder options alphabetically Message-ID: <20220323201808.3AEF8854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39c3ad67401fadf8ebcb7d591649d821dc02411a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit reorders dependencies and Kconfig package options alphabetically for better maintainability. This commit does not change anything else. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 82 +++++++++++++++++++++++++------------------------- package/poco/poco.mk | 28 ++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index dd87ee36bb..df3d3cbc66 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,41 +28,50 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_CPP_PARSER + bool "cpp_parser" + +config BR2_PACKAGE_POCO_CRYPTO + bool "crypto" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL + +config BR2_PACKAGE_POCO_DATA + bool + +config BR2_PACKAGE_POCO_DATA_MYSQL + bool "mysql" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_POCO_DATA + +config BR2_PACKAGE_POCO_DATA_SQLITE + bool "sqlite" + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_SQLITE + config BR2_PACKAGE_POCO_JSON bool "json" -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT +config BR2_PACKAGE_POCO_JWT + bool "jwt" + select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_JSON -config BR2_PACKAGE_POCO_UTIL - bool "util" - select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_MONGODB + bool "mongodb" + select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET bool "net" -config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL - config BR2_PACKAGE_POCO_NETSSL_OPENSSL bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML + select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL -config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" - config BR2_PACKAGE_POCO_PDF bool "pdf" select BR2_PACKAGE_POCO_JSON @@ -73,28 +82,19 @@ config BR2_PACKAGE_POCO_REDIS bool "redis" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" - select BR2_PACKAGE_POCO_NET - -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE +config BR2_PACKAGE_POCO_UTIL + bool "util" + select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_XML + bool "xml" + select BR2_PACKAGE_EXPAT -config BR2_PACKAGE_POCO_JWT - bool "jwt" - select BR2_PACKAGE_POCO_JSON - select BR2_PACKAGE_POCO_CRYPTO +config BR2_PACKAGE_POCO_ZIP + bool "zip" + select BR2_PACKAGE_POCO_NET + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML endif # BR2_PACKAGE_POCO diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 857f215e3a..81409ffec4 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -11,29 +11,29 @@ POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ +POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring From arnout at mind.be Wed Mar 23 20:09:01 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:01 +0100 Subject: [Buildroot] [git commit] package/poco: use poco component names in kconfig variables Message-ID: <20220323201808.439FD854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=386b0d6c5e9c6c9ece230ad63b25f126e249a37f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For clarity, use the same names used in documentation, and component selection in configure. Valid poco component names are defined in: https://github.com/pocoproject/poco/blob/poco-1.11.1-release/components Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index df3d3cbc66..79ffac741d 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -29,10 +29,10 @@ if BR2_PACKAGE_POCO comment "poco components" config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" + bool "CppParser" config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" + bool "Crypto" select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL @@ -40,58 +40,58 @@ config BR2_PACKAGE_POCO_DATA bool config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" + bool "Data/MySQL" depends on BR2_USE_MMU # mysql select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" + bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA select BR2_PACKAGE_SQLITE config BR2_PACKAGE_POCO_JSON - bool "json" + bool "JSON" config BR2_PACKAGE_POCO_JWT - bool "jwt" + bool "JWT" select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_JSON config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" + bool "MongoDB" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_NET - bool "net" + bool "Net" config BR2_PACKAGE_POCO_NETSSL_OPENSSL - bool "netssl_openssl" + bool "NetSSL_OpenSSL" select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_POCO_CRYPTO select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL config BR2_PACKAGE_POCO_PDF - bool "pdf" + bool "PDF" select BR2_PACKAGE_POCO_JSON select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_REDIS - bool "redis" + bool "Redis" select BR2_PACKAGE_POCO_NET config BR2_PACKAGE_POCO_UTIL - bool "util" + bool "Util" select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_XML - bool "xml" + bool "XML" select BR2_PACKAGE_EXPAT config BR2_PACKAGE_POCO_ZIP - bool "zip" + bool "Zip" select BR2_PACKAGE_POCO_NET select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML From arnout at mind.be Wed Mar 23 20:23:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:46 +0100 Subject: [Buildroot] [git commit] package/dovecot: bump version to 2.3.18 Message-ID: <20220323201808.A3DFE854E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f8a46311b5e0680609d3432d4256fbe83558c3b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://dovecot.org/pipermail/dovecot-news/2022-February/000470.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 0363b6e922..e70b266d92 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz +sha256 06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 dovecot-2.3.18.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fb299a8e45..053462c6dd 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).18 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: fix CVE comments Message-ID: <20220323201808.7CD81854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b2adbff1585b2581c76c9abcc8d5529134be60c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE comments Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef02edfc1d..4418f0d3ba 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,8 +12,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 # A few comments: From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/nbd: security bump to version 3.24 Message-ID: <20220323201808.92906854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf2e459bb9fc9fe57147313cda35f7022172e6e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs From arnout at mind.be Wed Mar 23 20:09:10 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:10 +0100 Subject: [Buildroot] [git commit] Revert "package/ola: drop autoreconf" Message-ID: <20220323201808.62D8B854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c494b5f22da88bae860221f23b494e221a47e44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 66d348ae18c6e73d6ff9d935a241e55a65948be6 because for an unknown reason, the build fails if autoreconf is dropped: /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolauartdmx.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: warning: libolaserverplugininterface.so.0, needed by olad/.libs/libolaserver.so, not found (try using -rpath or -rpath-link) Fixes: - http://autobuild.buildroot.org/results/f8164c69da0b9fa38081e8b785d8234f0f297ae1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 1874350784..5090076175 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES # util-linux provides uuid lib OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/ola: add comment to AUTORECONF Message-ID: <20220323201808.6B288854E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3c7e03e2ad9908e91246260b90c2dba175c7e3c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As explained in the previous commit, AUTORECONF is necessary to handle a build failure. Add a comment to make sure it doesn't get removed again in the future. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 5090076175..557f454fe9 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -9,6 +9,7 @@ OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VE OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE OLA_INSTALL_STAGING = YES +# Bundled Makefile.in don't link correctly, regenerate with recent automake OLA_AUTORECONF = YES # util-linux provides uuid lib From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: fix build on sparc v8 Message-ID: <20220323201808.85584854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ee6d734f08e772202320841208f11a1a239ea49b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure on sparc v8 raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: ERROR: detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr Fixes: - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...b-configure.json-fix-atomicfptr-detection.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 0000000000..5f0f81a4bd --- /dev/null +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + From arnout at mind.be Wed Mar 23 20:23:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:46 +0100 Subject: [Buildroot] [git commit] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220323201808.9B4E9854E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a3ca0932155498747c46d6f902a939d55c39f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From arnout at mind.be Wed Mar 23 20:23:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:23:45 +0100 Subject: [Buildroot] [git commit] package/ola: fix build with libexecinfo Message-ID: <20220323201808.73A01854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=803bc68d59a46ea68540f437ced6334cf3335a7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: common/.libs/libolacommon.so: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/4362b20d786a0f44268ec32a689c23ac6d3b71c6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 557f454fe9..1b55ca440a 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -54,6 +54,11 @@ endef OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OLA_DEPENDENCIES += libexecinfo +OLA_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ## OLA Bindings and Interface selections ifeq ($(BR2_PACKAGE_OLA_WEB),y) From arnout at mind.be Wed Mar 23 20:09:04 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:04 +0100 Subject: [Buildroot] [git commit] package/poco: add Data/PostgreSQL support Message-ID: <20220323201808.4D2F7854E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fd31f073981a2cf586264bcde00ccd17ef9deb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master PostgreSQL support was introduced in poco v1.10.0, in commit: https://github.com/pocoproject/poco/commit/8cec8f6451b9a0ead80f655eee986040863e3526 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/poco/Config.in | 6 ++++++ package/poco/poco.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/package/poco/Config.in b/package/poco/Config.in index 79ffac741d..714e40f447 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -45,6 +45,12 @@ config BR2_PACKAGE_POCO_DATA_MYSQL select BR2_PACKAGE_MYSQL select BR2_PACKAGE_POCO_DATA +config BR2_PACKAGE_POCO_DATA_PGSQL + bool "Data/PostgreSQL" + depends on BR2_USE_MMU # postgresql + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_POSTGRESQL + config BR2_PACKAGE_POCO_DATA_SQLITE bool "Data/SQLite" select BR2_PACKAGE_POCO_DATA diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 81409ffec4..119711f3fd 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -15,6 +15,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_POCO_XML),expat) @@ -24,6 +25,7 @@ POCO_OMIT = Data/ODBC PageCompiler \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),,Data/PostgreSQL) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ From arnout at mind.be Wed Mar 23 20:09:07 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:09:07 +0100 Subject: [Buildroot] [git commit] package/poco: bump to version 1.11.1 Message-ID: <20220323201808.58323854C9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5086d75cc8613a9730150662ca83dfa4592dfef0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit drop patches, as they are now included upstream or no longer needed. It also introduces a new patch to fix a build failure for nios2. MySQL include and library paths can now be provided in variables passed to the build command. Variables MYSQL_{INC,LIB}DIR are renamed to POCO_MYSQL_{INCLUDE,LIB}. For PostgreSQL support, variables POCO_PGSQL_{INCLUDE,LIB} are also passed the same way to the build command. This poco version 1.11.1 introduces a new ActiveRecord component. For changelog, see: https://raw.githubusercontent.com/pocoproject/poco/poco-1.11.1-release/CHANGELOG Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...OS2-double-conversion-detection-to-fix-co.patch | 36 +++++++++++++++++++ ...-poco-add-the-staging-path-to-search-path.patch | 40 ---------------------- .../poco/0002-Add-support-for-m68000-1856.patch | 32 ----------------- ...src-utils.h-backport-double-conversion-ch.patch | 34 ------------------ package/poco/Config.in | 4 +++ package/poco/poco.hash | 2 +- package/poco/poco.mk | 9 +++-- 7 files changed, 47 insertions(+), 110 deletions(-) diff --git a/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch new file mode 100644 index 0000000000..7b31729347 --- /dev/null +++ b/package/poco/0001-Add-back-NIOS2-double-conversion-detection-to-fix-co.patch @@ -0,0 +1,36 @@ +From d328829e9cb8b9fde9e70b07f2b991972cf474d1 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 12 Mar 2022 10:34:04 +0100 +Subject: [PATCH] Add back NIOS2 double conversion detection to fix compile + errors + +The commit +https://github.com/pocoproject/poco/commit/558324f672d824300498060aff63356bc6bb8097 + +removed the nios2 support, which was originally added in +https://github.com/pocoproject/poco/commit/e7b91e8125d6910b53f94de5be4bb53f38dc77c1 + +This commit add it back. + +Signed-off-by: Julien Olivain +--- + Foundation/src/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 4328344d7..0a222c77d 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -102,7 +102,8 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__EMSCRIPTEN__) ++ defined(__EMSCRIPTEN__) || \ ++ defined(nios2) || defined(__nios2) || defined(__nios2__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) +-- +2.35.1 + diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch deleted file mode 100644 index fbabfc8f26..0000000000 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH] poco: add the staging path to search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach -[J??rg: Update to version 1.6.1 from github] -Signed-off-by: J??rg Krause -[Julien: Rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Data/MySQL/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 64a7d3f82..955fee2d4 100644 ---- a/Data/MySQL/Makefile -+++ b/Data/MySQL/Makefile -@@ -6,8 +6,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ --- -2.26.2 - diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch deleted file mode 100644 index bc04a9bf69..0000000000 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof -Date: Wed, 23 Aug 2017 16:50:51 +0200 -Subject: [PATCH] Add support for m68000 (#1856) - -Originally taken from - -https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da - -Signed-off-by: Thomas Petazzoni -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index c87cee13c..e891c0f10 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -66,6 +66,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. --- -2.26.2 - diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch deleted file mode 100644 index c06eebe8b0..0000000000 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 Jul 2018 15:37:47 +0200 -Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for - AArch64 BE support - -This commit, identical to upstream double-conversion commit -https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a -allows Poco to build on AArch64 big-endian. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/pocoproject/poco/pull/2378 -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index e891c0f10..892f7db18 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__riscv) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) --- -2.26.2 - diff --git a/package/poco/Config.in b/package/poco/Config.in index 714e40f447..699495a241 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -28,6 +28,10 @@ if BR2_PACKAGE_POCO comment "poco components" +config BR2_PACKAGE_POCO_ACTIVERECORD + bool "ActiveRecord" + select BR2_PACKAGE_POCO_XML + config BR2_PACKAGE_POCO_CPP_PARSER bool "CppParser" diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 2a2629733d..78d7d0b96e 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz +sha256 2412a5819a239ff2ee58f81033bcc39c40460d7a8b330013a687c8c0bd2b4ac0 poco-1.11.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 119711f3fd..fcf480c2a8 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.10.1 +POCO_VERSION = 1.11.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -20,6 +20,7 @@ POCO_DEPENDENCIES = pcre zlib \ $(if $(BR2_PACKAGE_POCO_XML),expat) POCO_OMIT = Data/ODBC PageCompiler \ + $(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \ $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ @@ -74,8 +75,10 @@ endef # Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25) define POCO_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ - MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ - MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_INCLUDE=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql \ + POCO_PGSQL_INCLUDE=$(STAGING_DIR)/usr/include/postgresql \ + POCO_PGSQL_LIB=$(STAGING_DIR)/usr/lib/postgresql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef From arnout at mind.be Wed Mar 23 20:43:43 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 23 Mar 2022 21:43:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 7.82.0 In-Reply-To: <20220313130424.3046857-1-bernd.kuhls@t-online.de> References: <20220313130424.3046857-1-bernd.kuhls@t-online.de> Message-ID: <535e8a72-f175-8c1b-9cb9-e8156143796c@mind.be> On 13/03/2022 14:04, Bernd Kuhls wrote: > Changelog: https://curl.se/changes.html > > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 > > Signed-off-by: Bernd Kuhls Applied to master, after dropping the NSS option entirely, and with an explanation in the commit message why we choose that rather than passing --with-nss-deprecated. Regards, Arnout > --- > package/libcurl/libcurl.hash | 6 +++--- > package/libcurl/libcurl.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash > index 63d6ba306c..4be245041c 100644 > --- a/package/libcurl/libcurl.hash > +++ b/package/libcurl/libcurl.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -# https://curl.se/download/curl-7.81.0.tar.xz.asc > +# https://curl.se/download/curl-7.82.0.tar.xz.asc > # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 > -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz > -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING > +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz > +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 20ebb4f271..863cc268b4 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBCURL_VERSION = 7.81.0 > +LIBCURL_VERSION = 7.82.0 > LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz > LIBCURL_SITE = https://curl.se/download > LIBCURL_DEPENDENCIES = host-pkgconf \ From arnout at mind.be Wed Mar 23 20:44:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Wed, 23 Mar 2022 21:44:00 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 7.82.0 Message-ID: <20220323203601.D784585538@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8afb945bf04816a0df594f8b310f5f9994b55104 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/0409192b1fde6b7a4f09667e80ca5dc555eab3f1 The NSS crypto backend requires a special option now, without it configure errors out with: configure: error: NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md Since it will be removed entirely soon anyway, and since this version doesn't fix any CVEs so doesn't need to be backported to stable branches, drop the NSS option entirely. Since NSS is going to be removed soon, drop the --without-nss as well. It is never going to be enabled automatically. Signed-off-by: Bernd Kuhls [Arnout: drop NSS option entirely, as suggested by Baruch Siach.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 6 ++++++ package/libcurl/Config.in | 4 ---- package/libcurl/libcurl.hash | 6 +++--- package/libcurl/libcurl.mk | 10 +--------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3b066bbf72..48c5ebb81e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_LIBCURL_LIBNSS + bool "libcurl NSS removed" + select BR2_LEGACY + help + NSS was deprecated in libcurl 7.82.0. + config BR2_PACKAGE_WESTON_DEFAULT_FBDEV bool "weston fbdev removed" select BR2_LEGACY diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index d8072c0afc..8c601c3a70 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -61,10 +61,6 @@ config BR2_PACKAGE_LIBCURL_GNUTLS bool "GnuTLS" depends on BR2_PACKAGE_GNUTLS -config BR2_PACKAGE_LIBCURL_LIBNSS - bool "NSS" - depends on BR2_PACKAGE_LIBNSS - config BR2_PACKAGE_LIBCURL_MBEDTLS bool "mbed TLS" depends on BR2_PACKAGE_MBEDTLS diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 63d6ba306c..4be245041c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.81.0.tar.xz.asc +# https://curl.se/download/curl-7.82.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING +sha256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c curl-7.82.0.tar.xz +sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 4b2e52829c..97857954db 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.81.0 +LIBCURL_VERSION = 7.82.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -68,14 +68,6 @@ else LIBCURL_CONF_OPTS += --without-gnutls endif -ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y) -LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr -LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" -LIBCURL_DEPENDENCIES += libnss -else -LIBCURL_CONF_OPTS += --without-nss -endif - ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y) LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr LIBCURL_DEPENDENCIES += mbedtls From peter at korsgaard.com Wed Mar 23 21:02:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:02:50 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x In-Reply-To: <20220310095602.2435745-2-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:55:59 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-2-kamel.bouhara@bootlin.com> Message-ID: <878rt0fklh.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > From: Thomas Petazzoni > Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix > build with gcc 11") already fixed some gcc 11.x issues, but not all of > them. This commit backports two upstream patches fixing the remaining > issues, ensuring host-odb can be built on a gcc 11.x machine. > Fixes: > http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ > Signed-off-by: Thomas Petazzoni > Signed-off-by: Kamel Bouhara > --- > Note: the above autobuilder issue has stopped appearing after > September 29, 2021, which initially sounded odd. However, on October > 3, we started rejecting build results from Xogium's autobuilder (for > other reasons), and all those issues were coming from Xogium's > autobuilder. And this is pretty logical: Xogium's autobuilder was > known to be running a very recent Arch Linux, and therefore was the > only autobuild machine running gcc 11.x as the host compiler. Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:03:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:03:01 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/libodb: add host variant In-Reply-To: <20220310095602.2435745-3-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:56:00 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-3-kamel.bouhara@bootlin.com> Message-ID: <874k3ofkl6.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > From: Thomas Petazzoni > Signed-off-by: Thomas Petazzoni > Signed-off-by: Kamel Bouhara Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:03:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:03:35 +0100 Subject: [Buildroot] [PATCH v2 3/4] package/libodb-boost: add host variant In-Reply-To: <20220310095602.2435745-4-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:56:01 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-4-kamel.bouhara@bootlin.com> Message-ID: <87zglge5zs.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > Add host variant of libodb-boost required by the ODB compiler. > The libodb-boost headers are needed at compile time, and > therefore installed in $(HOST_DIR). > Signed-off-by: Kamel Bouhara Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:03:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:03:44 +0100 Subject: [Buildroot] [PATCH v2 4/4] package/odb: add dependency on host-libodb In-Reply-To: <20220310095602.2435745-5-kamel.bouhara@bootlin.com> (Kamel Bouhara via buildroot's message of "Thu, 10 Mar 2022 10:56:02 +0100") References: <20220310095602.2435745-1-kamel.bouhara@bootlin.com> <20220310095602.2435745-5-kamel.bouhara@bootlin.com> Message-ID: <87v8w4e5zj.fsf@dell.be.48ers.dk> >>>>> "Kamel" == Kamel Bouhara via buildroot writes: > From: Thomas Petazzoni > host-odb installs the ODB compiler, which when executed at runtime, > needs access to the libodb headers. In order to have them installed, > add a dependency on host-libodb. > Signed-off-by: Thomas Petazzoni > Signed-off-by: Kamel Bouhara > [Kamel: Add optional host-libodb-boost dependency] Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:10:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:10:55 +0100 Subject: [Buildroot] [PATCH 1/2] package/bind: reorder openssl variables In-Reply-To: <20220313092148.353432-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 10:21:47 +0100") References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> Message-ID: <87r16se5nk.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > openssl is mandatory since bump to version 9.16.26 in commit > 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in > the beginning of bind.mk instead of keeping them in the middle of the > file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as > host-pkgconf is already mandatory > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:11:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:11:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/bind: fix libxml2 build In-Reply-To: <20220313092148.353432-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 10:21:48 +0100") References: <20220313092148.353432-1-fontaine.fabrice@gmail.com> <20220313092148.353432-2-fontaine.fabrice@gmail.com> Message-ID: <87mthge5n5.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with libxml2 raised since bump to > version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: > configure: error: Specifying libxml2 installation path is not > supported, adjust PKG_CONFIG_PATH instead > Fixes: > - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:27:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:27:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libgsasl support In-Reply-To: <20220314185945.2823356-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Mon, 14 Mar 2022 19:59:45 +0100") References: <20220314185945.2823356-1-bernd.kuhls@t-online.de> Message-ID: <87ils4e4vq.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Contrary to the helptext > https://github.com/curl/curl/blob/master/configure.ac#L152 > the configure option is called --with-libgsasl: > https://github.com/curl/curl/blob/master/configure.ac#L1989 > Signed-off-by: Bernd Kuhls Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:40:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:40:09 +0100 Subject: [Buildroot] [PATCH v3 1/1] package/rpi-firmware: fix missing files in overlays In-Reply-To: (Rutger Sassen's message of "Thu, 17 Mar 2022 11:06:22 +0000") References: Message-ID: <87ee2se4au.fsf@dell.be.48ers.dk> >>>>> "Sassen," == Sassen, Rutger writes: > When supporting multiple hardware targets, overlay_map.dtb might > be needed to map overlay names to one of several implementations. > Signed-off-by: Rutger Sassen > --- > Changes v2 -> v3: > - in Config.in use if statement instead of depends (suggested by Peter > Seiderer) > - mention the filename overlay_map.dtb in the help text (suggested by > Peter Seiderer) > Changes v1 -> v2: > - instead of always copying overlay_map.dtb, make it configurable > (suggested by Peter Seiderer) > - do not copy README since it a special case, only needed when > installing overlays to a non-standard location (suggested by Peter > Seiderer) Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:01:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:51 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libodb: add host variant Message-ID: <20220323213117.05CF684F5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d78ea86f92ccfd6859acc2aff8147f624894405 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b9c81cc4eefd0972b91abced472e2bce8b53fa2) Signed-off-by: Peter Korsgaard --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:34:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:34:28 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rpi-firmware: fix missing files in overlays Message-ID: <20220323213117.31A7485583@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d5fd132f098026f36c64b0b0c52ab49c6519bd4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da38cdead909aa133b9c468ddebf3f67c8d198f2) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 37bfa84eaf..230ba99372 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -23,6 +23,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 21:02:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:02:02 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libodb-boost: add host variant Message-ID: <20220323213117.0EEC785584@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a0d8e74b936ee8f500eb8805fe1d88ed784dbee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2f1f28efd4236431b333fabe6c75aceba9678bc) Signed-off-by: Peter Korsgaard --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:34:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:34:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/rpi-firmware: convert dtb overlay install loop to make-level foreach loop Message-ID: <20220323213117.297EC85584@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3f87a7ba3678c9d863244c66bdfec5a4382508f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit d0350a6c023ccbe4450d68d28c3797b1320087ba) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index f3d28ef825..37bfa84eaf 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -20,9 +20,9 @@ endif ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - for ovldtb in $(@D)/boot/overlays/*.dtbo; do \ - $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ - done + $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ + $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) + ) endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 21:02:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:02:23 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/odb: add dependency on host-libodb Message-ID: <20220323213117.185F685583@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e249f262afddc4ecbf2b857204667b6d70a9458b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88471fe4fdc3d25d81b5b6898415a0550d06b90b) Signed-off-by: Peter Korsgaard --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From peter at korsgaard.com Wed Mar 23 21:23:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:23:58 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libcurl: fix libgsasl support Message-ID: <20220323213117.207D685586@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3f38e420732533dd5643cf4864ddab72fe2bb0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b98d8bba7c1358938f8930a0167abe7a3f6c521) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a70ebe4113..4ff193d62e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From peter at korsgaard.com Wed Mar 23 20:55:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:55:49 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220323213116.F192F85583@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cce793940a09ce0ff0924c2e550734537cbc7173 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2d6e5a8501ff509760dca5c1477281d3f3430ddf) Signed-off-by: Peter Korsgaard --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From peter at korsgaard.com Wed Mar 23 21:01:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:00 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libodb: add host variant Message-ID: <20220323213124.D0FCE85644@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4cf10bedd4d7efea98c4c926978aaa924d9c081 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b9c81cc4eefd0972b91abced472e2bce8b53fa2) Signed-off-by: Peter Korsgaard --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:18:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:18:12 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libcurl: fix libgsasl support Message-ID: <20220323213124.F26F685659@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75ecaa43e0bddb4d562378c33aec11c881a8cd99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b98d8bba7c1358938f8930a0167abe7a3f6c521) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a70ebe4113..4ff193d62e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From peter at korsgaard.com Wed Mar 23 20:55:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:55:57 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220323213124.C1B4185638@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aadba596b9c258f46b2c0e2ef5f1456d35364d1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2d6e5a8501ff509760dca5c1477281d3f3430ddf) Signed-off-by: Peter Korsgaard --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From peter at korsgaard.com Wed Mar 23 21:31:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:31:29 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/rpi-firmware: fix missing files in overlays Message-ID: <20220323213125.0937F85638@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=813dec2b4236ab13d70f087ac9115fd6b485cd99 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da38cdead909aa133b9c468ddebf3f67c8d198f2) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 3a4741a0ff..1921017291 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -48,6 +48,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 21:01:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:06 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libodb-boost: add host variant Message-ID: <20220323213124.DC37585638@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2702c4e8f5e073ca44db691487ab27e9ebbd4a52 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2f1f28efd4236431b333fabe6c75aceba9678bc) Signed-off-by: Peter Korsgaard --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:01:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:01:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/odb: add dependency on host-libodb Message-ID: <20220323213124.E72F885644@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5997ee004d2c3c22e48dfeb7d18c4ead4f76c547 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88471fe4fdc3d25d81b5b6898415a0550d06b90b) Signed-off-by: Peter Korsgaard --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From peter at korsgaard.com Wed Mar 23 20:58:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:58:46 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libodb: add host variant Message-ID: <20220323213134.10EEF856ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0dd4dd121735896e4875bf2527c032fc3c15bd4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b9c81cc4eefd0972b91abced472e2bce8b53fa2) Signed-off-by: Peter Korsgaard --- package/libodb/libodb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866..b25e8ac501 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 20:59:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:59:49 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libodb-boost: add host variant Message-ID: <20220323213134.189CE856EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f331ffdaec10e9595d8e43f56e987d6861494eee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Add host variant of libodb-boost required by the ODB compiler. The libodb-boost headers are needed at compile time, and therefore installed in $(HOST_DIR). Signed-off-by: Kamel Bouhara [Arnout: add -std=c++11] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2f1f28efd4236431b333fabe6c75aceba9678bc) Signed-off-by: Peter Korsgaard --- package/libodb-boost/libodb-boost.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f..6deb67f943 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From peter at korsgaard.com Wed Mar 23 21:10:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:10:29 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bind: reorder openssl variables Message-ID: <20220323213134.296B2856ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f0dbbcbd34ad39834fcc83dc5991a315d4a793 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x openssl is mandatory since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92 so move openssl variables in the beginning of bind.mk instead of keeping them in the middle of the file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as host-pkgconf is already mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b127b0c1b653b0e2ce3c1996a7eb370a258e712) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5b4c60b14c..72f1e4dcdc 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + BUILD_CFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ @@ -36,14 +37,17 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr \ + --with-ecdsa=yes \ + --with-eddsa=no \ + --with-aes=yes -BIND_DEPENDENCIES = libuv +BIND_DEPENDENCIES = host-pkgconf libuv openssl ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib -BIND_DEPENDENCIES += host-pkgconf zlib else BIND_CONF_OPTS += --without-zlib endif @@ -69,13 +73,6 @@ else BIND_CONF_OPTS += --with-libxml2=no endif -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes From peter at korsgaard.com Wed Mar 23 21:16:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:16:34 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libcurl: fix libgsasl support Message-ID: <20220323213134.3A2D0856EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de5f4568c015e2adc82eab3fc007802c3a87ed24 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Contrary to the helptext https://github.com/curl/curl/blob/master/configure.ac#L152 the configure option is called --with-libgsasl: https://github.com/curl/curl/blob/master/configure.ac#L1989 Signed-off-by: Bernd Kuhls Acked-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4b98d8bba7c1358938f8930a0167abe7a3f6c521) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f271..4b2e52829c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -128,9 +128,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) From peter at korsgaard.com Wed Mar 23 21:00:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:00:39 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/odb: add dependency on host-libodb Message-ID: <20220323213134.2111B856EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb37f62dfe0a4da4377c84f943c0b4c81f190b82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x host-odb installs the ODB compiler, which when executed at runtime, needs access to the libodb headers. This is a runtime dependency, normally added in Config.in, but for host packages there is no way to express a runtime dependency. In order to have them installed, add a dependency on host-libodb. Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara [Kamel: Add optional host-libodb-boost dependency] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88471fe4fdc3d25d81b5b6898415a0550d06b90b) Signed-off-by: Peter Korsgaard --- package/odb/odb.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bb..a234069952 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts From peter at korsgaard.com Wed Mar 23 21:28:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:28:34 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/rpi-firmware: fix missing files in overlays Message-ID: <20220323213134.426AA856ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b43b4f12773bf63bb3ba6f10498db5c9ac9e2cad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x When supporting multiple hardware targets, overlay_map.dtb might be needed to map overlay names to one of several implementations [1]. If the correct overlay names are specified in config.txt, the map file is not needed, but it also doesn't hurt. [1] https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/configuration/device-tree.adoc#the-overlay-map-file Signed-off-by: Rutger Sassen Reviewed-by: Peter Seiderer [Arnout: always install overlay_map.dtb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit da38cdead909aa133b9c468ddebf3f67c8d198f2) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f5270..d4d1d07b3f 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -48,6 +48,7 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ endef else # Still create the directory, so a genimage.cfg can include it independently of From peter at korsgaard.com Wed Mar 23 20:38:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 21:38:37 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/odb: backport more upstream commits to fix build with gcc 11.x Message-ID: <20220323213134.08E83856EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6d29bacb3c8e8e5c8f852bdd4db5068d7828ebd1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix build with gcc 11") already fixed some gcc 11.x issues, but not all of them. This commit backports two upstream patches fixing the remaining issues, ensuring host-odb can be built on a gcc 11.x machine. Fixes: http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/ Signed-off-by: Thomas Petazzoni Signed-off-by: Kamel Bouhara Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 2d6e5a8501ff509760dca5c1477281d3f3430ddf) Signed-off-by: Peter Korsgaard --- package/odb/0012-Adjust-to-changes-in-GCC-11.patch | 50 ++++++++++++++++ ...e-lookup-ambiguity-causing-error-with-GCC.patch | 68 ++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 0000000000..2959a71dea --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 0000000000..79c3d982fa --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + From peter at korsgaard.com Wed Mar 23 21:10:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:10:38 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/bind: fix libxml2 build Message-ID: <20220323213134.31AB0856EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9adf86d9b64c32acfb9e2a1b0c1567b06ab8fe6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure with libxml2 raised since bump to version 9.16.26 in commit 8adeaec8afacbc680edebae91524f6144926ac92: configure: error: Specifying libxml2 installation path is not supported, adjust PKG_CONFIG_PATH instead Fixes: - http://autobuild.buildroot.org/results/648d29e4cfa6a40bb6e54793c044e9c834f03a1b Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 33413b7e5326591dbfc29050a0d1136dcae868c7) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 72f1e4dcdc..a595baabc5 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -67,7 +67,7 @@ BIND_CONF_OPTS += --with-gssapi=no endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-libxml2 BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no From peter at korsgaard.com Wed Mar 23 21:41:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:42 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3 In-Reply-To: <20220315090209.206025-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:09 +0100") References: <20220315090209.206025-1-angelo@amarulasolutions.com> Message-ID: <87a6dge489.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:41:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:57 +0100 Subject: [Buildroot] [PATCH] linux: bump CIP kernel to version 5.10.104-cip3-rt3 In-Reply-To: <20220315090220.206426-1-angelo@amarulasolutions.com> (Angelo Compagnucci's message of "Tue, 15 Mar 2022 10:02:20 +0100") References: <20220315090220.206426-1-angelo@amarulasolutions.com> Message-ID: <875yo4e47u.fsf@dell.be.48ers.dk> >>>>> "Angelo" == Angelo Compagnucci writes: > Signed-off-by: Angelo Compagnucci Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:41:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:12 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] linux: bump CIP kernel to version 5.10.104-cip3 Message-ID: <20220323213305.A5717856F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=987c284d6a2b35965c42c3b23d570a2eb11c4bd8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard (cherry picked from commit 781a01c9f3d8c7d970d75ca56198161352a91d4b) Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 043e7c6574..c6590b31ee 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.15)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.104-cip3)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,7 +126,7 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf856..18480a87bf 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux- sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz +sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz # Licenses hashes From peter at korsgaard.com Wed Mar 23 21:41:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:41:19 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] linux: bump CIP-RT kernel to version 5.10.104-cip3-rt3 Message-ID: <20220323213305.AD8FD856F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e5f4ae1f4737dcb392e9b32d5b5525e9b591d8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard (cherry picked from commit 2b6bd9b0de8c60f8acd87bb7ffaefc59be6d8dae) Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c6590b31ee..f21beb4222 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.104-cip3-rt3)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -127,7 +127,7 @@ config BR2_LINUX_KERNEL_VERSION string default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index 18480a87bf..976f1d07c0 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -10,7 +10,7 @@ sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux- sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From peter at korsgaard.com Wed Mar 23 21:46:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:46:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libiec61850: security bump to version 1.5.1 In-Reply-To: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 18:34:29 +0100") References: <20220315173429.1987326-1-fontaine.fabrice@gmail.com> Message-ID: <871qyse3zi.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Retrieve official tarball > - Fix CVE-2021-45769: A NULL pointer dereference in > AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 > v1.5.0 can lead to a segmentation fault or application crash. > - Fix many other vulnerabilities: > https://libiec61850.com/new-release-1-5-1-of-libiec61850 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:47:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/apache: security bump version to 2.4.53 In-Reply-To: <20220314184353.2639955-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Mon, 14 Mar 2022 19:43:53 +0100") References: <20220314184353.2639955-1-bernd.kuhls@t-online.de> Message-ID: <87wngkcpds.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 > Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. > Signed-off-by: Bernd Kuhls Committed to 2021.02.x, 2021.11.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 23 21:42:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:42:18 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220323213850.58B7885735@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c4cfe71314a28f8d982148e7fa6b9966b97657f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 52c372446f034cf8277951ad083abe5e1c10f52d) Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 23 21:47:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:31 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] package/apache: security bump version to 2.4.53 Message-ID: <20220323213850.61586856F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44edd4bd14c54b401c27976406ab24062c353cbc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit eaa8fcf546d84e38990566e49f4730c530d2577c) Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Wed Mar 23 21:42:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:42:28 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220323213856.C3072857B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83a15447c1a45802e1c15fcd0879f6d0f1c3694f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 52c372446f034cf8277951ad083abe5e1c10f52d) Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 23 21:47:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:25 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] package/apache: security bump version to 2.4.53 Message-ID: <20220323213856.CC1EB857B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3106b412be4d70d4f8e6b7b2c81a6aa5a7eb8eff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit eaa8fcf546d84e38990566e49f4730c530d2577c) Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 5fcb887fbc..24d17364bb 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,7 +17,7 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define APACHE_FIXUP_APR_LIBTOOL @@ -29,7 +29,7 @@ endif APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -43,7 +43,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Wed Mar 23 21:47:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:47:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/apache: security bump version to 2.4.53 Message-ID: <20220323213901.E11EB85A7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9f936b16763c9074434249960337be4c25b501d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit eaa8fcf546d84e38990566e49f4730c530d2577c) Signed-off-by: Peter Korsgaard --- package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 3b518795be..d5eb65db43 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,7 +17,7 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define APACHE_FIXUP_APR_LIBTOOL @@ -29,7 +29,7 @@ endif APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -43,7 +43,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ From peter at korsgaard.com Wed Mar 23 21:43:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:43:08 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libiec61850: security bump to version 1.5.1 Message-ID: <20220323213901.D84D585A7C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ad69d4363ad871e6637d9930f49f3efbdff349b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Retrieve official tarball - Fix CVE-2021-45769: A NULL pointer dereference in AcseConnection_parseMessage at src/mms/iso_acse/acse.c of libiec61850 v1.5.0 can lead to a segmentation fault or application crash. - Fix many other vulnerabilities: https://libiec61850.com/new-release-1-5-1-of-libiec61850 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 52c372446f034cf8277951ad083abe5e1c10f52d) Signed-off-by: Peter Korsgaard --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6..a416ecdb4d 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad39..9bd55cb76a 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Mar 23 21:42:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 23 Mar 2022 22:42:56 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/libiec61850: bump to version 1.5.0 Message-ID: <20220323213901.CFEC085A7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd7058a0c1802a969f8d5d32d949d382b19749b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Remove all upstream patches Remove IGNORE_CVES for CVE-2020-15158 Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/309037705 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a42e0e4600be785fa750c6b481c41a76d041df03) Signed-off-by: Peter Korsgaard --- .../0001-use-poll.h-instead-of-sys-poll.h.patch | 33 ---------------------- ...port_linux-Add-missing-include-sys-time.h.patch | 32 --------------------- ...eap-buffer-overflow-when-handling-message.patch | 27 ------------------ package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 5 +--- 5 files changed, 2 insertions(+), 97 deletions(-) diff --git a/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch b/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index a04473d218..0000000000 --- a/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4cad505fc98240eb66eaabfae61a9694f8158dda Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 7 Apr 2020 20:58:37 +0200 -Subject: [PATCH] use instead of - -The manpage of poll(2) states that the prototype of poll is defined -in . Use that header file instead of to allow -compilation against musl-libc. - -Upstream status: Pending -https://github.com/mz-automation/libiec61850/pull/228 - -Signed-off-by: Romain Naour ---- - hal/ethernet/linux/ethernet_linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c -index c3ab2e2..9aa5c28 100644 ---- a/hal/ethernet/linux/ethernet_linux.c -+++ b/hal/ethernet/linux/ethernet_linux.c -@@ -23,7 +23,7 @@ - - #include - #include --#include -+#include - #include - #include - #include --- -2.21.1 - diff --git a/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch b/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch deleted file mode 100644 index e1b8ca15b3..0000000000 --- a/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 661405eb6066b67dfe51d5ff9635e29f86bdd238 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 7 Apr 2020 21:02:54 +0200 -Subject: [PATCH] serial_port_linux: Add missing include sys/time.h - -POSIX says `struct timeval` is defined if is included. - -Adding this header allow to build against musl-libc. - -Upstream status: Pending -https://github.com/mz-automation/libiec61850/pull/228 - -Signed-off-by: Romain Naour ---- - hal/serial/linux/serial_port_linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c -index e6308c0..15e5794 100644 ---- a/hal/serial/linux/serial_port_linux.c -+++ b/hal/serial/linux/serial_port_linux.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include "hal_serial.h" - #include "hal_time.h" --- -2.21.1 - diff --git a/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch b/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch deleted file mode 100644 index 88048555b7..0000000000 --- a/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 033ab5b6488250c8c3b838f25a7cbc3e099230bb Mon Sep 17 00:00:00 2001 -From: Michael Zillgith -Date: Wed, 12 Aug 2020 07:25:37 +0200 -Subject: [PATCH] - COTP: fixed possible heap buffer overflow when handling - message with invalid (zero) value in length field (#250) - -[Retrieved from: -https://github.com/mz-automation/libiec61850/commit/033ab5b6488250c8c3b838f25a7cbc3e099230bb] -Signed-off-by: Fabrice Fontaine ---- - src/mms/iso_cotp/cotp.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/mms/iso_cotp/cotp.c b/src/mms/iso_cotp/cotp.c -index cbb34b36..8c37d262 100644 ---- a/src/mms/iso_cotp/cotp.c -+++ b/src/mms/iso_cotp/cotp.c -@@ -720,6 +720,9 @@ CotpConnection_readToTpktBuffer(CotpConnection* self) - goto exit_waiting; - } - -+ if (self->packetSize <= bufPos) -+ goto exit_error; -+ - readBytes = readFromSocket(self, buffer + bufPos, self->packetSize - bufPos); - - if (readBytes < 0) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 5739a5d8c9..3a024be7c6 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0630cd5b7ac67a2d286b0ad574ff1c9074c96be33b9d5a300cd69e89429abbe libiec61850-1.4.2.1.tar.gz +sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 4f82451eb8..6da782ad39 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.4.2.1 +LIBIEC61850_VERSION = 1.5.0 LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ @@ -12,7 +12,4 @@ LIBIEC61850_LICENSE_FILES = COPYING LIBIEC61850_CPE_ID_VENDOR = mz-automation LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF -# 0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch -LIBIEC61850_IGNORE_CVES += CVE-2020-15158 - $(eval $(cmake-package)) From Jason at zx2c4.com Thu Mar 24 02:41:44 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 23 Mar 2022 20:41:44 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323035233.140997-1-Jason@zx2c4.com> <20220323091336.GL1566358@scaer> Message-ID: Hi Yann, On Wed, Mar 23, 2022 at 2:06 PM Jason A. Donenfeld wrote: > > > As a final note, while this commit improves upon the status quo by > > > removing a vulnerability, this shell script still does not actually > > > initialize the RNG like it says it does. For initialization via a seed > > > file, the RNDADDENTROPY ioctl must be used. > > > > Is there a way to do that within a shell script? If so, would you be > > kind enough to send a followup patch, please? > > No, there isn't, at all. But I'm writing some code now that I hope to > release as a standalone utility, and upstream into busybox/util-linux > that should make it accessible. When that happens, I'll keep this > mailing list informed, and we can move forward then. Initial draft is here: https://git.zx2c4.com/seedrng/about/ https://git.zx2c4.com/seedrng/tree/seedrng.c I'll probably play with that for a few more days to make sure it's solid. Probably the long term solution here is putting something like that into busybox, and having scripts call that instead. Jason From james.hilliard1 at gmail.com Thu Mar 24 04:30:06 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 23 Mar 2022 22:30:06 -0600 Subject: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> Message-ID: On Sat, Feb 12, 2022 at 5:55 AM Arnout Vandecappelle wrote: > > > > On 02/02/2022 20:39, James Hilliard wrote: > > On Mon, Jan 31, 2022 at 4:36 AM Romain Naour wrote: > >> > >> Hello James, Thomas, All, > >> > >> Le 31/01/2022 ? 10:45, Thomas Petazzoni via buildroot a ?crit : > >>> On Sun, 30 Jan 2022 18:59:37 -0700 > >>> James Hilliard wrote: > >>> > >>>> This appears to be the latest version that has a working lld build. > >>>> > >>>> Version 12.0.0 and newer have broken lld stand-alone builds: > >>>> https://bugs.llvm.org/show_bug.cgi?id=49228 > >>>> > >>>> Signed-off-by: James Hilliard > >>> > >>> Is this really enough? I remember seeing patches a long time ago doing > >>> bumps on LLVM/Clang and that was much more involved, which I think > >>> explains why we're still at version 9.x. > >>> > >>> Romain, any comments on this? > >> > >> Adding Matt in Cc: > >> > >> IIRC, there is an issue with libclc package which is part of the llvm project. > >> > >> Due to the gap between the two version, all CMake options must be reviewed (long > >> and boring task I agree). > > > > Oh, I guess there was already a series here with more changes: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=233431&submitter=&state=*&q=&archive=both&delegate= > > Given the discussion in both these threads, I've marked the patch as Changes > Requested. I think I managed to fix the blockers with libclc in Matt's series which I've sent as a v12: https://patchwork.ozlabs.org/project/buildroot/list/?series=291585&submitter=&state=*&q=&archive=both&delegate= > > Regards, > Arnout > From snathicktechno at gmail.com Thu Mar 24 04:49:46 2022 From: snathicktechno at gmail.com (snathick) Date: Thu, 24 Mar 2022 10:19:46 +0530 Subject: [Buildroot] Python package integration Message-ID: Hi, I am trying to add the below python package to buildroot https://github.com/richteel/TeelSys_Python_SHT .mk file as follows ################################################################################ # # python-sht21 # ################################################################################ PYTHON_SHT21_VERSION = 1.0 PYTHON_SHT21_SOURCE = pysht21-$(PYTHON_SHT21_VERSION).tar.gz PYTHON_SHT21_SITE = https://github.com/richteel/TeelSys_Python_SHT PYTHON_SHT21_LICENSE = BSD PYTHON_SHT21_LICENSE_FILES = LICENSE PYTHON_SHT21_SETUP_TYPE = setuptools $(eval $(python-package)) make command giving following error wget --passive-ftp -nd -t 3 -O '/home/snathick/buildroot/output/build/.pysht21-1.0.uyWYsC/output' ' http://sources.buildroot.net/pysht21-1.0' --2022-03-24 08:57:12-- http://sources.buildroot.net/pysht21-1.0 Resolving sources.buildroot.net (sources.buildroot.net)... 172.67.72.56, 104.26.0.37, 104.26.1.37, ... Connecting to sources.buildroot.net (sources.buildroot.net)|172.67.72.56|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2022-03-24 08:57:13 ERROR 404: Not Found. package/pkg-generic.mk:185: recipe for target '/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded' failed make[1]: *** [/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded] Error 1 Makefile:84: recipe for target '_all' failed make: *** [_all] Error 2 Any suggestions to resolve the issue -- Thanks & Regards, Snathick -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Thu Mar 24 05:56:02 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 23 Mar 2022 23:56:02 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: add cmake dependency support Message-ID: <20220324055602.3021498-1-james.hilliard1@gmail.com> Meson dependencies and variables can be provided by cmake similar to how they can be provided by pkgconfig, for this to work we need to ensure that cmake_prefix_path is set for both cross and native targets along with the cmake binary path. See: https://mesonbuild.com/Dependencies.html#cmake https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways https://mesonbuild.com/Machine-files.html#meson-builtin-options Signed-off-by: James Hilliard --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a..9e70d49b60 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e..1977a83501 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,7 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true -- 2.25.1 From foss+buildroot at 0leil.net Thu Mar 24 06:38:08 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Thu, 24 Mar 2022 07:38:08 +0100 Subject: [Buildroot] Python package integration In-Reply-To: References: Message-ID: <4470C393-DAE8-4385-A817-9895CF2CFECC@0leil.net> Hi, On March 24, 2022 5:49:46 AM GMT+01:00, snathick wrote: >Hi, > >I am trying to add the below python package to buildroot > >https://github.com/richteel/TeelSys_Python_SHT > > >.mk file as follows > >################################################################################ ># ># python-sht21 ># >################################################################################ > >PYTHON_SHT21_VERSION = 1.0 >PYTHON_SHT21_SOURCE = pysht21-$(PYTHON_SHT21_VERSION).tar.gz >PYTHON_SHT21_SITE = https://github.com/richteel/TeelSys_Python_SHT I think this is one of the issues. The documentation (https://buildroot.org/downloads/manual/manual.html#github-download-url) states that you should use: PYTHON_SHT21_SITE = $(call github,richteel,TeelSys_Python_SHT,$(PYTHON_SHT21_VERSION)) I also don't think there's a need for PYTHON_SHT21_SOURCE since Buildroot will figure it out from _SITE variable here. Finally, I couldn't see tags or releases on this github repo, so you want to pass a commit id to PYTHON_SHT21_VERSION, e.g. 84398b3267158d15e2322878294c0d7e0e6fa78d for the last commit in master branch. >PYTHON_SHT21_LICENSE = BSD It's actually MIT. Cheers, Quentin >PYTHON_SHT21_LICENSE_FILES = LICENSE >PYTHON_SHT21_SETUP_TYPE = setuptools > >$(eval $(python-package)) > >make command giving following error > >wget --passive-ftp -nd -t 3 -O >'/home/snathick/buildroot/output/build/.pysht21-1.0.uyWYsC/output' ' >http://sources.buildroot.net/pysht21-1.0' >--2022-03-24 08:57:12-- http://sources.buildroot.net/pysht21-1.0 >Resolving sources.buildroot.net (sources.buildroot.net)... 172.67.72.56, >104.26.0.37, 104.26.1.37, ... >Connecting to sources.buildroot.net (sources.buildroot.net)|172.67.72.56|:80... >connected. >HTTP request sent, awaiting response... 404 Not Found >2022-03-24 08:57:13 ERROR 404: Not Found. > >package/pkg-generic.mk:185: recipe for target >'/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded' >failed >make[1]: *** >[/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded] >Error 1 >Makefile:84: recipe for target '_all' failed >make: *** [_all] Error 2 > > >Any suggestions to resolve the issue > > > > From james.hilliard1 at gmail.com Thu Mar 24 06:39:28 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 00:39:28 -0600 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 Message-ID: <20220324063928.3448755-1-james.hilliard1@gmail.com> CONTRIBUTING.md hash changed due to various style updates. Set new default wifi backend config option to iwd when enabled in cases where the default wpa_supplicant is not enabled. Signed-off-by: James Hilliard --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index d25f0e8194..26bcf843c2 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992c..3479bb3794 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.34 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.36 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES @@ -53,8 +53,15 @@ endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_CONF_OPTS += --with-iwd +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +endif +else +NETWORK_MANAGER_CONF_OPTS += \ + --without-iwd \ + --with-config-wifi-backend-default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) -- 2.25.1 From james.hilliard1 at gmail.com Thu Mar 24 07:18:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 01:18:17 -0600 Subject: [Buildroot] [PATCH 1/1] package/python-txaio: bump to version 22.2.1 Message-ID: <20220324071817.1270488-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-txaio/python-txaio.hash | 4 ++-- package/python-txaio/python-txaio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 5e05f02d3a..f06c14b21f 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 750d9e3d3d..1a8a888963 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 21.2.1 +PYTHON_TXAIO_VERSION = 22.2.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools -- 2.25.1 From yann.morin.1998 at free.fr Thu Mar 24 08:22:47 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 09:22:47 +0100 Subject: [Buildroot] [git commit] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220324081411.4381E85637@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0986de551f46e72268857fd817986e9be697cd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used but there's currently no way to do that from a shell script for now. Signed-off-by: Jason A. Donenfeld Signed-off-by: Yann E. MORIN --- package/urandom-scripts/S20urandom | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" From yann.morin.1998 at free.fr Thu Mar 24 08:24:33 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 09:24:33 +0100 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220323200731.170409-1-Jason@zx2c4.com> References: <20220323200731.170409-1-Jason@zx2c4.com> Message-ID: <20220324082433.GA3649946@scaer> Jason, All, +Peter: candidate for backporting as a security fix On 2022-03-23 14:07 -0600, Jason A. Donenfeld spake thusly: > Writing into /dev/urandom doesn't actually credit any entropy bits. And > while it adds that data to the entropy pool, it won't actually be > immediately used when reading from /dev/urandom subsequently. This is > how the kernel's /dev/urandom has always worked, unfortunately. > > As a result of this behavior, which may be understandably surprising, > writing a good seed file into /dev/urandom and then saving a new seed > file immediately after is dangerous, because the new seed file may wind > up being entirely deterministic, even if the old seed file was quite > good. > > This has been fixed in systemd with > , > and fortunately it's possible to do the same thing in shell script here. > Specifically, instead of just saving new /dev/urandom output straight > up, we hash the new /dev/urandom together with the old seed, in order to > produce the new seed. This way the amount of entropy in the new seed > will stay the same or get better, but not appreciably regress. > > At the same time, the pool size check in this script is useless. Writing > to /dev/urandom never credits bits anyway, so no matter what, writing > into /dev/urandom is useful and not harmful. There's also not much of a > point in seeding with more than 256 bits, which is what the hashing > operation above produces. So this commit removes the file size check. > > As a final note, while this commit improves upon the status quo by > removing a vulnerability, this shell script still does not actually > initialize the RNG like it says it does. For initialization via a seed > file, the RNDADDENTROPY ioctl must be used. > > Signed-off-by: Jason A. Donenfeld Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/urandom-scripts/S20urandom | 39 +++++++++++++----------------- > 1 file changed, 17 insertions(+), 22 deletions(-) > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index e4fd125721..c6b2ebd48f 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -17,43 +17,38 @@ else > pool_size=512 > fi > > -check_file_size() { > - [ -f "$URANDOM_SEED" ] || return 1 > - # Try to read two blocks but exactly one will be read if the file has > - # the correct size. > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > - test "$size" -eq "$pool_size" > -} > - > init_rng() { > - if check_file_size; then > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > + printf 'Initializing random number generator: ' > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > + status=$? > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > fi > + return "$status" > } > > save_random_seed() { > printf 'Saving random seed: ' > - if touch "$URANDOM_SEED" 2> /dev/null; then > + status=1 > + if touch "$URANDOM_SEED.new" 2> /dev/null; then > old_umask=$(umask) > umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > - status=$? > + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > + | sha256sum \ > + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > + rm -f "$URANDOM_SEED.tmp" > umask "$old_umask" > if [ "$status" -eq 0 ]; then > echo "OK" > else > echo "FAIL" > fi > + > else > - status=$? > echo "SKIP (read-only file system detected)" > fi > return "$status" > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bugzilla at busybox.net Thu Mar 24 08:32:07 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 24 Mar 2022 08:32:07 +0000 Subject: [Buildroot] [Bug 14686] genimage.cfg have a hard-coded .ext4 extension which is not compatible with others filesystems's extension In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14686 --- Comment #2 from Roman --- My bad, thank you for your time :-) -- You are receiving this mail because: You are on the CC list for the bug. From David.Laight at ACULAB.COM Thu Mar 24 09:15:09 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 09:15:09 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324082433.GA3649946@scaer> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: From: Yann E. MORIN > Sent: 24 March 2022 08:25 > > +Peter: candidate for backporting as a security fix Probably not - the security fix is the code that actually initialises the RNG. David > On 2022-03-23 14:07 -0600, Jason A. Donenfeld spake thusly: > > Writing into /dev/urandom doesn't actually credit any entropy bits. And > > while it adds that data to the entropy pool, it won't actually be > > immediately used when reading from /dev/urandom subsequently. This is > > how the kernel's /dev/urandom has always worked, unfortunately. > > > > As a result of this behavior, which may be understandably surprising, > > writing a good seed file into /dev/urandom and then saving a new seed > > file immediately after is dangerous, because the new seed file may wind > > up being entirely deterministic, even if the old seed file was quite > > good. > > > > This has been fixed in systemd with > > , > > and fortunately it's possible to do the same thing in shell script here. > > Specifically, instead of just saving new /dev/urandom output straight > > up, we hash the new /dev/urandom together with the old seed, in order to > > produce the new seed. This way the amount of entropy in the new seed > > will stay the same or get better, but not appreciably regress. > > > > At the same time, the pool size check in this script is useless. Writing > > to /dev/urandom never credits bits anyway, so no matter what, writing > > into /dev/urandom is useful and not harmful. There's also not much of a > > point in seeding with more than 256 bits, which is what the hashing > > operation above produces. So this commit removes the file size check. > > > > As a final note, while this commit improves upon the status quo by > > removing a vulnerability, this shell script still does not actually > > initialize the RNG like it says it does. For initialization via a seed > > file, the RNDADDENTROPY ioctl must be used. > > > > Signed-off-by: Jason A. Donenfeld > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/urandom-scripts/S20urandom | 39 +++++++++++++----------------- > > 1 file changed, 17 insertions(+), 22 deletions(-) > > > > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > > index e4fd125721..c6b2ebd48f 100644 > > --- a/package/urandom-scripts/S20urandom > > +++ b/package/urandom-scripts/S20urandom > > @@ -17,43 +17,38 @@ else > > pool_size=512 > > fi > > > > -check_file_size() { > > - [ -f "$URANDOM_SEED" ] || return 1 > > - # Try to read two blocks but exactly one will be read if the file has > > - # the correct size. > > - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) > > - test "$size" -eq "$pool_size" > > -} > > - > > init_rng() { > > - if check_file_size; then > > - printf 'Initializing random number generator: ' > > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > > - status=$? > > - if [ "$status" -eq 0 ]; then > > - echo "OK" > > - else > > - echo "FAIL" > > - fi > > - return "$status" > > + printf 'Initializing random number generator: ' > > + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > > + status=$? > > + if [ "$status" -eq 0 ]; then > > + echo "OK" > > + else > > + echo "FAIL" > > fi > > + return "$status" > > } > > > > save_random_seed() { > > printf 'Saving random seed: ' > > - if touch "$URANDOM_SEED" 2> /dev/null; then > > + status=1 > > + if touch "$URANDOM_SEED.new" 2> /dev/null; then > > old_umask=$(umask) > > umask 077 > > - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null > > - status=$? > > + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > > + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > > + | sha256sum \ > > + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > > + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > > + rm -f "$URANDOM_SEED.tmp" > > umask "$old_umask" > > if [ "$status" -eq 0 ]; then > > echo "OK" > > else > > echo "FAIL" > > fi > > + > > else > > - status=$? > > echo "SKIP (read-only file system detected)" > > fi > > return "$status" > > -- > > 2.35.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From yann.morin.1998 at free.fr Thu Mar 24 10:09:06 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 11:09:06 +0100 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: <20220324100906.GC3649946@scaer> David, All, On 2022-03-24 09:15 +0000, David Laight spake thusly: > From: Yann E. MORIN > > Sent: 24 March 2022 08:25 > > > > +Peter: candidate for backporting as a security fix > Probably not - the security fix is the code that actually > initialises the RNG. Not sure I understood... As Jason explained, we have so far been saving a seed from an RNG that is probably partially deterministic; that is the security issue. The way we are seeding the RNG fundamentally does not change, because we are not crediting any entropy with whatever we put in there. So, whether we write something, anything, or nothing at all, has no impact on the strength of the RNG. As far as I understood it, at least. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From David.Laight at ACULAB.COM Thu Mar 24 10:25:13 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 10:25:13 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324100906.GC3649946@scaer> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <20220324100906.GC3649946@scaer> Message-ID: From: Yann E. MORIN > Sent: 24 March 2022 10:09 > > David, All, > > On 2022-03-24 09:15 +0000, David Laight spake thusly: > > From: Yann E. MORIN > > > Sent: 24 March 2022 08:25 > > > > > > +Peter: candidate for backporting as a security fix > > Probably not - the security fix is the code that actually > > initialises the RNG. > > Not sure I understood... As Jason explained, we have so far been saving > a seed from an RNG that is probably partially deterministic; that is the > security issue. I'm pretty sure the seed is also saved during shutdown. So a normal startup doesn't rely on the seed saved by the startup script. (Although is would be better to use a background script to save after (say) 30 minutes of operation.) > The way we are seeding the RNG fundamentally does not change, because > we are not crediting any entropy with whatever we put in there. So, > whether we write something, anything, or nothing at all, has no impact > on the strength of the RNG. Right - the problem is that RNG isn't being given any entropy at boot time. So it is very weak. The only point in saving/loading a seed is to give the RNG some entropy at boot time. Otherwise programs run from startup scripts that read the RNG to get session keys don't get very good values at all. That is the real security problem. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From yann.morin.1998 at free.fr Thu Mar 24 10:39:39 2022 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 24 Mar 2022 11:39:39 +0100 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <20220324100906.GC3649946@scaer> Message-ID: <20220324103939.GD3649946@scaer> David, All, On 2022-03-24 10:25 +0000, David Laight spake thusly: > From: Yann E. MORIN > > On 2022-03-24 09:15 +0000, David Laight spake thusly: > > > From: Yann E. MORIN > > > > +Peter: candidate for backporting as a security fix > > > Probably not - the security fix is the code that actually > > > initialises the RNG. > > Not sure I understood... As Jason explained, we have so far been saving > > a seed from an RNG that is probably partially deterministic; that is the > > security issue. > I'm pretty sure the seed is also saved during shutdown. > So a normal startup doesn't rely on the seed saved by the startup script. > (Although is would be better to use a background script > to save after (say) 30 minutes of operation.) The problem is that a lot, if not most, embedded devices are never properly shut-down; instead, they are, intentionally or not, brutally electrically powered off. In that case, the seed that is saved at boot is what is going to be reused on the next boot. And currently, that seed is weak, because the output of the RNG at boot is mostly predicatble. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From David.Laight at ACULAB.COM Thu Mar 24 13:06:53 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 13:06:53 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324103939.GD3649946@scaer> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <20220324100906.GC3649946@scaer> <20220324103939.GD3649946@scaer> Message-ID: <5ee688669a3c451696590ba855660465@AcuMS.aculab.com> From: Yann E. MORIN > Sent: 24 March 2022 10:40 > > David, All, > > On 2022-03-24 10:25 +0000, David Laight spake thusly: > > From: Yann E. MORIN > > > On 2022-03-24 09:15 +0000, David Laight spake thusly: > > > > From: Yann E. MORIN > > > > > +Peter: candidate for backporting as a security fix > > > > Probably not - the security fix is the code that actually > > > > initialises the RNG. > > > Not sure I understood... As Jason explained, we have so far been saving > > > a seed from an RNG that is probably partially deterministic; that is the > > > security issue. > > I'm pretty sure the seed is also saved during shutdown. > > So a normal startup doesn't rely on the seed saved by the startup script. > > (Although is would be better to use a background script > > to save after (say) 30 minutes of operation.) > > The problem is that a lot, if not most, embedded devices are never > properly shut-down; instead, they are, intentionally or not, brutally > electrically powered off. > > In that case, the seed that is saved at boot is what is going to be > reused on the next boot. And currently, that seed is weak, because the > output of the RNG at boot is mostly predicatble. Maybe, but what you are saving at boot is also very weak. Even if the code worked as intended it is almost entirely completely dependant on the previous value. So you might as well just count the number of times the system has been booted. There really is little point saving a new block of 'entropy' until the system has had some chance to locate some. The embedded device's system software also needs to find somewhere non-volatile to save the entropy. If the system is likely to just get powered off then none of the filesystems are actually likely to be mounted rw. Things like /, /etc, /var and /tmp are very likely to be ramdisk (or ramdisk overlays) to avoid trashing the actual filesystems [1]. So saving the entropy may not be as simple as just writing to a file - the filesystem might need (re)mounting first. [1] Of course, if you are using a flash disk it might decide to do 'wear levelling' at the time the power is cut. In that case you can lose 'big time'. I've seen a completely trashed FAT filesystem. Nothing was in the right place at all. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From Jason at zx2c4.com Thu Mar 24 13:54:28 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 24 Mar 2022 07:54:28 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: Hi David, On Thu, Mar 24, 2022 at 3:15 AM David Laight wrote: > > From: Yann E. MORIN > > Sent: 24 March 2022 08:25 > > > > +Peter: candidate for backporting as a security fix > > Probably not - the security fix is the code that actually > initialises the RNG. No. The security fix here is that the old and new seeds are hashed together so that the new one doesn't regress in entropy. Yann is correct. Jason From David.Laight at ACULAB.COM Thu Mar 24 14:31:35 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 24 Mar 2022 14:31:35 +0000 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: <859deab97eb947eb9114cf491c871a00@AcuMS.aculab.com> From: Jason A. Donenfeld > Sent: 24 March 2022 13:54 > > On Thu, Mar 24, 2022 at 3:15 AM David Laight wrote: > > > > From: Yann E. MORIN > > > Sent: 24 March 2022 08:25 > > > > > > +Peter: candidate for backporting as a security fix > > > > Probably not - the security fix is the code that actually > > initialises the RNG. > > No. The security fix here is that the old and new seeds are hashed > together so that the new one doesn't regress in entropy. Yann is > correct. But there is no entropy, you've never let the system collect any. It is still completely broken. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From nealf at xilinx.com Thu Mar 24 14:36:46 2022 From: nealf at xilinx.com (Neal Frager) Date: Thu, 24 Mar 2022 14:36:46 +0000 Subject: [Buildroot] [PATCH v1 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <70D87B9E-978A-49CE-BECE-500C876CE13D@benettiengineering.com> References: <20220322110313.4061782-1-neal.frager@amd.com> <70D87B9E-978A-49CE-BECE-500C876CE13D@benettiengineering.com> Message-ID: Hi Giulio, > Il giorno 22 mar 2022, alle ore 12:03, Neal Frager ha scritto: > > ?This patch migrates Xilinx Linux kernel and U-Boot from git:// to > https:// because git:// is no longer supported. > > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > > Signed-off-by: Neal Frager > --- > DEVELOPERS | 2 +- > configs/zynqmp_zcu102_defconfig | 4 ++-- > configs/zynqmp_zcu106_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 942bb8fe9c..58ed4f81cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2089,7 +2089,7 @@ F: package/libevdev/ > F: package/pkg-qmake.mk > F: package/qt5/qt5opcua/ > > -N: Neal Frager > +N: Neal Frager > F: board/zynqmp/ > F: configs/zynqmp_zcu102_defconfig > This ^^^ should be splitted into another patch. Done. > > diff --git a/configs/zynqmp_zcu102_defconfig > b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" > diff --git a/configs/zynqmp_zcu106_defconfig > b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" > BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_GIT=y > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" > BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" > -- > 2.17.1 > Best regards, Neal Frager AMD From Jason at zx2c4.com Thu Mar 24 14:39:44 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 24 Mar 2022 08:39:44 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <859deab97eb947eb9114cf491c871a00@AcuMS.aculab.com> References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> <859deab97eb947eb9114cf491c871a00@AcuMS.aculab.com> Message-ID: Hi David, On Thu, Mar 24, 2022 at 8:31 AM David Laight wrote: > > From: Jason A. Donenfeld > > Sent: 24 March 2022 13:54 > > > > On Thu, Mar 24, 2022 at 3:15 AM David Laight wrote: > > > > > > From: Yann E. MORIN > > > > Sent: 24 March 2022 08:25 > > > > > > > > +Peter: candidate for backporting as a security fix > > > > > > Probably not - the security fix is the code that actually > > > initialises the RNG. > > > > No. The security fix here is that the old and new seeds are hashed > > together so that the new one doesn't regress in entropy. Yann is > > correct. > > But there is no entropy, you've never let the system collect any. > > It is still completely broken. You misunderstand the problem. An initial seed might be derived from some external source and be high quality. The goal is for the next seed, generated on-device, to be not lower quality. Prior to this patch, it might become lower quality. With this patch, it now doesn't regress in quality. Jason From dambrosio at outrider.ai Thu Mar 24 15:38:04 2022 From: dambrosio at outrider.ai (Dan Ambrosio) Date: Thu, 24 Mar 2022 09:38:04 -0600 Subject: [Buildroot] Suspected ccache Issue With wireshark Message-ID: Hello, I recently upgraded my buildroot project from 2021.02.6 to the latest LTS (2022.02) and ran into a compilation error with the wireshark package when BR2_CCACHE is enabled. It seems like a cmake argument is being passed through to ccache. >>> wireshark 3.4.12 Building PATH="/home/builder/output/oc_general/host/bin:/home/builder/output/oc_general/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j17 -C /home/builder/output/oc_general/build/wireshark-3.4.12/ [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o /home/builder/output/oc_general/host/bin/ccache: invalid option -- 'D' Usage: ccache [options] ccache compiler [compiler options] compiler [compiler options] (via symbolic link) Common options: -c, --cleanup delete old files and recalculate size counters (normally not needed as this is done automatically) -C, --clear clear the cache completely (except configuration) -F, --max-files=N set maximum number of files in cache to N (use 0 for no limit) -M, --max-size=SIZE set maximum size of cache to SIZE (use 0 for no limit); available suffixes: k, M, G, T (decimal) and Ki, Mi, Gi, Ti (binary); default suffix: G -p, --show-config show current configuration options in human-readable format -s, --show-stats show summary of configuration and statistics counters in human-readable format -z, --zero-stats zero statistics counters -h, --help print this help text -V, --version print version and copyright information Options for scripting or debugging: --dump-manifest=PATH dump manifest file at PATH in text format -k, --get-config=K print the value of configuration key K --hash-file=PATH print the hash (-) of the file at PATH --print-stats print statistics counter IDs and corresponding values in machine-parsable format -o, --set-config=K=V set configuration item K to value V See also . [ 0%] Built target cli_main make[4]: *** [tools/lemon/CMakeFiles/lemon.dir/build.make:66: tools/lemon/CMakeFiles/lemon.dir/lemon.c.o] Error 1 make[3]: *** [CMakeFiles/Makefile2:10914: tools/lemon/CMakeFiles/lemon.dir/all] Error 2 FYI, 2021.02.6 did not exhibit this behavior. Thanks, Dan Ambrosio From luca at lucaceresoli.net Thu Mar 24 15:59:31 2022 From: luca at lucaceresoli.net (Luca Ceresoli) Date: Thu, 24 Mar 2022 16:59:31 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220324123117.2369981-1-neal.frager@amd.com> References: <20220324123117.2369981-1-neal.frager@amd.com> Message-ID: Hi Neal, On 24/03/22 13:31, Neal Frager wrote: > This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// > The git:// location is no longer supported. > > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > > Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli -- Luca From peter at korsgaard.com Thu Mar 24 17:10:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 18:10:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220324123117.2369981-1-neal.frager@amd.com> (Neal Frager's message of "Thu, 24 Mar 2022 06:31:17 -0600") References: <20220324123117.2369981-1-neal.frager@amd.com> Message-ID: <87sfr7cm3h.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// > The git:// location is no longer supported. > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > Signed-off-by: Neal Frager > --- V1-> V2: > -separated DEVELOPERS file update to make stand alone patch Committed, thanks. We have a few more packages using git://github.com, I'll take care of those. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 24 17:11:18 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 18:11:18 +0100 Subject: [Buildroot] [git commit] configs/zynqmp_zcu10x: change git to https Message-ID: <20220324170250.403AE85ADB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f653c24057065a4964f83e9ed70e868eac0f89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The git:// location is no longer supported by github, so change to https:// For more details: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 4 ++-- configs/zynqmp_zcu106_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" From ps.report at gmx.net Thu Mar 24 19:35:15 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 24 Mar 2022 20:35:15 +0100 Subject: [Buildroot] Suspected ccache Issue With wireshark In-Reply-To: References: Message-ID: <20220324203515.5eeb9584@gmx.net> Hello Dan, On Thu, 24 Mar 2022 09:38:04 -0600, Dan Ambrosio via buildroot wrote: > Hello, > I recently upgraded my buildroot project from 2021.02.6 to the latest > LTS (2022.02) and ran into a compilation error with the wireshark > package when BR2_CCACHE is enabled. > > It seems like a cmake argument is being passed through to ccache. > > >>> wireshark 3.4.12 Building > PATH="/home/builder/output/oc_general/host/bin:/home/builder/output/oc_general/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" > /usr/bin/make -j17 -C > /home/builder/output/oc_general/build/wireshark-3.4.12/ > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > /home/builder/output/oc_general/host/bin/ccache: invalid option -- 'D' > Usage: > ccache [options] > ccache compiler [compiler options] > compiler [compiler options] (via symbolic link) > > Common options: > -c, --cleanup delete old files and recalculate size counters > (normally not needed as this is done > automatically) > -C, --clear clear the cache completely (except configuration) > -F, --max-files=N set maximum number of files in cache to N (use 0 > for no limit) > -M, --max-size=SIZE set maximum size of cache to SIZE (use 0 for no > limit); available suffixes: k, M, G, T (decimal) > and Ki, Mi, Gi, Ti (binary); default suffix: G > -p, --show-config show current configuration options in > human-readable format > -s, --show-stats show summary of configuration and statistics > counters in human-readable format > -z, --zero-stats zero statistics counters > > -h, --help print this help text > -V, --version print version and copyright information > > Options for scripting or debugging: > --dump-manifest=PATH dump manifest file at PATH in text format > -k, --get-config=K print the value of configuration key K > --hash-file=PATH print the hash (-) of the file at PATH > --print-stats print statistics counter IDs and corresponding > values in machine-parsable format > -o, --set-config=K=V set configuration item K to value V > > See also . > [ 0%] Built target cli_main > make[4]: *** [tools/lemon/CMakeFiles/lemon.dir/build.make:66: > tools/lemon/CMakeFiles/lemon.dir/lemon.c.o] Error 1 > make[3]: *** [CMakeFiles/Makefile2:10914: > tools/lemon/CMakeFiles/lemon.dir/all] Error 2 > > FYI, 2021.02.6 did not exhibit this behavior. Seems this comes form the configure step: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc [...] With --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER="$(HOSTCC)" ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) this changes to [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER="/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...] but the build fails this time with [...] cd .../build/wireshark-3.4.12/tools/lemon && "/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...]lemon.c /bin/sh: line 1: .../host/bin/ccache /usr/bin/gcc: No such file or directory With --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=/usr/bin/gcc ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) The build succeeds... Regards, Peter > > Thanks, > > Dan Ambrosio > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From ps.report at gmx.net Thu Mar 24 19:39:32 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 24 Mar 2022 20:39:32 +0100 Subject: [Buildroot] Suspected ccache Issue With wireshark In-Reply-To: <20220324203515.5eeb9584@gmx.net> References: <20220324203515.5eeb9584@gmx.net> Message-ID: <20220324203932.73119c70@gmx.net> Hello Dan, On Thu, 24 Mar 2022 20:35:15 +0100, Peter Seiderer wrote: > Hello Dan, > > On Thu, 24 Mar 2022 09:38:04 -0600, Dan Ambrosio via buildroot wrote: > > > Hello, > > I recently upgraded my buildroot project from 2021.02.6 to the latest > > LTS (2022.02) and ran into a compilation error with the wireshark > > package when BR2_CCACHE is enabled. > > > > It seems like a cmake argument is being passed through to ccache. > > > > >>> wireshark 3.4.12 Building > > PATH="/home/builder/output/oc_general/host/bin:/home/builder/output/oc_general/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" > > /usr/bin/make -j17 -C > > /home/builder/output/oc_general/build/wireshark-3.4.12/ > > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > > /home/builder/output/oc_general/host/bin/ccache: invalid option -- 'D' > > Usage: > > ccache [options] > > ccache compiler [compiler options] > > compiler [compiler options] (via symbolic link) > > > > Common options: > > -c, --cleanup delete old files and recalculate size counters > > (normally not needed as this is done > > automatically) > > -C, --clear clear the cache completely (except configuration) > > -F, --max-files=N set maximum number of files in cache to N (use 0 > > for no limit) > > -M, --max-size=SIZE set maximum size of cache to SIZE (use 0 for no > > limit); available suffixes: k, M, G, T (decimal) > > and Ki, Mi, Gi, Ti (binary); default suffix: G > > -p, --show-config show current configuration options in > > human-readable format > > -s, --show-stats show summary of configuration and statistics > > counters in human-readable format > > -z, --zero-stats zero statistics counters > > > > -h, --help print this help text > > -V, --version print version and copyright information > > > > Options for scripting or debugging: > > --dump-manifest=PATH dump manifest file at PATH in text format > > -k, --get-config=K print the value of configuration key K > > --hash-file=PATH print the hash (-) of the file at PATH > > --print-stats print statistics counter IDs and corresponding > > values in machine-parsable format > > -o, --set-config=K=V set configuration item K to value V > > > > See also . > > [ 0%] Built target cli_main > > make[4]: *** [tools/lemon/CMakeFiles/lemon.dir/build.make:66: > > tools/lemon/CMakeFiles/lemon.dir/lemon.c.o] Error 1 > > make[3]: *** [CMakeFiles/Makefile2:10914: > > tools/lemon/CMakeFiles/lemon.dir/all] Error 2 > > > > FYI, 2021.02.6 did not exhibit this behavior. > > Seems this comes form the configure step: > > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc [...] > > > With > > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ > -DENABLE_ILBC=OFF \ > -DENABLE_PCAP=ON \ > -DENABLE_SMI=OFF \ > - -DLEMON_C_COMPILER=$(HOSTCC) > + -DLEMON_C_COMPILER="$(HOSTCC)" > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > > this changes to > > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER="/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...] > > but the build fails this time with > > [...] > cd .../build/wireshark-3.4.12/tools/lemon && "/home/seiderer/Work/Buildroot/build_rpi0w_mesa_v3d_001/host/bin/ccache /usr/bin/gcc" [...]lemon.c > > /bin/sh: line 1: .../host/bin/ccache /usr/bin/gcc: No such file or directory > > > With > > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ > -DENABLE_ILBC=OFF \ > -DENABLE_PCAP=ON \ > -DENABLE_SMI=OFF \ > - -DLEMON_C_COMPILER=$(HOSTCC) > + -DLEMON_C_COMPILER=/usr/bin/gcc > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > The build succeeds... Or better: --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic Regards, Peter > > Regards, > Peter > > > > > > Thanks, > > > > Dan Ambrosio > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Thu Mar 24 19:40:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:40:06 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-txdbus: drop python2 support Message-ID: <20220324193927.0D6EC85BA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fed11362152e8d302b5895c2a3f5c0cbc187a932 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Txdbus is built on top of twisted, which is python3 only since commit f1db1922e460d4f (package/python-twisted: Needs python 3), so propagate the python3 dependency. Signed-off-by: Peter Korsgaard --- package/python-txdbus/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index f38bbf93f0..df77a1f573 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" + depends on BR2_PACKAGE_PYTHON3 # python-twisted select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help From peter at korsgaard.com Thu Mar 24 19:36:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:36:24 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-treq: drop python2 support Message-ID: <20220324193927.03F2A85BA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=294b6e050d2aaf164770d05ececc270da845088f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fixes: http://autobuild.buildroot.net/results/94e/94e009e322787bbcaac3704b64218cefe77b0f56/ Treq is built on top of twisted, which is python3 only since commit f1db1922e460d4f (package/python-twisted: Needs python 3), so propagate the python3 dependency. Signed-off-by: Peter Korsgaard --- package/python-treq/Config.in | 1 + support/testing/tests/package/test_python_treq.py | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 23056e72d2..6ca8be8ab7 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TREQ bool "python-treq" depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl + depends on BR2_PACKAGE_PYTHON3 # python-twisted select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index e24ae845be..d7a23829ea 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -12,15 +12,6 @@ class TestPythonTreq(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Treq(TestPythonTreq): - __test__ = True - config = TestPythonTreq.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TREQ=y - """ - - class TestPythonPy3Treq(TestPythonTreq): __test__ = True config = TestPythonTreq.config + \ From peter at korsgaard.com Thu Mar 24 19:42:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:42:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-txtorcon: drop python2 support Message-ID: <20220324193927.1676385BB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a6448f1aaef2f1da7fa2016b5f473d5e9aeec64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Txtorcon is built on top of twisted, which is python3 only since commit f1db1922e460d4f (package/python-twisted: Needs python 3), so propagate the python3 dependency. Signed-off-by: Peter Korsgaard --- package/python-txtorcon/Config.in | 1 + support/testing/tests/package/test_python_txtorcon.py | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index 4f91e7b048..09166a26bb 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity + depends on BR2_PACKAGE_PYTHON3 # python-twisted select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_IDNA # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 1ac2f6919a..8e74190ee1 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txtorcon(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TXTORCON=y - """ - sample_scripts = ["tests/package/sample_python_txtorcon.py"] - timeout = 30 - - class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ From peter at korsgaard.com Thu Mar 24 19:47:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 20:47:19 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-coherence: drop package Message-ID: <20220324193927.247DB85BA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be37df00dabf5155d7d9bd8ff7414ed2e44426fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The package does not work with python3, is unmaintained upstream and depends on twisted which no longer works with python2, so drop it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 ++++++ package/Config.in | 1 - .../0001-Fix-twisted-detection.patch | 29 ---------------------- package/python-coherence/Config.in | 10 -------- package/python-coherence/python-coherence.hash | 3 --- package/python-coherence/python-coherence.mk | 13 ---------- 6 files changed, 7 insertions(+), 56 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3f3b42a2a9..197fb4d899 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2021.02" +config BR2_PACKAGE_PYTHON_COHERENCE + bool "python-coherence package removed" + select BR2_LEGACY + help + This package has been removed as it does not work with + Python 3.x and is unmaintained. + config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index d45e6d3a86..22ff876c62 100644 --- a/package/Config.in +++ b/package/Config.in @@ -935,7 +935,6 @@ menu "External python modules" source "package/python-cheroot/Config.in" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" - source "package/python-coherence/Config.in" source "package/python-colorama/Config.in" source "package/python-colorlog/Config.in" source "package/python-colorzero/Config.in" diff --git a/package/python-coherence/0001-Fix-twisted-detection.patch b/package/python-coherence/0001-Fix-twisted-detection.patch deleted file mode 100644 index c0e51b9e31..0000000000 --- a/package/python-coherence/0001-Fix-twisted-detection.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3cf8d89cbb44b5c7a0693d0b5d665e68acc3927c Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 10 May 2016 00:14:33 +0200 -Subject: [PATCH] Fix twisted detection. - -Addresses https://github.com/coherence-project/Coherence/issues/25 - -Signed-off-by: Thomas Klausner -Signed-off-by: Yegor Yefremov ---- - coherence/__init__.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/coherence/__init__.py b/coherence/__init__.py -index 2e4e8f1..4c4d73d 100644 ---- a/coherence/__init__.py -+++ b/coherence/__init__.py -@@ -24,8 +24,6 @@ try: - if twisted_version < Version("twisted", 2, 5, 0): - raise ImportError("Twisted >= 2.5 is required. Please install it.") - -- if twisted_web_version < Version("twisted.web", 2, 5, 0): -- raise ImportError("Twisted.Web >= 2.5 is required. Please install it") - except ImportError, exc: - # log error to stderr, might be useful for debugging purpose - for arg in exc.args: --- -2.8.1 - diff --git a/package/python-coherence/Config.in b/package/python-coherence/Config.in deleted file mode 100644 index 0f50080e67..0000000000 --- a/package/python-coherence/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_COHERENCE - bool "python-coherence" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - select BR2_PACKAGE_PYTHON_PYASN1 - help - A DLNA/UPnP Media Server and Framework for the Digital Living. - - https://github.com/coherence-project/Coherence diff --git a/package/python-coherence/python-coherence.hash b/package/python-coherence/python-coherence.hash deleted file mode 100644 index 3c2d45b537..0000000000 --- a/package/python-coherence/python-coherence.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 97c8b700b3fe73d48eacb259008f410d6567e5d7d1b8e96386f8cc2422135ca5 python-coherence-b7856985fd496689ca1f9024925ae737297c00d1.tar.gz -sha256 7713ed8484b4d3364c7f6f2c02aed427b06a0159b1f77aecf907d47016812e81 LICENCE diff --git a/package/python-coherence/python-coherence.mk b/package/python-coherence/python-coherence.mk deleted file mode 100644 index 24da7f70a7..0000000000 --- a/package/python-coherence/python-coherence.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-coherence -# -################################################################################ - -PYTHON_COHERENCE_VERSION = b7856985fd496689ca1f9024925ae737297c00d1 -PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,$(PYTHON_COHERENCE_VERSION)) -PYTHON_COHERENCE_SETUP_TYPE = setuptools -PYTHON_COHERENCE_LICENSE = MIT -PYTHON_COHERENCE_LICENSE_FILES = LICENCE - -$(eval $(python-package)) From arnout at mind.be Thu Mar 24 20:02:06 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:02:06 +0100 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le In-Reply-To: <20220315130737.428449-1-joel@jms.id.au> References: <20220315130737.428449-1-joel@jms.id.au> Message-ID: On 15/03/2022 14:07, Joel Stanley wrote: > When generating a filesystem image on a power10 build machine running > Ubuntu, we see a segfault when fakeroot is running chmod. > > This has been reported and fixed upstream in Debian in version 1.26-1.2: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 > > Add the samae patch to resolve the segfault. > > Signed-off-by: Joel Stanley > --- > This isn't a commit in the fakeroot tree, rather a patch from the Debian > packaging. Normally we'd just bump fakeroot, but I guess the patch isn't there yet in 1.28. > > I would appreciate if this was added to the 2022.02 stable tree. Plus, that would make backporting iffy. Therefore, applied to master. However. > > Signed-off-by: Joel Stanley > --- > .../fakeroot/fix-prototype-generation.patch | 59 +++++++++++++++++++ > 1 file changed, 59 insertions(+) > create mode 100644 package/fakeroot/fix-prototype-generation.patch > > diff --git a/package/fakeroot/fix-prototype-generation.patch b/package/fakeroot/fix-prototype-generation.patch > new file mode 100644 > index 000000000000..38d32ff3b22c > --- /dev/null > +++ b/package/fakeroot/fix-prototype-generation.patch Patches should be named 0001-XXXX even if they are downloaded from upstream. Actually, if it can literally be downloaded, you could just as well have used FAKEROOT_PATCH = https://... > @@ -0,0 +1,59 @@ > +Subject: Fix prototype generation for openat > +Author: Christoph Biedl > +Date: 2021-12-30 > +Bug-Debian: https://bugs.debian.org/995393 > +Forwarded: Yes (implicitely) > + > + As jrtc27 pointed out in IRC, ppc64el is more strict than other > + architectures when it comes to va_arg handling: > + > + it's that ppc64le uses the elfv2 abi, and for variadic calls you > + must reserve space for a parameter save area > + > + So enhance wrapawk to create a proper prototype and argument > + handling although it's specific to the openat call. Also add the > + missing documentation for the sixth column to wrapfunc.inp. > + Missing Signed-off-by. Again, this needs to be added even if the patch is literally downloaded. Both problems are reported by check-package. Regards, Arnout > +--- a/wrapawk > ++++ b/wrapawk > +@@ -37,7 +37,25 @@ > + argtype=$3; > + argname=$4; > + MACRO=$5; > +- if(MACRO){ > ++ openat_extra=$6; > ++ if(openat_extra){ > ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; > ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; > ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; > ++ > ++ print ret " tmp_" name, openat_extra "{" > tmpffile; > ++ print " mode_t mode = 0;" > tmpffile; > ++ print " if (flags & O_CREAT) {" > tmpffile; > ++ print " va_list args;" > tmpffile; > ++ print " va_start(args, flags);" > tmpffile; > ++ print " mode = va_arg(args, int);" > tmpffile; > ++ print " va_end(args);" > tmpffile; > ++ print " }" > tmpffile; > ++ print " load_library_symbols();" > tmpffile; > ++ print " return next_" name, argname ";" > tmpffile; > ++ print "}" > tmpffile; > ++ print "" > tmpffile; > ++ } else if(MACRO){ > + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; > + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; > + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; > +--- a/wrapfunc.inp > ++++ b/wrapfunc.inp > +@@ -9,8 +9,10 @@ > + /**/ */ > + /* each line of this file lists 4 fields, seperated by a ";". */ > + /* The first field is the name of the wrapped function, then it's return */ > +-/* value. After that come the function arguments with types, and the last */ > ++/* value. After that come the function arguments with types, and the fifth */ > + /* field contains the function arguments without types. */ > ++/* A sixth field is a special needed when wrapping the openat syscall. */ > ++/* Otherwise it's like the third (function arguments with types). */ > + /**/ > + > + /* __*xstat are used on glibc systems instead of just *xstat. */ From arnout at mind.be Thu Mar 24 20:12:52 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:12:52 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/pistache: bump version & switch to meson build In-Reply-To: <20220314181347.190747-2-thomas@ruschival.de> References: <20220312104402.33075-2-thomas@ruschival.de> <20220314181347.190747-1-thomas@ruschival.de> <20220314181347.190747-2-thomas@ruschival.de> Message-ID: On 14/03/2022 19:13, Thomas Ruschival wrote: > While upstream pistache has not yet released a stable 'tag' I don't think they ever will :-) > a lot has changed since June 2020: > > * project has moved to meson build system, cmake builds > do not install headers. > * patches in buildroot are no longer required > * project-implemented Pistache::Optional was replaced by > use of std::optional. This is only available in C++17 > * dependency to rapidjson has been introduced > > Signed-off-by: Thomas Ruschival > --- > ...-add-C-language-to-project-statement.patch | 70 -------------- > ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ------------------- > ...de-pistache-typeid.h-include-cstddef.patch | 38 -------- > package/pistache/Config.in | 9 +- > package/pistache/pistache.hash | 2 +- > package/pistache/pistache.mk | 10 +- > 6 files changed, 12 insertions(+), 212 deletions(-) > delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch > delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch > delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch > [snip] > diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk > index 4d6bd283ea..65d9b2412c 100644 > --- a/package/pistache/pistache.mk > +++ b/package/pistache/pistache.mk > @@ -4,18 +4,20 @@ > # > ################################################################################ > > -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d > +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 > PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) > PISTACHE_LICENSE = Apache-2.0 > PISTACHE_LICENSE_FILES = LICENSE > > PISTACHE_INSTALL_STAGING = YES > +PISTACHE_DEPENDENCIES += rapidjson > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > PISTACHE_DEPENDENCIES += openssl > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true > +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false I've applied to master as is, but this sounds like we would always want to disable it (we don't build tests if we can avoid it). Follow-up patch to move it out of the condition (if that's the right thing to do) welcome! Regards, Arnout > else > -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF > +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false > endif > > -$(eval $(cmake-package)) > +$(eval $(meson-package)) From kris at embeddedTS.com Thu Mar 24 20:20:22 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:22 -0700 Subject: [Buildroot] [PATCH 0/4] Pull in WILC Wi-Fi updates Message-ID: <20220324202026.5688-1-kris@embeddedTS.com> This series bumps WILC1000/3000 firmware to the latest available from Microchip, updates existing defconfig files to include both WILC1000 and WILC3000 blobs, and adds a package to build the wilc driver as an external kernel module. The previous wilc1000-firmware package was extremely outdated, no longer available on github, and installed the firmware files to the wrong location for the current upstream kernel wilc1000 driver and Microchip's separately maintained driver. Since the firmware change includes individual WILC1000 and WILC3000 config options, this package is renamed to wilc-firmware. The defconfigs of all platforms that used WILC1000 firmware were touched to also include WILC3000 firmware. They either natively have WILC3000 or can support either WILC1000/WILC3000 being connected to these platforms. I've attempted to test the firmware changes against microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig as this is a board I have in my possession. However, the defconfig appears broken (Microchip now maintains the evk in their own BR2_EXTERNAL repo): ... Kernel command line: console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw ... RAMDISK: Couldn't find valid RAM disk image starting at 0. mmc0: new ultra high speed DDR50 SDHC card at address aaaa List of all partitions: ... Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(1,0) CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.80-linux4microchip-2021.10 #1 Hardware name: Atmel SAMA5 Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Function entered at [] from [] Exception stack(0xc2c29fb0 to 0xc2c29ff8) 9fa0: 00000000 00000000 00000000 00000000 9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(1,0) ]--- The firmware and driver changes have been thoroughly tested, however, on an embeddedTS platform (BR patch for this in the future, waiting on kernel accepting FDT) that includes the WILC3000 device. We have a number of platforms that all use this same device and are starting to push for better upstream support overall. So this patch series is us laying the groundwork for that. Kris Bahnsen (4): package/wilc1000-firmware: bump to 15.6 package/wilc-firmware: rename from wilc1000-firmware configs: add WILC3000_FIRMWARE to compatible devices package/wilc-driver: new package DEVELOPERS | 6 ++- configs/at91sam9x5ek_dev_defconfig | 1 + configs/at91sam9x5ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 1 + configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + .../microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + package/Config.in | 3 +- package/wilc-driver/Config.in | 58 ++++++++++++++++++++++ package/wilc-driver/wilc-driver.hash | 2 + package/wilc-driver/wilc-driver.mk | 29 +++++++++++ package/wilc-firmware/Config.in | 29 +++++++++++ package/wilc-firmware/wilc-firmware.hash | 2 + package/wilc-firmware/wilc-firmware.mk | 34 +++++++++++++ package/wilc1000-firmware/Config.in | 6 --- package/wilc1000-firmware/wilc1000-firmware.hash | 2 - package/wilc1000-firmware/wilc1000-firmware.mk | 24 --------- 23 files changed, 173 insertions(+), 34 deletions(-) create mode 100644 package/wilc-driver/Config.in create mode 100644 package/wilc-driver/wilc-driver.hash create mode 100644 package/wilc-driver/wilc-driver.mk create mode 100644 package/wilc-firmware/Config.in create mode 100644 package/wilc-firmware/wilc-firmware.hash create mode 100644 package/wilc-firmware/wilc-firmware.mk delete mode 100644 package/wilc1000-firmware/Config.in delete mode 100644 package/wilc1000-firmware/wilc1000-firmware.hash delete mode 100644 package/wilc1000-firmware/wilc1000-firmware.mk -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:26 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:26 -0700 Subject: [Buildroot] [PATCH 4/4] package/wilc-driver: new package In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-5-kris@embeddedTS.com> WILC1000/3000 driver pulled from at91-linux tree set-up to be built as an external module. Upstream Linux kernel does not support WILC3000 features at this time. This package is intended to bridge that gap until WILC1000/3000 is fully supported in kernel. Signed-off-by: Kris Bahnsen --- DEVELOPERS | 1 + package/Config.in | 1 + package/wilc-driver/Config.in | 58 ++++++++++++++++++++++++++++++++++++ package/wilc-driver/wilc-driver.hash | 2 ++ package/wilc-driver/wilc-driver.mk | 29 ++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 package/wilc-driver/Config.in create mode 100644 package/wilc-driver/wilc-driver.hash create mode 100644 package/wilc-driver/wilc-driver.mk diff --git a/DEVELOPERS b/DEVELOPERS index 17becfa189..acd341873d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1662,6 +1662,7 @@ F: configs/octavo_osd32mp1_red_defconfig N: Kris Bahnsen F: package/wilc-firmware/ +F: package/wilc-driver/ N: Kurt Van Dijck F: package/bcusdk/ diff --git a/package/Config.in b/package/Config.in index a175f105f3..ae3f13df5c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -610,6 +610,7 @@ endmenu source "package/usbutils/Config.in" source "package/w_scan/Config.in" source "package/wf111/Config.in" + source "package/wilc-driver/Config.in" source "package/wipe/Config.in" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" diff --git a/package/wilc-driver/Config.in b/package/wilc-driver/Config.in new file mode 100644 index 0000000000..caf46ae281 --- /dev/null +++ b/package/wilc-driver/Config.in @@ -0,0 +1,58 @@ +config BR2_PACKAGE_WILC_DRIVER + bool "wilc kernel module" + help + External kernel module for WILC1000/3000 devices. + + wilc kernel driver source as found in Microchip's at91-linux + kernel tree with added Kbuild file to be built as a generic + external module. + + The wilc1000 driver currently maintained in Linux kernel does + not support BLE of the WILC3000 hardware. This package is + meant to bridge that gap until Microchip can get WILC3000 + support upstream. + + Supports both SDIO and SPI modes. + + https://github.com/embeddedTS/wilc3000-external-module + +if BR2_PACKAGE_WILC_DRIVER + +config BR2_PACKAGE_WILC_DRIVER_SPI + bool "SPI" + help + This module adds support for the SPI interface of adapters + using WILC1000/3000 chipset. The WILC1000/3000 has a Serial + Peripheral Interface (SPI) that operates as an SPI slave. + This SPI interface can be used for control and for serial + I/O of 802.11 data. The SPI is a full-duplex slave + synchronous serial interface that is available immediately + following reset when pin 9 (SDIO_SPI_CFG) is tied to VDDIO. + Select this if your platform is using the SPI bus. + +config BR2_PACKAGE_WILC_DRIVER_SDIO + bool "SDIO" + help + This module adds support for the SDIO interface of adapters + using WILC1000/3000 chipset. The WILC1000/3000 SDIO is a full + speed interface. It meets SDIO card specification version 2.0. + The interface supports the 1-bit/4-bit SD transfer mode at the + clock range of 0-50 MHz. The host can use this interface to + read and write from any register within the chip as well as + configure the WILC1000/3000 for data DMA. To use this + interface, pin9 (SDIO_SPI_CFG) must be grounded. Select this + if your platform is using the SDIO bus. + +if BR2_PACKAGE_WILC_DRIVER_SDIO + +config BR2_PACKAGE_WILC_DRIVER_SDIO_OOB + bool "Enable out-of-band interrupt" + help + This option enables out-of-band interrupt support for the + WILC1000/3000 chipset. This OOB interrupt is intended to + provide a faster interrupt mechanism for SDIO host controllers + that don't support SDIO interrupt. Select this option If the + SDIO host controller in your platform doesn't support SDIO + time division interrupt. +endif +endif diff --git a/package/wilc-driver/wilc-driver.hash b/package/wilc-driver/wilc-driver.hash new file mode 100644 index 0000000000..bfd8eaebc4 --- /dev/null +++ b/package/wilc-driver/wilc-driver.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 62a03d1a4f6aa92f5ecae36b5c8798a121506e8b09a8a68192b664416bf6e745 wilc-driver-linux4microchip-2021.10.tar.gz diff --git a/package/wilc-driver/wilc-driver.mk b/package/wilc-driver/wilc-driver.mk new file mode 100644 index 0000000000..3b1fab8954 --- /dev/null +++ b/package/wilc-driver/wilc-driver.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# wilc-driver +# +################################################################################ + +WILC_DRIVER_VERSION = linux4microchip-2021.10 +WILC_DRIVER_SITE = $(call github,embeddedTS,wilc3000-external-module,$(WILC_DRIVER_VERSION)) + +WILC_DRIVER_LICENSE = GPL-2.0 +WILC_DRIVER_LICENSE_FILES = LICENSE + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SPI),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_SPI=m +endif + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_SDIO=m +endif + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO_OOB),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_HW_OOB_INTR=y +endif + +$(eval $(kernel-module)) +$(eval $(generic-package)) -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:25 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:25 -0700 Subject: [Buildroot] [PATCH 3/4] configs: add WILC3000_FIRMWARE to compatible devices In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-4-kris@embeddedTS.com> The update to wilc-firmware added firmware files for WILC3000 devices as a separate config option. All Atmel/Microchip defconfigs that previously only had WILC1000_FIRMWARE either have WILC3000 Wi-Fi hardware (WILC3000 is the same silicon but with BLE added) or have the capacity to have either WILC1000 or WILC3000 devices added to the system. Install all firmware blobs to these devices by default. Signed-off-by: Kris Bahnsen --- configs/at91sam9x5ek_dev_defconfig | 1 + configs/at91sam9x5ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 1 + configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_dev_defconfig | 1 + configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_dev_defconfig | 1 + configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 1 + configs/microchip_sam9x60ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig | 1 + configs/microchip_sama5d2_icp_mmc_dev_defconfig | 1 + configs/microchip_sama7g5ek_mmc_dev_defconfig | 1 + 12 files changed, 12 insertions(+) diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index bfa8e95941..8714463d89 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -47,6 +47,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 2e1a5c7f59..9481594716 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -50,6 +50,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index ba2fa46790..38618a5732 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -39,6 +39,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index a8b68ca0a2..1654408aa5 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -53,6 +53,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index cdfd9de17e..64455cb2e0 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -49,6 +49,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a2205aeefa..8f5724d631 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -52,6 +52,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index f8783f5652..fab91cf0b3 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -50,6 +50,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index b4e99f658a..f9074e9862 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -53,6 +53,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 06e03967c4..2b4e234297 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -36,6 +36,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 3bcd5f0200..f9aa6cdc05 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -39,6 +39,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 27d1d3409d..b1b22c1312 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -32,6 +32,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 6eb6c282e0..d68846e553 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -30,6 +30,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:24 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:24 -0700 Subject: [Buildroot] [PATCH 2/4] package/wilc-firmware: rename from wilc1000-firmware In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-3-kris@embeddedTS.com> Separates out WILC1000 and WILC3000 in to individual config options since in reality only one or the other set would be needed. Signed-off-by: Kris Bahnsen --- DEVELOPERS | 5 ++++- package/Config.in | 2 +- package/{wilc1000-firmware => wilc-firmware}/Config.in | 4 ++-- .../wilc-firmware.hash} | 2 +- .../wilc-firmware.mk} | 14 +++++++------- 5 files changed, 15 insertions(+), 12 deletions(-) rename package/{wilc1000-firmware => wilc-firmware}/Config.in (92%) rename package/{wilc1000-firmware/wilc1000-firmware.hash => wilc-firmware/wilc-firmware.hash} (62%) rename package/{wilc1000-firmware/wilc1000-firmware.mk => wilc-firmware/wilc-firmware.mk} (67%) diff --git a/DEVELOPERS b/DEVELOPERS index 942bb8fe9c..17becfa189 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1660,6 +1660,9 @@ F: board/octavo/osd32mp1-red/ F: configs/octavo_osd32mp1_brk_defconfig F: configs/octavo_osd32mp1_red_defconfig +N: Kris Bahnsen +F: package/wilc-firmware/ + N: Kurt Van Dijck F: package/bcusdk/ F: package/libpthsem/ @@ -1757,7 +1760,7 @@ F: package/python-json-schema-validator/ F: package/python-keyring/ F: package/python-simplejson/ F: package/python-versiontools/ -F: package/wilc1000-firmware/ +F: package/wilc-firmware/ N: Maeva Manuel F: board/freescale/imx8qmmek/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..a175f105f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -432,7 +432,7 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" - source "package/wilc1000-firmware/Config.in" + source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" endmenu diff --git a/package/wilc1000-firmware/Config.in b/package/wilc-firmware/Config.in similarity index 92% rename from package/wilc1000-firmware/Config.in rename to package/wilc-firmware/Config.in index 0734c7ad99..23abc88712 100644 --- a/package/wilc1000-firmware/Config.in +++ b/package/wilc-firmware/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WILC1000_FIRMWARE bool "wilc1000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE help Firmware for Microchip WILC1000 wireless device @@ -12,9 +13,9 @@ config BR2_PACKAGE_WILC1000_FIRMWARE https://github.com/linux4wilc/firmware -if BR2_PACKAGE_WILC1000_FIRMWARE config BR2_PACKAGE_WILC3000_FIRMWARE bool "wilc3000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE help Firmware for Microchip WILC3000 wireless device @@ -26,4 +27,3 @@ config BR2_PACKAGE_WILC3000_FIRMWARE These will be installed to /lib/firmware/mchp/ https://github.com/linux4wilc/firmware -endif diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc-firmware/wilc-firmware.hash similarity index 62% rename from package/wilc1000-firmware/wilc1000-firmware.hash rename to package/wilc-firmware/wilc-firmware.hash index 9d55be9edc..2f1fc9964d 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc1000-firmware-wilc_linux_15_6.tar.gz +sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc-firmware-wilc_linux_15_6.tar.gz diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc-firmware/wilc-firmware.mk similarity index 67% rename from package/wilc1000-firmware/wilc1000-firmware.mk rename to package/wilc-firmware/wilc-firmware.mk index 2bea9febe2..63fd100421 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -1,13 +1,13 @@ ################################################################################ # -# wilc1000-firmware +# wilc-firmware # ################################################################################ -WILC1000_FIRMWARE_VERSION = wilc_linux_15_6 -WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION)) +WILC_FIRMWARE_VERSION = wilc_linux_15_6 +WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) -WILC1000_FIRMWARE_LICENSE = PROPRIETARY +WILC_FIRMWARE_LICENSE = PROPRIETARY ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) WILC1000_FIRMWARE_FILES += \ @@ -20,15 +20,15 @@ WILC1000_FIRMWARE_FILES += \ wilc3000_wifi_firmware.bin endif -define WILC1000_FIRMWARE_INSTALL_FILES +define WILC_FIRMWARE_INSTALL_FILES cd $(@D) && \ $(TAR) cf install.tar $(sort $(WILC1000_FIRMWARE_FILES)) && \ $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp endef -define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS +define WILC_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ - $(WILC1000_FIRMWARE_INSTALL_FILES) + $(WILC_FIRMWARE_INSTALL_FILES) endef $(eval $(generic-package)) -- 2.11.0 From kris at embeddedTS.com Thu Mar 24 20:20:23 2022 From: kris at embeddedTS.com (Kris Bahnsen) Date: Thu, 24 Mar 2022 13:20:23 -0700 Subject: [Buildroot] [PATCH 1/4] package/wilc1000-firmware: bump to 15.6 In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com> References: <20220324202026.5688-1-kris@embeddedTS.com> Message-ID: <20220324202026.5688-2-kris@embeddedTS.com> Supports both WILC1000 (Wi-Fi only) and WILC3000 (Wi-Fi/BLE) hardware To support WILC3000 this commit adds a separate config option, the original config option from this package is still valid. Signed-off-by: Kris Bahnsen --- package/wilc1000-firmware/Config.in | 27 +++++++++++++++++++++-- package/wilc1000-firmware/wilc1000-firmware.hash | 2 +- package/wilc1000-firmware/wilc1000-firmware.mk | 28 ++++++++++++++++-------- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/package/wilc1000-firmware/Config.in b/package/wilc1000-firmware/Config.in index df8a7a6b60..0734c7ad99 100644 --- a/package/wilc1000-firmware/Config.in +++ b/package/wilc1000-firmware/Config.in @@ -1,6 +1,29 @@ config BR2_PACKAGE_WILC1000_FIRMWARE bool "wilc1000-firmware" help - Firmware for Atmel Wilc1000 wireless device + Firmware for Microchip WILC1000 wireless device - https://github.com/linux4sc/wireless-firmware.git + These binary blobs are provided directly from Microchip. + Ideally, the firmware version should match driver version. + Generally, the latest firmware would be acceptible regardless + of driver version. + + These will be installed to /lib/firmware/mchp/ + + https://github.com/linux4wilc/firmware + +if BR2_PACKAGE_WILC1000_FIRMWARE +config BR2_PACKAGE_WILC3000_FIRMWARE + bool "wilc3000-firmware" + help + Firmware for Microchip WILC3000 wireless device + + These binary blobs are provided directly from Microchip. + Ideally, the firmware version should match driver version. + Generally, the latest firmware would be acceptible regardless + of driver version. + + These will be installed to /lib/firmware/mchp/ + + https://github.com/linux4wilc/firmware +endif diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc1000-firmware/wilc1000-firmware.hash index 5344efe517..9d55be9edc 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.hash +++ b/package/wilc1000-firmware/wilc1000-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a2e7a327dd545ba2051946f7613005cbde88fdd952afb8eecdd1dacda7e767d2 v14.1_Firmware.zip +sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc1000-firmware-wilc_linux_15_6.tar.gz diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc1000-firmware/wilc1000-firmware.mk index 6f504d67a0..2bea9febe2 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ b/package/wilc1000-firmware/wilc1000-firmware.mk @@ -4,21 +4,31 @@ # ################################################################################ -WILC1000_FIRMWARE_VERSION = 14.1 -WILC1000_FIRMWARE_SITE = https://github.com/linux4sc/wireless-firmware/archive -WILC1000_FIRMWARE_SOURCE = v$(WILC1000_FIRMWARE_VERSION)_Firmware.zip +WILC1000_FIRMWARE_VERSION = wilc_linux_15_6 +WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION)) WILC1000_FIRMWARE_LICENSE = PROPRIETARY -define WILC1000_FIRMWARE_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(WILC1000_FIRMWARE_DL_DIR)/$(WILC1000_FIRMWARE_SOURCE) - mv $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware/* $(@D) - rmdir $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware +ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) +WILC1000_FIRMWARE_FILES += \ + wilc1000_wifi_firmware.bin +endif + +ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y) +WILC1000_FIRMWARE_FILES += \ + wilc3000_ble_firmware.bin \ + wilc3000_wifi_firmware.bin +endif + +define WILC1000_FIRMWARE_INSTALL_FILES + cd $(@D) && \ + $(TAR) cf install.tar $(sort $(WILC1000_FIRMWARE_FILES)) && \ + $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp endef define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/wilc1003_firmware.bin \ - $(TARGET_DIR)/lib/firmware/atmel/wilc1003_firmware.bin + $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ + $(WILC1000_FIRMWARE_INSTALL_FILES) endef $(eval $(generic-package)) -- 2.11.0 From arnout at mind.be Thu Mar 24 20:37:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:37:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <20220313175615.406390-1-james.hilliard1@gmail.com> References: <20220313175615.406390-1-james.hilliard1@gmail.com> Message-ID: <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> On 13/03/2022 18:56, James Hilliard wrote: > There are a number of flit toolchain dependencies currently in the > process of deprecating distutils based fallbacks. > > This will be needed in order to update tomli. > > We need to migrate these to use a new bootstrap based build+install > sequence which relies on flit's bootstrap wheel build+install > features to build and install host-python-pypa-build and > host-python-installer which gives us a full pep517 toolchain. > > Note that one can run host-python-flit-core commands for building > and installing itself since the package build directory is the cwd. > > For host-python-installer to do this we need to add the package src > directory to PYTHONPATH as we need to run it from the source directory > for installing itself. This is due to a directory structure that does > not let us run directly from the top level. > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - formatting/cleanup > - add comments > --- > package/pkg-python.mk | 45 ++++++++++++++++++-- > package/python-flit-core/python-flit-core.mk | 2 +- > package/python-installer/python-installer.mk | 3 +- > package/python-pep517/python-pep517.mk | 2 +- > package/python-tomli/python-tomli.mk | 2 +- > 5 files changed, 46 insertions(+), 8 deletions(-) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..f08d8ce04c 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --scripts=$(HOST_DIR)/usr/bin \ > --data=$(HOST_DIR)/usr > > +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ > + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > + > ################################################################################ > # inner-python-package -- defines how the configuration, compilation > # and installation of a Python package should be done, implements a > @@ -211,8 +214,25 @@ $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $ > $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) > else > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > -$(2)_BASE_BUILD_CMD = -m build -n -w > -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > +# Use flit built in wheel builder for packages that are host-python-pypa-build dependencies. > +# This is needed to avoid a circular with host-python-pypa-build and those dependencies. > +# > +$(2)_BASE_BUILD_CMD = $$(if \ > + $$(filter \ > + host-python-flit-core host-python-installer host-python-pep517 host-python-tomli, \ > + $(1)) \ > + , \ > + -m flit_core.wheel, \ > + -m build -n -w \ This is adding way too much complexity to the infra just to support these four packages. I think there a a couple of better options: - don't use python infra at all for these packages; or - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or - add a fifth SETUP_TYPE "generic" or "custom" or something, which requires $(2)_BASE_* to be set by the python-flit-core.mk; - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which only gets used by the problematic packages. The latter two options have my preference because I think they are the cleanest, but any of them is OK for me. The "generic" setup type and the overridable _BASE_BUILD_CMD would also require an update in the manual. > + ) > +# Use flit built in bootstrap_install for installing host-python-flit-core. > +# This is due to host-python-installer depending on host-python-flit-core. > +# > +$(2)_BASE_INSTALL_CMD = $$(if \ > + $$(filter host-python-flit-core,$(1)), \ > + -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS), \ > + $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) \ > + ) > endif > else > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") > @@ -235,9 +255,26 @@ endif # ($(4),target) > ifeq ($$($(2)_SETUP_TYPE),setuptools) > $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) > else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > +# Filter out host-python-pypa-build and any of its dependencies that need a flit based build. > +# > +$(2)_DEPENDENCIES += $$(if \ > + $$(filter \ > + host-python-flit-core host-python-installer host-python-pep517 host-python-pypa-build host-python-tomli, \ > + $(1)) \ > + ,, \ > + host-python-pypa-build \ With the "generic" or "flit-bootstrap" setup types, this would no longer be needed. For the other solutions, we will indeed still need this ugly thing. > + ) > +# Filter out host-python-installer and any of its dependencies that need a flit based build. > +# > +$(2)_DEPENDENCIES += $$(if \ > + $$(filter \ > + host-python-flit-core host-python-installer, \ > + $(1)) \ > + ,, \ > + host-python-installer \ > + ) > ifeq ($$($(2)_SETUP_TYPE),flit) > -$(2)_DEPENDENCIES += host-python-flit-core > +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) > endif > endif # SETUP_TYPE > > diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk > index 0e058a1f17..d206a72f82 100644 > --- a/package/python-flit-core/python-flit-core.mk > +++ b/package/python-flit-core/python-flit-core.mk > @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > +PYTHON_FLIT_CORE_SETUP_TYPE = flit This means there's no package any more that uses pep517 setup type. Do you think it's ever going to be used again? Or can we remove it altogether? (Removing it is not urgent at all even if it's unused. But if it's really not likely to be used again, I'd prefer to get rid of it by 2022.05.) > > $(eval $(host-python-package)) > diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk > index 862a251415..97a158b738 100644 > --- a/package/python-installer/python-installer.mk > +++ b/package/python-installer/python-installer.mk > @@ -9,6 +9,7 @@ PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz > PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/74/b7/9187323cd732840f1cddd6a9f05961406636b50c799eef37c920b63110c0 > PYTHON_INSTALLER_LICENSE = MIT > PYTHON_INSTALLER_LICENSE_FILES = LICENSE > -PYTHON_INSTALLER_SETUP_TYPE = distutils > +PYTHON_INSTALLER_SETUP_TYPE = flit > +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH=$(@D)/src You said that all these packages have to be converted in a single patch, but that's not true: it's perfectly possible to change the infra and keep using distutils for this package. The infra changes don't affect distutils setup type at all. Only the change in flit-core really needs to be in the same patch. BTW, when someone reviews a patch (i.e. Yann), it's nice to put them in Cc of later iterations. Regards, Arnout > > $(eval $(host-python-package)) > diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk > index 99aa62d51d..1ca1bc4e35 100644 > --- a/package/python-pep517/python-pep517.mk > +++ b/package/python-pep517/python-pep517.mk > @@ -9,7 +9,7 @@ PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz > PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 > PYTHON_PEP517_LICENSE = MIT > PYTHON_PEP517_LICENSE_FILES = LICENSE > -PYTHON_PEP517_SETUP_TYPE = distutils > +PYTHON_PEP517_SETUP_TYPE = flit > HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli > > $(eval $(host-python-package)) > diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk > index b8c20ca736..3539a505be 100644 > --- a/package/python-tomli/python-tomli.mk > +++ b/package/python-tomli/python-tomli.mk > @@ -7,7 +7,7 @@ > PYTHON_TOMLI_VERSION = 1.2.0 > PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz > PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa > -PYTHON_TOMLI_SETUP_TYPE = distutils > +PYTHON_TOMLI_SETUP_TYPE = flit > PYTHON_TOMLI_LICENSE = MIT > PYTHON_TOMLI_LICENSE_FILES = LICENSE > From arnout at mind.be Thu Mar 24 20:38:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:38:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: switch to autotools-package In-Reply-To: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> References: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> Message-ID: <5a93d9b6-0db2-4613-c0a4-c7304f19236e@mind.be> On 13/03/2022 18:39, Fabrice Fontaine wrote: > Switch to autotools-package to avoid the following static build failure Usually cmake is more future-safe, but here it seems both really are fully maintained. Applied to master, thanks. Regards, Arnout > since commit d661740201405970f65c16c39a79f4148705af30: > > [ 56%] Linking C executable rtl_biast > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' > collect2: error: ld returned 1 exit status > > Drop both cmake-related patches > > Fixes: > - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 > > Signed-off-by: Fabrice Fontaine > --- > ...pect-DESTDIR-with-install-udev-rules.patch | 31 +++++ > ...sable_shared_library_target_in_build.patch | 130 ------------------ > ...rsion.cmake-don-t-use-Git-version-if.patch | 47 ------- > package/librtlsdr/librtlsdr.mk | 26 ++-- > 4 files changed, 42 insertions(+), 192 deletions(-) > create mode 100644 package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch > delete mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch > delete mode 100644 package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch > > diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch > new file mode 100644 > index 0000000000..1aec8166cc > --- /dev/null > +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch > @@ -0,0 +1,31 @@ > +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sat, 19 Feb 2022 22:29:45 +0100 > +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] > +--- > + Makefile.am | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index 65b2f21..6b8691a 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -14,10 +14,10 @@ dist-hook: > + echo $(VERSION) > $(distdir)/.tarball-version > + > + install-udev-rules: > +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d > ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d > + > + uninstall-udev-rules: > +- rm -rf /etc/udev/rules.d/rtl-sdr.rules > ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules > + > + EXTRA_DIST = git-version-gen .version > + > +-- > +2.34.1 > + > diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch > deleted file mode 100644 > index 2fb63465de..0000000000 > --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch > +++ /dev/null > @@ -1,130 +0,0 @@ > -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 > -From: Gwenhael Goavec-Merou > -Date: Fri, 15 May 2020 16:14:48 +0200 > -Subject: [PATCH] disable shared library target in build > - > -Disable shared library target if BUILD_SHARED_LIBS if OFF. > - > -Patch retrieved from > -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x > - > -Patch has been updated to work with master and to be able to keep current > -behavior of building shared and static version of library if > -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. > -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library > -will be install. > - > -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] > - > -Signed-off-by: Yuvaraj Patil > -Signed-off-by: Fabrice Fontaine > -Signed-off-by: Gwenhael Goavec-Merou > -Signed-off-by: Titouan Christophe > ---- > - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- > - 1 file changed, 21 insertions(+), 9 deletions(-) > - > -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt > -index de93044..13b7b1a 100644 > ---- a/src/CMakeLists.txt > -+++ b/src/CMakeLists.txt > -@@ -18,6 +18,8 @@ > - ######################################################################## > - # Setup shared library variant > - ######################################################################## > -+option(BUILD_SHARED_LIBS "Build shared library" ON) > -+if(BUILD_SHARED_LIBS) > - add_library(rtlsdr SHARED librtlsdr.c > - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) > - target_link_libraries(rtlsdr PkgConfig::LIBUSB) > -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) > - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) > - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) > - generate_export_header(rtlsdr) > -+list(APPEND rtlsdr_lib rtlsdr) > -+endif() > - > - ######################################################################## > - # Setup static library variant > - ######################################################################## > -+option(BUILD_STATIC_LIBS "Build static library" ON) > -+if(BUILD_STATIC_LIBS) > - add_library(rtlsdr_static STATIC librtlsdr.c > - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) > - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) > -@@ -47,6 +53,8 @@ if(NOT WIN32) > - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) > - endif() > - generate_export_header(rtlsdr_static) > -+list(APPEND rtlsdr_lib rtlsdr_static) > -+endif() > - > - ######################################################################## > - # Set up Windows DLL resource files > -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) > - add_executable(rtl_adsb rtl_adsb.c) > - add_executable(rtl_power rtl_power.c) > - add_executable(rtl_biast rtl_biast.c) > --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) > -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) > - > --target_link_libraries(rtl_sdr rtlsdr convenience_static > -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_tcp rtlsdr convenience_static > -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_test rtlsdr convenience_static > -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_fm rtlsdr convenience_static > -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_eeprom rtlsdr convenience_static > -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_adsb rtlsdr convenience_static > -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_power rtlsdr convenience_static > -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > --target_link_libraries(rtl_biast rtlsdr convenience_static > -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static > - ${LIBUSB_LIBRARIES} > - ${CMAKE_THREAD_LIBS_INIT} > - ) > -@@ -156,12 +164,16 @@ endif() > - ######################################################################## > - # Install built library files & utilities > - ######################################################################## > -+if(BUILD_SHARED_LIBS) > - install(TARGETS rtlsdr EXPORT RTLSDR-export > - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file > - ) > -+endif() > -+if(BUILD_STATIC_LIBS) > - install(TARGETS rtlsdr_static EXPORT RTLSDR-export > - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file > - ) > -+endif() > - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast > - DESTINATION ${CMAKE_INSTALL_BINDIR} > - ) > --- > -2.25.3 > - > diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch > deleted file mode 100644 > index 9c808edd41..0000000000 > --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Tue, 11 Aug 2020 23:07:08 +0200 > -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in > - a Git repo > - > -If the librtlsdr code comes from a tarball, it doesn't have any .git/ > -metadata, and therefore even if Git (as a tool) is found, the logic in > -cmake/Modules/Version.cmake fails finding a version through Git: > - > --- Extracting version information from git describe... > -fatal: Not a git repository (or any of the parent directories): .git > - > -As a consequence, the VERSION variable is empty, which later causes > -cmake to bail out with: > - > -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): > - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() > -Call Stack (most recent call first): > - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) > - CMakeLists.txt:173 (write_basic_package_version_file) > - > -To avoid this, we only use Git to determine the version if the cmake > -project top-level source directory has a .git/ folder. > - > -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 > -Signed-off-by: Thomas Petazzoni > ---- > - cmake/Modules/Version.cmake | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake > -index 2d4e76d..6f67fa4 100644 > ---- a/cmake/Modules/Version.cmake > -+++ b/cmake/Modules/Version.cmake > -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) > - ######################################################################## > - find_package(Git QUIET) > - > --if(GIT_FOUND) > -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) > - message(STATUS "Extracting version information from git describe...") > - execute_process( > - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long > --- > -2.26.2 > - > diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk > index 7796d1096a..908be158b1 100644 > --- a/package/librtlsdr/librtlsdr.mk > +++ b/package/librtlsdr/librtlsdr.mk > @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) > LIBRTLSDR_LICENSE = GPL-2.0+ > LIBRTLSDR_LICENSE_FILES = COPYING > LIBRTLSDR_INSTALL_STAGING = YES > -LIBRTLSDR_DEPENDENCIES = libusb > - > -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable > -ifeq ($(BR2_STATIC_LIBS),y) > -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON > -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON > -else ifeq ($(BR2_SHARED_LIBS),y) > -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF > -endif > +# From git > +LIBRTLSDR_AUTORECONF = YES > +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb > +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install > > ifeq ($(BR2_PACKAGE_HAS_UDEV),y) > -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON > +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules > endif > > ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) > -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 > +LIBRTLSDR_CONF_OPTS += --enable-driver-detach > +else > +LIBRTLSDR_CONF_OPTS += --disable-driver-detach > endif > > ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) > -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON > +LIBRTLSDR_CONF_OPTS += --enable-zerocopy > else > -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF > +LIBRTLSDR_CONF_OPTS += --disable-zerocopy > endif > > -$(eval $(cmake-package)) > +$(eval $(autotools-package)) From arnout at mind.be Thu Mar 24 20:41:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:41:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.3 In-Reply-To: <20220314183014.2173419-1-james.hilliard1@gmail.com> References: <20220314183014.2173419-1-james.hilliard1@gmail.com> Message-ID: <186f7501-bf1e-c896-07e9-e7d439b2a044@mind.be> On 14/03/2022 19:30, James Hilliard wrote: > Signed-off-by: James Hilliard There's not really much point bumping a host-only package unless it actually does something for the build. Still: applied to master, thanks. Regards, Arnout > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index c2d53519d4..d909709b24 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc > -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc > +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 125488dd46..4615e839fe 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 0.61.1 > +MESON_VERSION = 0.61.3 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING From arnout at mind.be Thu Mar 24 20:42:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:42:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gstd: bump to version 0.14.0 In-Reply-To: <20220314181634.2155997-1-james.hilliard1@gmail.com> References: <20220314181634.2155997-1-james.hilliard1@gmail.com> Message-ID: On 14/03/2022 19:16, James Hilliard wrote: > Drop patches that are now upstream. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > ...d-check-user-xenv.sh-for-systemd-se.patch} | 0 > ...treamer-check-1.0-unless-tests-are-e.patch | 33 ---------------- > ...on-python-module-for-python-install.patch} | 0 > ...tive-symlink-for-gstd-gst-client-exe.patch | 38 ------------------- > package/gstreamer1/gstd/gstd.hash | 2 +- > package/gstreamer1/gstd/gstd.mk | 2 +- > 6 files changed, 2 insertions(+), 73 deletions(-) > rename package/gstreamer1/gstd/{0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch => 0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch} (100%) > delete mode 100644 package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch > rename package/gstreamer1/gstd/{0005-Use-native-meson-python-module-for-python-install.patch => 0003-Use-native-meson-python-module-for-python-install.patch} (100%) > delete mode 100644 package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch > > diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch > similarity index 100% > rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch > rename to package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch > diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch > deleted file mode 100644 > index 495fbfc3fa..0000000000 > --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 > -From: James Hilliard > -Date: Tue, 14 Sep 2021 01:49:49 -0600 > -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. > - > -Signed-off-by: James Hilliard > -[Upstream status: > -https://github.com/RidgeRun/gstd-1.x/pull/248] > ---- > - meson.build | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/meson.build b/meson.build > -index 1d9ce9d..76990a0 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') > - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') > - libd_dep = dependency('libdaemon', version : '>=0.14') > - jansson_dep = dependency('jansson', version : '>=2.7') > --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') > - thread_dep = dependency('threads') > - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') > - > -+gst_check_required = get_option('enable-tests').enabled() > -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') > -+ > - systemd_required = get_option('enable-systemd').enabled() > - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') > - > --- > -2.25.1 > - > diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch > similarity index 100% > rename from package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch > rename to package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch > diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch > deleted file mode 100644 > index 265ea8d8c3..0000000000 > --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 > -From: James Hilliard > -Date: Tue, 14 Sep 2021 02:49:10 -0600 > -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. > - > -This should fix the symlink path when cross compiling. > - > -Signed-off-by: James Hilliard > -[Upstream status: > -https://github.com/RidgeRun/gstd-1.x/pull/249] > ---- > - gst_client/gst_client_symbolic_link.sh | 2 +- > - gstd/gstd_symbolic_link.sh | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh > -index d8d7617..b87dd12 100755 > ---- a/gst_client/gst_client_symbolic_link.sh > -+++ b/gst_client/gst_client_symbolic_link.sh > -@@ -4,4 +4,4 @@ > - # $1: target > - # $2: link name > - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh > -index d8d7617..b87dd12 100755 > ---- a/gstd/gstd_symbolic_link.sh > -+++ b/gstd/gstd_symbolic_link.sh > -@@ -4,4 +4,4 @@ > - # $1: target > - # $2: link name > - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 > --- > -2.25.1 > - > diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash > index 6ec84bd58d..20c821a27f 100644 > --- a/package/gstreamer1/gstd/gstd.hash > +++ b/package/gstreamer1/gstd/gstd.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz > +sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk > index 959e277272..08a29f26ff 100644 > --- a/package/gstreamer1/gstd/gstd.mk > +++ b/package/gstreamer1/gstd/gstd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GSTD_VERSION = 0.13.0 > +GSTD_VERSION = 0.14.0 > GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) > GSTD_LICENSE_FILES = COPYING > GSTD_LICENSE = GPL-2.0+ From arnout at mind.be Thu Mar 24 20:42:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:42:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.1 In-Reply-To: <20220314183234.2174325-1-james.hilliard1@gmail.com> References: <20220314183234.2174325-1-james.hilliard1@gmail.com> Message-ID: <1a211258-0573-2218-c4a2-7a658e0f61b6@mind.be> On 14/03/2022 19:32, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aioconsole/python-aioconsole.hash | 4 ++-- > package/python-aioconsole/python-aioconsole.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash > index 39ce16f8b2..af8b5c4de9 100644 > --- a/package/python-aioconsole/python-aioconsole.hash > +++ b/package/python-aioconsole/python-aioconsole.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aioconsole/json > -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz > -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz > +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz > +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz > # Locally computed sha256 checksums > sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE > diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk > index 44857054d4..a58fd33a61 100644 > --- a/package/python-aioconsole/python-aioconsole.mk > +++ b/package/python-aioconsole/python-aioconsole.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOCONSOLE_VERSION = 0.4.0 > +PYTHON_AIOCONSOLE_VERSION = 0.4.1 > PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz > -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df > +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac > PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools > PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 > PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 24 20:42:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 21:42:56 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: Add some more entries for Thomas Huth In-Reply-To: <20220314203226.4481-1-huth@tuxfamily.org> References: <20220314203226.4481-1-huth@tuxfamily.org> Message-ID: On 14/03/2022 21:32, Thomas Huth wrote: > I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU > machine, so I could help to have a look on these files, too. > > Signed-off-by: Thomas Huth Applied to master, thanks. Regards, Arnout > --- > DEVELOPERS | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 70d71186ed..4083e87d30 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2753,8 +2753,11 @@ F: utils/size-stats-compare > F: toolchain/ > > N: Thomas Huth > +F: board/qemu/m68k-mcf5208/ > +F: configs/qemu_m68k_mcf5208_defconfig > F: package/ascii-invaders/ > F: package/frotz/ > +F: package/kvm-unit-tests/ > F: package/xorcurses/ > > N: Thomas Petazzoni From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/gstreamer1/gstd: bump to version 0.14.0 Message-ID: <20220324203416.B8E8E85C13@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a334b9a7668ba412cb2da79b75a019cd89985145 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches that are now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...e-gstd-check-user-xenv.sh-for-systemd-se.patch} | 0 ...re-gstreamer-check-1.0-unless-tests-are-e.patch | 33 ------------------- ...e-meson-python-module-for-python-install.patch} | 0 ...-relative-symlink-for-gstd-gst-client-exe.patch | 38 ---------------------- package/gstreamer1/gstd/gstd.hash | 2 +- package/gstreamer1/gstd/gstd.mk | 2 +- 6 files changed, 2 insertions(+), 73 deletions(-) diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0002-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch deleted file mode 100644 index 495fbfc3fa..0000000000 --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:49:49 -0600 -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/248] ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1d9ce9d..76990a0 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') - libd_dep = dependency('libdaemon', version : '>=0.14') - jansson_dep = dependency('jansson', version : '>=2.7') --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') - thread_dep = dependency('threads') - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') - -+gst_check_required = get_option('enable-tests').enabled() -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') -+ - systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch similarity index 100% rename from package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch rename to package/gstreamer1/gstd/0003-Use-native-meson-python-module-for-python-install.patch diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch deleted file mode 100644 index 265ea8d8c3..0000000000 --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 02:49:10 -0600 -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. - -This should fix the symlink path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/249] ---- - gst_client/gst_client_symbolic_link.sh | 2 +- - gstd/gstd_symbolic_link.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gst_client/gst_client_symbolic_link.sh -+++ b/gst_client/gst_client_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gstd/gstd_symbolic_link.sh -+++ b/gstd/gstd_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 6ec84bd58d..20c821a27f 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz +sha256 56afd58530b63d0d88dd818fd4e6c9230861819b3e131c6a87a46084c3f3fa96 gstd-0.14.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 959e277272..08a29f26ff 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTD_VERSION = 0.13.0 +GSTD_VERSION = 0.14.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING GSTD_LICENSE = GPL-2.0+ From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220324203416.D421285C13@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3396e945dfc1482cb21b65e5451abc5ec96a796b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 58ed4f81cd..a66b9d7eee 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2759,8 +2759,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.3 Message-ID: <20220324203416.C2B3285C11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffb0c357397a67ceaadd215669bf00dcb27bd558 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d4..d909709b24 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd46..4615e839fe 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 0.61.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/pistache: bump version & switch to meson build Message-ID: <20220324203416.AFA2D82AFE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f3218567953185008ec862f814bebecb9d6ed82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While upstream pistache has not yet released a stable 'tag' a lot has changed since June 2020: * project has moved to meson build system, cmake builds do not install headers. * patches in buildroot are no longer required * project-implemented Pistache::Optional was replaced by use of std::optional. This is only available in C++17 * dependency to rapidjson has been introduced Signed-off-by: Thomas Ruschival Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...s.txt-add-C-language-to-project-statement.patch | 70 ---------------- ...-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 ---------------------- ...include-pistache-typeid.h-include-cstddef.patch | 38 --------- package/pistache/Config.in | 9 +- package/pistache/pistache.hash | 2 +- package/pistache/pistache.mk | 10 ++- 6 files changed, 12 insertions(+), 212 deletions(-) diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d..0000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ???__atomic_load_8??? [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ???CHECK_FUNCTION_EXISTS??? - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec..0000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a..0000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210a..806c27077a 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,23 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_RAPIDJSON depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a glibc toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7..9a2cd1d1f9 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea..65d9b2412c 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,18 +4,20 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE PISTACHE_INSTALL_STAGING = YES +PISTACHE_DEPENDENCIES += rapidjson ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) From arnout at mind.be Thu Mar 24 19:44:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 20:44:13 +0100 Subject: [Buildroot] [git commit] package/librtlsdr: switch to autotools-package Message-ID: <20220324203416.A696385C11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26a16ed9d84cbd934fbad4d6042dfd10dc8063b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to autotools-package to avoid the following static build failure since commit d661740201405970f65c16c39a79f4148705af30: [ 56%] Linking C executable rtl_biast /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' collect2: error: ld returned 1 exit status Drop both cmake-related patches Fixes: - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...m-respect-DESTDIR-with-install-udev-rules.patch | 31 +++++ ...01-disable_shared_library_target_in_build.patch | 130 --------------------- ...es-Version.cmake-don-t-use-Git-version-if.patch | 47 -------- package/librtlsdr/librtlsdr.mk | 26 ++--- 4 files changed, 42 insertions(+), 192 deletions(-) diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 0000000000..1aec8166cc --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465de..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41..0000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a..908be158b1 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.4.1 Message-ID: <20220324203416.CBB3B85C12@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3a1593b74048eec038cd351b06a6654e8bba0c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b2..af8b5c4de9 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d4..a58fd33a61 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.4.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 24 20:10:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:10:36 +0100 Subject: [Buildroot] [git commit] fakeroot: Fix segfault on ppc64le Message-ID: <20220324203416.DC70085C11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a38c6827dba0a5ccee5504167344ea6bba44e9d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When generating a filesystem image on a power10 build machine running Ubuntu, we see a segfault when fakeroot is running chmod. This has been reported and fixed upstream in Debian in version 1.26-1.2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 Add the same patch to resolve the segfault. Signed-off-by: Joel Stanley [Arnout: add patch signoff and give proper name (check-package)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../fakeroot/0001-fix-prototype-generation.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/fakeroot/0001-fix-prototype-generation.patch b/package/fakeroot/0001-fix-prototype-generation.patch new file mode 100644 index 0000000000..960bad2129 --- /dev/null +++ b/package/fakeroot/0001-fix-prototype-generation.patch @@ -0,0 +1,61 @@ +Subject: Fix prototype generation for openat +Author: Christoph Biedl +Date: 2021-12-30 +Bug-Debian: https://bugs.debian.org/995393 +Forwarded: Yes (implicitely) + + As jrtc27 pointed out in IRC, ppc64el is more strict than other + architectures when it comes to va_arg handling: + + it's that ppc64le uses the elfv2 abi, and for variadic calls you + must reserve space for a parameter save area + + So enhance wrapawk to create a proper prototype and argument + handling although it's specific to the openat call. Also add the + missing documentation for the sixth column to wrapfunc.inp. + +Signed-off-by: Joel Stanley + +--- a/wrapawk ++++ b/wrapawk +@@ -37,7 +37,25 @@ + argtype=$3; + argname=$4; + MACRO=$5; +- if(MACRO){ ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -9,8 +9,10 @@ + /**/ */ + /* each line of this file lists 4 fields, seperated by a ";". */ + /* The first field is the name of the wrapped function, then it's return */ +-/* value. After that come the function arguments with types, and the last */ ++/* value. After that come the function arguments with types, and the fifth */ + /* field contains the function arguments without types. */ ++/* A sixth field is a special needed when wrapping the openat syscall. */ ++/* Otherwise it's like the third (function arguments with types). */ + /**/ + + /* __*xstat are used on glibc systems instead of just *xstat. */ From arnout at mind.be Thu Mar 24 21:11:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:11:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls In-Reply-To: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> References: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> Message-ID: <2a0a7ee7-386c-6f47-df79-cde409cbfa4c@mind.be> On 15/03/2022 21:59, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 0.40.2 in > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > FAILED: src/librygel-core/RygelCore-2.6.typelib > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > > Fixes: > - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > > Signed-off-by: Fabrice Fontaine > --- > ...-meson.build-fix-g_ir_compiler-calls.patch | 84 +++++++++++++++++++ > 1 file changed, 84 insertions(+) > create mode 100644 package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > new file mode 100644 > index 0000000000..3961ad0564 > --- /dev/null > +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > @@ -0,0 +1,84 @@ > +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Tue, 15 Mar 2022 19:20:33 +0100 > +Subject: [PATCH] meson.build: fix g_ir_compiler calls > + > +Fix the following build failure when cross-compiling which is raised > +because rygel is using a custom_target target instead of the standard > +gnome.generate_gir: > + > +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > +FAILED: src/librygel-core/RygelCore-2.6.typelib > +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > + > +Indeed, the custom_target command is unable to retrieve the correct > +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls > + > +Fixes: > + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: probably not upstreamable] > +--- > + src/librygel-core/meson.build | 4 +++- > + src/librygel-renderer-gst/meson.build | 1 + > + src/librygel-renderer/meson.build | 1 + > + src/librygel-server/meson.build | 1 + > + 4 files changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build > +index fd43bebe..e6be2b5e 100644 > +--- a/src/librygel-core/meson.build > ++++ b/src/librygel-core/meson.build > +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', > + # so we depend on the custom_target from that step and pass the input through > + # commandline. > + custom_target('RygelCore-2.6.typelib', > +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > ++ command: [g_ir_compiler, '--output', '@OUTPUT@', > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, I don't understand why this isn't needed for any other g-ir-compiler calls. It can't be that rygel is the only package that has any GIR dependencies? If more packages need something like this, then we should probably create a wrapper around g-ir-compiler that adds the --includedir automatically. [Adam in Cc as the GOI specialist - poor guy.] Anyway, for now, applied to master, thanks. Regards, Arnout > ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > + output: 'RygelCore-2.6.typelib', > + depends: [ core_lib, core_gir ], > + install: true, > +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build > +index ad98a3a7..e8baefe1 100644 > +--- a/src/librygel-renderer-gst/meson.build > ++++ b/src/librygel-renderer-gst/meson.build > +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', > + '--output', '@OUTPUT@', > + '--includedir', core_girdir, > + '--includedir', renderer_girdir, > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], > + output: 'RygelRendererGst-2.6.typelib', > + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], > +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build > +index 5f401527..821273ff 100644 > +--- a/src/librygel-renderer/meson.build > ++++ b/src/librygel-renderer/meson.build > +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', > + command: [g_ir_compiler, > + '--output', '@OUTPUT@', > + '--includedir', core_girdir, > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], > + output: 'RygelRenderer-2.6.typelib', > + depends: [ renderer_lib, renderer_gir, core_gir ], > +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build > +index a3bd77d9..6b084eb6 100644 > +--- a/src/librygel-server/meson.build > ++++ b/src/librygel-server/meson.build > +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', > + command: [g_ir_compiler, > + '--output', '@OUTPUT@', > + '--includedir', core_girdir, > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], > + output: 'RygelServer-2.6.typelib', > + depends: [ server_lib, server_gir, core_gir ], > +-- > +2.35.1 > + From arnout at mind.be Thu Mar 24 21:12:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:12:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpi-gpio: enable package on aarch64 In-Reply-To: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> References: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> Message-ID: <117dc4de-5528-0f46-f77a-f3923ea9b6fa@mind.be> On 15/03/2022 15:26, Mirza Kapetanovic wrote: > Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested > this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. > > Signed-off-by: Mirza Kapetanovic Applied to master, thanks. Regards, Arnout > --- > package/python-rpi-gpio/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in > index 4f59ebdb06..f3c0928c62 100644 > --- a/package/python-rpi-gpio/Config.in > +++ b/package/python-rpi-gpio/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_PYTHON_RPI_GPIO > bool "python-rpi-gpio" > - depends on BR2_arm > + depends on BR2_arm || BR2_aarch64 > help > A Python module to control the GPIO on a Raspberry Pi. > From arnout at mind.be Thu Mar 24 21:12:32 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:12:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> Message-ID: On 15/03/2022 18:32, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > reintroduction of the package in commit > 16ff948444c3978d63f483344a3d92d994c64312: > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/grpc/grpc.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index 23b92f1750..9138b4ea59 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf > # which doesn't do this. These CARES settings trick the gRPC cmake code into > # not looking for c-ares at all and yet still linking with the library. > GRPC_CONF_OPTS = \ > + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ > -DgRPC_ABSL_PROVIDER=package \ > -D_gRPC_CARES_LIBRARIES=cares \ > -DgRPC_CARES_PROVIDER=none \ > @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ > -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +GRPC_DEPENDENCIES += libexecinfo > +GRPC_EXE_LINKER_FLAGS += -lexecinfo > +endif > + > # grpc can use __atomic builtins, so we need to link with > # libatomic when available > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > +GRPC_EXE_LINKER_FLAGS += -latomic > endif > > GRPC_CFLAGS = $(TARGET_CFLAGS) From arnout at mind.be Thu Mar 24 21:12:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:12:57 +0100 Subject: [Buildroot] [PATCH] package/perl: bump to version 5.34.1 In-Reply-To: <20220315173324.1113174-1-francois.perrad@gadz.org> References: <20220315173324.1113174-1-francois.perrad@gadz.org> Message-ID: <78306b4a-a95d-e666-3d86-917abc38989a@mind.be> On 15/03/2022 18:33, Francois Perrad wrote: > diff README: > -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Larry Wall and others. > +2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 > +by Larry Wall and others. > > Signed-off-by: Francois Perrad Applied to master, thanks. Thanks for explaining the README diff! Regards, Arnout > --- > package/perl/perl.hash | 14 +++++++------- > package/perl/perl.mk | 4 ++-- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/package/perl/perl.hash b/package/perl/perl.hash > index b0f60ef6f..d8344d975 100644 > --- a/package/perl/perl.hash > +++ b/package/perl/perl.hash > @@ -1,12 +1,12 @@ > -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt > -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz > -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz > -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz > +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt > +md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz > +sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz > +sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz > > -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash > -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz > +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.hash > +sha256 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335 perl-cross-1.3.7.tar.gz > > # Locally calculated > sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic > sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying > -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README > +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README > diff --git a/package/perl/perl.mk b/package/perl/perl.mk > index d7f9c58dd..392fb8b6e 100644 > --- a/package/perl/perl.mk > +++ b/package/perl/perl.mk > @@ -6,7 +6,7 @@ > > # When updating the version here, also update utils/scancpan > PERL_VERSION_MAJOR = 34 > -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 > +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 > PERL_SITE = https://www.cpan.org/src/5.0 > PERL_SOURCE = perl-$(PERL_VERSION).tar.xz > PERL_LICENSE = Artistic or GPL-1.0+ > @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl > PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > PERL_INSTALL_STAGING = YES > > -PERL_CROSS_VERSION = 1.3.6 > +PERL_CROSS_VERSION = 1.3.7 > # DO NOT refactor with the github helper (the result is not the same) > PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) > PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From arnout at mind.be Thu Mar 24 21:13:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:13:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-avro: renumber patch In-Reply-To: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> References: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Message-ID: <8a6e08bc-1832-0be0-2d68-189330b0b6e2@mind.be> On 15/03/2022 22:16, Fabrice Fontaine wrote: > Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber > patch > > Signed-off-by: Fabrice Fontaine A bit useless if you're anyway removing it in the next patch, but OK. For backporting, I guess. Applied both to master, thanks. Regards, Arnout > --- > ...h => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 > 1 file changed, 0 insertions(+), 0 deletions(-) > rename package/python-avro/{0002-drop-install-time-linting-and-imports-sorting.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} (100%) > > diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch > similarity index 100% > rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch > rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From arnout at mind.be Thu Mar 24 21:13:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:13:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbdplus: bump to version 0.2.0 In-Reply-To: <20220315214113.2322315-1-fontaine.fabrice@gmail.com> References: <20220315214113.2322315-1-fontaine.fabrice@gmail.com> Message-ID: On 15/03/2022 22:41, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://code.videolan.org/videolan/libbdplus/-/blob/0.2.0/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libbdplus/libbdplus.hash | 6 +++--- > package/libbdplus/libbdplus.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash > index 6abc0e4970..2445af6e82 100644 > --- a/package/libbdplus/libbdplus.hash > +++ b/package/libbdplus/libbdplus.hash > @@ -1,5 +1,5 @@ > -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 > -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 > +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 > +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 > > # Hash for license file: > -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING > +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING > diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk > index b0e8b1488d..600cb6b545 100644 > --- a/package/libbdplus/libbdplus.mk > +++ b/package/libbdplus/libbdplus.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBDPLUS_VERSION = 0.1.2 > +LIBBDPLUS_VERSION = 0.2.0 > LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) > LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 > LIBBDPLUS_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:14:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:14:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libbluray: bump to version 1.3.1 In-Reply-To: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> References: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> Message-ID: <52993c0b-1955-f1e0-6aa8-49fa2d984132@mind.be> On 15/03/2022 23:03, Fabrice Fontaine wrote: > https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/libbluray/libbluray.hash | 4 ++-- > package/libbluray/libbluray.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash > index 4ab8c85866..6e62bb49a1 100644 > --- a/package/libbluray/libbluray.hash > +++ b/package/libbluray/libbluray.hash > @@ -1,4 +1,4 @@ > -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 > -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 > +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 > +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 > # Locally computed > sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING > diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk > index 233797f38d..a9eb3c67c6 100644 > --- a/package/libbluray/libbluray.mk > +++ b/package/libbluray/libbluray.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBLURAY_VERSION = 1.3.0 > +LIBBLURAY_VERSION = 1.3.1 > LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) > LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 > LIBBLURAY_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 21:14:57 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:14:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/dav1d: use official tarball In-Reply-To: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> References: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> Message-ID: On 15/03/2022 23:10, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/dav1d/dav1d.hash | 3 ++- > package/dav1d/dav1d.mk | 4 ++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash > index b0f163bae7..5e838b0951 100644 > --- a/package/dav1d/dav1d.hash > +++ b/package/dav1d/dav1d.hash > @@ -1,3 +1,4 @@ > +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 > +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz > # Locally computed > -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 > sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING > diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk > index d7224625c8..ecc4cc55c3 100644 > --- a/package/dav1d/dav1d.mk > +++ b/package/dav1d/dav1d.mk > @@ -5,8 +5,8 @@ > ################################################################################ > > DAV1D_VERSION = 0.9.2 > -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 > -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) > +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz > +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) > DAV1D_LICENSE = BSD-2-Clause > DAV1D_LICENSE_FILES = COPYING > DAV1D_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 20:51:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:33 +0100 Subject: [Buildroot] [git commit] package/python-avro: renumber patch Message-ID: <20220324210619.C51D985C5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a23f6b7b011fee47812bb70a11c21b9d68844b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ing.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From arnout at mind.be Thu Mar 24 20:51:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:20 +0100 Subject: [Buildroot] [git commit] package/python-rpi-gpio: enable package on aarch64 Message-ID: <20220324210619.A0CC185C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45f2609ca2eb5577ec5e6e204aec5a3eb2e80253 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. Signed-off-by: Mirza Kapetanovic Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-rpi-gpio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb06..f3c0928c62 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. From arnout at mind.be Thu Mar 24 20:51:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:23 +0100 Subject: [Buildroot] [git commit] package/grpc: fix build with libexecinfo Message-ID: <20220324210619.AA88285C5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3aa82ea44462862d56f6e54889741d95684dc84 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/grpc/grpc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 23b92f1750..9138b4ea59 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +GRPC_DEPENDENCIES += libexecinfo +GRPC_EXE_LINKER_FLAGS += -lexecinfo +endif + # grpc can use __atomic builtins, so we need to link with # libatomic when available ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +GRPC_EXE_LINKER_FLAGS += -latomic endif GRPC_CFLAGS = $(TARGET_CFLAGS) From arnout at mind.be Thu Mar 24 20:51:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:26 +0100 Subject: [Buildroot] [git commit] package/perl: bump to version 5.34.1 Message-ID: <20220324210619.B369085C5F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74dbc305b28de4b73499eb76878503a71b381bd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master diff README: -2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Larry Wall and others. +2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 +by Larry Wall and others. Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl/perl.hash | 14 +++++++------- package/perl/perl.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b0f60ef6f8..d8344d9754 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz.{md5,sha1,sha256}.txt -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt +md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz +sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz +sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.hash +sha256 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335 perl-cross-1.3.7.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index d7f9c58ddd..392fb8b6e2 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.6 +PERL_CROSS_VERSION = 1.3.7 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From arnout at mind.be Thu Mar 24 20:51:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:40 +0100 Subject: [Buildroot] [git commit] package/libbdplus: bump to version 0.2.0 Message-ID: <20220324210619.D647585C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f318c729f0776a8a51c9832e9d431c57edfd7990 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://code.videolan.org/videolan/libbdplus/-/blob/0.2.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbdplus/libbdplus.hash | 6 +++--- package/libbdplus/libbdplus.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash index 6abc0e4970..2445af6e82 100644 --- a/package/libbdplus/libbdplus.hash +++ b/package/libbdplus/libbdplus.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk index b0e8b1488d..600cb6b545 100644 --- a/package/libbdplus/libbdplus.mk +++ b/package/libbdplus/libbdplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBDPLUS_VERSION = 0.1.2 +LIBBDPLUS_VERSION = 0.2.0 LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 LIBBDPLUS_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 20:51:30 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:30 +0100 Subject: [Buildroot] [git commit] package/rygel: fix g_ir_compiler calls Message-ID: <20220324210619.BC55385C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94515b902c74d51aeb32654a4795ca92d6dd7279 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command FAILED: src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-meson.build-fix-g_ir_compiler-calls.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 0000000000..3961ad0564 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + From arnout at mind.be Thu Mar 24 20:51:46 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:46 +0100 Subject: [Buildroot] [git commit] package/dav1d: use official tarball Message-ID: <20220324210619.E715585C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bdf40b1b0a36212fefef0b19632545f94c06423 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dav1d/dav1d.hash | 3 ++- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae7..5e838b0951 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8..ecc4cc55c3 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -5,8 +5,8 @@ ################################################################################ DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 20:51:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:36 +0100 Subject: [Buildroot] [git commit] package/{avro-c, python-avro}: bump to version 1.11.0 Message-ID: <20220324210619.CE1F085C5F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f617bbbf9fff6e436ae1b86f8af4d127e17fa08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop avro-c patch (already in version) - Drop python-avro patch (not needed anymore) https://github.com/apache/avro/releases/tag/release-1.11.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-Build-failure-without-a-C-compiler-again.patch | 34 ---------------- package/avro-c/avro-c.hash | 4 +- package/avro-c/avro-c.mk | 2 +- ...-install-time-linting-and-imports-sorting.patch | 46 ---------------------- package/python-avro/python-avro.hash | 4 +- package/python-avro/python-avro.mk | 5 ++- 6 files changed, 8 insertions(+), 87 deletions(-) diff --git a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch b/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch deleted file mode 100644 index 8f7e59cf62..0000000000 --- a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Jul 2020 09:35:09 +0200 -Subject: [PATCH] cmake: Build failure without a C++ compiler (again) - -avro-c fails to build (again) without a C++ compiler because commit -664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by -commit 414a51fdc1856083bb16851f09a4c61a48796132 - -Fixes: - - http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c8d7aaf..aa923e18 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # under the License. - # - cmake_minimum_required(VERSION 3.1) --project(AvroC) -+project(AvroC C) - enable_testing() - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) --- -2.27.0 - diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index c4fd7d3f57..7a4a6f7aca 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 -sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/c/avro-c-1.11.0.tar.gz.sha512 +sha512 5369ec11832e0ce1aa0181d594f657bae82ab5fb317ec1bee5ba190de9ed42956b425a5bf7e423940e8f871a54ae1246b92db2ce8562f270b4a05523ec4b60ae avro-c-1.11.0.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index ee6e864161..262a0fee5f 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVRO_C_VERSION = 1.10.0 +AVRO_C_VERSION = 1.11.0 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch deleted file mode 100644 index 41231e923d..0000000000 --- a/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Mon, 17 Feb 2020 15:12:13 +0100 -Subject: [PATCH] drop install time linting and imports sorting - -Since the 1.9.2 release, the setup script is also performing code linting -tasks, which require additional python libraries. - -These linting tasks are not needed anyway, since they are intended to prepare -the code for distribution, but the Buildroot package is already using a -distributed version. We therefore simply remove them. - -Signed-off-by: Titouan Christophe ---- - setup.cfg | 2 -- - setup.py | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 7b5de18..d46a36e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -25,8 +25,6 @@ package_dir = - include_package_data = true - packages = avro - setup_requires = -- isort -- pycodestyle - install_requires = - zip_safe = true - scripts = -diff --git a/setup.py b/setup.py -index f6297bb..91d3287 100755 ---- a/setup.py -+++ b/setup.py -@@ -164,7 +164,6 @@ def main(): - setuptools.setup(cmdclass={ - "clean": CleanCommand, - "generate_interop_data": GenerateInteropDataCommand, -- "lint": LintCommand, - }) - - --- -2.24.1 - diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index 2428be96e5..d752fa8ae6 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 -sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.0/py/avro-1.11.0.tar.gz.sha512 +sha512 8af67deb33b9990b74ffd7ab5c3c55e13a649070b4623c7bbe2b278287fd0929e57ed6d0344f9e93f3eb79663b43f75891d0810812349dfaecce65fdd9b44e93 avro-1.11.0.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index dd6008b1ba..0c4c431777 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -5,8 +5,9 @@ ################################################################################ PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) -PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3 -PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz +PYTHON_AVRO_SITE = \ + https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py +PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE PYTHON_AVRO_SETUP_TYPE = setuptools From arnout at mind.be Thu Mar 24 20:51:43 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 21:51:43 +0100 Subject: [Buildroot] [git commit] package/libbluray: bump to version 1.3.1 Message-ID: <20220324210619.DEC7F85C5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49413c6d97b72ef5f44341a3dc720b902a88279b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c85866..6e62bb49a1 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38d..a9eb3c67c6 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES From arnout at mind.be Thu Mar 24 21:23:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:23:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireplumber: fix default device behaviour In-Reply-To: <20220316092200.66623-1-theo.lebrun@bootlin.com> References: <20220316092200.66623-1-theo.lebrun@bootlin.com> Message-ID: On 16/03/2022 10:22, Th?o Lebrun wrote: > This patch has been applied upstream and is required to allow having > default devices on non x86_64 platforms with WirePlumber v0.4.8. > https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 > > Signed-off-by: Th?o Lebrun Applied to master with the changes I commented earlier, thanks. Regards, Arnout > --- > .../0001-fix-non-x86_64-architectures.patch | 212 ++++++++++++++++++ > 1 file changed, 212 insertions(+) > create mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch > > diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > new file mode 100644 > index 0000000000..27b6f034b2 > --- /dev/null > +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch > @@ -0,0 +1,212 @@ > +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 > +From: Julian Bouzas > +Date: Wed, 9 Feb 2022 07:59:59 -0500 > +Subject: [PATCH] spa-json: fix va_list APIs for different architectures > + > +The va_list type might not always be a pointer in some architectures, so we > +cannot guarantee it will be modified after using it for a second time in another > +function. This fixes the issue by using macros so args does not get copied, and > +always gets modified when using it more than once. > +--- > + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- > + 1 file changed, 80 insertions(+), 76 deletions(-) > + > +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c > +index f14f395d..c5e59a3e 100644 > +--- a/lib/wp/spa-json.c > ++++ b/lib/wp/spa-json.c > +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) > + wp_spa_json_builder_new_formatted ("\"%s\"", value)); > + } > + > +-static void > +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- wp_spa_json_builder_add_null (self); > +- break; > +- case 'b': > +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); > +- break; > +- case 'i': > +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); > +- break; > +- case 'f': > +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); > +- break; > +- case 's': > +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); > +- break; > +- case 'J': > +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); > +- break; > +- default: > +- return; > +- } > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_builder_add_value(self,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ wp_spa_json_builder_add_null (self); \ > ++ break; \ > ++ case 'b': \ > ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ > ++ break; \ > ++ case 'i': \ > ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ > ++ break; \ > ++ case 'f': \ > ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ > ++ break; \ > ++ case 's': \ > ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ > ++ break; \ > ++ case 'J': \ > ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ > ++ break; \ > ++ default: \ > ++ break; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Creates a spa json of type array > +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) > + return res; > + } > + > +-static gboolean > +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, > +- va_list args) > +-{ > +- switch (*fmt) { > +- case 'n': > +- if (!spa_json_is_null (data, len)) > +- return FALSE; > +- break; > +- case 'b': > +- if (!wp_spa_json_parse_boolean_internal (data, len, > +- va_arg(args, gboolean *))) > +- return FALSE; > +- break; > +- case 'i': > +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) > +- return FALSE; > +- break; > +- case 'f': > +- if (spa_json_parse_float (data, len, > +- (float *)va_arg(args, double *)) < 0) > +- return FALSE; > +- break; > +- case 's': { > +- gchar *str = wp_spa_json_parse_string_internal (data, len); > +- if (!str) > +- return FALSE; > +- *va_arg(args, gchar **) = str; > +- break; > +- } > +- case 'J': { > +- WpSpaJson *j = wp_spa_json_new (data, len); > +- if (!j) > +- return FALSE; > +- *va_arg(args, WpSpaJson **) = j; > +- break; > +- } > +- default: > +- return FALSE; > +- } > +- return TRUE; > +-} > ++/* Args is not a pointer in some architectures, so this needs to be a macro to > ++ * avoid args being copied */ > ++#define wp_spa_json_parse_value(data,len,fmt,args) \ > ++do { \ > ++ switch (*fmt) { \ > ++ case 'n': \ > ++ if (!spa_json_is_null (data, len)) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'b': \ > ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ > ++ va_arg(args, gboolean *))) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'i': \ > ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 'f': \ > ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ > ++ return FALSE; \ > ++ break; \ > ++ case 's': { \ > ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ > ++ if (!str) \ > ++ return FALSE; \ > ++ *va_arg(args, gchar **) = str; \ > ++ break; \ > ++ } \ > ++ case 'J': { \ > ++ WpSpaJson *j = wp_spa_json_new (data, len); \ > ++ if (!j) \ > ++ return FALSE; \ > ++ *va_arg(args, WpSpaJson **) = j; \ > ++ break; \ > ++ } \ > ++ default: \ > ++ return FALSE; \ > ++ } \ > ++} while(false) > + > + /*! > + * \brief Parses the object property values of a spa json object > +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) > + value = g_value_get_boxed (&item); > + > + if (g_strcmp0 (key_str, lookup_key) == 0) { > +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) > +- return FALSE; > ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); > + lookup_key = va_arg(args, const gchar *); > + if (!lookup_key) > + return TRUE; > +@@ -1366,9 +1363,12 @@ gboolean > + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, > + va_list args) > + { > +- return wp_spa_json_parser_advance (self) && > +- wp_spa_json_parse_value (self->curr.cur, > +- self->curr.end - self->curr.cur, fmt, args); > ++ if (wp_spa_json_parser_advance (self)) { > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ fmt, args); > ++ return TRUE; > ++ } > ++ return FALSE; > + } > + > + /*! > +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) > + if (!format) > + return TRUE; > + > +- /* parse value */ > +- if (!wp_spa_json_parser_get_value (self, format, args)) > ++ /* advance */ > ++ if (!wp_spa_json_parser_advance (self)) > + return FALSE; > ++ > ++ /* parse value */ > ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, > ++ format, args); > + } while (TRUE); > + > + return FALSE; > +-- > +GitLab > + From arnout at mind.be Thu Mar 24 21:22:33 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:22:33 +0100 Subject: [Buildroot] [git commit] package/wireplumber: fix default device behaviour Message-ID: <20220324211439.67E7185C63@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe9f465036f80382d7fbc2e65d29e5c366dbe472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch has been applied upstream and is required to allow having default devices on non x86_64 platforms with WirePlumber v0.4.8. https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 Signed-off-by: Th??o Lebrun Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-fix-non-x86_64-architectures.patch | 215 +++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch new file mode 100644 index 0000000000..19c34e4e1a --- /dev/null +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch @@ -0,0 +1,215 @@ +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 9 Feb 2022 07:59:59 -0500 +Subject: [PATCH] spa-json: fix va_list APIs for different architectures + +The va_list type might not always be a pointer in some architectures, so we +cannot guarantee it will be modified after using it for a second time in another +function. This fixes the issue by using macros so args does not get copied, and +always gets modified when using it more than once. + +Signed-off-by: Th??o Lebrun +Upstream: https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 +--- + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- + 1 file changed, 80 insertions(+), 76 deletions(-) + +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c +index f14f395d..c5e59a3e 100644 +--- a/lib/wp/spa-json.c ++++ b/lib/wp/spa-json.c +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) + wp_spa_json_builder_new_formatted ("\"%s\"", value)); + } + +-static void +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- wp_spa_json_builder_add_null (self); +- break; +- case 'b': +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); +- break; +- case 'i': +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); +- break; +- case 'f': +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); +- break; +- case 's': +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); +- break; +- case 'J': +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); +- break; +- default: +- return; +- } +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_builder_add_value(self,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ wp_spa_json_builder_add_null (self); \ ++ break; \ ++ case 'b': \ ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ ++ break; \ ++ case 'i': \ ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ ++ break; \ ++ case 'f': \ ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ ++ break; \ ++ case 's': \ ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ ++ break; \ ++ case 'J': \ ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ ++ break; \ ++ default: \ ++ break; \ ++ } \ ++} while(false) + + /*! + * \brief Creates a spa json of type array +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) + return res; + } + +-static gboolean +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- if (!spa_json_is_null (data, len)) +- return FALSE; +- break; +- case 'b': +- if (!wp_spa_json_parse_boolean_internal (data, len, +- va_arg(args, gboolean *))) +- return FALSE; +- break; +- case 'i': +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) +- return FALSE; +- break; +- case 'f': +- if (spa_json_parse_float (data, len, +- (float *)va_arg(args, double *)) < 0) +- return FALSE; +- break; +- case 's': { +- gchar *str = wp_spa_json_parse_string_internal (data, len); +- if (!str) +- return FALSE; +- *va_arg(args, gchar **) = str; +- break; +- } +- case 'J': { +- WpSpaJson *j = wp_spa_json_new (data, len); +- if (!j) +- return FALSE; +- *va_arg(args, WpSpaJson **) = j; +- break; +- } +- default: +- return FALSE; +- } +- return TRUE; +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_parse_value(data,len,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ if (!spa_json_is_null (data, len)) \ ++ return FALSE; \ ++ break; \ ++ case 'b': \ ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ ++ va_arg(args, gboolean *))) \ ++ return FALSE; \ ++ break; \ ++ case 'i': \ ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 'f': \ ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 's': { \ ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ ++ if (!str) \ ++ return FALSE; \ ++ *va_arg(args, gchar **) = str; \ ++ break; \ ++ } \ ++ case 'J': { \ ++ WpSpaJson *j = wp_spa_json_new (data, len); \ ++ if (!j) \ ++ return FALSE; \ ++ *va_arg(args, WpSpaJson **) = j; \ ++ break; \ ++ } \ ++ default: \ ++ return FALSE; \ ++ } \ ++} while(false) + + /*! + * \brief Parses the object property values of a spa json object +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) + value = g_value_get_boxed (&item); + + if (g_strcmp0 (key_str, lookup_key) == 0) { +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) +- return FALSE; ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); + lookup_key = va_arg(args, const gchar *); + if (!lookup_key) + return TRUE; +@@ -1366,9 +1363,12 @@ gboolean + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, + va_list args) + { +- return wp_spa_json_parser_advance (self) && +- wp_spa_json_parse_value (self->curr.cur, +- self->curr.end - self->curr.cur, fmt, args); ++ if (wp_spa_json_parser_advance (self)) { ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ fmt, args); ++ return TRUE; ++ } ++ return FALSE; + } + + /*! +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) + if (!format) + return TRUE; + +- /* parse value */ +- if (!wp_spa_json_parser_get_value (self, format, args)) ++ /* advance */ ++ if (!wp_spa_json_parser_advance (self)) + return FALSE; ++ ++ /* parse value */ ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ format, args); + } while (TRUE); + + return FALSE; +-- +GitLab + From arnout at mind.be Thu Mar 24 21:31:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:31:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: bump to version 4.3.1 In-Reply-To: <20220317075909.3705760-1-johannes.agricola@work-microwave.com> References: <20220317075909.3705760-1-johannes.agricola@work-microwave.com> Message-ID: On 17/03/2022 08:59, Johannes Agricola wrote: > Signed-off-by: Johannes Agricola > --- > package/libwebsockets/libwebsockets.hash | 2 +- > package/libwebsockets/libwebsockets.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash > index 1761a7658a..f92c66018f 100644 > --- a/package/libwebsockets/libwebsockets.hash > +++ b/package/libwebsockets/libwebsockets.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz > +sha256 8fdb1454a1b34cd9a6351beaab237a485e6853806101de7e62bd2bc250bb50af libwebsockets-4.3.1.tar.gz > sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE Hash of the license file changed. Could you check what changed - in particular, if anything changed about the license itself (usually, however, it's just an update of the copyright year). Document your findings in the commit message. And of course, update the hash of the LICENSE file. Until then, I've marked your patch as Changes Requested. Thanks! Regards, Arnout > diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk > index c25686d385..152659cee6 100644 > --- a/package/libwebsockets/libwebsockets.mk > +++ b/package/libwebsockets/libwebsockets.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBWEBSOCKETS_VERSION = 4.0.21 > +LIBWEBSOCKETS_VERSION = 4.3.1 > LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) > LIBWEBSOCKETS_LICENSE = MIT with exceptions > LIBWEBSOCKETS_LICENSE_FILES = LICENSE From arnout at mind.be Thu Mar 24 21:35:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:35:54 +0100 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5base: security bump In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <305c203d-e5f4-cbdd-036a-4c996bf802f1@mind.be> On 17/03/2022 17:38, Quentin Schulz wrote: > From: Quentin Schulz > > This fixes CVE-2022-25255 and CVE-2022-25634. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz > --- > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 1b9ff43ab2..c031f71c77 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ef02edfc1d..8fd5800822 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > @@ -15,6 +15,10 @@ QT5BASE_SYNC_QT_HEADERS = YES > # 0010-Avoid-processing-intensive-painting-of-high-number-o.patch > # 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 FYI, this no longer applies cleanly to master. Regards, Arnout > +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" > +QT5BASE_IGNORE_CVES += CVE-2022-25634 > > # A few comments: > # * -no-pch to workaround the issue described at From arnout at mind.be Thu Mar 24 21:42:51 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:42:51 +0100 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5base: remove leftover patch In-Reply-To: <20220317163823.2913753-2-foss+buildroot@0leil.net> References: <20220317163823.2913753-1-foss+buildroot@0leil.net> <20220317163823.2913753-2-foss+buildroot@0leil.net> Message-ID: <0f660a9a-f182-05e6-b4a8-143dbb4665a5@mind.be> On 17/03/2022 17:38, Quentin Schulz wrote: > From: Quentin Schulz > > CVE-2021-38593 fixes originally missed a usecase that was covered by the > to-be-removed patch. However, this patch was incorrect and added some > issues on its own, which was then fixed by now-removed > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. > > Unfortunately for us, the to-be-removed patch (fixed by > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually > be applied (with fuzz; by `patch` only) on top of the now-removed patch. > When the move to KDE Qt fork was made, some patches were removed as they > were already part of the new git fork. However, the to-be-removed patch > was not. This means the > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually > undone when Buildroot patched qt5base. > > Let's remove this patch to fix this oversight. > > As a reference: > e7ea2ed27c Improve fix for avoiding huge number of tiny dashes > fixed by > 65b3aa6a1c Refix for avoiding huge number of tiny dashes > in the git repo. > > Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied to master, thanks. I've also renumbered patches 7 and 8. Regards, Arnout > --- > ...-avoiding-huge-number-of-tiny-dashes.patch | 37 ------------------- > 1 file changed, 37 deletions(-) > delete mode 100644 package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > > diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > deleted file mode 100644 > index 16e0f20200..0000000000 > --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 > -From: Eirik Aavitsland > -Date: Fri, 23 Jul 2021 15:53:56 +0200 > -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Some pathological cases were not caught by the previous fix. > - > -Fixes: QTBUG-95239 > -Pick-to: 6.2 6.1 5.15 > -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 > -Reviewed-by: Robert L?hning > -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) > -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] > -Signed-off-by: Quentin Schulz > ---- > - src/gui/painting/qpaintengineex.cpp | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp > -index 55fdb0c2a0..19e4b23423 100644 > ---- a/src/gui/painting/qpaintengineex.cpp > -+++ b/src/gui/painting/qpaintengineex.cpp > -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) > - patternLength *= pen.widthF(); > - if (qFuzzyIsNull(patternLength)) { > - pen.setStyle(Qt::NoPen); > -- } else if (extent / patternLength > 10000) { > -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { > - // approximate stream of tiny dashes with semi-transparent solid line > - pen.setStyle(Qt::SolidLine); > - QColor color(pen.color()); > --- > -2.34.1 > - From arnout at mind.be Thu Mar 24 21:43:42 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:43:42 +0100 Subject: [Buildroot] [PATCH v1] package/qt5base: fix eglconvenience compile (missing QList include) In-Reply-To: <20220316182440.17393-1-ps.report@gmx.net> References: <20220316182440.17393-1-ps.report@gmx.net> Message-ID: <9c7a1a58-eb12-bbf7-74c0-c11a245c87e1@mind.be> On 16/03/2022 19:24, Peter Seiderer wrote: > - add 0008-eglconvenience-add-missing-QList-include.patch to fix > eglconvenience compile (missing QList include) > > Fixes: > > qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type > 418 | QList extensions = > | ^~~~~~~~~~ > qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? > 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); > | ^ > > Signed-off-by: Peter Seiderer > --- > ...onvenience-add-missing-QList-include.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch > > diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch > new file mode 100644 > index 0000000000..c7127291e4 > --- /dev/null > +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch There was already a patch 0008. However, I merged another commit that removed patch 0006, and renumbered them, so no your patch is 0008 :-) Applied to master, thanks. Regards, Arnout > @@ -0,0 +1,37 @@ > +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Wed, 16 Mar 2022 19:08:55 +0100 > +Subject: [PATCH] eglconvenience: add missing QList include > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes: > + > + qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type > + 418 | QList extensions = > + | ^~~~~~~~~~ > + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? > + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); > + | ^ > + > +Signed-off-by: Peter Seiderer > +--- > + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp > +index 5303d37c..daceeb8b 100644 > +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp > ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp > +@@ -38,6 +38,7 @@ > + ****************************************************************************/ > + > + #include > ++#include > + #include > + > + #ifdef Q_OS_LINUX > +-- > +2.35.1 > + From arnout at mind.be Thu Mar 24 21:44:36 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:44:36 +0100 Subject: [Buildroot] [PATCH] package/unbound: use system libevent In-Reply-To: <20220317162530.427876-1-kyle@balena.io> References: <20220317162530.427876-1-kyle@balena.io> Message-ID: <898e1009-dbc1-9f4b-9cdf-ae3edfb1d299@mind.be> On 17/03/2022 17:25, Kyle Harding via buildroot wrote: > The file descriptor limit when using the builtin mini-event > cannot handle more than 1024 file descriptors. It was already the intention to use the system libevent, so I've extended the commit message to clarify that a bit. Applied to master, thanks. Regards, Arnout > > https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent > > Signed-off-by: Kyle Harding > --- > package/unbound/unbound.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk > index 1e6e0d99d7..782ed2b049 100644 > --- a/package/unbound/unbound.mk > +++ b/package/unbound/unbound.mk > @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ > --with-pidfile=/var/run/unbound.pid \ > --with-rootkey-file=/etc/unbound/root.key \ > --enable-tfo-server \ > + --with-libevent=$(STAGING_DIR)/usr \ > --with-libexpat=$(STAGING_DIR)/usr \ > --with-ssl=$(STAGING_DIR)/usr > From arnout at mind.be Thu Mar 24 21:46:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 24 Mar 2022 22:46:38 +0100 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 In-Reply-To: <20220316190545.3618918-1-james.hilliard1@gmail.com> References: <20220316190545.3618918-1-james.hilliard1@gmail.com> Message-ID: <97a25507-2a9c-4928-eb14-388693a3766b@mind.be> On 16/03/2022 20:05, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. As Peter said, a changelog would be nice (so Peter K. knows if it needs to be backported to the stable branches), but I've applied as-is anyway. Regards, Arnout > --- > 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz > +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 267b44e5f0..9735865eae 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.48 > +ELL_VERSION = 0.49 > ELL_SOURCE = ell-$(ELL_VERSION).tar.xz > ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell > ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:40:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:40:17 +0100 Subject: [Buildroot] [git commit] package/unbound: use system libevent Message-ID: <20220324213751.D8B1385C9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=929df7c483d19cf08badc36ef19a56735896b5d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Without explicit --with-libevent, it uses the builtin mini-event. Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 1e6e0d99d7..782ed2b049 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr From arnout at mind.be Thu Mar 24 21:40:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:40:17 +0100 Subject: [Buildroot] [git commit] package/ell: bump to version 0.49 Message-ID: <20220324213751.C38EA85C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7af2589a72db1764e2d889fbc6144b54e0f496a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 4bde1ab677..9affa390b8 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 9894943042a5d6165d3e5cc354f92274fb1304004d02b4bee682ab6067cdbbd5 ell-0.48.tar.xz +sha256 a7ff8ecbc76b187d942dd22b61cb489711400897c790319ffb7e944791687c3f ell-0.49.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 267b44e5f0..9735865eae 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.48 +ELL_VERSION = 0.49 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:40:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:40:17 +0100 Subject: [Buildroot] [git commit] package/iwd: bump to version 1.25 Message-ID: <20220324213751.CDE3D85C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0fc5bc235990073233df6352d1208624034a6b6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 1a58ec88e8..1c34aa0a90 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 61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 iwd-1.24.tar.xz +sha256 3f138e03301beb2afc7b385a62f56db17059137857ab579f269c4e441783e760 iwd-1.25.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 548b508edb..fc10c5f1d4 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.24 +IWD_VERSION = 1.25 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From arnout at mind.be Thu Mar 24 21:41:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:41:41 +0100 Subject: [Buildroot] [git commit] package/qt5base: fix eglconvenience compile (missing QList include) Message-ID: <20220324213751.ED03485C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68159373d1a1fcb542a1ad411141dc910b8e1d49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - add 0008-eglconvenience-add-missing-QList-include.patch to fix eglconvenience compile (missing QList include) Fixes: qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | ^ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-eglconvenience-add-missing-QList-include.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 0000000000..c7127291e4 --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + From arnout at mind.be Thu Mar 24 21:41:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Thu, 24 Mar 2022 22:41:12 +0100 Subject: [Buildroot] [git commit] package/qt5/qt5base: remove leftover patch Message-ID: <20220324213751.E35CF85C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3857bccca5e59dfe90fc5b5823bfe672a1847cd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: renumber patches 0007 and 0008] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...scv32.patch => 0006-Fix-build-on-riscv32.patch} | 0 ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 ---------------------- ...-configure.json-fix-atomicfptr-detection.patch} | 0 3 files changed, 37 deletions(-) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch similarity index 100% rename from package/qt5/qt5base/0007-Fix-build-on-riscv32.patch rename to package/qt5/qt5base/0006-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert L??hning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch similarity index 100% rename from package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch rename to package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch From peter at korsgaard.com Thu Mar 24 21:51:07 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 22:51:07 +0100 Subject: [Buildroot] [git commit branch/2021.11.x] Update for 2021.11.3 Message-ID: <20220324214238.D52D585CA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d30542dde748f4d3b04ac5d1a238c8280de611fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.11.x Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 29b7f2159a..72a4fabd37 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2021.11.3, released March 24th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, boinc, dbus, + directfb, docker-engine, exempi, expat, flac, gdb, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libvirt, libxml2, libxslt, lxc, mariadb, minidlna, + odb, openblas, openvpn, oprofile, php, pppd, python-ipython, + python-twisted, raptor, rpi-firmware, samba4, seatd, + timescaledb, usbguard, util-linux, vim, wavpack, + wireless-regdb, wireplumber, wireshark, wolfssl, xscreensaver, + xterm, zsh + + New packages: gdk-pixbuf-xlib + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.11.2, released February 28th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 09bf835b05..2493c8acfb 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.11.2 +export BR2_VERSION := 2021.11.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646080000 +BR2_VERSION_EPOCH = 1648158600 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 37981d7932..9101b8ea49 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.11.2' +RELEASE='2021.11.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Thu Mar 24 22:20:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 23:20:37 +0100 Subject: [Buildroot] Buildroot 2021.11.3 released, 2021.11.x now EOL Message-ID: <87lewzc7re.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.11.3 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.11.3.tar.gz or http://buildroot.org/downloads/buildroot-2021.11.3.tar.xz Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.11.3 is a bugfix release, fixing a number of important / security related issues discovered since the 2021.11.2 release. - Security fixes for apache, exempi, expat, flac, gnutls, go, libiec61850, libopenssl, libpjsip, libressl, libxml2, libxslt, mariadb, minidlna, openvpn, php, python-ipython, python-twisted, raptor, samba4, seatd, timescaledb, util-linux, vim, wavpack, wireshark, wolfssl, xterm, zsh - Fixes for download/compilation/runtime/license issues in azure-iot-sdk, boinc, dbus, directfb, docker-engine, gdb, gdk-pixbuf, haproxy, libcurl, libminiupnpc, libodb, libodb-boost, librsvg, libsrtp, libvirt, lxc, odb, openblas, oprofile, pppd, rpi-firmware, usbguard, wireless-regdb, wireplumber, xscreensaver For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.11.3 Users of the affected packages are strongly encouraged to upgrade. Notice that the 2021.11.x series is now END OF LIFE. Please migrate to the 2022.02.x series instead which will be supported until April 2023. Many thanks to all the people contributing to this release: git shortlog -sn 2021.11.2.. 39 Fabrice Fontaine 6 Bernd Kuhls 6 Peter Korsgaard 5 Thomas Petazzoni 3 Francois Perrad 3 Peter Seiderer 2 Julien Olivain 1 Adrian Perez de Castro 1 Andrei Gherghescu 1 Arnout Vandecappelle (Essensium/Mind) 1 Christian Stewart 1 John Keeping 1 Kamel Bouhara 1 Kris Bahnsen 1 Maxim Kochetkov 1 Romain Naour 1 Sassen, Rutger 1 Simon Doppler 1 TIAN Yuanhao 1 Th?o Lebrun 1 Yannick Brosseau -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Thu Mar 24 22:23:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Mar 2022 23:23:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls In-Reply-To: <2a0a7ee7-386c-6f47-df79-cde409cbfa4c@mind.be> References: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> <2a0a7ee7-386c-6f47-df79-cde409cbfa4c@mind.be> Message-ID: Le jeu. 24 mars 2022 ? 22:11, Arnout Vandecappelle a ?crit : > > > > On 15/03/2022 21:59, Fabrice Fontaine wrote: > > Fix the following build failure raised since bump to version 0.40.2 in > > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > > > > [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > > FAILED: src/librygel-core/RygelCore-2.6.typelib > > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > > Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > > error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > > > > Fixes: > > - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > > > > Signed-off-by: Fabrice Fontaine > > --- > > ...-meson.build-fix-g_ir_compiler-calls.patch | 84 +++++++++++++++++++ > > 1 file changed, 84 insertions(+) > > create mode 100644 package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > > > diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > new file mode 100644 > > index 0000000000..3961ad0564 > > --- /dev/null > > +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch > > @@ -0,0 +1,84 @@ > > +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 > > +From: Fabrice Fontaine > > +Date: Tue, 15 Mar 2022 19:20:33 +0100 > > +Subject: [PATCH] meson.build: fix g_ir_compiler calls > > + > > +Fix the following build failure when cross-compiling which is raised > > +because rygel is using a custom_target target instead of the standard > > +gnome.generate_gir: > > + > > +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > > +FAILED: src/librygel-core/RygelCore-2.6.typelib > > +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > > +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > > +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 > > + > > +Indeed, the custom_target command is unable to retrieve the correct > > +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls > > + > > +Fixes: > > + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > > + > > +Signed-off-by: Fabrice Fontaine > > +[Upstream status: probably not upstreamable] > > +--- > > + src/librygel-core/meson.build | 4 +++- > > + src/librygel-renderer-gst/meson.build | 1 + > > + src/librygel-renderer/meson.build | 1 + > > + src/librygel-server/meson.build | 1 + > > + 4 files changed, 6 insertions(+), 1 deletion(-) > > + > > +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build > > +index fd43bebe..e6be2b5e 100644 > > +--- a/src/librygel-core/meson.build > > ++++ b/src/librygel-core/meson.build > > +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', > > + # so we depend on the custom_target from that step and pass the input through > > + # commandline. > > + custom_target('RygelCore-2.6.typelib', > > +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > > ++ command: [g_ir_compiler, '--output', '@OUTPUT@', > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > I don't understand why this isn't needed for any other g-ir-compiler calls. It > can't be that rygel is the only package that has any GIR dependencies? To my knowledge, rygel is the only package that makes g-ir-compiler calls through the meson custom_target command. The other meson packages use the standard meson gnome.generate_gir which has been "fixed" by commit b094f88a4d501101bfba9b65491209e6a0fe0397. The autotools packages use Makefile.introspection which has been fixed by commit 8dda79970661090f202e1f20e5982ba53fdaeb95. > > If more packages need something like this, then we should probably create a > wrapper around g-ir-compiler that adds the --includedir automatically. > > [Adam in Cc as the GOI specialist - poor guy.] > > Anyway, for now, applied to master, thanks. > > Regards, > Arnout > > > > ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], > > + output: 'RygelCore-2.6.typelib', > > + depends: [ core_lib, core_gir ], > > + install: true, > > +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build > > +index ad98a3a7..e8baefe1 100644 > > +--- a/src/librygel-renderer-gst/meson.build > > ++++ b/src/librygel-renderer-gst/meson.build > > +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', > > + '--output', '@OUTPUT@', > > + '--includedir', core_girdir, > > + '--includedir', renderer_girdir, > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], > > + output: 'RygelRendererGst-2.6.typelib', > > + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], > > +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build > > +index 5f401527..821273ff 100644 > > +--- a/src/librygel-renderer/meson.build > > ++++ b/src/librygel-renderer/meson.build > > +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', > > + command: [g_ir_compiler, > > + '--output', '@OUTPUT@', > > + '--includedir', core_girdir, > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], > > + output: 'RygelRenderer-2.6.typelib', > > + depends: [ renderer_lib, renderer_gir, core_gir ], > > +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build > > +index a3bd77d9..6b084eb6 100644 > > +--- a/src/librygel-server/meson.build > > ++++ b/src/librygel-server/meson.build > > +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', > > + command: [g_ir_compiler, > > + '--output', '@OUTPUT@', > > + '--includedir', core_girdir, > > ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, > > + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], > > + output: 'RygelServer-2.6.typelib', > > + depends: [ server_lib, server_gir, core_gir ], > > +-- > > +2.35.1 > > + Best Regards, Fabrice From peter at korsgaard.com Thu Mar 24 22:31:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 23:31:52 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.11.3 Message-ID: <20220324222320.3328785CB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a7a2c761745357379d42ee907bd738ed2309db3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 3b7234b307..146a64d034 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

          News

            +
          • +
            +
            +
            +

            2021.11.3 released, 2021.11.x series EOL

            +

            24 March 2022

            +
            +
            +

            The 2021.11.3 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.11.2 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.11.3 release.

            + +

            Notice that the 2021.11.x series is now end of life. Please migrate to + the 2022.02 series instead which will be supported until April 2023.

            +
            +
            +
            • +
          • From peter at korsgaard.com Thu Mar 24 22:29:17 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 24 Mar 2022 23:29:17 +0100 Subject: [Buildroot] [git commit] Update for 2021.11.3 Message-ID: <20220324222320.226D385CB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c6b750201e27cfdf3e0ce23f0bd45b1c62f18c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit d30542dde748f4d3b04ac5d1a238c8280de611fb) [Peter: drop Makefile/Vagrantfile change] Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGES b/CHANGES index 59ae8f15ce..981c4c08ec 100644 --- a/CHANGES +++ b/CHANGES @@ -131,6 +131,29 @@ #14501: lttng-modules v2.11 package fails to build #14531: Package EFL - build error +2021.11.3, released March 24th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, boinc, dbus, + directfb, docker-engine, exempi, expat, flac, gdb, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libvirt, libxml2, libxslt, lxc, mariadb, minidlna, + odb, openblas, openvpn, oprofile, php, pppd, python-ipython, + python-twisted, raptor, rpi-firmware, samba4, seatd, + timescaledb, usbguard, util-linux, vim, wavpack, + wireless-regdb, wireplumber, wireshark, wolfssl, xscreensaver, + xterm, zsh + + New packages: gdk-pixbuf-xlib + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.11.2, released February 28th, 2022 Important / security related fixes. From fontaine.fabrice at gmail.com Thu Mar 24 22:32:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 24 Mar 2022 23:32:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy Message-ID: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Fix the following build failure if clang-tidy is found on host (and protobuf is built before protozero) which is raised since tests are disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: CMake Error at CMakeLists.txt:77 (add_dependencies): The dependency target "writer_tests" of target "clang-tidy" does not exist. Fixes: - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e Signed-off-by: Fabrice Fontaine --- ...xt-protobuf-is-only-needed-for-tests.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 0000000000..3033e24aa2 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + -- 2.35.1 From dpb at corrigendum.ru Thu Mar 24 22:28:16 2022 From: dpb at corrigendum.ru (=?UTF-8?B?0KDQvtC80LDQvSDQlNC+0L3Rh9C10L3QutC+?=) Date: Fri, 25 Mar 2022 01:28:16 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> Message-ID: <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Hi, 24.03.2022 23:37, Arnout Vandecappelle ?????: >> ? else >> ? $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) >> -$(2)_BASE_BUILD_CMD = -m build -n -w >> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py >> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) >> +# Use flit built in wheel builder for packages that are >> host-python-pypa-build dependencies. >> +# This is needed to avoid a circular with host-python-pypa-build and >> those dependencies. >> +# >> +$(2)_BASE_BUILD_CMD = $$(if \ >> +??????? $$(filter \ >> +??????????? host-python-flit-core host-python-installer >> host-python-pep517 host-python-tomli, \ >> +??????????? $(1)) \ >> +??????? , \ >> +??????? -m flit_core.wheel, \ >> +??????? -m build -n -w \ > > ?This is adding way too much complexity to the infra just to support > these four packages. I think there a a couple of better options: > > - don't use python infra at all for these packages; or > - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or > - add a fifth SETUP_TYPE "generic" or "custom" or something, which > requires $(2)_BASE_* to be set by the python-flit-core.mk; > - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set > HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or > - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which > only gets used by the problematic packages. > > > ?The latter two options have my preference because I think they are the > cleanest, but any of them is OK for me. The "generic" setup type and the > overridable _BASE_BUILD_CMD would also require an update in the manual. IMO, the simplest implementation would be: 1. For host-python-flit-core and host-python-installer, use host-generic-package and define the build and install commands manually. 2. For every other package whose SETUP_TYPE is "flit", have it depend on just host-python-flit-core and host-python-installer, and build with "python -m flit_core.wheel". In other words, don't use host-python-pypa-build. I don't think there are any advantages in using pypa-build over just running flit_core.wheel directly, and dropping it would reduce the number of packages that need special handling and simplify the dependency tree. >> diff --git a/package/python-flit-core/python-flit-core.mk >> b/package/python-flit-core/python-flit-core.mk >> index 0e058a1f17..d206a72f82 100644 >> --- a/package/python-flit-core/python-flit-core.mk >> +++ b/package/python-flit-core/python-flit-core.mk >> @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 >> ? PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz >> ? PYTHON_FLIT_CORE_SITE = >> https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 >> >> ? PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause >> -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 >> +PYTHON_FLIT_CORE_SETUP_TYPE = flit > > ?This means there's no package any more that uses pep517 setup type. Do > you think it's ever going to be used again? Or can we remove it altogether? I think python-setuptools could be a potential user of this, if python-pypa-build ever becomes buildable without setuptools (which it very well might). -Roman. From james.hilliard1 at gmail.com Thu Mar 24 22:37:15 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 16:37:15 -0600 Subject: [Buildroot] [PATCH v3 1/1] package/pkg-python: migrate flit to new bootstrapping sequence Message-ID: <20220324223715.1961461-1-james.hilliard1@gmail.com> There are a number of flit toolchain dependencies currently in the process of deprecating distutils based fallbacks. This will be needed in order to update tomli. We need to migrate these to use a new bootstrap based build+install sequence which relies on flit's bootstrap wheel build+install features to build and install host-python-pypa-build and host-python-installer which gives us a full pep517 toolchain. Note that one can run host-python-flit-core commands for building and installing itself since the package build directory is the cwd. We need to add a special flit-bootstrap SETUP_TYPE for dependencies of host-python-pypa-build and host-python-installer which can not use the normal flit SETUP_TYPE which would cause a circular dependency issue. We need to special case dependency exclusions for host-python-flit-core and host-python-installer to avoid circular dependencies in the flit-bootstrap SETUP_TYPE. We also need to special case the installation command for host-python-flit-core since it can not depend on host-python-installer due to host-python-installer requiring host-python-flit-core. Signed-off-by: James Hilliard Cc: "Yann E. MORIN" Cc: Arnout Vandecappelle --- Changes v2 -> v3: - add special flit-bootstrap SETUP_TYPE - don't change package SETUP_TYPE's yet Changes v1 -> v2: - formatting/cleanup - add comments --- package/pkg-python.mk | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..353bbada65 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -154,6 +154,9 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -203,7 +206,7 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif -else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +else ifneq ($$(filter flit flit-bootstrap pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) $(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) $(2)_BASE_BUILD_CMD = -m build -n -w @@ -211,9 +214,24 @@ $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $ $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +# Use flit built in wheel builder for packages that are flit-bootstrap packages. +# This is needed to avoid a circular with host-python-pypa-build and those dependencies. +# +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +$(2)_BASE_BUILD_CMD = -m flit_core.wheel +ifeq ($(1),host-python-flit-core) +# Use flit built in bootstrap_install for installing host-python-flit-core. +# This is due to host-python-installer depending on host-python-flit-core. +# +$(2)_BASE_INSTALL_CMD = -m bootstrap_install dist/* $$(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS) +else +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif +else $(2)_BASE_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif +endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif @@ -239,6 +257,12 @@ $(2)_DEPENDENCIES += host-python-pypa-build host-python-installer ifeq ($$($(2)_SETUP_TYPE),flit) $(2)_DEPENDENCIES += host-python-flit-core endif +else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifneq ($$(filter host-python-flit-core host-python-installer,$(1)),) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit-core,$(1)),,host-python-flit-core) +else +$(2)_DEPENDENCIES += host-python-flit-core host-python-installer +endif endif # SETUP_TYPE # Python interpreter to use for building the package. -- 2.25.1 From james.hilliard1 at gmail.com Thu Mar 24 22:47:20 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 16:47:20 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Message-ID: On Thu, Mar 24, 2022 at 4:28 PM ????? ???????? wrote: > > Hi, > > 24.03.2022 23:37, Arnout Vandecappelle ?????: > > >> else > >> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > >> -$(2)_BASE_BUILD_CMD = -m build -n -w > >> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py > >> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > >> +# Use flit built in wheel builder for packages that are > >> host-python-pypa-build dependencies. > >> +# This is needed to avoid a circular with host-python-pypa-build and > >> those dependencies. > >> +# > >> +$(2)_BASE_BUILD_CMD = $$(if \ > >> + $$(filter \ > >> + host-python-flit-core host-python-installer > >> host-python-pep517 host-python-tomli, \ > >> + $(1)) \ > >> + , \ > >> + -m flit_core.wheel, \ > >> + -m build -n -w \ > > > > This is adding way too much complexity to the infra just to support > > these four packages. I think there a a couple of better options: > > > > - don't use python infra at all for these packages; or > > - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or > > - add a fifth SETUP_TYPE "generic" or "custom" or something, which > > requires $(2)_BASE_* to be set by the python-flit-core.mk; > > - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set > > HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or > > - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which > > only gets used by the problematic packages. I added a flit-bootstrap SETUP_TYPE and isolated the special casing logic to that: https://patchwork.ozlabs.org/project/buildroot/patch/20220324223715.1961461-1-james.hilliard1 at gmail.com/ > > > > > > The latter two options have my preference because I think they are the > > cleanest, but any of them is OK for me. The "generic" setup type and the > > overridable _BASE_BUILD_CMD would also require an update in the manual. > > IMO, the simplest implementation would be: > > 1. For host-python-flit-core and host-python-installer, use > host-generic-package and define the build and install commands manually. This is more complex since we only need to special case a few things. > > 2. For every other package whose SETUP_TYPE is "flit", have it depend on > just host-python-flit-core and host-python-installer, and build with > "python -m flit_core.wheel". In other words, don't use > host-python-pypa-build. This is not recommended by upstream AFAIU, "python -m flit_core.wheel" is only supposed to be used for initial toolchain bootstrapping as it's not a generic pep517 build frontend. > > I don't think there are any advantages in using pypa-build over just > running flit_core.wheel directly, and dropping it would reduce the > number of packages that need special handling and simplify the > dependency tree. We will need a full pep517 build frontend anyways so this wouldn't simplify anything IMO. > > > >> diff --git a/package/python-flit-core/python-flit-core.mk > >> b/package/python-flit-core/python-flit-core.mk > >> index 0e058a1f17..d206a72f82 100644 > >> --- a/package/python-flit-core/python-flit-core.mk > >> +++ b/package/python-flit-core/python-flit-core.mk > >> @@ -8,6 +8,6 @@ PYTHON_FLIT_CORE_VERSION = 3.7.1 > >> PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz > >> PYTHON_FLIT_CORE_SITE = > >> https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481 > >> > >> PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause > >> -PYTHON_FLIT_CORE_SETUP_TYPE = pep517 > >> +PYTHON_FLIT_CORE_SETUP_TYPE = flit > > > > This means there's no package any more that uses pep517 setup type. Do > > you think it's ever going to be used again? Or can we remove it altogether? > > I think python-setuptools could be a potential user of this, if > python-pypa-build ever becomes buildable without setuptools (which it > very well might). >From my understanding upstream intends to migrate python-pypa-build to a flit based build in the future. At that point setuptools could itself use the generic pep517 SETUP_TYPE since it uses a local pep517 build backend. > > -Roman. From dpb at corrigendum.ru Thu Mar 24 23:32:49 2022 From: dpb at corrigendum.ru (=?UTF-8?B?0KDQvtC80LDQvSDQlNC+0L3Rh9C10L3QutC+?=) Date: Fri, 25 Mar 2022 02:32:49 +0300 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Message-ID: 25.03.2022 1:47, James Hilliard ?????: > On Thu, Mar 24, 2022 at 4:28 PM ????? ???????? wrote: >> >> Hi, >> >> 24.03.2022 23:37, Arnout Vandecappelle ?????: >> >>>> else >>>> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) >>>> -$(2)_BASE_BUILD_CMD = -m build -n -w >>>> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py >>>> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) >>>> +# Use flit built in wheel builder for packages that are >>>> host-python-pypa-build dependencies. >>>> +# This is needed to avoid a circular with host-python-pypa-build and >>>> those dependencies. >>>> +# >>>> +$(2)_BASE_BUILD_CMD = $$(if \ >>>> + $$(filter \ >>>> + host-python-flit-core host-python-installer >>>> host-python-pep517 host-python-tomli, \ >>>> + $(1)) \ >>>> + , \ >>>> + -m flit_core.wheel, \ >>>> + -m build -n -w \ >>> >>> This is adding way too much complexity to the infra just to support >>> these four packages. I think there a a couple of better options: >>> >>> - don't use python infra at all for these packages; or >>> - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or >>> - add a fifth SETUP_TYPE "generic" or "custom" or something, which >>> requires $(2)_BASE_* to be set by the python-flit-core.mk; >>> - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set >>> HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or >>> - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which >>> only gets used by the problematic packages. > > I added a flit-bootstrap SETUP_TYPE and isolated the special casing > logic to that: > https://patchwork.ozlabs.org/project/buildroot/patch/20220324223715.1961461-1-james.hilliard1 at gmail.com/ > >>> >>> >>> The latter two options have my preference because I think they are the >>> cleanest, but any of them is OK for me. The "generic" setup type and the >>> overridable _BASE_BUILD_CMD would also require an update in the manual. >> >> IMO, the simplest implementation would be: >> >> 1. For host-python-flit-core and host-python-installer, use >> host-generic-package and define the build and install commands manually. > > This is more complex since we only need to special case a few things. Is it really that complex, though? Admittedly, I'm not hugely familiar with buildroot, but I wrote a test version of the makefile for flit-core, and I just had to define PYTHON_FLIT_CORE_DEPENDENCIES (= host-python), HOST_PYTHON_FLIT_CORE_BUILD_CMDS and HOST_PYTHON_FLIT_CORE_INSTALL_CMDS. I think it's easier to understand that than to track all the special cases in pkg-python.mk. >> >> 2. For every other package whose SETUP_TYPE is "flit", have it depend on >> just host-python-flit-core and host-python-installer, and build with >> "python -m flit_core.wheel". In other words, don't use >> host-python-pypa-build. > > This is not recommended by upstream AFAIU, "python -m flit_core.wheel" is > only supposed to be used for initial toolchain bootstrapping as it's > not a generic > pep517 build frontend. Yes, but we don't need a generic build frontend. We already know that these packages use flit as the backend, and the build dependencies are installed by Buildroot, so the function of the frontend is reduced to just calling the backend - so you might as well remove the frontend and call the backend directly. Also, you can see that flit_core.wheel uses the same underlying code as Flit's PEP 517 backend, so I don't think there can be cases where the latter will work, but the former won't: https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/wheel.py#L235 https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/buildapi.py#L70 > >> >> I don't think there are any advantages in using pypa-build over just >> running flit_core.wheel directly, and dropping it would reduce the >> number of packages that need special handling and simplify the >> dependency tree. > > We will need a full pep517 build frontend anyways so this wouldn't simplify > anything IMO. The simplification is in not having two different flit-based SETUP_TYPEs. -Roman. From neal.frager at amd.com Thu Mar 24 12:31:17 2022 From: neal.frager at amd.com (Neal Frager) Date: Thu, 24 Mar 2022 06:31:17 -0600 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https Message-ID: <20220324123117.2369981-1-neal.frager@amd.com> This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// The git:// location is no longer supported. For more details: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Neal Frager --- V1->V2: -separated DEVELOPERS file update to make stand alone patch --- configs/zynqmp_zcu102_defconfig | 4 ++-- configs/zynqmp_zcu106_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" -- 2.17.1 From james.hilliard1 at gmail.com Fri Mar 25 00:18:40 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 24 Mar 2022 18:18:40 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python: migrate flit to new bootstrapping sequence In-Reply-To: References: <20220313175615.406390-1-james.hilliard1@gmail.com> <5313758f-f64d-f9f8-cdf2-3ca2ab426c7e@mind.be> <87bd50d3-72e9-2211-b53f-4046381e7419@corrigendum.ru> Message-ID: On Thu, Mar 24, 2022 at 5:32 PM ????? ???????? wrote: > > > > 25.03.2022 1:47, James Hilliard ?????: > > On Thu, Mar 24, 2022 at 4:28 PM ????? ???????? wrote: > >> > >> Hi, > >> > >> 24.03.2022 23:37, Arnout Vandecappelle ?????: > >> > >>>> else > >>>> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) > >>>> -$(2)_BASE_BUILD_CMD = -m build -n -w > >>>> -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py > >>>> dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) > >>>> +# Use flit built in wheel builder for packages that are > >>>> host-python-pypa-build dependencies. > >>>> +# This is needed to avoid a circular with host-python-pypa-build and > >>>> those dependencies. > >>>> +# > >>>> +$(2)_BASE_BUILD_CMD = $$(if \ > >>>> + $$(filter \ > >>>> + host-python-flit-core host-python-installer > >>>> host-python-pep517 host-python-tomli, \ > >>>> + $(1)) \ > >>>> + , \ > >>>> + -m flit_core.wheel, \ > >>>> + -m build -n -w \ > >>> > >>> This is adding way too much complexity to the infra just to support > >>> these four packages. I think there a a couple of better options: > >>> > >>> - don't use python infra at all for these packages; or > >>> - set HOST_PYTHON_FLIT_CORE_BUILD_CMDS etc. in python-flit-core.mk; or > >>> - add a fifth SETUP_TYPE "generic" or "custom" or something, which > >>> requires $(2)_BASE_* to be set by the python-flit-core.mk; > >>> - in the infra change it to $(2)_BASE_BUILD_CMD ?=, set > >>> HOST_PYTHON_FLIT_CORE_BASE_BUILD_CMD in python-flit-core.mk; or > >>> - add a fifth SETUP_TYPE "flit-bootstrap" or something like that which > >>> only gets used by the problematic packages. > > > > I added a flit-bootstrap SETUP_TYPE and isolated the special casing > > logic to that: > > https://patchwork.ozlabs.org/project/buildroot/patch/20220324223715.1961461-1-james.hilliard1 at gmail.com/ > > > >>> > >>> > >>> The latter two options have my preference because I think they are the > >>> cleanest, but any of them is OK for me. The "generic" setup type and the > >>> overridable _BASE_BUILD_CMD would also require an update in the manual. > >> > >> IMO, the simplest implementation would be: > >> > >> 1. For host-python-flit-core and host-python-installer, use > >> host-generic-package and define the build and install commands manually. > > > > This is more complex since we only need to special case a few things. > > Is it really that complex, though? Admittedly, I'm not hugely familiar > with buildroot, but I wrote a test version of the makefile for > flit-core, and I just had to define PYTHON_FLIT_CORE_DEPENDENCIES (= > host-python), HOST_PYTHON_FLIT_CORE_BUILD_CMDS and > HOST_PYTHON_FLIT_CORE_INSTALL_CMDS. > I think it's easier to understand that than to track all the special > cases in pkg-python.mk. It's harder to maintain IMO since you'd then have to manually sync generic fixes in pkg-python.mk with multiple package makefiles. There's really not that much special casing needed in pkg-python.mk IMO and it's easier to do there since the special casing needs to apply to a few packages. > > >> > >> 2. For every other package whose SETUP_TYPE is "flit", have it depend on > >> just host-python-flit-core and host-python-installer, and build with > >> "python -m flit_core.wheel". In other words, don't use > >> host-python-pypa-build. > > > > This is not recommended by upstream AFAIU, "python -m flit_core.wheel" is > > only supposed to be used for initial toolchain bootstrapping as it's > > not a generic > > pep517 build frontend. > > Yes, but we don't need a generic build frontend. We already know that > these packages use flit as the backend, and the build dependencies are > installed by Buildroot, so the function of the frontend is reduced to > just calling the backend - so you might as well remove the frontend and > call the backend directly. Setuptools for example would be a non-flit pep517 package. The goal here is not just to provide flit support but rather to bring up the necessary infrastructure for installing different types of pep517 packages that may use different pep517 backends. > > Also, you can see that flit_core.wheel uses the same underlying code as > Flit's PEP 517 backend, so I don't think there can be cases where the > latter will work, but the former won't: > > https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/wheel.py#L235 > https://github.com/pypa/flit/blob/3.7.1/flit_core/flit_core/buildapi.py#L70 The main issue is that flit_core.wheel isn't a generic pep517 frontend and it's recommended to move to pypa-build once bootstrapped: https://github.com/pypa/flit/blob/3.7.1/doc/bootstrap.rst I'm also wary of using the python -m flit_core.wheel bootstrapping frontend for packages that aren't needed for bootstrapping as it's unlikely to be tested much in general compared with a full pep517 frontend like pypa-build. > > > > >> > >> I don't think there are any advantages in using pypa-build over just > >> running flit_core.wheel directly, and dropping it would reduce the > >> number of packages that need special handling and simplify the > >> dependency tree. > > > > We will need a full pep517 build frontend anyways so this wouldn't simplify > > anything IMO. > > The simplification is in not having two different flit-based SETUP_TYPEs. I mean, I'm trying to share the pypa-build frontend across all pep517 based package builds other than those where it's not possible, bringing up build here will simplify adding support for non-flit pep517 based packages down the line as we will already have a functional generic pep517 build frontend then. The regular flit SETUP_TYPE is basically identical to the pep517 SETUP_TYPE except that it has a host-python-flit-core dependency so there's very little extra code actually needed for the non-bootstrap flit SETUP_TYPE. > > -Roman. From fido_max at inbox.ru Fri Mar 25 05:38:37 2022 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Fri, 25 Mar 2022 08:38:37 +0300 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy In-Reply-To: <20220324223218.27767-1-fontaine.fabrice@gmail.com> References: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Message-ID: <944e8eb8-c4a6-f009-00a9-8b273b947cef@inbox.ru> On 25.03.2022 01:32, Fabrice Fontaine wrote: > Fix the following build failure if clang-tidy is found on host (and > protobuf is built before protozero) which is raised since tests are > disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: > > CMake Error at CMakeLists.txt:77 (add_dependencies): > The dependency target "writer_tests" of target "clang-tidy" does not exist. > > Fixes: > - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e > > Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov From etienne.carriere at linaro.org Fri Mar 25 10:17:00 2022 From: etienne.carriere at linaro.org (Etienne Carriere) Date: Fri, 25 Mar 2022 11:17:00 +0100 Subject: [Buildroot] [PATCH] boot/optee-os: fix version choice In-Reply-To: <20220319094939.1588302-1-yann.morin.1998@free.fr> References: <20220319094939.1588302-1-yann.morin.1998@free.fr> Message-ID: Hello Yann, On Sat, 19 Mar 2022 at 10:49, Yann E. MORIN wrote: > > Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to > propagate the rustc arch dependency from the new version, to the default > clause of the choice. > > This leaves only the custom git tree as a posible source for building nit: s/posible/possible/ > OP-TEE OS in case the host can't have a rustc compiler. > > Signed-off-by: Yann E. MORIN > Reported-by: Thomas Petazzoni > Cc: Cl?ment L?ger > Cc: Etienne Carriere > --- > boot/optee-os/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 18e1efee55..30b6f62434 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS > > choice > prompt "OP-TEE OS version" > - default BR2_TARGET_OPTEE_OS_LATEST > + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > help > Select the version of OP-TEE OS you want to use LGTM. Acked-by: Etienne Carriere br, etienne > > -- > 2.25.1 > From peter at korsgaard.com Fri Mar 25 11:08:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 12:08:14 +0100 Subject: [Buildroot] [git commit branch/2021.02.x] Update for 2021.02.11 Message-ID: <20220325105935.ED86B85CC8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a78c830a49b19425de5d1df407c2ba8c302cb7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Peter Korsgaard --- CHANGES | 24 ++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ee01f12a3c..c9822cdf80 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,27 @@ +2021.02.11, released March 25th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, dbus, + directfb, docker-engine, exempi, expat, flac, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libxml2, libxslt, lxc, mariadb, odbm openblas, + openvpn, oprofile, php, pppd, python-ipython, python-treq, + python-twisted, python-txbus, python-txtorcon, raptor, + rpi-firmware, samba4, timescaledb, util-linux, vim, wavpack, + wireless-regdb, wireshark, wolfssl, xscreensaver, xterm, zsh + + New packages: gdk-pixbuf-xlib + + Removed packages: python-coherence + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.02.10, released February 28th, 2022 Important / security related fixes. diff --git a/Makefile b/Makefile index 9dc0a8673c..a3c5802d55 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.10 +export BR2_VERSION := 2021.02.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646081600 +BR2_VERSION_EPOCH = 1648206000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 85aa167efc..7e97a277ea 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.10' +RELEASE='2021.02.11' ### Change here for more memory/cores ### VM_MEMORY=2048 From peter at korsgaard.com Fri Mar 25 13:02:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 14:02:16 +0100 Subject: [Buildroot] Buildroot 2021.02.11 released Message-ID: <87fsn6chif.fsf@dell.be.48ers.dk> Hi, Buildroot is a simple tool for creating complete embedded Linux systems (http://buildroot.org). Buildroot 2021.02.11 is released - Go download it at: http://buildroot.org/downloads/buildroot-2021.02.11.tar.gz or http://buildroot.org/downloads/buildroot-2021.02.11.tar.bz2 Or get it from Git: git://git.buildroot.org/buildroot Buildroot 2021.02.11 is a bugfix release on the current long term release, fixing a number of important / security related issues discovered since the 2021.02.10 release. - Security fixes for apache, exempi, expat, flac, gnutls, go, libiec61850, libopenssl, libpjsip, libressl, libxml2, libxslt, mariadb, minidlna, openvpn, php, python-ipython, python-twisted, raptor, samba4, timescaledb, util-linux, vim, wavpack, wireshark, wolfssl, xterm, zsh - Fixes for download/compilation/runtime/license issues in azure-iot-sdk-c, dbus, directfb, docker-engine, gdk-pixbuf, haproxy, libcurl, libminiupnpc, libodb, libodb-boost, librsvg, libsrtp, lxc, odb, openblas, oprofile, pppd, python-treq, python-txdbus, python-txtorcon, rpi-firmware, wireless-regdb, xscreensaver, - Removed packages: python-coherence For more details, see the CHANGES file: https://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02.11 Users of the affected packages are strongly encouraged to upgrade. Many thanks to all the people contributing to this release: git shortlog -sn 2021.02.10.. 33 Fabrice Fontaine 15 Peter Korsgaard 7 Bernd Kuhls 6 Maxim Kochetkov 5 Francois Perrad 5 Thomas Petazzoni 4 Peter Seiderer 2 Adam Duskett 2 Julien Olivain 2 Romain Naour 1 Andrei Gherghescu 1 Arnout Vandecappelle (Essensium/Mind) 1 Kamel Bouhara 1 Kris Bahnsen 1 Sassen, Rutger 1 Simon Doppler 1 TIAN Yuanhao 1 Th?o Lebrun 1 Yannick Brosseau -- Bye, Peter Korsgaard From peter at korsgaard.com Fri Mar 25 13:14:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 14:14:31 +0100 Subject: [Buildroot] [git commit] Update for 2021.02.11 Message-ID: <20220325130832.5A4F085D2D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7935ca44508a605a5bce73d4ad63cd7c18450c70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard (cherry picked from commit 6a78c830a49b19425de5d1df407c2ba8c302cb7a) [Peter: drop Makefile/Vagrantfile change] Signed-off-by: Peter Korsgaard --- CHANGES | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGES b/CHANGES index 981c4c08ec..370f89aa6f 100644 --- a/CHANGES +++ b/CHANGES @@ -803,6 +803,30 @@ #13751: libopenssl (static): huge drop in performance in newer .. #13771: package htop has undeclared dependency on host python +2021.02.11, released March 25th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, dbus, + directfb, docker-engine, exempi, expat, flac, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libxml2, libxslt, lxc, mariadb, odbm openblas, + openvpn, oprofile, php, pppd, python-ipython, python-treq, + python-twisted, python-txbus, python-txtorcon, raptor, + rpi-firmware, samba4, timescaledb, util-linux, vim, wavpack, + wireless-regdb, wireshark, wolfssl, xscreensaver, xterm, zsh + + New packages: gdk-pixbuf-xlib + + Removed packages: python-coherence + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.02.10, released February 28th, 2022 Important / security related fixes. From peter at korsgaard.com Fri Mar 25 13:17:04 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 14:17:04 +0100 Subject: [Buildroot] [git commit] docs/website: update for 2021.02.11 Message-ID: <20220325130832.6BA7685D30@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16008ee1c01c80c5b802e66acd139c6705d901f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- docs/website/news.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 146a64d034..4e153aebb0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

            News

              +
            • +
              +
              +
              +

              2021.02.11 released

              +

              25 March 2022

              +
              +
              +

              The 2021.02.11 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.02.10 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.02.11 release.

              +
              +
              +
              • +
            • From peter at korsgaard.com Fri Mar 25 16:43:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 17:43:59 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220325163503.E4EBC85D3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=607c5986a9b3bde0cacdbe38eeaea2ab456a6e80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f21beb4222..f25b662aa5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.30" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 976f1d07c0..87a0f0465b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 cca7d6e053e33f44af1b39f7becec73a387911d81ede5a84ecf671692533138f linux-5.16.16.tar.xz +sha256 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132 linux-5.15.30.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831..479f64b72e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -381,13 +381,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 + default "5.15.30" if BR2_KERNEL_HEADERS_5_15 + default "5.16.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Fri Mar 25 16:44:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Fri, 25 Mar 2022 17:44:10 +0100 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series In-Reply-To: <20220322082939.2153092-1-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 22 Mar 2022 09:29:38 +0100") References: <20220322082939.2153092-1-peter@korsgaard.com> Message-ID: <87bkxuc78l.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.4.x is now EOL, so no more updates for that series. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From ps.report at gmx.net Fri Mar 25 19:09:34 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 25 Mar 2022 20:09:34 +0100 Subject: [Buildroot] [PATCH v1] package/wireshark: fix compile with ccache enabled Message-ID: <20220325190934.24982-1-ps.report@gmx.net> - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73..1a549f7037 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:05:54 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:05:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/iwd: fix uclibc build Message-ID: <20220325210554.526198-1-fontaine.fabrice@gmail.com> Fix the following uclibc build failure raised since bump to version 1.25 in commit 0fc5bc235990073233df6352d1208624034a6b6e and https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=01cd8587606bf2da1af245163150589834126c1: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' Fixes: - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 Signed-off-by: Fabrice Fontaine --- ...-src-storage.c-fix-build-with-uclibc.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch diff --git a/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch new file mode 100644 index 0000000000..55fdaa86fd --- /dev/null +++ b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch @@ -0,0 +1,37 @@ +From 99e74ade2ea892e6d0b070bec1df6a135ce2c8b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Mar 2022 16:35:49 +0100 +Subject: [PATCH] src/storage.c: fix build with uclibc + +explicit_bzero is used in src/storage.c since commit +01cd8587606bf2da1af245163150589834126c1c but src/missing.h is not +included, as a result build with uclibc fails on: + +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': +storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' + +Fixes: + - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/WB2XXRBUDHC5IVFDEOJBK23JHPURL427] +--- + src/storage.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/storage.c b/src/storage.c +index 82a72443..aa8066b1 100644 +--- a/src/storage.c ++++ b/src/storage.c +@@ -44,6 +44,7 @@ + #include + #include "ell/useful.h" + ++#include "src/missing.h" + #include "src/common.h" + #include "src/storage.h" + #include "src/crypto.h" +-- +2.35.1 + -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:17:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:17:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/atk: bump to version 2.38.0 Message-ID: <20220325211725.612796-1-fontaine.fabrice@gmail.com> https://gitlab.gnome.org/GNOME/atk/-/tags/2.38.0 Signed-off-by: Fabrice Fontaine --- package/atk/atk.hash | 4 ++-- package/atk/atk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 2e7c3b5fec..d8cd69ff1f 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz # Hash for license file sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index dfeb4de8b2..2820fb486d 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.36 +ATK_VERSION_MAJOR = 2.38 ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) -- 2.35.1 From james.hilliard1 at gmail.com Fri Mar 25 21:24:05 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 25 Mar 2022 15:24:05 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 Message-ID: <20220325212405.25243-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index d909709b24..8389adb243 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 4615e839fe..e9c3145183 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.3 +MESON_VERSION = 0.61.4 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:28:52 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:28:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: bump to version 8.2.2 Message-ID: <20220325212852.713531-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://frrouting.org/release/8.2.2 Signed-off-by: Fabrice Fontaine --- ...001-configure.ac-fix-enable_bmp-typo.patch | 29 ----------------- ...-lib-fix-elf_py-TLS-section-handling.patch | 31 ------------------- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 4 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 package/frr/0001-configure.ac-fix-enable_bmp-typo.patch delete mode 100644 package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch deleted file mode 100644 index c8ce500dfc..0000000000 --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 16 Dec 2021 20:10:26 +0100 -Subject: [PATCH] configure.ac: fix enable_bmp typo - -enable_bmp doesn't exist, use enable_bgp_bmp - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FRRouting/frr/pull/10236] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1bcc42ef8..c7a5f1286 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then - fi - - bgpd_bmp=false --case "${enable_bmp}" in -+case "${enable_bgp_bmp}" in - no) - ;; - yes) --- -2.33.0 - diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch deleted file mode 100644 index d491cb1a7d..0000000000 --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Wed, 10 Nov 2021 15:30:07 +0100 -Subject: [PATCH] lib: fix elf_py TLS section handling - -... need to ignore TLS sections, their address is effectively -meaningless but can overlap other sections we actually need to access. - -Signed-off-by: David Lamparter - -[Retrieved from: -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] -Signed-off-by: Fabrice Fontaine ---- - lib/elf_py.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/elf_py.c b/lib/elf_py.c -index 1c306893ad8..f230add6957 100644 ---- a/lib/elf_py.c -+++ b/lib/elf_py.c -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) - Elf_Scn *scn = elf_getscn(ef->elf, i); - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); - -+ /* virtual address is kinda meaningless for TLS sections */ -+ if (shdr->sh_flags & SHF_TLS) -+ continue; - if (addr < shdr->sh_addr || - addr >= shdr->sh_addr + shdr->sh_size) - continue; diff --git a/package/frr/frr.hash b/package/frr/frr.hash index bb6c32b7bb..9bb2b75b8f 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz +sha256 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f frr-8.2.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 0e6ab7a815..aa36387a3a 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.1 +FRR_VERSION = 8.2.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING -- 2.35.1 From fontaine.fabrice at gmail.com Fri Mar 25 21:35:57 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 25 Mar 2022 22:35:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump to version 5.16.2 Message-ID: <20220325213557.757894-1-fontaine.fabrice@gmail.com> Drop patches (already in version) https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES Signed-off-by: Fabrice Fontaine --- ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ---------------- ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 ------------------- ...ocal-definition-for-alignment-macros.patch | 46 ----------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 5 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch delete mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch delete mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch deleted file mode 100644 index b6c1a42456..0000000000 --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 30 Dec 2021 15:23:59 +0200 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Signed-off-by: Bruce Ashfield -[remove invalid OE Upstream-status] -Signed-off-by: Stijn Tintel -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6c..2503d1afa 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch deleted file mode 100644 index 7473fe67cb..0000000000 --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 Jan 2022 22:44:44 +0100 -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl - -Make inclusion of sys/sysinfo.h conditional to avoid the following build -failure on musl: - -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from ./kerncompat.h:31, - from common/utils.c:42: -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - 7 | struct sysinfo { - | ^~~~~~~ -In file included from common/utils.c:27: -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - 10 | struct sysinfo { - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc - -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, -while both must not be included at the same time. Stop including -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and -causes the double definition for some reason. As we now include -linux/const.h directly, there's no other effective change. - -Pull-request: #433 -Signed-off-by: Fabrice Fontaine -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] ---- - kerncompat.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 2503d1afa..6ca1526e2 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch deleted file mode 100644 index 86c63edc30..0000000000 --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 6ca1526e2..f0a6e196e 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - { diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 339eab02aa..14eeb1ca07 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 54922df839..9bf50ccfda 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.15.1 +BTRFS_PROGS_VERSION = 5.16.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib -- 2.35.1 From thomas.petazzoni at bootlin.com Sat Mar 26 07:15:10 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 26 Mar 2022 07:15:10 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-25 Message-ID: <20220326071514.7303C60C01@smtp3.osuosl.org> Hello, Autobuild statistics for 2022-03-25 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 46 | 7 | 1 | 54 | 2022.02.x | 13 | 4 | 0 | 17 | master | 64 | 27 | 0 | 91 | Classification of failures by reason for master ----------------------------------------------- pango-1.50.5 | 8 dhcp-4.4.2-P1 | 5 unknown | 3 mongodb-4.2.18 | 2 wavemon-0.9.4 | 2 exempi-2.6.1 | 1 host-delve-1.8.0 | 1 host-pango-1.50.5 | 1 iwd-1.25 | 1 liquid-dsp-1.4.0 | 1 mesa3d-21.3.8 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/230dc26c61f4a29cc755248285f7f938916f7649 | ORPH arc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/86a0c2ab55fc2404b77107c403767b12042eced8 | ORPH s390x | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/e4df4f72e3782b712528fab4f33c0f48fc8c50e4 | ORPH arm | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/4d06e811ca90d48772a01cb83f172a1c5b7c9cfc | ORPH microblazeel | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/f9d3525e4cb3706b94317e747c70741a38051fb7 | ORPH arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/26e51513bbbf43b949da227d97ad1ad290c6a303 | arm | host-delve-1.8.0 | NOK | http://autobuild.buildroot.net/results/b59458266d09a1a1e6c82428cb48170cc0c95828 | arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/54369fff25c34e4fc01ba99943fac0b4520c93ed | ORPH powerpc | iwd-1.25 | NOK | http://autobuild.buildroot.net/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 | arm | liquid-dsp-1.4.0 | NOK | http://autobuild.buildroot.net/results/881826b4b6c141e59a0da2d7d1ad55d3709fdb95 | mips | mesa3d-21.3.8 | NOK | http://autobuild.buildroot.net/results/9b50c992567cc5d46dadb42ed5a72d27cd019388 | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/c23bb2884dfb54ec29db151bd8d6d3183de035ab | x86_64 | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/1211fe407e413742813c94dc2a7738ce5fd04735 | arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/1cc8efe0895137828693f3059c22c139ff5295eb | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/f52f6b3ed62d8a8e43b7db2c5b36c585e94adeea | ORPH powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/b18da16d29022eb27549d9aa431790259ae589d8 | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/127875183c97e7bf70515eb1f3d2c0506200e149 | ORPH sparc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/3ff6bb98beecb72ef405563fa5341da2f140d57a | ORPH i586 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/85e2aa2c8e2e490ce613da58b02ab7e8e7b0305c | ORPH s390x | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/4acc36c6dc50a009bedd184cdf0343e375308dd6 | ORPH powerpc | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/1a78659b9f975913902c0a0d3bfc6467c9d2b0b4 | ORPH i686 | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/89dd546426d045c42814b0378949d958e7b1a6df | m68k | unknown | NOK | http://autobuild.buildroot.net/results/a3f177a4e5cd93d188ae14b0cf0fa8bfaabb8474 | nios2 | unknown | NOK | http://autobuild.buildroot.net/results/d4f4e03841ae902b59a13e849ba0b679959be2f9 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/774ae837717eb4bfc333877b66fae4a207b31a06 | aarch64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/d8fe28ad85df5415f15409285e601c39c36f557a | i686 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/1102aa675d4b959c590f95439a9c20c253d273af | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 3 glib-networking-2.66.0 | 1 host-nodejs-12.22.9 | 1 hwloc-1.11.13 | 1 python-lxml | 1 rocksdb-6.13.3 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | glib-networking-2.66.0 | NOK | http://autobuild.buildroot.net/results/ea89da41f8ac6d77775e3ae1dd52228eb682e5ff | ORPH arm | host-nodejs-12.22.9 | NOK | http://autobuild.buildroot.net/results/0f24e44353f34fea25644d97d7bc586bb386d884 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/5c235348081cf917ab8b942f62bf3950ad66c105 | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c644605b7356269da97156577d5f0bc4a474f0fd | s390x | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/6079f06f494d970d8cdac4b7d3e7034a32738dc4 | microblazeel | hwloc-1.11.13 | NOK | http://autobuild.buildroot.net/results/ddc57a897ed3b4c69c5a25dc18cb4f2fb6b82bdf | m68k | python-lxml | TIM | http://autobuild.buildroot.net/results/78c501c1499c7f093910dce4c5ddc793d0d4cb2b | powerpc | rocksdb-6.13.3 | NOK | http://autobuild.buildroot.net/results/86cc0dca02deb81354568f998b52f61f51059490 | Classification of failures by reason for 2022.02.x -------------------------------------------------- bind-9.16.26 | 1 bluez5_utils-5.63 | 1 dhcp-4.4.2-P1 | 1 exempi-2.6.1 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- nds32le | bind-9.16.26 | NOK | http://autobuild.buildroot.net/results/36293589d7bafdf29d542489240145a7a36eaa59 | ORPH arm | bluez5_utils-5.63 | NOK | http://autobuild.buildroot.net/results/4aa68100c0becc4b0344fa5b5e8c39d6c784b120 | riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/4b036e9e687490ff78383ceff4e59a6b108199e4 | ORPH arm | exempi-2.6.1 | NOK | http://autobuild.buildroot.net/results/c5544a44e85fcbec25a2f45d9d175110a22bed2b | Gitlab CI results for 2022-03-25 ================================ Detail of runtime-test failures for 2021.11.3 --------------------------------------------- runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestLuajitLuaExpat | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566655 | ORPH TestLxc | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566682 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566765 | ORPH TestPythonPy3Libftdi1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566610 | ORPH TestPythonPy3Treq | https://gitlab.com/buildroot.org/buildroot/-/jobs/2249566855 | ORPH Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ amarula_a64_relic | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853884 | andes_ae350_45 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853897 | bananapi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853955 | bananapi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853957 | bananapi_m2_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853958 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853962 | csky_gx6605s | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243853985 | freescale_imx6ullevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854014 | freescale_imx8qxpmek | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854039 | friendlyarm_nanopi_m1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854059 | ORPH friendlyarm_nanopi_m1_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854065 | ORPH friendlyarm_nanopi_neo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854082 | friendlyarm_nanopi_neo_plus2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854084 | friendlyarm_nanopi_r1 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854086 | galileo | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854091 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854146 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854148 | licheepi_zero | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854164 | minnowboard_max-graphical | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854190 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854335 | orangepi_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854355 | ORPH orangepi_win | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854370 | qemu_s390x | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854482 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854507 | snps_archs38_axs103 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854538 | zynqmp_zcu102 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854592 | zynqmp_zcu106 | https://gitlab.com/buildroot.org/buildroot/-/jobs/2243854593 | -- http://autobuild.buildroot.net From bernd.kuhls at t-online.de Sat Mar 26 14:20:07 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 26 Mar 2022 15:20:07 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/intel-mediasdk: bump version to 22.3.0 In-Reply-To: <20220326142007.864294-1-bernd.kuhls@t-online.de> References: <20220326142007.864294-1-bernd.kuhls@t-online.de> Message-ID: <20220326142007.864294-3-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- v2: no changes package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d9acf49637..802131a772 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz +sha256 e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 intel-mediasdk-22.3.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 698d2348b2..b90d252b4f 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.2 +INTEL_MEDIASDK_VERSION = 22.3.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE -- 2.30.2 From bernd.kuhls at t-online.de Sat Mar 26 14:20:05 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 26 Mar 2022 15:20:05 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/intel-mediadriver: bump version to 22.3.0 Message-ID: <20220326142007.864294-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- v2: no changes package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 044b9d7013..57499830b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 84eda811ae..c22aeecc77 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_VERSION = 22.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.30.2 From bernd.kuhls at t-online.de Sat Mar 26 14:20:06 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Sat, 26 Mar 2022 15:20:06 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/intel-gmmlib: bump version to 22.1.2 In-Reply-To: <20220326142007.864294-1-bernd.kuhls@t-online.de> References: <20220326142007.864294-1-bernd.kuhls@t-online.de> Message-ID: <20220326142007.864294-2-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- v2: bump version to 22.1.2 package/intel-gmmlib/0001-Drop-hardening-related-flags.patch | 2 +- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch index 581afd9066..c429df6581 100644 --- a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch +++ b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch @@ -15,7 +15,7 @@ diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake index 1a09bc4..b28fc1b 100644 --- a/Source/GmmLib/Linux.cmake +++ b/Source/GmmLib/Linux.cmake -@@ -62,7 +62,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON +@@ -99,7 +99,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON -DUSE_SSE3 -DUSE_SSSE3 # Other common flags diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index beb3cfd6ae..5e48238448 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz +sha256 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334 intel-gmmlib-22.1.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 06628132a2..25cc733e0c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.3 +INTEL_GMMLIB_VERSION = 22.1.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md -- 2.30.2 From snathicktechno at gmail.com Sat Mar 26 16:52:13 2022 From: snathicktechno at gmail.com (snathick) Date: Sat, 26 Mar 2022 09:52:13 -0700 Subject: [Buildroot] Python package integration In-Reply-To: References: <4470C393-DAE8-4385-A817-9895CF2CFECC@0leil.net> Message-ID: Hi, I am working with integrating below package to buildroot https://github.com/richteel/TeelSys_Python_SHT locally computed sha256 and .hash as follows sha256 d62efb2207390e623cf7c6067606f300a68cb2d0a448c93368302d3fa0d50b87 python-sht21-84398b3267158d15e2322878294c0d7e0e6fa78d.tar.gz sha256 5979e787d347e88357e5e8d70c446e9b082c40c32014ec632942aaed0a218e73 LICENSE when building error with hash mismatch ERROR: python-sht21-84398b3267158d15e2322878294c0d7e0e6fa78d.tar.gz has wrong sha256 hash ERROR: expected: d62efb2207390e623cf7c6067606f300a68cb2d0a448c93368302d3fa0d50b87 ERROR: got : 88696f8d6961cda3c52676607dde37ae7825ab0567364dc4a0162d964ad6266e ERROR: Incomplete download, or man-in-the-middle (MITM) attack hash generated was perfect, but how it got generated hash 88696f8d6961cda3c52676607dde37ae7825ab0567364dc4a0162d964ad6266e not understanding Any suggestions to resolve this issue? Thanks, Snathick On Thu, Mar 24, 2022 at 1:35 PM snathick wrote: > Hi quentin, > > Thanks for the response and suggestions. > > As per your suggestion modified .mk as follows > > ################################################################################ > # > # python-sht21 > # > > ################################################################################ > > PYTHON_SHT21_SITE = $(call > github,richteel,TeelSys_Python_SHT,84398b3267158d15e2322878294c0d7e0e6fa78d)) > PYTHON_SHT21_LICENSE = MIT > PYTHON_SHT21_LICENSE_FILES = LICENSE > PYTHON_SHT21_SETUP_TYPE = setuptools > > $(eval $(python-package)) > > observed that package is not downloading make is failing informing that > output/build/python-sht21 no setup.py is present > > Any suggestions > > > On Thu, Mar 24, 2022 at 12:08 PM Quentin Schulz > wrote: > >> Hi, >> >> On March 24, 2022 5:49:46 AM GMT+01:00, snathick < >> snathicktechno at gmail.com> wrote: >> >Hi, >> > >> >I am trying to add the below python package to buildroot >> > >> >https://github.com/richteel/TeelSys_Python_SHT >> > >> > >> >.mk file as follows >> > >> >> >################################################################################ >> ># >> ># python-sht21 >> ># >> >> >################################################################################ >> > >> >PYTHON_SHT21_VERSION = 1.0 >> >PYTHON_SHT21_SOURCE = pysht21-$(PYTHON_SHT21_VERSION).tar.gz >> >PYTHON_SHT21_SITE = https://github.com/richteel/TeelSys_Python_SHT >> >> I think this is one of the issues. >> >> The documentation ( >> https://buildroot.org/downloads/manual/manual.html#github-download-url) >> states that you should use: >> PYTHON_SHT21_SITE = $(call >> github,richteel,TeelSys_Python_SHT,$(PYTHON_SHT21_VERSION)) >> >> I also don't think there's a need for PYTHON_SHT21_SOURCE since Buildroot >> will figure it out from _SITE variable here. >> >> Finally, I couldn't see tags or releases on this github repo, so you want >> to pass a commit id to PYTHON_SHT21_VERSION, e.g. >> 84398b3267158d15e2322878294c0d7e0e6fa78d for the last commit in master >> branch. >> >> >PYTHON_SHT21_LICENSE = BSD >> >> It's actually MIT. >> >> Cheers, >> Quentin >> >> >PYTHON_SHT21_LICENSE_FILES = LICENSE >> >PYTHON_SHT21_SETUP_TYPE = setuptools >> > >> >$(eval $(python-package)) >> > >> >make command giving following error >> > >> >wget --passive-ftp -nd -t 3 -O >> >'/home/snathick/buildroot/output/build/.pysht21-1.0.uyWYsC/output' ' >> >http://sources.buildroot.net/pysht21-1.0' >> >--2022-03-24 08:57:12-- http://sources.buildroot.net/pysht21-1.0 >> >Resolving sources.buildroot.net (sources.buildroot.net)... 172.67.72.56, >> >104.26.0.37, 104.26.1.37, ... >> >Connecting to sources.buildroot.net (sources.buildroot.net >> )|172.67.72.56|:80... >> >connected. >> >HTTP request sent, awaiting response... 404 Not Found >> >2022-03-24 08:57:13 ERROR 404: Not Found. >> > >> >package/pkg-generic.mk:185: recipe for target >> >> >'/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded' >> >failed >> >make[1]: *** >> >> >[/home/snathick/buildroot/output/build/python-sht21-1.0/.stamp_downloaded] >> >Error 1 >> >Makefile:84: recipe for target '_all' failed >> >make: *** [_all] Error 2 >> > >> > >> >Any suggestions to resolve the issue >> > >> > >> > >> > >> > > > -- > Thanks & Regards, > Snathick > -- Thanks & Regards, Snathick -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Sat Mar 26 19:27:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 26 Mar 2022 20:27:05 +0100 Subject: [Buildroot] [PATCH v1 1/1] DEVELOPERS: update email address In-Reply-To: <20220323170235.GO1566358@scaer> (Yann E. MORIN's message of "Wed, 23 Mar 2022 18:02:35 +0100") References: <20220323072029.260340-1-neal.frager@amd.com> <20220323170235.GO1566358@scaer> Message-ID: <874k3kcy5y.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Neal, All, > On 2022-03-23 01:20 -0600, Neal Frager via buildroot spake thusly: >> This patch updates my email address in the DEVELOPERS file. >> >> Signed-off-by: Neal Frager > Applied to master, thanks. Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Mar 26 19:25:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 26 Mar 2022 20:25:24 +0100 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: update email address Message-ID: <20220326192052.0495B848DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2366533fd1be0bea767ef68fe2d8d45e676a4f5f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This patch updates my email address in the DEVELOPERS file. Signed-off-by: Neal Frager Signed-off-by: Yann E. MORIN (cherry picked from commit ae1deebb9e78b5338f5f30fe4765e3eb9e5be3d7) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index b5183711b5..c3d7c4a6fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2082,7 +2082,7 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager F: board/zynqmp/ F: configs/zynqmp_zcu102_defconfig From fontaine.fabrice at gmail.com Sat Mar 26 20:49:15 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 26 Mar 2022 21:49:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4632 Message-ID: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src -- 2.35.1 From angelo at amarulasolutions.com Sat Mar 26 22:07:27 2022 From: angelo at amarulasolutions.com (Angelo Compagnucci) Date: Sat, 26 Mar 2022 23:07:27 +0100 Subject: [Buildroot] [PATCH v2] package/libdill: new package Message-ID: <20220326220727.827332-1-angelo@amarulasolutions.com> Libdill is a C library that makes writing structured concurrent programs easy. Signed-off-by: Angelo Compagnucci --- v1-v2: Better configuration options handling: libdill build can actually be customized only when using configure indeed cmake doesn't offer the same configuration option, DEVELOPERS | 1 + package/Config.in | 1 + package/libdill/Config.in | 7 +++++++ package/libdill/libdill.hash | 3 +++ package/libdill/libdill.mk | 25 +++++++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/libdill/Config.in create mode 100644 package/libdill/libdill.hash create mode 100644 package/libdill/libdill.mk diff --git a/DEVELOPERS b/DEVELOPERS index 70d71186ed..9410944584 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -167,6 +167,7 @@ F: package/i2c-tools/ F: package/jq/ F: package/libapparmor/ F: package/libb64/ +F: package/libdill/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..47f84a08dc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdill/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdill/Config.in b/package/libdill/Config.in new file mode 100644 index 0000000000..0e6757b809 --- /dev/null +++ b/package/libdill/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDILL + bool "libdill" + help + Libdill is a C library that makes writing structured concurrent + programs easy. + + http://libdill.org diff --git a/package/libdill/libdill.hash b/package/libdill/libdill.hash new file mode 100644 index 0000000000..4a1fb91a57 --- /dev/null +++ b/package/libdill/libdill.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 6df7527e8f1e91f5106c21c5bfeaa69eee470bec476c74585143e3e439864404 libdill-fa01648cf2a8d06e53c965b45eeacfb3ac57bd04.tar.gz +sha256 3f78d9c42c8919cb6dc63e51de17b9eb40a49d9cdd876ce59e77392721e8c2c6 COPYING diff --git a/package/libdill/libdill.mk b/package/libdill/libdill.mk new file mode 100644 index 0000000000..8efe1ff356 --- /dev/null +++ b/package/libdill/libdill.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# libdill +# +################################################################################ + +LIBDILL_VERSION = fa01648cf2a8d06e53c965b45eeacfb3ac57bd04 +LIBDILL_SITE = $(call github,sustrik,libdill,$(LIBDILL_VERSION)) +LIBDILL_LICENSE = MIT +LIBDILL_LICENSE_FILES = COPYING +LIBDILL_CPE_ID_VENDOR = libdill +LIBDILL_CPE_ID_PRODUCT = libdill +LIBDILL_INSTALL_STAGING = YES +LIBDILL_AUTORECONF = YES + +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBDILL_CONF_OPTS += --disable-threads +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBDILL_DEPENDENCIES = openssl +LIBDILL_CONF_OPTS += --enable-tls +endif + +$(eval $(autotools-package)) -- 2.25.1 From Jason at zx2c4.com Sun Mar 27 05:48:14 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sat, 26 Mar 2022 23:48:14 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng Message-ID: <20220327054814.942198-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 55 +-- package/urandom-scripts/seedrng.c | 445 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 10 + 4 files changed, 464 insertions(+), 50 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..f248089a0f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -6,63 +6,26 @@ # Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -URANDOM_SEED="/var/lib/random-seed" +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng. +#export SEEDRNG_SKIP_CREDIT=false +# You can also place this line into /etc/default/urandom. # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in start|restart|reload) # Carry a random seed from start-up to start-up # Load and then save the whole entropy pool - init_rng && save_random_seed;; + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; stop) # Carry a random seed from shut-down to start-up # Save the whole entropy pool - save_random_seed;; + seedrng;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..a77365d406 --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,445 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + +#ifndef LOCALSTATEDIR +#define LOCALSTATEDIR "/var/lib" +#endif +#ifndef RUNSTATEDIR +#define RUNSTATEDIR "/var/run" +#endif + +#define SEED_DIR LOCALSTATEDIR "/seedrng" +#define CREDITABLE_SEED SEED_DIR "/seed.credit" +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + return 1; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + close(fd); + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..a5cbb95feb 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,17 @@ # ################################################################################ +define URANDOM_SCRIPTS_EXTRACT_CMDS + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) +endef + +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(@D)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From fperrad at gmail.com Sun Mar 27 14:20:23 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 27 Mar 2022 16:20:23 +0200 Subject: [Buildroot] [PATCH] package/lua-basexx: bump to version 0.4.1 Message-ID: <20220327142023.1477251-1-francois.perrad@gadz.org> Signed-off-by: Francois Perrad --- package/lua-basexx/lua-basexx.hash | 4 ++-- package/lua-basexx/lua-basexx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash index aee636c32..447ec60ba 100644 --- a/package/lua-basexx/lua-basexx.hash +++ b/package/lua-basexx/lua-basexx.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk index 5aa5ecf21..22b5a3771 100644 --- a/package/lua-basexx/lua-basexx.mk +++ b/package/lua-basexx/lua-basexx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_BASEXX_VERSION = 0.4.0-1 +LUA_BASEXX_VERSION = 0.4.1-1 LUA_BASEXX_NAME_UPSTREAM = basexx LUA_BASEXX_LICENSE = MIT LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE -- 2.32.0 From fperrad at gmail.com Sun Mar 27 14:20:48 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 27 Mar 2022 16:20:48 +0200 Subject: [Buildroot] [PATCH] package/luasec: bump to version 1.0.2 Message-ID: <20220327142048.1477306-1-francois.perrad@gadz.org> diff LICENSE: -LuaSec 1.0 license +LuaSec 1.0.2 license Signed-off-by: Francois Perrad --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9..1e381612b 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14da..4ace94d16 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.0.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE -- 2.32.0 From arnout at mind.be Sun Mar 27 15:34:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:34:48 +0200 Subject: [Buildroot] [PATCH v2, 1/1] package/libminiupnpc: drop dependencies In-Reply-To: <20220317185615.179351-1-fontaine.fabrice@gmail.com> References: <20220317185615.179351-1-fontaine.fabrice@gmail.com> Message-ID: <5bf8ccc2-820e-763d-03a5-7633f91658bb@mind.be> On 17/03/2022 19:56, Fabrice Fontaine wrote: > libminiupnpc can be statically built with or without binfmt flat since > version 1.7 and > https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Rebase patch on current master > > package/libminiupnpc/Config.in | 6 ------ > package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in > index a3410a0225..51f4b43bbb 100644 > --- a/package/libminiupnpc/Config.in > +++ b/package/libminiupnpc/Config.in > @@ -1,7 +1,5 @@ > config BR2_PACKAGE_LIBMINIUPNPC > bool "libminiupnpc" > - depends on !BR2_BINFMT_FLAT > - depends on !BR2_STATIC_LIBS > help > The UPnP protocol is supported by most home adsl/cable routers > and Microsoft Windows 2K/XP. The aim of the MiniUPnP project > @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC > ANSI C. > > http://miniupnp.free.fr > - > -comment "libminiupnpc needs a toolchain w/ dynamic library" > - depends on BR2_STATIC_LIBS > - depends on !BR2_BINFMT_FLAT > diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk > index 0633ccd234..52fe9849f2 100644 > --- a/package/libminiupnpc/libminiupnpc.mk > +++ b/package/libminiupnpc/libminiupnpc.mk > @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) > LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) > LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF > > +ifeq ($(BR2_STATIC_LIBS),y) > +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON > +else ifeq ($(BR2_SHARED_LIBS),y) > +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF > +else > +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON > +endif > + > $(eval $(cmake-package)) From arnout at mind.be Sun Mar 27 15:35:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:35:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/ola: usbpro needs gcc >= 4.9 In-Reply-To: <20220317185842.183700-1-fontaine.fabrice@gmail.com> References: <20220317185842.183700-1-fontaine.fabrice@gmail.com> Message-ID: <3567fd8c-8c60-874d-2137-df028cf22b62@mind.be> On 17/03/2022 19:58, Fabrice Fontaine wrote: > Fix the following build failure with usbpro raised since re-introduction > of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: > > configure: error: compiler with C11 support is required to build libusb > > Fixes: > - http://autobuild.buildroot.org/results/e9239403bb13d3468db01a952da8c695c0e5ea30 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/ola/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/ola/Config.in b/package/ola/Config.in > index 36b175138f..e59637b57f 100644 > --- a/package/ola/Config.in > +++ b/package/ola/Config.in > @@ -164,8 +164,12 @@ config BR2_PACKAGE_OLA_PLUGIN_USBDMX > > config BR2_PACKAGE_OLA_PLUGIN_USBPRO > bool "usbpro" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb > select BR2_PACKAGE_LIBUSB > help > Build UsbPro plugin for OLA. > > +comment "usbpro needs a toolchain w/ gcc >= 4.9" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > + > endif From arnout at mind.be Sun Mar 27 15:35:21 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:35:21 +0200 Subject: [Buildroot] [PATCH 1/1] package/libgee: needs gcc >= 4.9 In-Reply-To: <20220317190027.183976-1-fontaine.fabrice@gmail.com> References: <20220317190027.183976-1-fontaine.fabrice@gmail.com> Message-ID: On 17/03/2022 20:00, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 0.20.5 > in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and > https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: > > task.c:59:1: error: initializer element is not constant > static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/granite/Config.in | 6 ++++-- > package/libgee/Config.in | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/package/granite/Config.in b/package/granite/Config.in > index 726bde1b2d..9519e16d45 100644 > --- a/package/granite/Config.in > +++ b/package/granite/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee > depends on BR2_PACKAGE_LIBGTK3 > select BR2_PACKAGE_LIBGEE > select BR2_PACKAGE_LIBGLIB2 > @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE > > https://github.com/elementary/granite > > -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" > +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" > depends on BR2_USE_MMU > depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ > - || !BR2_TOOLCHAIN_HAS_THREADS > + || !BR2_TOOLCHAIN_HAS_THREADS \ > + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > diff --git a/package/libgee/Config.in b/package/libgee/Config.in > index 07c387c985..cb33ec9ec2 100644 > --- a/package/libgee/Config.in > +++ b/package/libgee/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU # fork() > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 > select BR2_PACKAGE_LIBGLIB2 > help > Libgee is an utility library providing GObject-based > @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE > > https://wiki.gnome.org/Projects/Libgee > > -comment "libgee needs a toolchain w/ wchar, threads" > +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" > depends on BR2_USE_MMU > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Sun Mar 27 15:36:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:36:28 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/spidev_test: fix spidev_test.c version in Config.in help text In-Reply-To: <20220318082446.18552-1-ps.report@gmx.net> References: <20220318082446.18552-1-ps.report@gmx.net> Message-ID: On 18/03/2022 09:24, Peter Seiderer wrote: > - fix spidev_test.c version in Config.in help text, version update to 4.10 > (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) > > [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 > > Signed-off-by: Peter Seiderer > --- > package/spidev_test/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in > index 44990c66b6..2f3fcf4090 100644 > --- a/package/spidev_test/Config.in > +++ b/package/spidev_test/Config.in > @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST > proper operation of 'spidev_test'. > > The version used is based on your toolchain headers version, > - if it's older than 3.15 then 3.0 is used, otherwise 3.15 > + if it's older than 3.15 then 3.0 is used, otherwise 4.10 There was an EOL whitespace here (which gets removed again in the next commit). Not a big deal, but annoying for me because I automatically run check-package on each individual commit. Anyway, both applied to master, thanks. Regards, Arnout > is used. > This means you won't have quad-pumped SPI support if your > toolchain is too old. From arnout at mind.be Sun Mar 27 15:36:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:36:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/tpm2-tss: bump version to 3.2.0 In-Reply-To: References: Message-ID: <41c83efd-fef0-2462-befa-de14a47dc5e7@mind.be> On 18/03/2022 10:03, Yair Ben-Avraham via buildroot wrote: > Signed-off-by: Yair Ben-Avraham Applied to master, thanks. Regards, Arnout > --- > package/tpm2-tss/tpm2-tss.hash | 2 +- > package/tpm2-tss/tpm2-tss.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash > index b6eb3c1f97..db6b3b7ad0 100644 > --- a/package/tpm2-tss/tpm2-tss.hash > +++ b/package/tpm2-tss/tpm2-tss.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz > +sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz > sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE > diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk > index 060883c377..568ac35c8f 100644 > --- a/package/tpm2-tss/tpm2-tss.mk > +++ b/package/tpm2-tss/tpm2-tss.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TPM2_TSS_VERSION = 3.1.0 > +TPM2_TSS_VERSION = 3.2.0 > TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) > TPM2_TSS_LICENSE = BSD-2-Clause > TPM2_TSS_LICENSE_FILES = LICENSE > -- > 2.30.2 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Sun Mar 27 15:37:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:37:03 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/libcamera-apps: X11 support needs libdrm In-Reply-To: <20220318131058.32240-1-ps.report@gmx.net> References: <20220318131058.32240-1-ps.report@gmx.net> Message-ID: On 18/03/2022 14:10, Peter Seiderer wrote: > - X11 support needs libdrm (optional libdrm dependency already > present in libcamera-apps.mk) > > Fixes: > > http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e > > .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 18 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/libcamera-apps/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in > index a1affc2d23..492a99cf55 100644 > --- a/package/libcamera-apps/Config.in > +++ b/package/libcamera-apps/Config.in > @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS > select BR2_PACKAGE_LIBPNG > select BR2_PACKAGE_TIFF > select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) > select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 > select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 From arnout at mind.be Sun Mar 27 15:40:07 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:40:07 +0200 Subject: [Buildroot] [PATCH v1 2/2] package/libcamera-apps: add '-fpermissive' (fixes X11 preview compile) In-Reply-To: <20220318131058.32240-2-ps.report@gmx.net> References: <20220318131058.32240-1-ps.report@gmx.net> <20220318131058.32240-2-ps.report@gmx.net> Message-ID: <912d932f-0aed-0c9c-b35f-935b7177e812@mind.be> On 18/03/2022 14:10, Peter Seiderer wrote: > - add patch to add '-fpermissive' compiler command line option to fix > egl_preview.cpp compile > > Fixes: > > .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] > 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); > | ^~~~~~~ > | | > | Window {aka long unsigned int} > > Signed-off-by: Peter Seiderer > --- > ...missive-compiler-command-line-option.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch > > diff --git a/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch > new file mode 100644 > index 0000000000..0bfc7e1ad4 > --- /dev/null > +++ b/package/libcamera-apps/0002-cmake-add-fpermissive-compiler-command-line-option.patch > @@ -0,0 +1,37 @@ > +From b04777e6b386ed0c6b1036d4c1178b4b8a1c88d5 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer > +Date: Fri, 18 Mar 2022 12:39:27 +0100 > +Subject: [PATCH] cmake: add -fpermissive compiler command line option > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes (with bootlin arm toolchain): > + > + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] > + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); > + | ^~~~~~~ > + | | > + | Window {aka long unsigned int} > + > +Signed-off-by: Peter Seiderer > +--- > + CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 1ca1e39..eddda1f 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -11,7 +11,7 @@ endif() > + > + set (CMAKE_EXPORT_COMPILE_COMMANDS ON) > + set (CMAKE_CXX_STANDARD 17) > +-add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) > ++add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -fpermissive) This patch is most likely not upstreamable (and I indeed can't find your upstream PR). It would be much better to simply fix the underlying issue and upstream that. Should be simple enough, just add a cast. Regards, Arnout > + add_definitions(-D_FILE_OFFSET_BITS=64) > + > + if (CMAKE_COMPILER_IS_GNUCXX) > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 15:40:34 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:40:34 +0200 Subject: [Buildroot] [PATCH 1/1] package/luv: bump to version 1.43.0-0 In-Reply-To: <20220318173347.68409-1-joerg.krause@embedded.rocks> References: <20220318173347.68409-1-joerg.krause@embedded.rocks> Message-ID: <9657bb80-5111-136b-7148-7793eb088dab@mind.be> On 18/03/2022 18:33, J?rg Krause wrote: > Signed-off-by: J?rg Krause Applied to master, thanks. Regards, Arnout > --- > package/luv/luv.hash | 2 +- > package/luv/luv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/luv/luv.hash b/package/luv/luv.hash > index 2fb2b5c4fc..4cdb91729f 100644 > --- a/package/luv/luv.hash > +++ b/package/luv/luv.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz > +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/luv/luv.mk b/package/luv/luv.mk > index 2dc9af3b7a..36fcdc742e 100644 > --- a/package/luv/luv.mk > +++ b/package/luv/luv.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUV_VERSION = 1.42.0-1 > +LUV_VERSION = 1.43.0-0 > LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) > LUV_LICENSE = Apache-2.0 > LUV_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sun Mar 27 15:40:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:40:41 +0200 Subject: [Buildroot] [PATCH 1/1] package/luvi: bump to version 2.13.0 In-Reply-To: <20220318173427.68776-1-joerg.krause@embedded.rocks> References: <20220318173427.68776-1-joerg.krause@embedded.rocks> Message-ID: <7a2fe806-f522-354a-30a6-0e96c4f016d9@mind.be> On 18/03/2022 18:34, J?rg Krause wrote: > Signed-off-by: J?rg Krause Applied to master, thanks. Regards, Arnout > --- > package/luvi/luvi.hash | 2 +- > package/luvi/luvi.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash > index fcc81430db..9621ef4d03 100644 > --- a/package/luvi/luvi.hash > +++ b/package/luvi/luvi.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz > +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt > diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk > index 5daa3c1793..5266281ffc 100644 > --- a/package/luvi/luvi.mk > +++ b/package/luvi/luvi.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUVI_VERSION = 2.12.0 > +LUVI_VERSION = 2.13.0 > LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz > LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) > LUVI_LICENSE = Apache-2.0 From arnout at mind.be Sun Mar 27 15:41:33 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:41:33 +0200 Subject: [Buildroot] [PATCH 1/1] package/libscrypt: fix CFLAGS In-Reply-To: <20220318173507.10160-1-fontaine.fabrice@gmail.com> References: <20220318173507.10160-1-fontaine.fabrice@gmail.com> Message-ID: <26ccbc4c-2654-4ce8-66b8-bfea5718890b@mind.be> On 18/03/2022 18:35, Fabrice Fontaine wrote: > Don't pass TARGET_CONFIGURE_OPTS in LIBSCRYPT_MAKE_OPTS to avoid > overriding CFLAGS (and so loossing -fPIC). This will fix the following > build failure raised since bump to version 1.22 in commit > 4542c6714d3951070c31739d24e4bd42b446fbae: > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.36.1 assertion fail elf32-microblaze.c:1534 > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: sha256.o: probably compiled without -fPIC? > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value > > Fixes: > - http://autobuild.buildroot.org/results/ba4234ad305badb5ce815080ddcad6727e8d51c4 > > Signed-off-by: Fabrice Fontaine > --- > package/libscrypt/libscrypt.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk > index d28bd4e900..193c963f76 100644 > --- a/package/libscrypt/libscrypt.mk > +++ b/package/libscrypt/libscrypt.mk > @@ -11,7 +11,7 @@ LIBSCRYPT_LICENSE_FILES = LICENSE > LIBSCRYPT_INSTALL_STAGING = YES > > LIBSCRYPT_MAKE_OPTS = \ > - $(TARGET_CONFIGURE_OPTS) \ > + CC=$(TARGET_CC) \ We'd normally instead pass TARGET_CONFIGURE_OPTS in the environment, but even that doesn't work since the Makefile use ?=. So applied to master as-is, thanks. Regards, Arnout > CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ > LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ > PREFIX=/usr From arnout at mind.be Sun Mar 27 15:44:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:44:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/pango: drop -Werror=empty-body In-Reply-To: <20220318180713.19051-1-fontaine.fabrice@gmail.com> References: <20220318180713.19051-1-fontaine.fabrice@gmail.com> Message-ID: <52e0a19f-3d46-7c31-a59a-50abfac8f572@mind.be> On 18/03/2022 19:07, Fabrice Fontaine wrote: > Fix the following build failure raised since bump to version 1.50.5 in > commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75: > > ../utils/viewer-cairo.c: In function 'cairo_vector_view_create': > ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] > ; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/dee/dee3d631474f83b345f22eb26c59a305c32258f8/build-end.log > > Signed-off-by: Fabrice Fontaine > --- > ...1-meson.build-drop-Werror-empty-body.patch | 47 +++++++++++++++++++ > 1 file changed, 47 insertions(+) > create mode 100644 package/pango/0001-meson.build-drop-Werror-empty-body.patch > > diff --git a/package/pango/0001-meson.build-drop-Werror-empty-body.patch b/package/pango/0001-meson.build-drop-Werror-empty-body.patch > new file mode 100644 > index 0000000000..98b6828a63 > --- /dev/null > +++ b/package/pango/0001-meson.build-drop-Werror-empty-body.patch > @@ -0,0 +1,47 @@ > +From 1d0f3a8abcb2bb8931d02c136ae957ee2d60094e Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 18 Mar 2022 18:55:56 +0100 > +Subject: [PATCH] meson.build: drop -Werror=empty-body > + > +Drop -Werror=empty-body to avoid the following build failure raised > +since version 1.50.5 and > +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e: > + > +../utils/viewer-cairo.c: In function 'cairo_vector_view_create': > +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] > + ; > + ^ > + > +Fixes: > + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://gitlab.gnome.org/GNOME/pango/-/merge_requests/604] As noted in the MR: the patch is not upstreamable. Instead, the underlying error should be fixed. Which is trivial: simply replace the lone ';' with '{}'. Regards, Arnout > +--- > + meson.build | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 0f79bff7..c48fe01f 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' > + '-Wunused', > + '-Werror=address', > + '-Werror=array-bounds', > +- '-Werror=empty-body', > + '-Werror=implicit', > + '-Werror=implicit-fallthrough', > + '-Werror=init-self', > +@@ -135,7 +134,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' > + '-Werror=write-strings', > + '-Werror=address', > + '-Werror=int-to-pointer-cast', > +- '-Werror=empty-body', > + '-Werror=write-strings', > + '-Werror=unused-but-set-variable', > + '-Wundef', # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=792481 > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 15:45:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:45:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/pugixml: bump to version 1.12.1 In-Reply-To: <20220318175156.186854-1-joerg.krause@embedded.rocks> References: <20220318175156.186854-1-joerg.krause@embedded.rocks> Message-ID: <1ebb6766-2a49-1452-87e9-73b7bddd4353@mind.be> On 18/03/2022 18:51, J?rg Krause wrote: > The license file has updated the copyright year to 2022, therefore > update the hash of the license file as well. > > Signed-off-by: J?rg Krause Applied to master, thanks. Regards, Arnout > --- > package/pugixml/pugixml.hash | 4 ++-- > package/pugixml/pugixml.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash > index 5c629ac66f..190dfb6a6e 100644 > --- a/package/pugixml/pugixml.hash > +++ b/package/pugixml/pugixml.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz > -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md > +sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz > +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md > diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk > index bc018180ef..9137f04630 100644 > --- a/package/pugixml/pugixml.mk > +++ b/package/pugixml/pugixml.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PUGIXML_VERSION = 1.11.4 > +PUGIXML_VERSION = 1.12.1 > PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) > PUGIXML_LICENSE = MIT > PUGIXML_LICENSE_FILES = LICENSE.md From arnout at mind.be Sun Mar 27 15:45:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:45:35 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: update to version 0.23.6 In-Reply-To: <20220319061115.1641-1-br015@umbiko.net> References: <20220319061115.1641-1-br015@umbiko.net> Message-ID: <11ba0b58-3127-0d3d-7d40-d6a63877deeb@mind.be> On 19/03/2022 07:11, Andreas Ziegler wrote: > Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part > of this release > > Change log: > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS > > Signed-off-by: Andreas Ziegler Applied to master, thanks. Regards, Arnout > --- > ...2-lib-alsa-Error-add-missing-include.patch | 25 ------------------- > package/mpd/mpd.hash | 2 +- > package/mpd/mpd.mk | 2 +- > 3 files changed, 2 insertions(+), 27 deletions(-) > delete mode 100644 package/mpd/0002-lib-alsa-Error-add-missing-include.patch > > diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch > deleted file mode 100644 > index c45a087a54..0000000000 > --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 > -From: aeolio > -Date: Tue, 14 Dec 2021 09:01:23 +0100 > -Subject: [PATCH] lib/alsa/Error: add missing #include > - > -Downloaded from upstream commit: > -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 > - > -Signed-off-by: Bernd Kuhls > ---- > - src/lib/alsa/Error.cxx | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx > -index cd351f37d1..8ceb4417ca 100644 > ---- a/src/lib/alsa/Error.cxx > -+++ b/src/lib/alsa/Error.cxx > -@@ -29,6 +29,7 @@ > - > - #include "Error.hxx" > - > -+#include > - #include > - > - namespace Alsa { > diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash > index 56f88490cf..b09140abf5 100644 > --- a/package/mpd/mpd.hash > +++ b/package/mpd/mpd.hash > @@ -1,3 +1,3 @@ > # Locally calculated after checking pgp signature > -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz > +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index a55e4adde2..12da36098f 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > MPD_VERSION_MAJOR = 0.23 > -MPD_VERSION = $(MPD_VERSION_MAJOR).5 > +MPD_VERSION = $(MPD_VERSION_MAJOR).6 > MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz > MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) > MPD_DEPENDENCIES = host-pkgconf boost fmt From arnout at mind.be Sun Mar 27 15:45:56 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:45:56 +0200 Subject: [Buildroot] [PATCH] boot/optee-os: fix version choice In-Reply-To: <20220319094939.1588302-1-yann.morin.1998@free.fr> References: <20220319094939.1588302-1-yann.morin.1998@free.fr> Message-ID: <217207ff-69d0-5f8c-6fa0-8139f38bee63@mind.be> On 19/03/2022 10:49, Yann E. MORIN wrote: > Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to > propagate the rustc arch dependency from the new version, to the default > clause of the choice. > > This leaves only the custom git tree as a posible source for building > OP-TEE OS in case the host can't have a rustc compiler. > > Signed-off-by: Yann E. MORIN > Reported-by: Thomas Petazzoni > Cc: Cl?ment L?ger > Cc: Etienne Carriere Applied to master, thanks. Regards, Arnout > --- > boot/optee-os/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in > index 18e1efee55..30b6f62434 100644 > --- a/boot/optee-os/Config.in > +++ b/boot/optee-os/Config.in > @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS > > choice > prompt "OP-TEE OS version" > - default BR2_TARGET_OPTEE_OS_LATEST > + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS > help > Select the version of OP-TEE OS you want to use > From arnout at mind.be Sun Mar 27 14:53:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:53:15 +0200 Subject: [Buildroot] [git commit] package/ola: usbpro needs gcc >= 4.9 Message-ID: <20220327153711.EA55F85D39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=87674334dd8a8c9094a806d26f2683f9fca782f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with usbpro raised since re-introduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: compiler with C11 support is required to build libusb Fixes: - http://autobuild.buildroot.org/results/e9239403bb13d3468db01a952da8c695c0e5ea30 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ola/Config.in b/package/ola/Config.in index 36b175138f..e59637b57f 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -164,8 +164,12 @@ config BR2_PACKAGE_OLA_PLUGIN_USBDMX config BR2_PACKAGE_OLA_PLUGIN_USBPRO bool "usbpro" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Build UsbPro plugin for OLA. +comment "usbpro needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + endif From arnout at mind.be Sun Mar 27 14:53:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:53:12 +0200 Subject: [Buildroot] [git commit] package/libminiupnpc: drop dependencies Message-ID: <20220327153711.E2ADC85D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ffcb5ded44e932ca6c7d03a8a33c051d94d47b2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libminiupnpc can be statically built with or without binfmt flat since version 1.7 and https://github.com/miniupnp/miniupnp/commit/c183a72c46cae9e37ddf635318dfb0bdcd56ed9d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libminiupnpc/Config.in | 6 ------ package/libminiupnpc/libminiupnpc.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225..51f4b43bbb 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 0633ccd234..52fe9849f2 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -18,4 +18,12 @@ LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif + $(eval $(cmake-package)) From arnout at mind.be Sun Mar 27 14:53:18 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:53:18 +0200 Subject: [Buildroot] [git commit] package/libgee: needs gcc >= 4.9 Message-ID: <20220327153712.0123B85D67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de59a62af68593303bf420338e719a17e1a5e243 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 0.20.5 in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: task.c:59:1: error: initializer element is not constant static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; ^ Fixes: - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/granite/Config.in | 6 ++++-- package/libgee/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d..9519e16d45 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985..cb33ec9ec2 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/luvi: bump to version 2.13.0 Message-ID: <20220327153712.390C185D66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b6d6c2f6a41442fe1905dc51b7cef15c683bff65 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luvi/luvi.hash | 2 +- package/luvi/luvi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index fcc81430db..9621ef4d03 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5daa3c1793..5266281ffc 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.12.0 +LUVI_VERSION = 2.13.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 From arnout at mind.be Sun Mar 27 15:01:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:01:37 +0200 Subject: [Buildroot] [git commit] package/tpm2-tss: bump version to 3.2.0 Message-ID: <20220327153712.1D98A85D67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed13a65a08cfe315aed9344abc609f5f2b92c782 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yair Ben-Avraham Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f97..db6b3b7ad0 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377..568ac35c8f 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 14:54:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 16:54:28 +0200 Subject: [Buildroot] [git commit] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220327153712.09D4685D66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53da16e3786cbf4c7637dacfddeef58c315cce66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..aa57b5edbf 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/luv: bump to version 1.43.0-0 Message-ID: <20220327153712.3084985D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6c7772df9ada2782336e4e47209e2cc039252a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 2fb2b5c4fc..4cdb91729f 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 2dc9af3b7a..36fcdc742e 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.42.0-1 +LUV_VERSION = 1.43.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From arnout at mind.be Sun Mar 27 15:01:15 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:01:15 +0200 Subject: [Buildroot] [git commit] package/spidev_test: bump to version in Linux 5.8 Message-ID: <20220327153712.1471C85D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=407c6e62996b7bfff475330a6ac28a96292b1d73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - bump to version in Linux 5.8 (depends on SPI_TX_OCTAL/SPI_RX_OCTAL available since Linux 5.0) Changelog (since 4.10): 9006a7b3220e spi: spidev_test: add option to continuously transfer data 35386dfd13b7 spi: spidev_test: Improve decoded text part of hex dump 84a14ae8c44f treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178 020bd6c48ebd spi: spidev_test: Remove break after exit statement 1f3c36328a48 spi: spidev_test: Check input_tx and input_file first after parse options 470a072e1220 spi: spidev_test: Use perror() only if errno is not 0 896fa735084e spi: spidev_test: Add support for Octal mode data transfers 9ec8ade81224 spi: spidev_test: Use %u to format unsigned numbers bd2077915bfe spi: tools: Make default_tx/rx and input_tx static - update Config.in help text - indent hashes by 2 spaces Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/spidev_test/Config.in | 4 ++-- package/spidev_test/spidev_test.hash | 5 +++-- package/spidev_test/spidev_test.mk | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index aa57b5edbf..81386adf7a 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 4.10 - is used. + if it's older than 3.15 then 3.0 is used, up to headers 4.20 + version 4.10 is used and otherwise version 5.8. This means you won't have quad-pumped SPI support if your toolchain is too old. diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash index 7bc4a27e45..867920fc78 100644 --- a/package/spidev_test/spidev_test.hash +++ b/package/spidev_test/spidev_test.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 -sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 +sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 87329094ea3010eae9e65ad7ea2d2309e044845942414aa0ca8f1a7095b80178 spidev_test.c?id=v5.8 diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk index bd2fcf6db3..6c5a9495a4 100644 --- a/package/spidev_test/spidev_test.mk +++ b/package/spidev_test/spidev_test.mk @@ -10,7 +10,10 @@ # If you need quad-pumped spi support you need to upgrade your toolchain. # Note that the location of spidev_test.c changes from v4.5 onwards. -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y) +SPIDEV_TEST_VERSION = 5.8 +SPIDEV_TEST_PATH = tools/spi +else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) SPIDEV_TEST_VERSION = 4.10 SPIDEV_TEST_PATH = tools/spi else From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/libscrypt: fix CFLAGS Message-ID: <20220327153712.4196385D67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f5c5703464514e4b3773ac5590556ba301a2754 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Don't pass TARGET_CONFIGURE_OPTS in LIBSCRYPT_MAKE_OPTS to avoid overriding CFLAGS (and so loossing -fPIC). This will fix the following build failure raised since bump to version 1.22 in commit 4542c6714d3951070c31739d24e4bd42b446fbae: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.36.1 assertion fail elf32-microblaze.c:1534 /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: sha256.o: probably compiled without -fPIC? /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/10.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value Fixes: - http://autobuild.buildroot.org/results/ba4234ad305badb5ce815080ddcad6727e8d51c4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libscrypt/libscrypt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index d28bd4e900..193c963f76 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -11,7 +11,7 @@ LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES LIBSCRYPT_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) \ CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ PREFIX=/usr From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/mpd: update to version 0.23.6 Message-ID: <20220327153712.5408985D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8974c6fa26f626021aa170678989c57fa81e8faf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part of this release Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-lib-alsa-Error-add-missing-include.patch | 25 ---------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54..0000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf..b09140abf5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..12da36098f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From arnout at mind.be Sun Mar 27 15:01:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:01:39 +0200 Subject: [Buildroot] [git commit] package/libcamera-apps: X11 support needs libdrm Message-ID: <20220327153712.26FE885D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2bc5e916beedc1965da2a7bf9a86e74b24a5562 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - X11 support needs libdrm (optional libdrm dependency already present in libcamera-apps.mk) Fixes: http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libcamera-apps/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d23..492a99cf55 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] package/pugixml: bump to version 1.12.1 Message-ID: <20220327153712.4AE9E85D65@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92dfa760ad556e16340305e94fe1ed1e0dbc1798 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The license file has updated the copyright year to 2022, therefore update the hash of the license file as well. Signed-off-by: J??rg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pugixml/pugixml.hash | 4 ++-- package/pugixml/pugixml.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 5c629ac66f..190dfb6a6e 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md +sha256 dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 pugixml-1.12.1.tar.gz +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef..9137f04630 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.11.4 +PUGIXML_VERSION = 1.12.1 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md From arnout at mind.be Sun Mar 27 15:33:24 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:33:24 +0200 Subject: [Buildroot] [git commit] boot/optee-os: fix version choice Message-ID: <20220327153712.5C7CE85D66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=945f8a788f8b30983aa6b2ce7275551a8a60efc8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c5d441b7f2ee (boot/optee-os: bump to version 3.16.0) forgot to propagate the rustc arch dependency from the new version, to the default clause of the choice. This leaves only the custom git tree as a posible source for building OP-TEE OS in case the host can't have a rustc compiler. Signed-off-by: Yann E. MORIN Reported-by: Thomas Petazzoni Cc: Cl??ment L??ger Cc: Etienne Carriere Acked-by: Etienne Carriere Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/optee-os/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 18e1efee55..30b6f62434 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -13,7 +13,7 @@ if BR2_TARGET_OPTEE_OS choice prompt "OP-TEE OS version" - default BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of OP-TEE OS you want to use From arnout at mind.be Sun Mar 27 15:55:48 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:55:48 +0200 Subject: [Buildroot] [PATCH 1/1] package/usbguard: bump to version 1.1.1 In-Reply-To: <20220319193422.1148509-1-fontaine.fabrice@gmail.com> References: <20220319193422.1148509-1-fontaine.fabrice@gmail.com> Message-ID: On 19/03/2022 20:34, Fabrice Fontaine wrote: > - This bump fixes unauthorized access via D-Bus (CVE-2019-25058): > https://github.com/advisories/GHSA-p5wh-m4gj-x2mr > but dbus is disabled on buildroot > - musl is supported since > https://github.com/USBGuard/usbguard/commit/b04e8deacac4f3f4a82a10b219c2d555e1b2aa24 > - C++17 is now mandatory: > https://github.com/USBGuard/usbguard/commit/8c86264986685bf646c65228abce2432e08e3c4c > - Update hash of license file (use license file from gnu.org: > https://github.com/USBGuard/usbguard/commit/3292511ab164ce0bdf6d58f0369ce3993dded9ad) > > https://github.com/USBGuard/usbguard/blob/usbguard-1.1.1/CHANGELOG.md > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/usbguard/Config.in | 8 +++----- > package/usbguard/usbguard.hash | 6 ++++-- > package/usbguard/usbguard.mk | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in > index e97d0e729c..4c3dc7f2c2 100644 > --- a/package/usbguard/Config.in > +++ b/package/usbguard/Config.in > @@ -3,9 +3,8 @@ config BR2_PACKAGE_USBGUARD > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf > depends on BR2_INSTALL_LIBSTDCPP # protobuf > depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 > depends on !BR2_STATIC_LIBS # libqb, protobuf > - depends on !BR2_TOOLCHAIN_USES_MUSL > depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future > select BR2_PACKAGE_PROTOBUF > select BR2_PACKAGE_LIBQB > @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD > > https://usbguard.github.io/ > > -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" > +comment "usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ > - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ > - || BR2_TOOLCHAIN_USES_MUSL > + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 > depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS > > comment "usbguard needs a toolchain not affected by GCC bug 64735" > diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash > index fd77acc75a..a69240b3f9 100644 > --- a/package/usbguard/usbguard.hash > +++ b/package/usbguard/usbguard.hash > @@ -1,3 +1,5 @@ > +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.1/usbguard-1.1.1.tar.gz.sum > +sha256 460ebfb4ffc5609739a202a3a1d9fda1c30de033b634845b8baa136352bfb432 usbguard-1.1.1.tar.gz > + > # Locally calculated > -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz > -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk > index 54a4031056..614b7d655d 100644 > --- a/package/usbguard/usbguard.mk > +++ b/package/usbguard/usbguard.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -USBGUARD_VERSION = 1.0.0 > +USBGUARD_VERSION = 1.1.1 > USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) > USBGUARD_LICENSE = GPL-2.0+ > USBGUARD_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 15:57:08 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:57:08 +0200 Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd In-Reply-To: <20220320114138.433796-1-br015@umbiko.net> References: <20211227074056.13882-1-br015@umbiko.net> <20220320114138.433796-1-br015@umbiko.net> Message-ID: On 20/03/2022 12:41, Andreas Ziegler wrote: > The current released version of zziplib copies static libraries with appended > major version, but omits creating the necessary links to the base file names. > This prevents the linker to find the libraries via the search path. > > The issue (https://github.com/gdraheim/zziplib/issues/117) has been > fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. > > This resolves the following autobuild issues: > > http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 > http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 > http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 > > Signed-off-by: Andreas Ziegler > --- > Changes v1 -> v2: > - extract link creation from commit 0e8d35f > Changes v2 -> v3: > - update failure list > > ...-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 78 +++++++++++++++++++ > 1 file changed, 78 insertions(+) > create mode 100644 package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch > > diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch > new file mode 100644 > index 0000000000..50380861bc > --- /dev/null > +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch > @@ -0,0 +1,78 @@ > +Extract link creation for versioned libraries from commit > +0e8d35f92efb680c81f6ec1fca9f11d173dce389. > + > +Signed-off-by: Andreas Ziegler > + > +--- > +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 > +From: Guido Draheim > +Date: Sat, 22 May 2021 15:13:28 +0200 > +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib I've moved the part that you added down here, so it stays as a git-formatted patch. [Andreas: Extract link creation for versioned libraries from commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389.] Signed-off-by: Andreas Ziegler Applied to master, thanks. Regards, Arnout > + > +--- > + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- > + 1 file changed, 45 insertions(+), 12 deletions(-) > + > +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt > +index a966d5f..ccd08b6 100644 > +--- a/zzip/CMakeLists.txt > ++++ b/zzip/CMakeLists.txt > +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) > + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) > + endif() > + > ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) > ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) > ++else() > ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) > ++endif() > ++ > + # used in zzip/_config.h > + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") > + set(ZZIP_VERSION "${PROJECT_VERSION}") > +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) > + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) > + endif(ZZIP_LIBTOOL) > + > ++if(ZZIP_LIBLATEST) > ++ if(BUILD_SHARED_LIBS) > ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) > ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) > ++ else() > ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) > ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) > ++ endif() > ++ get_target_property(libname libzzip OUTPUT_NAME) > ++ get_target_property(librelease libzzip RELEASE_POSTFIX) > ++ add_custom_target(libzzip_latest ALL > ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} > ++ ) > ++ install(FILES > ++ ${outdir}/${lib}${libname}${dll} > ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) > ++ if(ZZIPFSEEKO) > ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) > ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) > ++ add_custom_target(libzzipfseeko_latest ALL > ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} > ++ ) > ++ install(FILES > ++ ${outdir}/${lib}${libname}${dll} > ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) > ++ endif(ZZIPFSEEKO) > ++ if(ZZIPMMAPPED) > ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) > ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) > ++ add_custom_target(libzzipmmaped_latest ALL > ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} > ++ ) > ++ install(FILES > ++ ${outdir}/${lib}${libname}${dll} > ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) > ++ endif(ZZIPMMAPPED) > ++endif(ZZIP_LIBLATEST) > ++ > ++ > + ## messages ############################################## > + > + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From arnout at mind.be Sun Mar 27 15:57:28 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:57:28 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads In-Reply-To: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> References: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> Message-ID: <8cec0c22-baa7-c9b5-6185-dcb7da137938@mind.be> On 20/03/2022 16:47, Fabrice Fontaine wrote: > Fix the following build failure without threads and openvpn raised since > commit 0199dc161769e5f28e9aebc634230ece08ff5008: > > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' > > Fixes: > - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...h-core.c-fix-build-without-slotevent.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch > > diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch > new file mode 100644 > index 0000000000..5b2829c5ca > --- /dev/null > +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch > @@ -0,0 +1,37 @@ > +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Sun, 20 Mar 2022 08:50:15 +0100 > +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent > + > +Fix the following build failure with --disable-slotevent: > + > +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' > + > +Fixes: > + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] > +--- > + lib/pkcs11h-core.c | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c > +index d7bb4cd..0bf11e8 100644 > +--- a/lib/pkcs11h-core.c > ++++ b/lib/pkcs11h-core.c > +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( > + > + switch (property) { > + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: > ++#if defined(ENABLE_PKCS11H_SLOTEVENT) > + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { > + goto cleanup; > + } > ++#endif > + break; > + } > + cleanup: > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 15:58:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:58:01 +0200 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: hid and hog needs headers >= 3.18 In-Reply-To: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> References: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> Message-ID: <020967d3-bcea-3192-6532-4a8b3d64e298@mind.be> On 20/03/2022 17:20, Fabrice Fontaine wrote: > Fix the following build failure with hid and hog raised since their > addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd > because UHID_GET_REPORT is only available since kernel 3.18 and > https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: > > profiles/input/device.c: In function 'uhid_send_get_report_reply': > profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' > if (size > sizeof(ev.u.get_report_reply.data)) > ^ > profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' > size = sizeof(ev.u.get_report_reply.data); > ^ > profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) > ev.type = UHID_GET_REPORT_REPLY; > ^ > > Fixes: > - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/bluez5_utils/Config.in | 16 ++++++++++++++++ > package/brltty/Config.in | 2 +- > package/cwiid/Config.in | 6 +++--- > package/kodi/Config.in | 6 +++--- > package/supertuxkart/Config.in | 2 +- > 5 files changed, 24 insertions(+), 8 deletions(-) > > diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in > index 2eea8c7ced..49bb719102 100644 > --- a/package/bluez5_utils/Config.in > +++ b/package/bluez5_utils/Config.in > @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH > > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID > bool "build hid plugin" > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG > help > Build plugin for HID (input) profiles. > > +comment "hid plugin needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG > bool "build hog plugin" > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > help > Build plugin for HoG (input) profiles. > > +comment "hog plugin needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH > bool "build mesh plugin" > depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell > @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP > config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS > bool "build sixaxis plugin" > depends on BR2_PACKAGE_HAS_UDEV > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime > help > Build sixaxis plugin (support Sony Dualshock > controller) > > +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > comment "sixaxis plugin needs udev /dev management" > depends on !BR2_PACKAGE_HAS_UDEV > > @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST > config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI > bool "build hid2hci tool" > depends on BR2_PACKAGE_HAS_UDEV > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime > select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS > help > Build hid2hci tool > > +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > + > comment "hid2hci tool needs udev /dev management" > depends on !BR2_PACKAGE_HAS_UDEV > > diff --git a/package/brltty/Config.in b/package/brltty/Config.in > index c728cb7e20..3527df6161 100644 > --- a/package/brltty/Config.in > +++ b/package/brltty/Config.in > @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on !BR2_STATIC_LIBS > depends on BR2_USE_MMU # fork() > - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime > + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime > help > A daemon providing access to the Linux console for a blind > person using a refreshable braille display. > diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in > index 6ae2ac9405..7e8cdc3086 100644 > --- a/package/cwiid/Config.in > +++ b/package/cwiid/Config.in > @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID > depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 > depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 > depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils > select BR2_PACKAGE_BLUEZ5_UTILS > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime > @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI > select BR2_PACKAGE_LIBGTK2 > endif > > -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" > +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ > !BR2_TOOLCHAIN_HAS_THREADS || \ > - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 > + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > depends on !BR2_USE_MMU > diff --git a/package/kodi/Config.in b/package/kodi/Config.in > index c8e1e5d0ed..4c6e01745c 100644 > --- a/package/kodi/Config.in > +++ b/package/kodi/Config.in > @@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI > > config BR2_PACKAGE_KODI_BLUEZ > bool "bluetooth" > - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin > depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils > select BR2_PACKAGE_BLUEZ5_UTILS > select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO > @@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ > help > Enable bluetooth support > > -comment "bluetooth support needs a toolchain w/ headers >= 3.4" > +comment "bluetooth support needs a toolchain w/ headers >= 3.18" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 > + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 > > config BR2_PACKAGE_KODI_DBUS > bool "dbus" > diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in > index 1dd5dcf058..319415754a 100644 > --- a/package/supertuxkart/Config.in > +++ b/package/supertuxkart/Config.in > @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART > select BR2_PACKAGE_SDL2 > select BR2_PACKAGE_XLIB_LIBXRANDR > select BR2_PACKAGE_ZLIB > - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime > + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime > help > Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart > racer with multiple karts, tracks and modes you can play. From arnout at mind.be Sun Mar 27 15:58:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:58:18 +0200 Subject: [Buildroot] [PATCH 1/1] package/json-glib: bump to version 1.6.6 In-Reply-To: <20220320171259.1591428-1-fontaine.fabrice@gmail.com> References: <20220320171259.1591428-1-fontaine.fabrice@gmail.com> Message-ID: <92f06b08-13dd-5124-982a-a17faf3d4158@mind.be> On 20/03/2022 18:12, Fabrice Fontaine wrote: > - Update introspection option: > https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 > - Disable docs (enabled by default since > https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) > - Disable tests (added by: > https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) > - Update indentation in hash file (two spaces) > > https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/json-glib/json-glib.hash | 6 +++--- > package/json-glib/json-glib.mk | 9 +++++---- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash > index b68794db37..680d404a4b 100644 > --- a/package/json-glib/json-glib.hash > +++ b/package/json-glib/json-glib.hash > @@ -1,5 +1,5 @@ > -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum > -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz > +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum > +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz > > # Hash for license file: > -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING > +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING > diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk > index accdb4f888..52ca47e906 100644 > --- a/package/json-glib/json-glib.mk > +++ b/package/json-glib/json-glib.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > > -JSON_GLIB_VERSION_MAJOR = 1.4 > -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 > +JSON_GLIB_VERSION_MAJOR = 1.6 > +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 > JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) > JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz > JSON_GLIB_LICENSE = LGPL-2.1+ > JSON_GLIB_LICENSE_FILES = COPYING > JSON_GLIB_INSTALL_STAGING = YES > +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false > > JSON_GLIB_DEPENDENCIES = \ > $(TARGET_NLS_DEPENDENCIES) \ > @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ > libglib2 > > ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) > -JSON_GLIB_CONF_OPTS += -Dintrospection=true > +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled > JSON_GLIB_DEPENDENCIES += gobject-introspection > else > -JSON_GLIB_CONF_OPTS += -Dintrospection=false > +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled > endif > > JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) From arnout at mind.be Sun Mar 27 15:58:39 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:58:39 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack1: libsamplerate is optional, not mandatory In-Reply-To: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> Message-ID: On 20/03/2022 22:18, Fabrice Fontaine wrote: > libsamplerate is only needed to build the NetJack backend and internal > client > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/jack1/Config.in | 1 - > package/jack1/jack1.mk | 6 +++++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/jack1/Config.in b/package/jack1/Config.in > index 1c67f10332..625afdf8c1 100644 > --- a/package/jack1/Config.in > +++ b/package/jack1/Config.in > @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 > select BR2_PACKAGE_ALSA_LIB_RAWMIDI > select BR2_PACKAGE_ALSA_LIB_SEQ > select BR2_PACKAGE_BERKELEYDB > - select BR2_PACKAGE_LIBSAMPLERATE > select BR2_PACKAGE_LIBSNDFILE > help > JACK Audio Connection Kit (JACK 1 implementation). > diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk > index 311f7c9ba0..39183826a4 100644 > --- a/package/jack1/jack1.mk > +++ b/package/jack1/jack1.mk > @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) > JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL > JACK1_INSTALL_STAGING = YES > > -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile > +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile > + > +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) > +JACK1_DEPENDENCIES += libsamplerate > +endif > > ifeq ($(BR2_PACKAGE_READLINE),y) > JACK1_DEPENDENCIES += readline From arnout at mind.be Sun Mar 27 15:59:09 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 17:59:09 +0200 Subject: [Buildroot] [PATCH 1/2] packages/guile: bump to version 3.0.8 In-Reply-To: <20220320221445.10259-1-paguilar@paguilar.org> References: <20220320221445.10259-1-paguilar@paguilar.org> Message-ID: <8c69827f-53b8-eec1-f235-a45e8e313af6@mind.be> On 20/03/2022 23:14, Pedro Aguilar wrote: > Signed-off-by: Pedro Aguilar Applied to master after squashing the two patches as suggested by Yann, thanks. Regards, Arnout > --- > package/guile/guile.hash | 2 +- > package/guile/guile.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/guile/guile.hash b/package/guile/guile.hash > index c2719fa7f2..e9ae5b6e51 100644 > --- a/package/guile/guile.hash > +++ b/package/guile/guile.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -sha256 f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz > +sha256 daa7060a56f2804e9b74c8d7e7fe8beed12b43aab2789a38585183fcc17b8a13 guile-3.0.8.tar.xz > # Locally computed > sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/guile/guile.mk b/package/guile/guile.mk > index 859d7ec96f..9478e75b41 100644 > --- a/package/guile/guile.mk > +++ b/package/guile/guile.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GUILE_VERSION = 3.0.7 > +GUILE_VERSION = 3.0.8 > GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz > GUILE_SITE = $(BR2_GNU_MIRROR)/guile > GUILE_INSTALL_STAGING = YES From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/jack1: libsndfile is optional, not mandatory Message-ID: <20220327155020.4260E85DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a78a756134831da20c471dee575f3e8108f62a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsndfile is only needed to build jackrec example client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 625afdf8c1..5b3116e2f1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 39183826a4..6dca56001f 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,12 +11,16 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK1_DEPENDENCIES += libsndfile +endif + ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline endif From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/zziplib: fix static build failure with mpd Message-ID: <20220327155020.13D0D85DB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f3d6d2e6a924b9075accb27cf5d7351a30d8f17 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..780d990ab7 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From arnout at mind.be Sun Mar 27 15:47:13 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:47:13 +0200 Subject: [Buildroot] [git commit] package/usbguard: bump to version 1.1.1 Message-ID: <20220327155020.09E2785DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad21d84a589458fd4542993912891daa503d72dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - This bump fixes unauthorized access via D-Bus (CVE-2019-25058): https://github.com/advisories/GHSA-p5wh-m4gj-x2mr but dbus is disabled on buildroot - musl is supported since https://github.com/USBGuard/usbguard/commit/b04e8deacac4f3f4a82a10b219c2d555e1b2aa24 - C++17 is now mandatory: https://github.com/USBGuard/usbguard/commit/8c86264986685bf646c65228abce2432e08e3c4c - Update hash of license file (use license file from gnu.org: https://github.com/USBGuard/usbguard/commit/3292511ab164ce0bdf6d58f0369ce3993dded9ad) https://github.com/USBGuard/usbguard/blob/usbguard-1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbguard/Config.in | 8 +++----- package/usbguard/usbguard.hash | 6 ++++-- package/usbguard/usbguard.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index ca6d52034b..ce7a3b8bc4 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,9 +3,8 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on !BR2_STATIC_LIBS # libqb, protobuf - depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD https://usbguard.github.io/ -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "usbguard needs a toolchain w/ C++, threads, dynamic library, gcc >= 7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS comment "usbguard needs a toolchain not affected by GCC bug 64735" diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash index fd77acc75a..a69240b3f9 100644 --- a/package/usbguard/usbguard.hash +++ b/package/usbguard/usbguard.hash @@ -1,3 +1,5 @@ +# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.1/usbguard-1.1.1.tar.gz.sum +sha256 460ebfb4ffc5609739a202a3a1d9fda1c30de033b634845b8baa136352bfb432 usbguard-1.1.1.tar.gz + # Locally calculated -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index d2b03eeb2a..26dc40d15b 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBGUARD_VERSION = 1.0.0 +USBGUARD_VERSION = 1.1.1 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/json-glib: bump to version 1.6.6 Message-ID: <20220327155020.3087585DB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a960dbc5d5f68c7ffdded79e34f6739b0d90940e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update introspection option: https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 - Disable docs (enabled by default since https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) - Disable tests (added by: https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) - Update indentation in hash file (two spaces) https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-glib/json-glib.hash | 6 +++--- package/json-glib/json-glib.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index b68794db37..680d404a4b 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz # Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index accdb4f888..52ca47e906 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,13 +4,14 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 +JSON_GLIB_VERSION_MAJOR = 1.6 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ JSON_GLIB_LICENSE_FILES = COPYING JSON_GLIB_INSTALL_STAGING = YES +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false JSON_GLIB_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection else -JSON_GLIB_CONF_OPTS += -Dintrospection=false +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] packages/guile: bump to version 3.0.8 Message-ID: <20220327155020.60D8785DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3eb888ce3959860dce8e4aa25fb2633a40b074f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Pedro Aguilar Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...le-system-base-target.scm-support-riscv32.patch | 33 - ...-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch | 13930 ------------------- package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- 4 files changed, 2 insertions(+), 13965 deletions(-) Patch is too large, so refusing to show it From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/jack1: libsamplerate is optional, not mandatory Message-ID: <20220327155020.394D285DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05bbdfa382ec8b26d9b2f98b1696cb884ed7c2ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libsamplerate is only needed to build the NetJack backend and internal client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f10332..625afdf8c1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba0..39183826a4 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate +endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/pkcs11-helper: fix build without threads Message-ID: <20220327155020.1C33885DB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d76b7564f1bb61762181ecd1fc69c72a925ed25c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without threads and openvpn raised since commit 0199dc161769e5f28e9aebc634230ece08ff5008: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' Fixes: - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...kcs11h-core.c-fix-build-without-slotevent.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch new file mode 100644 index 0000000000..5b2829c5ca --- /dev/null +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch @@ -0,0 +1,37 @@ +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Mar 2022 08:50:15 +0100 +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent + +Fix the following build failure with --disable-slotevent: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' + +Fixes: + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] +--- + lib/pkcs11h-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c +index d7bb4cd..0bf11e8 100644 +--- a/lib/pkcs11h-core.c ++++ b/lib/pkcs11h-core.c +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( + + switch (property) { + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: ++#if defined(ENABLE_PKCS11H_SLOTEVENT) + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { + goto cleanup; + } ++#endif + break; + } + cleanup: +-- +2.35.1 + From arnout at mind.be Sun Mar 27 15:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:55:23 +0200 Subject: [Buildroot] [git commit] package/bluez5_utils: hid and hog needs headers >= 3.18 Message-ID: <20220327155020.2682A85DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=328516a5add9e6f260d3a8e0d372c474ae30b2c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with hid and hog raised since their addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd because UHID_GET_REPORT is only available since kernel 3.18 and https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: profiles/input/device.c: In function 'uhid_send_get_report_reply': profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' if (size > sizeof(ev.u.get_report_reply.data)) ^ profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' size = sizeof(ev.u.get_report_reply.data); ^ profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) ev.type = UHID_GET_REPORT_REPLY; ^ Fixes: - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bluez5_utils/Config.in | 16 ++++++++++++++++ package/brltty/Config.in | 2 +- package/cwiid/Config.in | 6 +++--- package/kodi/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced..49bb719102 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e20..3527df6161 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac9405..7e8cdc3086 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on !BR2_USE_MMU diff --git a/package/kodi/Config.in b/package/kodi/Config.in index c8e1e5d0ed..4c6e01745c 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -130,7 +130,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -138,9 +138,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf058..319415754a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. From arnout at mind.be Sun Mar 27 16:07:47 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:07:47 +0200 Subject: [Buildroot] [PATCH] package/busybox: fix udhcpc options in minimal config In-Reply-To: <20220321145322.23881-1-vincent.stehle@laposte.net> References: <20220321145322.23881-1-vincent.stehle@laposte.net> Message-ID: <3615aca5-6be5-5cee-a4b2-172ee3505fa1@mind.be> On 21/03/2022 15:53, Vincent Stehl? via buildroot wrote: > The busybox-minimal.config, which is used by systems without an MMU, specifies > the "-b" command line option for udhcpc. However, this option is not supported > by BusyBox udhcpc anymore since version 1.27.0 when building for systems > without an MMU. > > Remove the "-b" option from busybox-minimal.config to repair network > initialization on systems without an MMU. > > This fixes the following network initialization failure: > > udhcpc: invalid option -- b > FAIL > > Signed-off-by: Vincent Stehl? Applied to master, thanks. Regards, Arnout > --- > > > Hi, > > I have verified on qemu that this patch does fix the network initialization for > qemu_arm_versatile_nommu_defconfig and qemu_m68k_mcf5208_defconfig. > > I could only verify the build for stm32f429_disco_xip_defconfig, > stm32f469_disco_sd_defconfig and stm32f469_disco_xip_defconfig. > > Best regards, > Vincent. > > > package/busybox/busybox-minimal.config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config > index 9eae0f51f4..1fb4e39e21 100644 > --- a/package/busybox/busybox-minimal.config > +++ b/package/busybox/busybox-minimal.config > @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 > CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 > # CONFIG_FEATURE_UDHCP_RFC3397 is not set > # CONFIG_FEATURE_UDHCP_8021Q is not set > -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" > +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" > > # > # Print Utilities From arnout at mind.be Sun Mar 27 16:08:01 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:08:01 +0200 Subject: [Buildroot] [PATCH v3] package/wget: bump version to 1.21.3 In-Reply-To: <20220321192947.20712-1-ps.report@gmx.net> References: <20220321192947.20712-1-ps.report@gmx.net> Message-ID: On 21/03/2022 20:29, Peter Seiderer wrote: > - bump version to 1.21.3 (for details see [1]) > > - remove legacy --with-libidn option (see [2]), replace with > --enable-iri option in case locale support and libidn2 are available > > [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html > [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 > > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - split out from original patch > - fix iri option enable dependency > > Changes v2 -> v3: > - fix libiconv handling > --- > package/wget/wget.hash | 4 ++-- > package/wget/wget.mk | 9 +++++---- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/package/wget/wget.hash b/package/wget/wget.hash > index 7f89bedb88..22674650a2 100644 > --- a/package/wget/wget.hash > +++ b/package/wget/wget.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig > +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig > # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 > -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz > +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz > # Locally calculated > sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING > diff --git a/package/wget/wget.mk b/package/wget/wget.mk > index 8a73c33699..455faaed12 100644 > --- a/package/wget/wget.mk > +++ b/package/wget/wget.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WGET_VERSION = 1.21.2 > +WGET_VERSION = 1.21.3 > WGET_SOURCE = wget-$(WGET_VERSION).tar.lz > WGET_SITE = $(BR2_GNU_MIRROR)/wget > WGET_DEPENDENCIES = host-pkgconf > @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) > WGET_DEPENDENCIES += libiconv > endif > > -ifeq ($(BR2_PACKAGE_LIBIDN2),y) > -WGET_CONF_OPTS += --with-libidn > +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive > +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) > +WGET_CONF_OPTS += --enable-iri > WGET_DEPENDENCIES += libidn2 > else > -WGET_CONF_OPTS += --without-libidn > +WGET_CONF_OPTS += --disable-iri > endif > > ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From arnout at mind.be Sun Mar 27 16:08:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:08:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/ola: fix host build In-Reply-To: <20220321230452.1901382-1-fontaine.fabrice@gmail.com> References: <20220321230452.1901382-1-fontaine.fabrice@gmail.com> Message-ID: On 22/03/2022 00:04, Fabrice Fontaine wrote: > host-bison and host-flex are mandatory dependencies of host-ola since > the reintroduction of the package in commit > 16ff948444c3978d63f483344a3d92d994c64312: > > configure: error: bison not found, please install it > > Fixes: > - http://autobuild.buildroot.org/results/ac089629a58d55ec5d1aa83fd77bd487bc9d76de > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/ola/ola.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/ola/ola.mk b/package/ola/ola.mk > index 471ae8ed9b..cde90dbd5b 100644 > --- a/package/ola/ola.mk > +++ b/package/ola/ola.mk > @@ -25,7 +25,7 @@ OLA_CONF_OPTS = \ > --disable-unittests \ > --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin > > -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf > +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex > > # When building the host part, disable as much as possible to speed up > # the configure step and avoid missing host dependencies. From arnout at mind.be Sun Mar 27 16:08:55 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:08:55 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack2: fix build with libexecinfo In-Reply-To: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Message-ID: <946cbedd-3b59-97d0-888d-6f974bdab57f@mind.be> On 22/03/2022 18:48, Fabrice Fontaine wrote: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': > sigsegv.c:(.text+0x98): undefined reference to `backtrace' > > Fixes: > - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc > > Signed-off-by: Fabrice Fontaine Applied both to master, thanks. Regards, Arnout > --- > package/jack2/jack2.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk > index 2e55169984..127c99eed1 100644 > --- a/package/jack2/jack2.mk > +++ b/package/jack2/jack2.mk > @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES > > JACK2_CONF_OPTS = --alsa > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +JACK2_DEPENDENCIES += libexecinfo > +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" > +endif > + > ifeq ($(BR2_PACKAGE_OPUS),y) > JACK2_DEPENDENCIES += opus > endif From arnout at mind.be Sun Mar 27 16:09:15 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:09:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/mp4v2: bump to version 2.1.1 In-Reply-To: <20220322182946.2446236-1-fontaine.fabrice@gmail.com> References: <20220322182946.2446236-1-fontaine.fabrice@gmail.com> Message-ID: On 22/03/2022 19:29, Fabrice Fontaine wrote: > - Switch to new active fork: > https://github.com/enzo1982/mp4v2/discussions/1 > https://github.com/TechSmith/mp4v2/commit/461abd2b1365e14ba28dd0e4a0cb6c3bee1bab41 > - C++11 is not needed anymore thanks to > https://github.com/enzo1982/mp4v2/commit/5a57bc2ce8948f6ffa96761286921ab3e2ebe467 > - Drop patch (not needed since > https://github.com/enzo1982/mp4v2/commit/23f8b907d4a221e1dae9e8b859cb6b1161206866) > - Update license (minor fix: > https://github.com/enzo1982/mp4v2/commit/0c37402d9d3644ea0b7d55db1d901bfad9723dfc) > - Version 2.1.1 was never released before so no issue is expected > (except a misunderstanding of users but new upstream is aware of this: > https://github.com/enzo1982/mp4v2/discussions/1#discussioncomment-2399344) > > https://github.com/enzo1982/mp4v2/releases/tag/v2.1.1 > https://github.com/enzo1982/mp4v2/releases/tag/v2.1.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...tatic-cast-to-unsigned-int-for-cases.patch | 99 ------------------- > package/mp4v2/Config.in | 8 +- > package/mp4v2/mp4v2.hash | 4 +- > package/mp4v2/mp4v2.mk | 5 +- > 4 files changed, 8 insertions(+), 108 deletions(-) > delete mode 100644 package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > > diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > deleted file mode 100644 > index 6c9b13bed8..0000000000 > --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch > +++ /dev/null > @@ -1,99 +0,0 @@ > -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 > -From: "Jason A. Donenfeld" > -Date: Thu, 6 Aug 2020 15:22:04 +0200 > -Subject: [PATCH] Static cast to unsigned int for cases > - > -Signed-off-by: Jason A. Donenfeld > -[Retrieved from: > -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] > -Signed-off-by: Fabrice Fontaine > ---- > - libutil/Utility.cpp | 2 +- > - util/mp4art.cpp | 2 +- > - util/mp4chaps.cpp | 2 +- > - util/mp4file.cpp | 2 +- > - util/mp4subtitle.cpp | 2 +- > - util/mp4track.cpp | 2 +- > - 6 files changed, 6 insertions(+), 6 deletions(-) > - > -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp > -index 76cdd12..d6739d4 100644 > ---- a/libutil/Utility.cpp > -+++ b/libutil/Utility.cpp > -@@ -493,7 +493,7 @@ Utility::process_impl() > - if( codes.find( code ) == codes.end() ) > - continue; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case 'z': > - _optimize = true; > - break; > -diff --git a/util/mp4art.cpp b/util/mp4art.cpp > -index add935e..6e7f531 100644 > ---- a/util/mp4art.cpp > -+++ b/util/mp4art.cpp > -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast ( code ) ) { > - case LC_ART_ANY: > - _artFilter = numeric_limits::max(); > - break; > -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp > -index 98400f8..ccc8b70 100644 > ---- a/util/mp4chaps.cpp > -+++ b/util/mp4chaps.cpp > -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast ( code ) ) { > - case 'A': > - case LC_CHPT_ANY: > - _ChapterType = MP4ChapterTypeAny; > -diff --git a/util/mp4file.cpp b/util/mp4file.cpp > -index c27844b..b127cd1 100644 > ---- a/util/mp4file.cpp > -+++ b/util/mp4file.cpp > -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case LC_LIST: > - _action = &FileUtility::actionList; > - break; > -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp > -index 7462153..19d977d 100644 > ---- a/util/mp4subtitle.cpp > -+++ b/util/mp4subtitle.cpp > -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case LC_LIST: > - _action = &SubtitleUtility::actionList; > - break; > -diff --git a/util/mp4track.cpp b/util/mp4track.cpp > -index d550506..cd63d7e 100644 > ---- a/util/mp4track.cpp > -+++ b/util/mp4track.cpp > -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) > - { > - handled = true; > - > -- switch( code ) { > -+ switch( static_cast( code ) ) { > - case LC_TRACK_WILDCARD: > - _trackMode = TM_WILDCARD; > - break; > --- > -2.28.0 > - > diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in > index 00e80cd358..705a8c9d24 100644 > --- a/package/mp4v2/Config.in > +++ b/package/mp4v2/Config.in > @@ -1,12 +1,11 @@ > config BR2_PACKAGE_MP4V2 > bool "mp4v2" > depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 > help > The MP4v2 library provides functions to read, create, and > modify mp4 files. > > - https://github.com/TechSmith/mp4v2/ > + https://mp4v2.org/ > > if BR2_PACKAGE_MP4V2 > > @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL > > endif > > -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" > - depends on !BR2_INSTALL_LIBSTDCPP || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 > +comment "mp4v2 needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash > index 7aa5402c8f..d3f0243650 100644 > --- a/package/mp4v2/mp4v2.hash > +++ b/package/mp4v2/mp4v2.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz > -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING > +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 > +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING > diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk > index 6d29228a13..7de837c170 100644 > --- a/package/mp4v2/mp4v2.mk > +++ b/package/mp4v2/mp4v2.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -MP4V2_VERSION = 5.0.1 > +MP4V2_VERSION = 2.1.1 > MP4V2_SITE = \ > - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) > + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) > +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 > MP4V2_INSTALL_STAGING = YES > MP4V2_LICENSE = MPL-1.1 > MP4V2_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:09:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:09:31 +0200 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix target loaders.cache In-Reply-To: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> References: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> Message-ID: <53e0f0fd-8db9-c324-ba12-fdfd75d7b258@mind.be> On 22/03/2022 20:00, Fabrice Fontaine wrote: > As reported by Rutger Sassen in > https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, > target loaders.cache is broken since commit > 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ > to relative host paths > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk > index 6eaf023789..69bb34b0cb 100644 > --- a/package/gdk-pixbuf/gdk-pixbuf.mk > +++ b/package/gdk-pixbuf/gdk-pixbuf.mk > @@ -70,14 +70,14 @@ endif > # gdk-pixbuf requires the loaders.cache file populated to work properly > # Rather than doing so at runtime, since the fs can be read-only, do so > # here after building and installing to target. > -# And since the cache file will contain absolute host directory names we > -# need to sanitize (strip) them. > +# And since the cache file will contain relative host directory names we > +# need to prepend them with /usr/. > ifeq ($(BR2_STATIC_LIBS),) > define GDK_PIXBUF_UPDATE_CACHE > GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ > $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ > + $(SED) 's,^"lib,"/usr/lib,g' \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > endef > GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From arnout at mind.be Sun Mar 27 15:59:41 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:41 +0200 Subject: [Buildroot] [git commit] package/busybox: fix udhcpc options in minimal config Message-ID: <20220327160039.4C89585E09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3de486f8b052b25c8e29a82903b334ca90f25735 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The busybox-minimal.config, which is used by systems without an MMU, specifies the "-b" command line option for udhcpc. However, this option is not supported by BusyBox udhcpc anymore since version 1.27.0 when building for systems without an MMU. Remove the "-b" option from busybox-minimal.config to repair network initialization on systems without an MMU. This fixes the following network initialization failure: udhcpc: invalid option -- b FAIL Signed-off-by: Vincent Stehl?? Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox-minimal.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4..1fb4e39e21 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities From arnout at mind.be Sun Mar 27 15:59:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:47 +0200 Subject: [Buildroot] [git commit] package/ola: fix host build Message-ID: <20220327160039.6497485E0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b38d3d22718270610639c9078476ac31ceeaa34d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master host-bison and host-flex are mandatory dependencies of host-ola since the reintroduction of the package in commit 16ff948444c3978d63f483344a3d92d994c64312: configure: error: bison not found, please install it Fixes: - http://autobuild.buildroot.org/results/ac089629a58d55ec5d1aa83fd77bd487bc9d76de Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ola/ola.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 1b55ca440a..1fd6d6a592 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -26,7 +26,7 @@ OLA_CONF_OPTS = \ --disable-unittests \ --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex # When building the host part, disable as much as possible to speed up # the configure step and avoid missing host dependencies. From arnout at mind.be Sun Mar 27 15:59:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:50 +0200 Subject: [Buildroot] [git commit] package/jack2: fix build with libexecinfo Message-ID: <20220327160039.714FA85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=930db465d9d9f2fd558e67bd808914309c2d4619 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': sigsegv.c:(.text+0x98): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack2/jack2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 2e55169984..127c99eed1 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif From arnout at mind.be Sun Mar 27 15:59:44 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:44 +0200 Subject: [Buildroot] [git commit] package/wget: bump version to 1.21.3 Message-ID: <20220327160039.585CF85DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5f82a4a5a6f14b4d178a4d662784d7bd6f7fada branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From arnout at mind.be Sun Mar 27 15:59:58 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:58 +0200 Subject: [Buildroot] [git commit] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220327160039.92C4685E0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39ceb94fdb96da47a350b92e86513ddc57a657eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9..329c05520e 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From arnout at mind.be Sun Mar 27 15:59:55 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:55 +0200 Subject: [Buildroot] [git commit] package/mp4v2: bump to version 2.1.1 Message-ID: <20220327160039.87AB485DB6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a324bbcf7e44d819fce8584595ca49bde7077e33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch to new active fork: https://github.com/enzo1982/mp4v2/discussions/1 https://github.com/TechSmith/mp4v2/commit/461abd2b1365e14ba28dd0e4a0cb6c3bee1bab41 - C++11 is not needed anymore thanks to https://github.com/enzo1982/mp4v2/commit/5a57bc2ce8948f6ffa96761286921ab3e2ebe467 - Drop patch (not needed since https://github.com/enzo1982/mp4v2/commit/23f8b907d4a221e1dae9e8b859cb6b1161206866) - Update license (minor fix: https://github.com/enzo1982/mp4v2/commit/0c37402d9d3644ea0b7d55db1d901bfad9723dfc) - Version 2.1.1 was never released before so no issue is expected (except a misunderstanding of users but new upstream is aware of this: https://github.com/enzo1982/mp4v2/discussions/1#discussioncomment-2399344) https://github.com/enzo1982/mp4v2/releases/tag/v2.1.1 https://github.com/enzo1982/mp4v2/releases/tag/v2.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...001-Static-cast-to-unsigned-int-for-cases.patch | 99 ---------------------- package/mp4v2/Config.in | 8 +- package/mp4v2/mp4v2.hash | 4 +- package/mp4v2/mp4v2.mk | 5 +- 4 files changed, 8 insertions(+), 108 deletions(-) diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch deleted file mode 100644 index 6c9b13bed8..0000000000 --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Thu, 6 Aug 2020 15:22:04 +0200 -Subject: [PATCH] Static cast to unsigned int for cases - -Signed-off-by: Jason A. Donenfeld -[Retrieved from: -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] -Signed-off-by: Fabrice Fontaine ---- - libutil/Utility.cpp | 2 +- - util/mp4art.cpp | 2 +- - util/mp4chaps.cpp | 2 +- - util/mp4file.cpp | 2 +- - util/mp4subtitle.cpp | 2 +- - util/mp4track.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp -index 76cdd12..d6739d4 100644 ---- a/libutil/Utility.cpp -+++ b/libutil/Utility.cpp -@@ -493,7 +493,7 @@ Utility::process_impl() - if( codes.find( code ) == codes.end() ) - continue; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case 'z': - _optimize = true; - break; -diff --git a/util/mp4art.cpp b/util/mp4art.cpp -index add935e..6e7f531 100644 ---- a/util/mp4art.cpp -+++ b/util/mp4art.cpp -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case LC_ART_ANY: - _artFilter = numeric_limits::max(); - break; -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp -index 98400f8..ccc8b70 100644 ---- a/util/mp4chaps.cpp -+++ b/util/mp4chaps.cpp -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case 'A': - case LC_CHPT_ANY: - _ChapterType = MP4ChapterTypeAny; -diff --git a/util/mp4file.cpp b/util/mp4file.cpp -index c27844b..b127cd1 100644 ---- a/util/mp4file.cpp -+++ b/util/mp4file.cpp -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &FileUtility::actionList; - break; -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp -index 7462153..19d977d 100644 ---- a/util/mp4subtitle.cpp -+++ b/util/mp4subtitle.cpp -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &SubtitleUtility::actionList; - break; -diff --git a/util/mp4track.cpp b/util/mp4track.cpp -index d550506..cd63d7e 100644 ---- a/util/mp4track.cpp -+++ b/util/mp4track.cpp -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_TRACK_WILDCARD: - _trackMode = TM_WILDCARD; - break; --- -2.28.0 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 00e80cd358..705a8c9d24 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,12 +1,11 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. - https://github.com/TechSmith/mp4v2/ + https://mp4v2.org/ if BR2_PACKAGE_MP4V2 @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 +comment "mp4v2 needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 7aa5402c8f..d3f0243650 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 6d29228a13..7de837c170 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,9 +4,10 @@ # ################################################################################ -MP4V2_VERSION = 5.0.1 +MP4V2_VERSION = 2.1.1 MP4V2_SITE = \ - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 15:59:52 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 17:59:52 +0200 Subject: [Buildroot] [git commit] package/jack2: explicitly {dis, en}able opus and readline Message-ID: <20220327160039.7C2E685E0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=618a23100fe5ff54b90ada1a8f23453f6c5a77dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 127c99eed1..6939aac9a6 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -21,10 +21,16 @@ endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) From arnout at mind.be Sun Mar 27 16:23:18 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:23:18 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: <20220325212405.25243-1-james.hilliard1@gmail.com> References: <20220325212405.25243-1-james.hilliard1@gmail.com> Message-ID: <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> On 25/03/2022 22:24, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Although honestly, there's not much point updating a host-only package unless it actually fixes an issue. Regards, Arnout > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index d909709b24..8389adb243 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc > -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc > +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 4615e839fe..e9c3145183 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 0.61.3 > +MESON_VERSION = 0.61.4 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:23:31 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:23:31 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: add cmake dependency support In-Reply-To: <20220324055602.3021498-1-james.hilliard1@gmail.com> References: <20220324055602.3021498-1-james.hilliard1@gmail.com> Message-ID: On 24/03/2022 06:56, James Hilliard wrote: > Meson dependencies and variables can be provided by cmake similar to > how they can be provided by pkgconfig, for this to work we need to > ensure that cmake_prefix_path is set for both cross and native > targets along with the cmake binary path. > > See: > https://mesonbuild.com/Dependencies.html#cmake > https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways > https://mesonbuild.com/Machine-files.html#meson-builtin-options > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/pkg-meson.mk | 2 ++ > support/misc/cross-compilation.conf.in | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 85de98e03a..9e70d49b60 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED > -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ > -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ > -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ > + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ > -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ > -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ > -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ > @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS > -Db_pie=false \ > -Dstrip=false \ > -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ > + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ > $$($$(PKG)_CONF_OPTS) \ > $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build > endef > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index 18cf258a8e..1977a83501 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -8,6 +8,7 @@ c = '@TARGET_CC@' > cpp = '@TARGET_CXX@' > ar = '@TARGET_AR@' > strip = '@TARGET_STRIP@' > +cmake = '@BR2_CMAKE@' > pkgconfig = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] > cpp_args = [@TARGET_CXXFLAGS@] > cpp_link_args = [@TARGET_LDFLAGS@] > wrap_mode = 'nodownload' > +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' > > [properties] > needs_exe_wrapper = true From arnout at mind.be Sun Mar 27 16:27:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:27:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 In-Reply-To: <20220324063928.3448755-1-james.hilliard1@gmail.com> References: <20220324063928.3448755-1-james.hilliard1@gmail.com> Message-ID: <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> On 24/03/2022 07:39, James Hilliard wrote: > CONTRIBUTING.md hash changed due to various style updates. > > Set new default wifi backend config option to iwd when enabled in > cases where the default wpa_supplicant is not enabled. Applied to master, thanks. However, I would like to challenge the order of preference here. If you select network-manager, iwd and wpa_supplicant, and network-manager uses wpa_supplicant, then you end up not using iwd at all, so that was probably not the intention of the user. However, there is a good reason to still have wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant is also used for 802.1X authentication over Ethernet. Either way, it's pretty hard to guess the intention of the user. So maybe a Config.in choice is appropriate? > > Signed-off-by: James Hilliard > --- > package/network-manager/network-manager.hash | 6 +++--- > package/network-manager/network-manager.mk | 13 ++++++++++--- > 2 files changed, 13 insertions(+), 6 deletions(-) > > diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash > index d25f0e8194..26bcf843c2 100644 > --- a/package/network-manager/network-manager.hash > +++ b/package/network-manager/network-manager.hash > @@ -1,6 +1,6 @@ > -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum > -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz > +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum > +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz > # Locally computed > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL > -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md > +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index a90228992c..3479bb3794 100644 > --- a/package/network-manager/network-manager.mk > +++ b/package/network-manager/network-manager.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -NETWORK_MANAGER_VERSION_MAJOR = 1.34 > -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 > +NETWORK_MANAGER_VERSION_MAJOR = 1.36 > +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > NETWORK_MANAGER_INSTALL_STAGING = YES > @@ -53,8 +53,15 @@ endif > ifeq ($(BR2_PACKAGE_IWD),y) > NETWORK_MANAGER_DEPENDENCIES += iwd > NETWORK_MANAGER_CONF_OPTS += --with-iwd > +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant > else > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd > +endif > +else > +NETWORK_MANAGER_CONF_OPTS += \ > + --without-iwd \ > + --with-config-wifi-backend-default=wpa_supplicant This is set regardless of whether wpa_supplicant is enabled or not. Are you sure that's OK? Regards, Arnout > endif > > ifeq ($(BR2_PACKAGE_LIBCURL),y) From arnout at mind.be Sun Mar 27 16:28:10 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:28:10 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-txaio: bump to version 22.2.1 In-Reply-To: <20220324071817.1270488-1-james.hilliard1@gmail.com> References: <20220324071817.1270488-1-james.hilliard1@gmail.com> Message-ID: <0463edce-bf9b-ecd1-2f6d-cc728a64409d@mind.be> On 24/03/2022 08:18, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-txaio/python-txaio.hash | 4 ++-- > package/python-txaio/python-txaio.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash > index 5e05f02d3a..f06c14b21f 100644 > --- a/package/python-txaio/python-txaio.hash > +++ b/package/python-txaio/python-txaio.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/txaio/json > -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz > -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz > +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz > +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz > # Locally computed sha256 checksums > sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE > diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk > index 750d9e3d3d..1a8a888963 100644 > --- a/package/python-txaio/python-txaio.mk > +++ b/package/python-txaio/python-txaio.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TXAIO_VERSION = 21.2.1 > +PYTHON_TXAIO_VERSION = 22.2.1 > PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz > -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 > +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 > PYTHON_TXAIO_LICENSE = MIT > PYTHON_TXAIO_LICENSE_FILES = LICENSE > PYTHON_TXAIO_SETUP_TYPE = setuptools From arnout at mind.be Sun Mar 27 16:28:30 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:28:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy In-Reply-To: <20220324223218.27767-1-fontaine.fabrice@gmail.com> References: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Message-ID: <6e6b1d54-a96f-1115-be91-7349e652043f@mind.be> On 24/03/2022 23:32, Fabrice Fontaine wrote: > Fix the following build failure if clang-tidy is found on host (and > protobuf is built before protozero) which is raised since tests are > disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: > > CMake Error at CMakeLists.txt:77 (add_dependencies): > The dependency target "writer_tests" of target "clang-tidy" does not exist. > > Fixes: > - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...xt-protobuf-is-only-needed-for-tests.patch | 35 +++++++++++++++++++ > 1 file changed, 35 insertions(+) > create mode 100644 package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch > > diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch > new file mode 100644 > index 0000000000..3033e24aa2 > --- /dev/null > +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch > @@ -0,0 +1,35 @@ > +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Wed, 16 Feb 2022 00:11:38 +0100 > +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests > + > +Don't check for protobuf if tests are disabled. As a side effect, this > +will avoid a build failure if clang-tidy and protobuf are found but > +tests are disabled > + > +Fix #109 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: https://github.com/mapbox/protozero/pull/110] > +--- > + CMakeLists.txt | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index b975d49..df2ca15 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -52,7 +52,9 @@ endif() > + # > + #----------------------------------------------------------------------------- > + > +-find_package(Protobuf) > ++if(BUILD_TESTING) > ++ find_package(Protobuf) > ++endif() > + > + > + #----------------------------------------------------------------------------- > +-- > +2.34.1 > + From arnout at mind.be Sun Mar 27 16:28:46 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:28:46 +0200 Subject: [Buildroot] [PATCH v1] package/wireshark: fix compile with ccache enabled In-Reply-To: <20220325190934.24982-1-ps.report@gmx.net> References: <20220325190934.24982-1-ps.report@gmx.net> Message-ID: On 25/03/2022 20:09, Peter Seiderer wrote: > - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER > > Fixes: > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] > [...] > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > .../host/bin/ccache: invalid option -- 'D' > > Reported-by: Dan Ambrosio > Signed-off-by: Peter Seiderer Applied to master, thanks. Regards, Arnout > --- > package/wireshark/wireshark.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk > index a5ca4b1f73..1a549f7037 100644 > --- a/package/wireshark/wireshark.mk > +++ b/package/wireshark/wireshark.mk > @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ > -DENABLE_ILBC=OFF \ > -DENABLE_PCAP=ON \ > -DENABLE_SMI=OFF \ > - -DLEMON_C_COMPILER=$(HOSTCC) > + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From arnout at mind.be Sun Mar 27 16:29:03 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:03 +0200 Subject: [Buildroot] [PATCH 1/1] package/iwd: fix uclibc build In-Reply-To: <20220325210554.526198-1-fontaine.fabrice@gmail.com> References: <20220325210554.526198-1-fontaine.fabrice@gmail.com> Message-ID: On 25/03/2022 22:05, Fabrice Fontaine wrote: > Fix the following uclibc build failure raised since bump to version 1.25 > in commit 0fc5bc235990073233df6352d1208624034a6b6e and > https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=01cd8587606bf2da1af245163150589834126c1: > > /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': > storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' > > Fixes: > - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...-src-storage.c-fix-build-with-uclibc.patch | 37 +++++++++++++++++++ > 1 file changed, 37 insertions(+) > create mode 100644 package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch > > diff --git a/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch > new file mode 100644 > index 0000000000..55fdaa86fd > --- /dev/null > +++ b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch > @@ -0,0 +1,37 @@ > +From 99e74ade2ea892e6d0b070bec1df6a135ce2c8b3 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Fri, 25 Mar 2022 16:35:49 +0100 > +Subject: [PATCH] src/storage.c: fix build with uclibc > + > +explicit_bzero is used in src/storage.c since commit > +01cd8587606bf2da1af245163150589834126c1c but src/missing.h is not > +included, as a result build with uclibc fails on: > + > +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': > +storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' > + > +Fixes: > + - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 > + > +Signed-off-by: Fabrice Fontaine > +[Upstream status: > +https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/WB2XXRBUDHC5IVFDEOJBK23JHPURL427] > +--- > + src/storage.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/src/storage.c b/src/storage.c > +index 82a72443..aa8066b1 100644 > +--- a/src/storage.c > ++++ b/src/storage.c > +@@ -44,6 +44,7 @@ > + #include > + #include "ell/useful.h" > + > ++#include "src/missing.h" > + #include "src/common.h" > + #include "src/storage.h" > + #include "src/crypto.h" > +-- > +2.35.1 > + From arnout at mind.be Sun Mar 27 16:29:25 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:25 +0200 Subject: [Buildroot] [PATCH 1/1] package/atk: bump to version 2.38.0 In-Reply-To: <20220325211725.612796-1-fontaine.fabrice@gmail.com> References: <20220325211725.612796-1-fontaine.fabrice@gmail.com> Message-ID: <8c605bb1-5f14-d29b-43fb-6ce9b44ad7f5@mind.be> On 25/03/2022 22:17, Fabrice Fontaine wrote: > https://gitlab.gnome.org/GNOME/atk/-/tags/2.38.0 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/atk/atk.hash | 4 ++-- > package/atk/atk.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/atk/atk.hash b/package/atk/atk.hash > index 2e7c3b5fec..d8cd69ff1f 100644 > --- a/package/atk/atk.hash > +++ b/package/atk/atk.hash > @@ -1,5 +1,5 @@ > -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum > -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz > +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum > +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz > > # Hash for license file > sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING > diff --git a/package/atk/atk.mk b/package/atk/atk.mk > index dfeb4de8b2..2820fb486d 100644 > --- a/package/atk/atk.mk > +++ b/package/atk/atk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ATK_VERSION_MAJOR = 2.36 > +ATK_VERSION_MAJOR = 2.38 > ATK_VERSION = $(ATK_VERSION_MAJOR).0 > ATK_SOURCE = atk-$(ATK_VERSION).tar.xz > ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) From arnout at mind.be Sun Mar 27 16:29:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:40 +0200 Subject: [Buildroot] [PATCH 1/1] package/frr: bump to version 8.2.2 In-Reply-To: <20220325212852.713531-1-fontaine.fabrice@gmail.com> References: <20220325212852.713531-1-fontaine.fabrice@gmail.com> Message-ID: <56dfbfb1-c67a-211f-55ce-00df980cfa9c@mind.be> On 25/03/2022 22:28, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://frrouting.org/release/8.2.2 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...001-configure.ac-fix-enable_bmp-typo.patch | 29 ----------------- > ...-lib-fix-elf_py-TLS-section-handling.patch | 31 ------------------- > package/frr/frr.hash | 2 +- > package/frr/frr.mk | 2 +- > 4 files changed, 2 insertions(+), 62 deletions(-) > delete mode 100644 package/frr/0001-configure.ac-fix-enable_bmp-typo.patch > delete mode 100644 package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch > > diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch > deleted file mode 100644 > index c8ce500dfc..0000000000 > --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Thu, 16 Dec 2021 20:10:26 +0100 > -Subject: [PATCH] configure.ac: fix enable_bmp typo > - > -enable_bmp doesn't exist, use enable_bgp_bmp > - > -Signed-off-by: Fabrice Fontaine > -[Upstream status: https://github.com/FRRouting/frr/pull/10236] > ---- > - configure.ac | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index 1bcc42ef8..c7a5f1286 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then > - fi > - > - bgpd_bmp=false > --case "${enable_bmp}" in > -+case "${enable_bgp_bmp}" in > - no) > - ;; > - yes) > --- > -2.33.0 > - > diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch > deleted file mode 100644 > index d491cb1a7d..0000000000 > --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 > -From: David Lamparter > -Date: Wed, 10 Nov 2021 15:30:07 +0100 > -Subject: [PATCH] lib: fix elf_py TLS section handling > - > -... need to ignore TLS sections, their address is effectively > -meaningless but can overlap other sections we actually need to access. > - > -Signed-off-by: David Lamparter > - > -[Retrieved from: > -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] > -Signed-off-by: Fabrice Fontaine > ---- > - lib/elf_py.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/lib/elf_py.c b/lib/elf_py.c > -index 1c306893ad8..f230add6957 100644 > ---- a/lib/elf_py.c > -+++ b/lib/elf_py.c > -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) > - Elf_Scn *scn = elf_getscn(ef->elf, i); > - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); > - > -+ /* virtual address is kinda meaningless for TLS sections */ > -+ if (shdr->sh_flags & SHF_TLS) > -+ continue; > - if (addr < shdr->sh_addr || > - addr >= shdr->sh_addr + shdr->sh_size) > - continue; > diff --git a/package/frr/frr.hash b/package/frr/frr.hash > index bb6c32b7bb..9bb2b75b8f 100644 > --- a/package/frr/frr.hash > +++ b/package/frr/frr.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz > +sha256 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f frr-8.2.2.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/frr/frr.mk b/package/frr/frr.mk > index 0e6ab7a815..aa36387a3a 100644 > --- a/package/frr/frr.mk > +++ b/package/frr/frr.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -FRR_VERSION = 8.1 > +FRR_VERSION = 8.2.2 > FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) > FRR_LICENSE = GPL-2.0 > FRR_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:29:53 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:29:53 +0200 Subject: [Buildroot] [PATCH 1/1] package/btrfs-progs: bump to version 5.16.2 In-Reply-To: <20220325213557.757894-1-fontaine.fabrice@gmail.com> References: <20220325213557.757894-1-fontaine.fabrice@gmail.com> Message-ID: On 25/03/2022 22:35, Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ---------------- > ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 ------------------- > ...ocal-definition-for-alignment-macros.patch | 46 ----------------- > package/btrfs-progs/btrfs-progs.hash | 2 +- > package/btrfs-progs/btrfs-progs.mk | 2 +- > 5 files changed, 2 insertions(+), 140 deletions(-) > delete mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > delete mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch > delete mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch > > diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > deleted file mode 100644 > index b6c1a42456..0000000000 > --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 > -From: Bruce Ashfield > -Date: Thu, 30 Dec 2021 15:23:59 +0200 > -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ > - headers > - > -btrfs-tools compile fails with mips, musl and 5.12+ headers. > - > -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we > -add an explicit include of const.h to pickup the macro: > - > - | make: *** [Makefile:595: mkfs.btrfs] Error 1 > - | make: *** Waiting for unfinished jobs.... > - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': > - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' > - | collect2: error: ld returned 1 exit status > - > -This is safe for older kernel's as well, since the header still > -exists, and is valid to include. > - > -Signed-off-by: Bruce Ashfield > -[remove invalid OE Upstream-status] > -Signed-off-by: Stijn Tintel > -Signed-off-by: David Sterba > -[Retrieved from: > -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] > -Signed-off-by: Fabrice Fontaine > ---- > - kerncompat.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/kerncompat.h b/kerncompat.h > -index df167fe6c..2503d1afa 100644 > ---- a/kerncompat.h > -+++ b/kerncompat.h > -@@ -29,6 +29,7 @@ > - #include > - #include > - #include > -+#include > - #include > - > - #include > diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch > deleted file mode 100644 > index 7473fe67cb..0000000000 > --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Sat, 8 Jan 2022 22:44:44 +0100 > -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl > - > -Make inclusion of sys/sysinfo.h conditional to avoid the following build > -failure on musl: > - > -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, > - from ./kerncompat.h:31, > - from common/utils.c:42: > -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' > - 7 | struct sysinfo { > - | ^~~~~~~ > -In file included from common/utils.c:27: > -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here > - 10 | struct sysinfo { > - | ^~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc > - > -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, > -while both must not be included at the same time. Stop including > -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and > -causes the double definition for some reason. As we now include > -linux/const.h directly, there's no other effective change. > - > -Pull-request: #433 > -Signed-off-by: Fabrice Fontaine > -Signed-off-by: David Sterba > -[Retrieved from: > -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] > ---- > - kerncompat.h | 1 - > - 1 file changed, 1 deletion(-) > - > -diff --git a/kerncompat.h b/kerncompat.h > -index 2503d1afa..6ca1526e2 100644 > ---- a/kerncompat.h > -+++ b/kerncompat.h > -@@ -28,7 +28,6 @@ > - #include > - #include > - #include > --#include > - #include > - #include > - > diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch > deleted file mode 100644 > index 86c63edc30..0000000000 > --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch > +++ /dev/null > @@ -1,46 +0,0 @@ > -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 > -From: David Sterba > -Date: Thu, 13 Jan 2022 14:47:08 +0100 > -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment > - macros > - > -There's still problem left with compilation on musl and kernel < 5.11, > -because __ALIGN_KERNEL is not defined anymore: > - > -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': > -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' > - > -Due to the entangled includes and unconditional definition of > -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it > -eventually (as kerncompat.h is the first include). Instead add local > -definitions of the macros and rename them to avoid name clashes. > - > -Pull-request: #433 > -Signed-off-by: David Sterba > -[Retrieved from: > -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] > -Signed-off-by: Fabrice Fontaine > ---- > - kerncompat.h | 9 ++++++++- > - 1 file changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/kerncompat.h b/kerncompat.h > -index 6ca1526e2..f0a6e196e 100644 > ---- a/kerncompat.h > -+++ b/kerncompat.h > -@@ -359,7 +359,14 @@ do { \ > - > - /* Alignment check */ > - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) > --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) > -+ > -+/* > -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around > -+ * issues caused by moving the definition in 5.12 > -+ */ > -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) > -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) > -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) > - > - static inline int is_power_of_2(unsigned long n) > - { > diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash > index 339eab02aa..14eeb1ca07 100644 > --- a/package/btrfs-progs/btrfs-progs.hash > +++ b/package/btrfs-progs/btrfs-progs.hash > @@ -1,5 +1,5 @@ > # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc > -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz > +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz > # Locally computed > sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk > index 54922df839..9bf50ccfda 100644 > --- a/package/btrfs-progs/btrfs-progs.mk > +++ b/package/btrfs-progs/btrfs-progs.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BTRFS_PROGS_VERSION = 5.15.1 > +BTRFS_PROGS_VERSION = 5.16.2 > BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs > BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz > BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib From arnout at mind.be Sun Mar 27 16:30:27 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:30:27 +0200 Subject: [Buildroot] [PATCH v2 1/3] package/intel-mediadriver: bump version to 22.3.0 In-Reply-To: <20220326142007.864294-1-bernd.kuhls@t-online.de> References: <20220326142007.864294-1-bernd.kuhls@t-online.de> Message-ID: On 26/03/2022 15:20, Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls Applied all 3 to master, thanks. Regards, Arnout > --- > v2: no changes > > package/intel-mediadriver/intel-mediadriver.hash | 2 +- > package/intel-mediadriver/intel-mediadriver.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash > index 044b9d7013..57499830b1 100644 > --- a/package/intel-mediadriver/intel-mediadriver.hash > +++ b/package/intel-mediadriver/intel-mediadriver.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz > +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz > sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md > diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk > index 84eda811ae..c22aeecc77 100644 > --- a/package/intel-mediadriver/intel-mediadriver.mk > +++ b/package/intel-mediadriver/intel-mediadriver.mk > @@ -6,7 +6,7 @@ > > # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack > > -INTEL_MEDIADRIVER_VERSION = 22.2.2 > +INTEL_MEDIADRIVER_VERSION = 22.3.0 > INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive > INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz > INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sun Mar 27 16:30:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:30:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4632 In-Reply-To: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> References: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> Message-ID: <8d7d7ad2-26a7-bcf4-8124-5859243560ea@mind.be> On 26/03/2022 21:49, Fabrice Fontaine wrote: > Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub > repository vim/vim prior to 8.2.4563. > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/vim/vim.hash | 2 +- > package/vim/vim.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/vim/vim.hash b/package/vim/vim.hash > index 8b60b7461f..d2c91dcfa5 100644 > --- a/package/vim/vim.hash > +++ b/package/vim/vim.hash > @@ -1,4 +1,4 @@ > # Locally computed > -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz > +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz > sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE > sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt > diff --git a/package/vim/vim.mk b/package/vim/vim.mk > index 28fd33c8ef..71aa735eff 100644 > --- a/package/vim/vim.mk > +++ b/package/vim/vim.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -VIM_VERSION = 8.2.4450 > +VIM_VERSION = 8.2.4632 > VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) > VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) > VIM_SUBDIR = src From arnout at mind.be Sun Mar 27 16:31:13 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:31:13 +0200 Subject: [Buildroot] [PATCH] package/lua-basexx: bump to version 0.4.1 In-Reply-To: <20220327142023.1477251-1-francois.perrad@gadz.org> References: <20220327142023.1477251-1-francois.perrad@gadz.org> Message-ID: <69a2a7a8-3f06-2779-b6f9-32f7d9345bfb@mind.be> On 27/03/2022 16:20, Francois Perrad wrote: > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/lua-basexx/lua-basexx.hash | 4 ++-- > package/lua-basexx/lua-basexx.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash > index aee636c32..447ec60ba 100644 > --- a/package/lua-basexx/lua-basexx.hash > +++ b/package/lua-basexx/lua-basexx.hash > @@ -1,3 +1,3 @@ > # computed by luarocks/buildroot > -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock > -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE > +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock > +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE > diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk > index 5aa5ecf21..22b5a3771 100644 > --- a/package/lua-basexx/lua-basexx.mk > +++ b/package/lua-basexx/lua-basexx.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUA_BASEXX_VERSION = 0.4.0-1 > +LUA_BASEXX_VERSION = 0.4.1-1 > LUA_BASEXX_NAME_UPSTREAM = basexx > LUA_BASEXX_LICENSE = MIT > LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:31:35 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 18:31:35 +0200 Subject: [Buildroot] [PATCH] package/luasec: bump to version 1.0.2 In-Reply-To: <20220327142048.1477306-1-francois.perrad@gadz.org> References: <20220327142048.1477306-1-francois.perrad@gadz.org> Message-ID: <74c2bcf3-61df-6077-1609-f4867379ebb3@mind.be> On 27/03/2022 16:20, Francois Perrad wrote: > diff LICENSE: > -LuaSec 1.0 license > +LuaSec 1.0.2 license > > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/luasec/luasec.hash | 4 ++-- > package/luasec/luasec.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash > index 1ea422aa9..1e381612b 100644 > --- a/package/luasec/luasec.hash > +++ b/package/luasec/luasec.hash > @@ -1,3 +1,3 @@ > # computed by luarocks/buildroot > -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock > -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE > +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock > +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE > diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk > index 3ef0c14da..4ace94d16 100644 > --- a/package/luasec/luasec.mk > +++ b/package/luasec/luasec.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LUASEC_VERSION = 1.0-1 > +LUASEC_VERSION = 1.0.2-1 > LUASEC_SUBDIR = luasec > LUASEC_LICENSE = MIT > LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:12:14 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:14 +0200 Subject: [Buildroot] [git commit] package/python-txaio: bump to version 22.2.1 Message-ID: <20220327162300.61D6785E92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3cbe5a540f04ef29ecf00fb23bc26068c3a718ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-txaio/python-txaio.hash | 4 ++-- package/python-txaio/python-txaio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 5e05f02d3a..f06c14b21f 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 750d9e3d3d..1a8a888963 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 21.2.1 +PYTHON_TXAIO_VERSION = 22.2.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools From arnout at mind.be Sun Mar 27 16:12:20 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:20 +0200 Subject: [Buildroot] [git commit] package/wireshark: fix compile with ccache enabled Message-ID: <20220327162300.77F0785E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=082076ffc186392f2b794facaa0545529e4f5851 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73..1a549f7037 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From arnout at mind.be Sun Mar 27 16:12:25 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:25 +0200 Subject: [Buildroot] [git commit] package/atk: bump to version 2.38.0 Message-ID: <20220327162300.8B22485E92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc1ffa38ba7a47aea2b0ab5bb86e198607ee61b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://gitlab.gnome.org/GNOME/atk/-/tags/2.38.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/atk/atk.hash | 4 ++-- package/atk/atk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 2e7c3b5fec..d8cd69ff1f 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz # Hash for license file sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index dfeb4de8b2..2820fb486d 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.36 +ATK_VERSION_MAJOR = 2.38 ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) From arnout at mind.be Sun Mar 27 16:12:09 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:09 +0200 Subject: [Buildroot] [git commit] package/pkg-meson: add cmake dependency support Message-ID: <20220327162300.4B18485E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b848117699707390b6507e59e2e705c54acdc9fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Meson dependencies and variables can be provided by cmake similar to how they can be provided by pkgconfig, for this to work we need to ensure that cmake_prefix_path is set for both cross and native targets along with the cmake binary path. See: https://mesonbuild.com/Dependencies.html#cmake https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways https://mesonbuild.com/Machine-files.html#meson-builtin-options Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a..9e70d49b60 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e..1977a83501 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,7 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true From arnout at mind.be Sun Mar 27 16:12:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:42 +0200 Subject: [Buildroot] [git commit] package/intel-mediasdk: bump version to 22.3.0 Message-ID: <20220327162300.D582085E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4722ba7b6eee79c066cca79ec7196ef9c9a9dcda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index d9acf49637..802131a772 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f8029e487aa163a9bf1061129fa1bf42ec85cd6a11014303d6d41e52463972f intel-mediasdk-22.2.2.tar.gz +sha256 e1e74229f409e969b70c2b35b1955068de3d40db85ecc42bd6ff501468bc76d7 intel-mediasdk-22.3.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 698d2348b2..b90d252b4f 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.2.2 +INTEL_MEDIASDK_VERSION = 22.3.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From arnout at mind.be Sun Mar 27 16:12:17 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:17 +0200 Subject: [Buildroot] [git commit] package/protozero: fix build with clang-tidy Message-ID: <20220327162300.6B90C85E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e54b82306d005eeb4ed013a4cbd39e59e5ea8f19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure if clang-tidy is found on host (and protobuf is built before protozero) which is raised since tests are disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: CMake Error at CMakeLists.txt:77 (add_dependencies): The dependency target "writer_tests" of target "clang-tidy" does not exist. Fixes: - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...sts.txt-protobuf-is-only-needed-for-tests.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 0000000000..3033e24aa2 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + From arnout at mind.be Sun Mar 27 16:12:31 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:31 +0200 Subject: [Buildroot] [git commit] package/frr: bump to version 8.2.2 Message-ID: <20220327162300.A53D185E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f799da6f742ef284e6b342054a59cc81e5f07681 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://frrouting.org/release/8.2.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-configure.ac-fix-enable_bmp-typo.patch | 29 -------------------- .../0002-lib-fix-elf_py-TLS-section-handling.patch | 31 ---------------------- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 4 files changed, 2 insertions(+), 62 deletions(-) diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch deleted file mode 100644 index c8ce500dfc..0000000000 --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 16 Dec 2021 20:10:26 +0100 -Subject: [PATCH] configure.ac: fix enable_bmp typo - -enable_bmp doesn't exist, use enable_bgp_bmp - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FRRouting/frr/pull/10236] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1bcc42ef8..c7a5f1286 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then - fi - - bgpd_bmp=false --case "${enable_bmp}" in -+case "${enable_bgp_bmp}" in - no) - ;; - yes) --- -2.33.0 - diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch deleted file mode 100644 index d491cb1a7d..0000000000 --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Wed, 10 Nov 2021 15:30:07 +0100 -Subject: [PATCH] lib: fix elf_py TLS section handling - -... need to ignore TLS sections, their address is effectively -meaningless but can overlap other sections we actually need to access. - -Signed-off-by: David Lamparter - -[Retrieved from: -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] -Signed-off-by: Fabrice Fontaine ---- - lib/elf_py.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/elf_py.c b/lib/elf_py.c -index 1c306893ad8..f230add6957 100644 ---- a/lib/elf_py.c -+++ b/lib/elf_py.c -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) - Elf_Scn *scn = elf_getscn(ef->elf, i); - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); - -+ /* virtual address is kinda meaningless for TLS sections */ -+ if (shdr->sh_flags & SHF_TLS) -+ continue; - if (addr < shdr->sh_addr || - addr >= shdr->sh_addr + shdr->sh_size) - continue; diff --git a/package/frr/frr.hash b/package/frr/frr.hash index bb6c32b7bb..9bb2b75b8f 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz +sha256 33e974e2a622618e139983f65d93e92e7f1a735936ef18b18244403b15be002f frr-8.2.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 0e6ab7a815..aa36387a3a 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.1 +FRR_VERSION = 8.2.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:12:12 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:12 +0200 Subject: [Buildroot] [git commit] package/network-manager: bump to version 1.36.4 Message-ID: <20220327162300.5886C85E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83ab8cc0bdb3ff376d7c61ceeb0b749f8c142b8a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master CONTRIBUTING.md hash changed due to various style updates. Set new default wifi backend config option to iwd when enabled in cases where the default wpa_supplicant is not enabled. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/network-manager/network-manager.hash | 6 +++--- package/network-manager/network-manager.mk | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index d25f0e8194..26bcf843c2 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992c..3479bb3794 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.34 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.36 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES @@ -53,8 +53,15 @@ endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_CONF_OPTS += --with-iwd +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +endif +else +NETWORK_MANAGER_CONF_OPTS += \ + --without-iwd \ + --with-config-wifi-backend-default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) From arnout at mind.be Sun Mar 27 16:12:37 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:37 +0200 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 22.3.0 Message-ID: <20220327162300.BEB7A85E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c75dc73de4b71084ce30f38c6b20068188e13bfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 044b9d7013..57499830b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b74227ab165fdb09f184968589129dbf29bf382b44b415dd69db9e612f551345 intel-media-22.2.2.tar.gz +sha256 89940ae2f7e5c7ec182f0d4d0ce8e149ae614876edd5bdad2b852e699a29b3f9 intel-media-22.3.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index f0e9f46f07..3e53bc0a3d 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.2.2 +INTEL_MEDIADRIVER_VERSION = 22.3.0 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From arnout at mind.be Sun Mar 27 16:12:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:45 +0200 Subject: [Buildroot] [git commit] package/vim: security bump to version 8.2.4632 Message-ID: <20220327162300.E256185E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b66fdc55fa097d139590d979f24c15b694e8bc3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From arnout at mind.be Sun Mar 27 16:12:48 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:48 +0200 Subject: [Buildroot] [git commit] package/lua-basexx: bump to version 0.4.1 Message-ID: <20220327162300.ED7E985E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b04d8ad4d2acfcea21f83b74f94feace6aa2ef04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/lua-basexx/lua-basexx.hash | 4 ++-- package/lua-basexx/lua-basexx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash index aee636c32f..447ec60ba0 100644 --- a/package/lua-basexx/lua-basexx.hash +++ b/package/lua-basexx/lua-basexx.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk index 5aa5ecf218..22b5a3771e 100644 --- a/package/lua-basexx/lua-basexx.mk +++ b/package/lua-basexx/lua-basexx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_BASEXX_VERSION = 0.4.0-1 +LUA_BASEXX_VERSION = 0.4.1-1 LUA_BASEXX_NAME_UPSTREAM = basexx LUA_BASEXX_LICENSE = MIT LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:12:34 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:34 +0200 Subject: [Buildroot] [git commit] package/btrfs-progs: bump to version 5.16.2 Message-ID: <20220327162300.B341A85E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd651106fc87d2b22565d923217d315fcd537f0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ux-const-h-to-fix-build-with-5-12-headers.patch | 43 ------------------- ...clude-sys-sysinfo-h-conditionally-on-musl.patch | 49 ---------------------- ...add-local-definition-for-alignment-macros.patch | 46 -------------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 5 files changed, 2 insertions(+), 140 deletions(-) diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch deleted file mode 100644 index b6c1a42456..0000000000 --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 30 Dec 2021 15:23:59 +0200 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Signed-off-by: Bruce Ashfield -[remove invalid OE Upstream-status] -Signed-off-by: Stijn Tintel -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6c..2503d1afa 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch deleted file mode 100644 index 7473fe67cb..0000000000 --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 Jan 2022 22:44:44 +0100 -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl - -Make inclusion of sys/sysinfo.h conditional to avoid the following build -failure on musl: - -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from ./kerncompat.h:31, - from common/utils.c:42: -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - 7 | struct sysinfo { - | ^~~~~~~ -In file included from common/utils.c:27: -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - 10 | struct sysinfo { - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc - -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, -while both must not be included at the same time. Stop including -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and -causes the double definition for some reason. As we now include -linux/const.h directly, there's no other effective change. - -Pull-request: #433 -Signed-off-by: Fabrice Fontaine -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] ---- - kerncompat.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 2503d1afa..6ca1526e2 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch deleted file mode 100644 index 86c63edc30..0000000000 --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 6ca1526e2..f0a6e196e 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - { diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 339eab02aa..14eeb1ca07 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 54922df839..9bf50ccfda 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.15.1 +BTRFS_PROGS_VERSION = 5.16.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib From arnout at mind.be Sun Mar 27 16:12:51 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:51 +0200 Subject: [Buildroot] [git commit] package/luasec: bump to version 1.0.2 Message-ID: <20220327162301.05AA185E90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b609e77bfab37ee71d31eeff24640a302946a44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master diff LICENSE: -LuaSec 1.0 license +LuaSec 1.0.2 license Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9b..1e381612bd 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14daf..4ace94d168 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.0.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From arnout at mind.be Sun Mar 27 16:12:28 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:28 +0200 Subject: [Buildroot] [git commit] package/meson: bump to version 0.61.4 Message-ID: <20220327162300.965FA85E08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=148e2115c0359ce0e39a75012f36ce985472e57f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index d909709b24..8389adb243 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 4615e839fe..e9c3145183 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.3 +MESON_VERSION = 0.61.4 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 16:12:23 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:23 +0200 Subject: [Buildroot] [git commit] package/iwd: fix uclibc build Message-ID: <20220327162300.8165E85E08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f11f6ab6e62cb04e33487390f0f0d66d9ed2d950 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following uclibc build failure raised since bump to version 1.25 in commit 0fc5bc235990073233df6352d1208624034a6b6e and https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=01cd8587606bf2da1af245163150589834126c1: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' Fixes: - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-src-storage.c-fix-build-with-uclibc.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch new file mode 100644 index 0000000000..55fdaa86fd --- /dev/null +++ b/package/iwd/0001-src-storage.c-fix-build-with-uclibc.patch @@ -0,0 +1,37 @@ +From 99e74ade2ea892e6d0b070bec1df6a135ce2c8b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Mar 2022 16:35:49 +0100 +Subject: [PATCH] src/storage.c: fix build with uclibc + +explicit_bzero is used in src/storage.c since commit +01cd8587606bf2da1af245163150589834126c1c but src/missing.h is not +included, as a result build with uclibc fails on: + +/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/storage.o: in function `storage_init': +storage.c:(.text+0x13a4): undefined reference to `explicit_bzero' + +Fixes: + - http://autobuild.buildroot.org/results/2aff8d3d7c33c95e2c57f7c8a71e69939f0580a1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/WB2XXRBUDHC5IVFDEOJBK23JHPURL427] +--- + src/storage.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/storage.c b/src/storage.c +index 82a72443..aa8066b1 100644 +--- a/src/storage.c ++++ b/src/storage.c +@@ -44,6 +44,7 @@ + #include + #include "ell/useful.h" + ++#include "src/missing.h" + #include "src/common.h" + #include "src/storage.h" + #include "src/crypto.h" +-- +2.35.1 + From arnout at mind.be Sun Mar 27 16:12:40 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Sun, 27 Mar 2022 18:12:40 +0200 Subject: [Buildroot] [git commit] package/intel-gmmlib: bump version to 22.1.2 Message-ID: <20220327162300.C94D085E91@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3dd0940081d5da5b5588fe3b4e9b5d20e4a4719e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/intel-gmmlib/0001-Drop-hardening-related-flags.patch | 2 +- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch index 581afd9066..c429df6581 100644 --- a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch +++ b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch @@ -15,7 +15,7 @@ diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake index 1a09bc4..b28fc1b 100644 --- a/Source/GmmLib/Linux.cmake +++ b/Source/GmmLib/Linux.cmake -@@ -62,7 +62,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON +@@ -99,7 +99,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON -DUSE_SSE3 -DUSE_SSSE3 # Other common flags diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index beb3cfd6ae..5e48238448 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d70ffc76e9dd7c533f4f3cd829da3a6df00b86418f78f057051d5e7cf208bc8d intel-gmmlib-22.0.3.tar.gz +sha256 3b9a6d5e7e3f5748b3d0a2fb0e980ae943907fece0980bd9c0508e71c838e334 intel-gmmlib-22.1.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 06628132a2..25cc733e0c 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.3 +INTEL_GMMLIB_VERSION = 22.1.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From james.hilliard1 at gmail.com Sun Mar 27 17:12:31 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:12:31 -0600 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 In-Reply-To: <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> References: <20220324063928.3448755-1-james.hilliard1@gmail.com> <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> Message-ID: On Sun, Mar 27, 2022 at 10:27 AM Arnout Vandecappelle wrote: > > > > On 24/03/2022 07:39, James Hilliard wrote: > > CONTRIBUTING.md hash changed due to various style updates. > > > > Set new default wifi backend config option to iwd when enabled in > > cases where the default wpa_supplicant is not enabled. > > Applied to master, thanks. > > However, I would like to challenge the order of preference here. If you select > network-manager, iwd and wpa_supplicant, and network-manager uses > wpa_supplicant, then you end up not using iwd at all, so that was probably not > the intention of the user. However, there is a good reason to still have > wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant > is also used for 802.1X authentication over Ethernet. This just sets a somewhat sane default, which can be overridden by the config files as with previous versions by setting the network manager config setting: [device] wifi.backend=iwd Note that upstream considers the iwd wifi backend somewhat experimental and defaults to wpa_supplicant even when iwd backend support is enabled. > > Either way, it's pretty hard to guess the intention of the user. So maybe a > Config.in choice is appropriate? I figured overrides can be just done via overlay for this with a config file. > > > > > Signed-off-by: James Hilliard > > --- > > package/network-manager/network-manager.hash | 6 +++--- > > package/network-manager/network-manager.mk | 13 ++++++++++--- > > 2 files changed, 13 insertions(+), 6 deletions(-) > > > > diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash > > index d25f0e8194..26bcf843c2 100644 > > --- a/package/network-manager/network-manager.hash > > +++ b/package/network-manager/network-manager.hash > > @@ -1,6 +1,6 @@ > > -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum > > -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz > > +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum > > +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz > > # Locally computed > > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL > > -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md > > +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md > > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > > index a90228992c..3479bb3794 100644 > > --- a/package/network-manager/network-manager.mk > > +++ b/package/network-manager/network-manager.mk > > @@ -4,8 +4,8 @@ > > # > > ################################################################################ > > > > -NETWORK_MANAGER_VERSION_MAJOR = 1.34 > > -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 > > +NETWORK_MANAGER_VERSION_MAJOR = 1.36 > > +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 > > NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz > > NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) > > NETWORK_MANAGER_INSTALL_STAGING = YES > > @@ -53,8 +53,15 @@ endif > > ifeq ($(BR2_PACKAGE_IWD),y) > > NETWORK_MANAGER_DEPENDENCIES += iwd > > NETWORK_MANAGER_CONF_OPTS += --with-iwd > > +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) > > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant > > else > > -NETWORK_MANAGER_CONF_OPTS += --without-iwd > > +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd > > +endif > > +else > > +NETWORK_MANAGER_CONF_OPTS += \ > > + --without-iwd \ > > + --with-config-wifi-backend-default=wpa_supplicant > > This is set regardless of whether wpa_supplicant is enabled or not. Are you > sure that's OK? > > Regards, > Arnout > > > endif > > > > ifeq ($(BR2_PACKAGE_LIBCURL),y) From james.hilliard1 at gmail.com Sun Mar 27 17:31:37 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:31:37 -0600 Subject: [Buildroot] [PATCH v3 1/1] package/network-manager: migrate autotools build system to meson Message-ID: <20220327173137.2575467-1-james.hilliard1@gmail.com> We need to add dbus as a build dependency since the meson build system uses dbus pkg-config to determine install locations. The meson build also requires mobile-broadband-info in order to get the database pkg-config variable. Signed-off-by: James Hilliard --- Changes v2 -> v3: - rebase on version 1.36.4 update Changes v1 -> v2: - add comments on new dependencies --- package/network-manager/Config.in | 1 + package/network-manager/network-manager.mk | 106 ++++++++++----------- 2 files changed, 51 insertions(+), 56 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..da1a7d79b3 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,6 +40,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 3479bb3794..19f2eb3b59 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \ libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md @@ -17,136 +17,130 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Dcrypto=gnutls \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) -NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=iwd endif else NETWORK_MANAGER_CONF_OPTS += \ - --without-iwd \ - --with-config-wifi-backend-default=wpa_supplicant + -Diwd=false \ + -Dconfig_wifi_backend_default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=true else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -159,4 +153,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 27 17:37:48 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:37:48 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> References: <20220325212405.25243-1-james.hilliard1@gmail.com> <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> Message-ID: On Sun, Mar 27, 2022 at 10:23 AM Arnout Vandecappelle wrote: > > > > On 25/03/2022 22:24, James Hilliard wrote: > > Signed-off-by: James Hilliard > > Applied to master, thanks. > > Although honestly, there's not much point updating a host-only package unless > it actually fixes an issue. There are usually minor fixes in each release with meson. Mostly I like to keep this updated since doing so helps catch upstream regressions. > > Regards, > Arnout > > > --- > > package/meson/meson.hash | 4 ++-- > > package/meson/meson.mk | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > > index d909709b24..8389adb243 100644 > > --- a/package/meson/meson.hash > > +++ b/package/meson/meson.hash > > @@ -1,4 +1,4 @@ > > # Locally calculated after checking pgp signature > > -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc > > -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz > > +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc > > +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz > > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > > index 4615e839fe..e9c3145183 100644 > > --- a/package/meson/meson.mk > > +++ b/package/meson/meson.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > > -MESON_VERSION = 0.61.3 > > +MESON_VERSION = 0.61.4 > > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > > MESON_LICENSE = Apache-2.0 > > MESON_LICENSE_FILES = COPYING From james.hilliard1 at gmail.com Sun Mar 27 17:41:30 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 11:41:30 -0600 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.62.0 Message-ID: <20220327174130.2577520-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 8389adb243..38fa43f6dc 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc -sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz.asc +sha256 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb meson-0.62.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e9c3145183..13adc2f2b1 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.4 +MESON_VERSION = 0.62.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING -- 2.25.1 From james.hilliard1 at gmail.com Sun Mar 27 18:01:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 12:01:25 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220327054814.942198-1-Jason@zx2c4.com> References: <20220327054814.942198-1-Jason@zx2c4.com> Message-ID: On Sat, Mar 26, 2022 at 11:48 PM Jason A. Donenfeld wrote: > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. > > Signed-off-by: Jason A. Donenfeld > --- > package/urandom-scripts/Config.in | 4 - > package/urandom-scripts/S20urandom | 55 +-- > package/urandom-scripts/seedrng.c | 445 +++++++++++++++++++++ > package/urandom-scripts/urandom-scripts.mk | 10 + > 4 files changed, 464 insertions(+), 50 deletions(-) > create mode 100644 package/urandom-scripts/seedrng.c > > diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in > index 987e442e22..070ffa5e9a 100644 > --- a/package/urandom-scripts/Config.in > +++ b/package/urandom-scripts/Config.in > @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS > depends on !BR2_PACKAGE_SYSTEMD > help > Initscript to preserve the random seed between reboots. > - > - WARNING: this is a poor fit to try and get high-quality > - entropy at boot. There are better ways, like haveged, or > - rng-tools. > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index c6b2ebd48f..f248089a0f 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -6,63 +6,26 @@ > # Quietly do nothing if /dev/urandom does not exist > [ -c /dev/urandom ] || exit 0 > > -URANDOM_SEED="/var/lib/random-seed" > +# Set this to true only if you do not want seed files to actually credit the > +# RNG, for example if you plan to replicate this file system image and do not > +# have the wherewithal to first delete the contents of /var/lib/seedrng. > +#export SEEDRNG_SKIP_CREDIT=false > +# You can also place this line into /etc/default/urandom. > > # shellcheck source=/dev/null > [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" > > -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then > - pool_size=$((pool_bits/8)) > -else > - pool_size=512 > -fi > - > -init_rng() { > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > -} > - > -save_random_seed() { > - printf 'Saving random seed: ' > - status=1 > - if touch "$URANDOM_SEED.new" 2> /dev/null; then > - old_umask=$(umask) > - umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > - | sha256sum \ > - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > - rm -f "$URANDOM_SEED.tmp" > - umask "$old_umask" > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - > - else > - echo "SKIP (read-only file system detected)" > - fi > - return "$status" > -} > - > case "$1" in > start|restart|reload) > # Carry a random seed from start-up to start-up > # Load and then save the whole entropy pool > - init_rng && save_random_seed;; > + # Never fail, as this isn't worth making a fuss > + # over if it doesn't go as planned. > + seedrng || true;; > stop) > # Carry a random seed from shut-down to start-up > # Save the whole entropy pool > - save_random_seed;; > + seedrng;; > *) > echo "Usage: $0 {start|stop|restart|reload}" > exit 1 > diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c > new file mode 100644 > index 0000000000..a77365d406 > --- /dev/null > +++ b/package/urandom-scripts/seedrng.c > @@ -0,0 +1,445 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) > +/* > + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. > + * > + * This is based on code from . > + */ > + > +#define _GNU_SOURCE > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#ifndef GRND_INSECURE > +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ > +#endif > + > +#ifndef LOCALSTATEDIR > +#define LOCALSTATEDIR "/var/lib" > +#endif > +#ifndef RUNSTATEDIR > +#define RUNSTATEDIR "/var/run" > +#endif Might be a good idea to have runtime env overrides for these to allow easier path customization by only having to override the init script in a rootfs overlay: https://buildroot.org/downloads/manual/manual.html#rootfs-custom Maybe something similar to the SEEDRNG_SKIP_CREDIT env override would make sense for these paths. > + > +#define SEED_DIR LOCALSTATEDIR "/seedrng" > +#define CREDITABLE_SEED SEED_DIR "/seed.credit" > +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" > +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" > + > +enum blake2s_lengths { > + BLAKE2S_BLOCK_LEN = 64, > + BLAKE2S_HASH_LEN = 32, > + BLAKE2S_KEY_LEN = 32 > +}; > + > +enum seedrng_lengths { > + MAX_SEED_LEN = 512, > + MIN_SEED_LEN = BLAKE2S_HASH_LEN > +}; > + > +struct blake2s_state { > + uint32_t h[8]; > + uint32_t t[2]; > + uint32_t f[2]; > + uint8_t buf[BLAKE2S_BLOCK_LEN]; > + unsigned int buflen; > + unsigned int outlen; > +}; > + > +#define le32_to_cpup(a) le32toh(*(a)) > +#define cpu_to_le32(a) htole32(a) > +#ifndef ARRAY_SIZE > +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > +#endif > +#ifndef DIV_ROUND_UP > +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > +#endif > + > +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = cpu_to_le32(*buf); > + ++buf; > + } > +} > + > +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = le32_to_cpup(buf); > + ++buf; > + } > +} > + > +static inline uint32_t ror32(uint32_t word, unsigned int shift) > +{ > + return (word >> (shift & 31)) | (word << ((-shift) & 31)); > +} > + > +static const uint32_t blake2s_iv[8] = { > + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, > + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL > +}; > + > +static const uint8_t blake2s_sigma[10][16] = { > + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, > + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, > + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, > + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, > + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, > + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, > + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, > + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, > + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, > + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, > +}; > + > +static void blake2s_set_lastblock(struct blake2s_state *state) > +{ > + state->f[0] = -1; > +} > + > +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) > +{ > + state->t[0] += inc; > + state->t[1] += (state->t[0] < inc); > +} > + > +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) > +{ > + int i; > + > + memset(state, 0, sizeof(*state)); > + for (i = 0; i < 8; ++i) > + state->h[i] = blake2s_iv[i]; > + state->h[0] ^= param; > +} > + > +static void blake2s_init(struct blake2s_state *state, const size_t outlen) > +{ > + blake2s_init_param(state, 0x01010000 | outlen); > + state->outlen = outlen; > +} > + > +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) > +{ > + uint32_t m[16]; > + uint32_t v[16]; > + int i; > + > + while (nblocks > 0) { > + blake2s_increment_counter(state, inc); > + memcpy(m, block, BLAKE2S_BLOCK_LEN); > + le32_to_cpu_array(m, ARRAY_SIZE(m)); > + memcpy(v, state->h, 32); > + v[ 8] = blake2s_iv[0]; > + v[ 9] = blake2s_iv[1]; > + v[10] = blake2s_iv[2]; > + v[11] = blake2s_iv[3]; > + v[12] = blake2s_iv[4] ^ state->t[0]; > + v[13] = blake2s_iv[5] ^ state->t[1]; > + v[14] = blake2s_iv[6] ^ state->f[0]; > + v[15] = blake2s_iv[7] ^ state->f[1]; > + > +#define G(r, i, a, b, c, d) do { \ > + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > + d = ror32(d ^ a, 16); \ > + c += d; \ > + b = ror32(b ^ c, 12); \ > + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > + d = ror32(d ^ a, 8); \ > + c += d; \ > + b = ror32(b ^ c, 7); \ > +} while (0) > + > +#define ROUND(r) do { \ > + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > +} while (0) > + ROUND(0); > + ROUND(1); > + ROUND(2); > + ROUND(3); > + ROUND(4); > + ROUND(5); > + ROUND(6); > + ROUND(7); > + ROUND(8); > + ROUND(9); > + > +#undef G > +#undef ROUND > + > + for (i = 0; i < 8; ++i) > + state->h[i] ^= v[i] ^ v[i + 8]; > + > + block += BLAKE2S_BLOCK_LEN; > + --nblocks; > + } > +} > + > +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) > +{ > + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; > + const uint8_t *in = inp; > + > + if (!inlen) > + return; > + if (inlen > fill) { > + memcpy(state->buf + state->buflen, in, fill); > + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); > + state->buflen = 0; > + in += fill; > + inlen -= fill; > + } > + if (inlen > BLAKE2S_BLOCK_LEN) { > + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); > + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); > + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); > + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); > + } > + memcpy(state->buf + state->buflen, in, inlen); > + state->buflen += inlen; > +} > + > +static void blake2s_final(struct blake2s_state *state, uint8_t *out) > +{ > + blake2s_set_lastblock(state); > + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); > + blake2s_compress(state, state->buf, 1, state->buflen); > + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); > + memcpy(out, state->h, state->outlen); > +} > + > +static size_t determine_optimal_seed_len(void) > +{ > + size_t ret = 0; > + char poolsize_str[11] = { 0 }; > + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); > + > + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { > + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); > + ret = MIN_SEED_LEN; > + } else > + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); > + if (fd >= 0) > + close(fd); > + if (ret < MIN_SEED_LEN) > + ret = MIN_SEED_LEN; > + else if (ret > MAX_SEED_LEN) > + ret = MAX_SEED_LEN; > + return ret; > +} > + > +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) > +{ > + ssize_t ret; > + int urandom_fd; > + > + *is_creditable = false; > + ret = getrandom(seed, len, GRND_NONBLOCK); > + if (ret == (ssize_t)len) { > + *is_creditable = true; > + return 0; > + } else if (ret < 0 && errno == ENOSYS) { > + struct pollfd random_fd = { > + .fd = open("/dev/random", O_RDONLY), > + .events = POLLIN > + }; > + if (random_fd.fd < 0) > + return -errno; > + *is_creditable = poll(&random_fd, 1, 0) == 1; > + close(random_fd.fd); > + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) > + return 0; > + urandom_fd = open("/dev/urandom", O_RDONLY); > + if (urandom_fd < 0) > + return -errno; > + ret = read(urandom_fd, seed, len); > + if (ret == (ssize_t)len) > + ret = 0; > + else > + ret = -errno ? -errno : -EIO; > + close(urandom_fd); > + return ret; > +} > + > +static int seed_rng(uint8_t *seed, size_t len, bool credit) > +{ > + struct { > + int entropy_count; > + int buf_size; > + uint8_t buffer[MAX_SEED_LEN]; > + } req = { > + .entropy_count = credit ? len * 8 : 0, > + .buf_size = len > + }; > + int random_fd, ret; > + > + if (len > sizeof(req.buffer)) > + return -EFBIG; > + memcpy(req.buffer, seed, len); > + > + random_fd = open("/dev/random", O_RDWR); > + if (random_fd < 0) > + return -errno; > + ret = ioctl(random_fd, RNDADDENTROPY, &req); > + if (ret) > + ret = -errno ? -errno : -EIO; > + close(random_fd); > + return ret; > +} > + > +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) > +{ > + uint8_t seed[MAX_SEED_LEN]; > + ssize_t seed_len; > + int fd, dfd, ret = 0; > + > + fd = open(filename, O_RDONLY); > + if (fd < 0 && errno == ENOENT) > + return 0; > + else if (fd < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); > + return ret; > + } > + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); > + if (dfd < 0) { > + ret = -errno; > + close(fd); > + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); > + return ret; > + } > + seed_len = read(fd, seed, sizeof(seed)); > + if (seed_len < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); > + } > + close(fd); > + if (ret) { > + close(dfd); > + return ret; > + } > + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); > + } > + close(dfd); > + if (ret) > + return ret; > + if (!seed_len) > + return 0; > + > + blake2s_update(hash, &seed_len, sizeof(seed_len)); > + blake2s_update(hash, seed, seed_len); > + > + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); > + ret = seed_rng(seed, seed_len, credit); > + if (ret < 0) > + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); > + return ret; > +} > + > +static bool skip_credit(void) > +{ > + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); > + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || > + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); > +} > + > +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) > +{ > + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; > + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; > + int ret, fd, lock, program_ret = 0; > + uint8_t new_seed[MAX_SEED_LEN]; > + size_t new_seed_len; > + bool new_seed_creditable; > + struct timespec realtime = { 0 }, boottime = { 0 }; > + struct blake2s_state hash; > + > + umask(0077); > + if (getuid()) { > + fprintf(stderr, "ERROR: This program requires root\n"); > + return 1; > + } > + > + blake2s_init(&hash, BLAKE2S_HASH_LEN); > + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); > + clock_gettime(CLOCK_REALTIME, &realtime); > + clock_gettime(CLOCK_BOOTTIME, &boottime); > + blake2s_update(&hash, &realtime, sizeof(realtime)); > + blake2s_update(&hash, &boottime, sizeof(boottime)); > + > + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { > + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); > + return 1; > + } > + > + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); > + if (lock < 0 || flock(lock, LOCK_EX) < 0) { > + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); > + return 1; > + } > + > + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); > + if (ret < 0) > + program_ret |= 1 << 1; > + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); > + if (ret < 0) > + program_ret |= 1 << 2; > + > + new_seed_len = determine_optimal_seed_len(); > + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); > + if (ret < 0) { > + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); > + new_seed_len = BLAKE2S_HASH_LEN; > + strncpy((char *)new_seed, seedrng_failure, new_seed_len); > + program_ret |= 1 << 3; > + } > + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); > + blake2s_update(&hash, new_seed, new_seed_len); > + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); > + > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > + if (fd < 0) { > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > + program_ret |= 1 << 4; > + goto out; > + } > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > + program_ret |= 1 << 5; > + goto out; > + } > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > + program_ret |= 1 << 6; > + } > +out: > + close(fd); > + close(lock); > + return program_ret; > +} > diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk > index 2c09728c46..a5cbb95feb 100644 > --- a/package/urandom-scripts/urandom-scripts.mk > +++ b/package/urandom-scripts/urandom-scripts.mk > @@ -4,7 +4,17 @@ > # > ################################################################################ > > +define URANDOM_SCRIPTS_EXTRACT_CMDS > + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) > +endef > + > +define URANDOM_SCRIPTS_BUILD_CMDS > + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ > + $(@D)/seedrng.c -o $(@D)/seedrng > +endef > + > define URANDOM_SCRIPTS_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng > $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ > $(TARGET_DIR)/etc/init.d/S20urandom > endef > -- > 2.35.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Mar 27 19:26:13 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 21:26:13 +0200 Subject: [Buildroot] [PATCH 1/1] package/jack1: bump to version 0.126 Message-ID: <20220327192613.1239929-1-fontaine.fabrice@gmail.com> - Switch site to get latest release - libsndfile and readline are not a dependency since removal of example-clients and tools with https://github.com/jackaudio/jack1/commit/ca3af4b0d8a8a8fd6c4ae72c24e4df6e18f83af9 - Update indentation in hash file (two spaces) https://jackaudio.org/news/2022/01/15/jack1-v01260-and-jack2-v1920-releases.html Signed-off-by: Fabrice Fontaine --- package/jack1/jack1.hash | 8 ++++---- package/jack1/jack1.mk | 14 +++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash index d7787ac2ad..d82b9daffd 100644 --- a/package/jack1/jack1.hash +++ b/package/jack1/jack1.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 6dca56001f..4e16d7e96e 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -4,9 +4,9 @@ # ################################################################################ -JACK1_VERSION = 0.125.0 -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz -JACK1_SITE = http://jackaudio.org/downloads +JACK1_VERSION = 0.126.0 +JACK1_SITE = \ + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES @@ -17,14 +17,6 @@ ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -JACK1_DEPENDENCIES += libsndfile -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK1_DEPENDENCIES += readline -endif - JACK1_CONF_OPTS = --without-html-dir --disable-oss $(eval $(autotools-package)) -- 2.35.1 From arnout at mind.be Sun Mar 27 19:32:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 21:32:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: References: <20220325212405.25243-1-james.hilliard1@gmail.com> <5e27550c-7c02-3f0d-54b4-4cc515efe970@mind.be> Message-ID: <8a31bb3a-8530-ad05-08df-4589a01cb7ae@mind.be> On 27/03/2022 19:37, James Hilliard wrote: > On Sun, Mar 27, 2022 at 10:23 AM Arnout Vandecappelle wrote: >> >> >> >> On 25/03/2022 22:24, James Hilliard wrote: >>> Signed-off-by: James Hilliard >> >> Applied to master, thanks. >> >> Although honestly, there's not much point updating a host-only package unless >> it actually fixes an issue. > > There are usually minor fixes in each release with meson. > > Mostly I like to keep this updated since doing so helps catch upstream > regressions. But the updates are coming somewhat ridiculously fast... We're almost tracking master :-) Regards, Arnout > >> >> Regards, >> Arnout >> >>> --- >>> package/meson/meson.hash | 4 ++-- >>> package/meson/meson.mk | 2 +- >>> 2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/package/meson/meson.hash b/package/meson/meson.hash >>> index d909709b24..8389adb243 100644 >>> --- a/package/meson/meson.hash >>> +++ b/package/meson/meson.hash >>> @@ -1,4 +1,4 @@ >>> # Locally calculated after checking pgp signature >>> -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc >>> -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz >>> +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc >>> +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz >>> sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING >>> diff --git a/package/meson/meson.mk b/package/meson/meson.mk >>> index 4615e839fe..e9c3145183 100644 >>> --- a/package/meson/meson.mk >>> +++ b/package/meson/meson.mk >>> @@ -4,7 +4,7 @@ >>> # >>> ################################################################################ >>> >>> -MESON_VERSION = 0.61.3 >>> +MESON_VERSION = 0.61.4 >>> MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) >>> MESON_LICENSE = Apache-2.0 >>> MESON_LICENSE_FILES = COPYING From arnout at mind.be Sun Mar 27 19:32:54 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 21:32:54 +0200 Subject: [Buildroot] [PATCH 1/1] package/network-manager: bump to version 1.36.4 In-Reply-To: References: <20220324063928.3448755-1-james.hilliard1@gmail.com> <66f33483-b1ac-640b-8226-a382de57d9c4@mind.be> Message-ID: <93bae11b-fdd9-dd11-ad47-2a6f09362d3c@mind.be> On 27/03/2022 19:12, James Hilliard wrote: > On Sun, Mar 27, 2022 at 10:27 AM Arnout Vandecappelle wrote: >> >> >> >> On 24/03/2022 07:39, James Hilliard wrote: >>> CONTRIBUTING.md hash changed due to various style updates. >>> >>> Set new default wifi backend config option to iwd when enabled in >>> cases where the default wpa_supplicant is not enabled. >> >> Applied to master, thanks. >> >> However, I would like to challenge the order of preference here. If you select >> network-manager, iwd and wpa_supplicant, and network-manager uses >> wpa_supplicant, then you end up not using iwd at all, so that was probably not >> the intention of the user. However, there is a good reason to still have >> wpa_supplicant around when you have selected network-manager+iwd: wpa_supplicant >> is also used for 802.1X authentication over Ethernet. > > This just sets a somewhat sane default, which can be overridden by the config > files as with previous versions by setting the network manager config setting: > [device] > wifi.backend=iwd > > Note that upstream considers the iwd wifi backend somewhat experimental and > defaults to wpa_supplicant even when iwd backend support is enabled. Good reasons. > >> >> Either way, it's pretty hard to guess the intention of the user. So maybe a >> Config.in choice is appropriate? > > I figured overrides can be just done via overlay for this with a config file. Yes, I agree, better like that than adding an explicit Config.in option which anyway only sets a default. Thanks for the explanation! Regards, Arnout > >> >>> >>> Signed-off-by: James Hilliard >>> --- >>> package/network-manager/network-manager.hash | 6 +++--- >>> package/network-manager/network-manager.mk | 13 ++++++++++--- >>> 2 files changed, 13 insertions(+), 6 deletions(-) >>> >>> diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash >>> index d25f0e8194..26bcf843c2 100644 >>> --- a/package/network-manager/network-manager.hash >>> +++ b/package/network-manager/network-manager.hash >>> @@ -1,6 +1,6 @@ >>> -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum >>> -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz >>> +# From https://download.gnome.org/sources/NetworkManager/1.36/NetworkManager-1.36.4.sha256sum >>> +sha256 61304e937dd926471d56715bdede7bab7ccac827356e67f2700d343317cd3c59 NetworkManager-1.36.4.tar.xz >>> # Locally computed >>> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING >>> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL >>> -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md >>> +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md >>> diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk >>> index a90228992c..3479bb3794 100644 >>> --- a/package/network-manager/network-manager.mk >>> +++ b/package/network-manager/network-manager.mk >>> @@ -4,8 +4,8 @@ >>> # >>> ################################################################################ >>> >>> -NETWORK_MANAGER_VERSION_MAJOR = 1.34 >>> -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 >>> +NETWORK_MANAGER_VERSION_MAJOR = 1.36 >>> +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 >>> NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz >>> NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) >>> NETWORK_MANAGER_INSTALL_STAGING = YES >>> @@ -53,8 +53,15 @@ endif >>> ifeq ($(BR2_PACKAGE_IWD),y) >>> NETWORK_MANAGER_DEPENDENCIES += iwd >>> NETWORK_MANAGER_CONF_OPTS += --with-iwd >>> +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) >>> +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant >>> else >>> -NETWORK_MANAGER_CONF_OPTS += --without-iwd >>> +NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd >>> +endif >>> +else >>> +NETWORK_MANAGER_CONF_OPTS += \ >>> + --without-iwd \ >>> + --with-config-wifi-backend-default=wpa_supplicant >> >> This is set regardless of whether wpa_supplicant is enabled or not. Are you >> sure that's OK? >> >> Regards, >> Arnout >> >>> endif >>> >>> ifeq ($(BR2_PACKAGE_LIBCURL),y) From arnout at mind.be Sun Mar 27 19:36:41 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Sun, 27 Mar 2022 21:36:41 +0200 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> Message-ID: <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> On 27/03/2022 20:01, James Hilliard wrote: > On Sat, Mar 26, 2022 at 11:48 PM Jason A. Donenfeld wrote: >> >> The RNG can't actually be seeded from a shell script, due to the >> reliance on ioctls. For this reason, the seedrng project provides a >> basic script meant to be copy and pasted into projects like buildroot >> and tweaked as needed: . >> >> This commit imports it into buildroot and wires up the init scripts to >> call it. This also is a significant improvement over the current init >> script, which doesn't credit entropy and whose hashing in shell scripts >> is sort of fragile. >> >> As seedrng.c is a short tiny C program, we include this here in the >> package, like a few other packages do. Later we'll investigate adding >> this to busybox, but for now, this is a good start and a positive step >> in the right direction. >> >> Signed-off-by: Jason A. Donenfeld [snip] >> +#ifndef GRND_INSECURE >> +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ >> +#endif >> + >> +#ifndef LOCALSTATEDIR >> +#define LOCALSTATEDIR "/var/lib" >> +#endif >> +#ifndef RUNSTATEDIR >> +#define RUNSTATEDIR "/var/run" >> +#endif > > Might be a good idea to have runtime env overrides for these to allow easier > path customization by only having to override the init script in a > rootfs overlay: > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > Maybe something similar to the SEEDRNG_SKIP_CREDIT env override would > make sense for these paths. I don't know if that makes sense. Dozens of buildroot packages hardocde these paths already. Regards, Arnout > >> + >> +#define SEED_DIR LOCALSTATEDIR "/seedrng" >> +#define CREDITABLE_SEED SEED_DIR "/seed.credit" >> +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" >> +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" >> + >> +enum blake2s_lengths { >> + BLAKE2S_BLOCK_LEN = 64, >> + BLAKE2S_HASH_LEN = 32, >> + BLAKE2S_KEY_LEN = 32 >> +}; >> + >> +enum seedrng_lengths { >> + MAX_SEED_LEN = 512, >> + MIN_SEED_LEN = BLAKE2S_HASH_LEN >> +}; >> + >> +struct blake2s_state { >> + uint32_t h[8]; >> + uint32_t t[2]; >> + uint32_t f[2]; >> + uint8_t buf[BLAKE2S_BLOCK_LEN]; >> + unsigned int buflen; >> + unsigned int outlen; >> +}; >> + >> +#define le32_to_cpup(a) le32toh(*(a)) >> +#define cpu_to_le32(a) htole32(a) >> +#ifndef ARRAY_SIZE >> +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) >> +#endif >> +#ifndef DIV_ROUND_UP >> +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) >> +#endif >> + >> +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) >> +{ >> + while (words--) { >> + *buf = cpu_to_le32(*buf); >> + ++buf; >> + } >> +} >> + >> +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) >> +{ >> + while (words--) { >> + *buf = le32_to_cpup(buf); >> + ++buf; >> + } >> +} >> + >> +static inline uint32_t ror32(uint32_t word, unsigned int shift) >> +{ >> + return (word >> (shift & 31)) | (word << ((-shift) & 31)); >> +} >> + >> +static const uint32_t blake2s_iv[8] = { >> + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, >> + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL >> +}; >> + >> +static const uint8_t blake2s_sigma[10][16] = { >> + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, >> + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, >> + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, >> + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, >> + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, >> + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, >> + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, >> + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, >> + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, >> + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, >> +}; >> + >> +static void blake2s_set_lastblock(struct blake2s_state *state) >> +{ >> + state->f[0] = -1; >> +} >> + >> +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) >> +{ >> + state->t[0] += inc; >> + state->t[1] += (state->t[0] < inc); >> +} >> + >> +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) >> +{ >> + int i; >> + >> + memset(state, 0, sizeof(*state)); >> + for (i = 0; i < 8; ++i) >> + state->h[i] = blake2s_iv[i]; >> + state->h[0] ^= param; >> +} >> + >> +static void blake2s_init(struct blake2s_state *state, const size_t outlen) >> +{ >> + blake2s_init_param(state, 0x01010000 | outlen); >> + state->outlen = outlen; >> +} >> + >> +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) >> +{ >> + uint32_t m[16]; >> + uint32_t v[16]; >> + int i; >> + >> + while (nblocks > 0) { >> + blake2s_increment_counter(state, inc); >> + memcpy(m, block, BLAKE2S_BLOCK_LEN); >> + le32_to_cpu_array(m, ARRAY_SIZE(m)); >> + memcpy(v, state->h, 32); >> + v[ 8] = blake2s_iv[0]; >> + v[ 9] = blake2s_iv[1]; >> + v[10] = blake2s_iv[2]; >> + v[11] = blake2s_iv[3]; >> + v[12] = blake2s_iv[4] ^ state->t[0]; >> + v[13] = blake2s_iv[5] ^ state->t[1]; >> + v[14] = blake2s_iv[6] ^ state->f[0]; >> + v[15] = blake2s_iv[7] ^ state->f[1]; >> + >> +#define G(r, i, a, b, c, d) do { \ >> + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ >> + d = ror32(d ^ a, 16); \ >> + c += d; \ >> + b = ror32(b ^ c, 12); \ >> + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ >> + d = ror32(d ^ a, 8); \ >> + c += d; \ >> + b = ror32(b ^ c, 7); \ >> +} while (0) >> + >> +#define ROUND(r) do { \ >> + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ >> + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ >> + G(r, 2, v[2], v[ 6], v[10], v[14]); \ >> + G(r, 3, v[3], v[ 7], v[11], v[15]); \ >> + G(r, 4, v[0], v[ 5], v[10], v[15]); \ >> + G(r, 5, v[1], v[ 6], v[11], v[12]); \ >> + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ >> + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ >> +} while (0) >> + ROUND(0); >> + ROUND(1); >> + ROUND(2); >> + ROUND(3); >> + ROUND(4); >> + ROUND(5); >> + ROUND(6); >> + ROUND(7); >> + ROUND(8); >> + ROUND(9); >> + >> +#undef G >> +#undef ROUND >> + >> + for (i = 0; i < 8; ++i) >> + state->h[i] ^= v[i] ^ v[i + 8]; >> + >> + block += BLAKE2S_BLOCK_LEN; >> + --nblocks; >> + } >> +} >> + >> +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) >> +{ >> + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; >> + const uint8_t *in = inp; >> + >> + if (!inlen) >> + return; >> + if (inlen > fill) { >> + memcpy(state->buf + state->buflen, in, fill); >> + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); >> + state->buflen = 0; >> + in += fill; >> + inlen -= fill; >> + } >> + if (inlen > BLAKE2S_BLOCK_LEN) { >> + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); >> + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); >> + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); >> + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); >> + } >> + memcpy(state->buf + state->buflen, in, inlen); >> + state->buflen += inlen; >> +} >> + >> +static void blake2s_final(struct blake2s_state *state, uint8_t *out) >> +{ >> + blake2s_set_lastblock(state); >> + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); >> + blake2s_compress(state, state->buf, 1, state->buflen); >> + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); >> + memcpy(out, state->h, state->outlen); >> +} >> + >> +static size_t determine_optimal_seed_len(void) >> +{ >> + size_t ret = 0; >> + char poolsize_str[11] = { 0 }; >> + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); >> + >> + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { >> + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); >> + ret = MIN_SEED_LEN; >> + } else >> + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); >> + if (fd >= 0) >> + close(fd); >> + if (ret < MIN_SEED_LEN) >> + ret = MIN_SEED_LEN; >> + else if (ret > MAX_SEED_LEN) >> + ret = MAX_SEED_LEN; >> + return ret; >> +} >> + >> +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) >> +{ >> + ssize_t ret; >> + int urandom_fd; >> + >> + *is_creditable = false; >> + ret = getrandom(seed, len, GRND_NONBLOCK); >> + if (ret == (ssize_t)len) { >> + *is_creditable = true; >> + return 0; >> + } else if (ret < 0 && errno == ENOSYS) { >> + struct pollfd random_fd = { >> + .fd = open("/dev/random", O_RDONLY), >> + .events = POLLIN >> + }; >> + if (random_fd.fd < 0) >> + return -errno; >> + *is_creditable = poll(&random_fd, 1, 0) == 1; >> + close(random_fd.fd); >> + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) >> + return 0; >> + urandom_fd = open("/dev/urandom", O_RDONLY); >> + if (urandom_fd < 0) >> + return -errno; >> + ret = read(urandom_fd, seed, len); >> + if (ret == (ssize_t)len) >> + ret = 0; >> + else >> + ret = -errno ? -errno : -EIO; >> + close(urandom_fd); >> + return ret; >> +} >> + >> +static int seed_rng(uint8_t *seed, size_t len, bool credit) >> +{ >> + struct { >> + int entropy_count; >> + int buf_size; >> + uint8_t buffer[MAX_SEED_LEN]; >> + } req = { >> + .entropy_count = credit ? len * 8 : 0, >> + .buf_size = len >> + }; >> + int random_fd, ret; >> + >> + if (len > sizeof(req.buffer)) >> + return -EFBIG; >> + memcpy(req.buffer, seed, len); >> + >> + random_fd = open("/dev/random", O_RDWR); >> + if (random_fd < 0) >> + return -errno; >> + ret = ioctl(random_fd, RNDADDENTROPY, &req); >> + if (ret) >> + ret = -errno ? -errno : -EIO; >> + close(random_fd); >> + return ret; >> +} >> + >> +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) >> +{ >> + uint8_t seed[MAX_SEED_LEN]; >> + ssize_t seed_len; >> + int fd, dfd, ret = 0; >> + >> + fd = open(filename, O_RDONLY); >> + if (fd < 0 && errno == ENOENT) >> + return 0; >> + else if (fd < 0) { >> + ret = -errno; >> + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); >> + return ret; >> + } >> + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); >> + if (dfd < 0) { >> + ret = -errno; >> + close(fd); >> + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); >> + return ret; >> + } >> + seed_len = read(fd, seed, sizeof(seed)); >> + if (seed_len < 0) { >> + ret = -errno; >> + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); >> + } >> + close(fd); >> + if (ret) { >> + close(dfd); >> + return ret; >> + } >> + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { >> + ret = -errno; >> + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); >> + } >> + close(dfd); >> + if (ret) >> + return ret; >> + if (!seed_len) >> + return 0; >> + >> + blake2s_update(hash, &seed_len, sizeof(seed_len)); >> + blake2s_update(hash, seed, seed_len); >> + >> + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); >> + ret = seed_rng(seed, seed_len, credit); >> + if (ret < 0) >> + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); >> + return ret; >> +} >> + >> +static bool skip_credit(void) >> +{ >> + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); >> + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || >> + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); >> +} >> + >> +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) >> +{ >> + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; >> + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; >> + int ret, fd, lock, program_ret = 0; >> + uint8_t new_seed[MAX_SEED_LEN]; >> + size_t new_seed_len; >> + bool new_seed_creditable; >> + struct timespec realtime = { 0 }, boottime = { 0 }; >> + struct blake2s_state hash; >> + >> + umask(0077); >> + if (getuid()) { >> + fprintf(stderr, "ERROR: This program requires root\n"); >> + return 1; >> + } >> + >> + blake2s_init(&hash, BLAKE2S_HASH_LEN); >> + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); >> + clock_gettime(CLOCK_REALTIME, &realtime); >> + clock_gettime(CLOCK_BOOTTIME, &boottime); >> + blake2s_update(&hash, &realtime, sizeof(realtime)); >> + blake2s_update(&hash, &boottime, sizeof(boottime)); >> + >> + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { >> + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); >> + return 1; >> + } >> + >> + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); >> + if (lock < 0 || flock(lock, LOCK_EX) < 0) { >> + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); >> + return 1; >> + } >> + >> + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); >> + if (ret < 0) >> + program_ret |= 1 << 1; >> + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); >> + if (ret < 0) >> + program_ret |= 1 << 2; >> + >> + new_seed_len = determine_optimal_seed_len(); >> + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); >> + if (ret < 0) { >> + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); >> + new_seed_len = BLAKE2S_HASH_LEN; >> + strncpy((char *)new_seed, seedrng_failure, new_seed_len); >> + program_ret |= 1 << 3; >> + } >> + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); >> + blake2s_update(&hash, new_seed, new_seed_len); >> + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); >> + >> + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); >> + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); >> + if (fd < 0) { >> + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); >> + program_ret |= 1 << 4; >> + goto out; >> + } >> + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { >> + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); >> + program_ret |= 1 << 5; >> + goto out; >> + } >> + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { >> + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); >> + program_ret |= 1 << 6; >> + } >> +out: >> + close(fd); >> + close(lock); >> + return program_ret; >> +} >> diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk >> index 2c09728c46..a5cbb95feb 100644 >> --- a/package/urandom-scripts/urandom-scripts.mk >> +++ b/package/urandom-scripts/urandom-scripts.mk >> @@ -4,7 +4,17 @@ >> # >> ################################################################################ >> >> +define URANDOM_SCRIPTS_EXTRACT_CMDS >> + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) >> +endef >> + >> +define URANDOM_SCRIPTS_BUILD_CMDS >> + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ >> + $(@D)/seedrng.c -o $(@D)/seedrng >> +endef >> + >> define URANDOM_SCRIPTS_INSTALL_INIT_SYSV >> + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng >> $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ >> $(TARGET_DIR)/etc/init.d/S20urandom >> endef >> -- >> 2.35.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Sun Mar 27 19:39:55 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 21:39:55 +0200 Subject: [Buildroot] [PATCH 1/1] package/opus: enable custom modes Message-ID: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point -- 2.35.1 From fperrad at gmail.com Sun Mar 27 19:47:40 2022 From: fperrad at gmail.com (Francois Perrad) Date: Sun, 27 Mar 2022 21:47:40 +0200 Subject: [Buildroot] [PATCH] package/luasocket: bump to version 3.0.0 Message-ID: <20220327194740.1482539-1-francois.perrad@gadz.org> moved under the hat of https://github.com/lunarmodules diff LICENSE: -LuaSocket 3.0 license -Copyright ? 2004-2013 Diego Nehab +Copyright (C) 2004-2022 Diego Nehab Signed-off-by: Francois Perrad --- package/luasocket/Config.in | 2 +- package/luasocket/luasocket.hash | 4 ++-- package/luasocket/luasocket.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in index 45263030f..5ad00f5c4 100644 --- a/package/luasocket/Config.in +++ b/package/luasocket/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET It provides easy access to TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more. - http://luaforge.net/projects/luasocket/ + https://github.com/lunarmodules/luasocket diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash index 843647b27..b66ae57b9 100644 --- a/package/luasocket/luasocket.hash +++ b/package/luasocket/luasocket.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE +sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index 20927fc1d..eeece26fd 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUASOCKET_VERSION = 3.0rc1-1 -LUASOCKET_SUBDIR = luasocket-3.0-rc1 +LUASOCKET_VERSION = 3.0.0-1 +LUASOCKET_SUBDIR = luasocket LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE -- 2.32.0 From james.hilliard1 at gmail.com Sun Mar 27 19:58:17 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 13:58:17 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: On Sun, Mar 27, 2022 at 1:36 PM Arnout Vandecappelle wrote: > > > > On 27/03/2022 20:01, James Hilliard wrote: > > On Sat, Mar 26, 2022 at 11:48 PM Jason A. Donenfeld wrote: > >> > >> The RNG can't actually be seeded from a shell script, due to the > >> reliance on ioctls. For this reason, the seedrng project provides a > >> basic script meant to be copy and pasted into projects like buildroot > >> and tweaked as needed: . > >> > >> This commit imports it into buildroot and wires up the init scripts to > >> call it. This also is a significant improvement over the current init > >> script, which doesn't credit entropy and whose hashing in shell scripts > >> is sort of fragile. > >> > >> As seedrng.c is a short tiny C program, we include this here in the > >> package, like a few other packages do. Later we'll investigate adding > >> this to busybox, but for now, this is a good start and a positive step > >> in the right direction. > >> > >> Signed-off-by: Jason A. Donenfeld > [snip] > >> +#ifndef GRND_INSECURE > >> +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ > >> +#endif > >> + > >> +#ifndef LOCALSTATEDIR > >> +#define LOCALSTATEDIR "/var/lib" > >> +#endif > >> +#ifndef RUNSTATEDIR > >> +#define RUNSTATEDIR "/var/run" > >> +#endif > > > > Might be a good idea to have runtime env overrides for these to allow easier > > path customization by only having to override the init script in a > > rootfs overlay: > > https://buildroot.org/downloads/manual/manual.html#rootfs-custom > > > > Maybe something similar to the SEEDRNG_SKIP_CREDIT env override would > > make sense for these paths. > > I don't know if that makes sense. Dozens of buildroot packages hardocde these > paths already. I'm mostly just thinking that due to this needing to run super early it may be useful to be able to override in case say the seed needs to be stored in a non-standard mount location like the ESP along the lines of systemd: https://www.freedesktop.org/software/systemd/man/bootctl.html#random-seed > > Regards, > Arnout > > > > >> + > >> +#define SEED_DIR LOCALSTATEDIR "/seedrng" > >> +#define CREDITABLE_SEED SEED_DIR "/seed.credit" > >> +#define NON_CREDITABLE_SEED SEED_DIR "/seed.no-credit" > >> +#define LOCK_FILE RUNSTATEDIR "/seedrng.lock" > >> + > >> +enum blake2s_lengths { > >> + BLAKE2S_BLOCK_LEN = 64, > >> + BLAKE2S_HASH_LEN = 32, > >> + BLAKE2S_KEY_LEN = 32 > >> +}; > >> + > >> +enum seedrng_lengths { > >> + MAX_SEED_LEN = 512, > >> + MIN_SEED_LEN = BLAKE2S_HASH_LEN > >> +}; > >> + > >> +struct blake2s_state { > >> + uint32_t h[8]; > >> + uint32_t t[2]; > >> + uint32_t f[2]; > >> + uint8_t buf[BLAKE2S_BLOCK_LEN]; > >> + unsigned int buflen; > >> + unsigned int outlen; > >> +}; > >> + > >> +#define le32_to_cpup(a) le32toh(*(a)) > >> +#define cpu_to_le32(a) htole32(a) > >> +#ifndef ARRAY_SIZE > >> +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > >> +#endif > >> +#ifndef DIV_ROUND_UP > >> +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > >> +#endif > >> + > >> +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) > >> +{ > >> + while (words--) { > >> + *buf = cpu_to_le32(*buf); > >> + ++buf; > >> + } > >> +} > >> + > >> +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) > >> +{ > >> + while (words--) { > >> + *buf = le32_to_cpup(buf); > >> + ++buf; > >> + } > >> +} > >> + > >> +static inline uint32_t ror32(uint32_t word, unsigned int shift) > >> +{ > >> + return (word >> (shift & 31)) | (word << ((-shift) & 31)); > >> +} > >> + > >> +static const uint32_t blake2s_iv[8] = { > >> + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, > >> + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL > >> +}; > >> + > >> +static const uint8_t blake2s_sigma[10][16] = { > >> + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, > >> + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, > >> + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, > >> + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, > >> + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, > >> + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, > >> + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, > >> + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, > >> + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, > >> + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, > >> +}; > >> + > >> +static void blake2s_set_lastblock(struct blake2s_state *state) > >> +{ > >> + state->f[0] = -1; > >> +} > >> + > >> +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) > >> +{ > >> + state->t[0] += inc; > >> + state->t[1] += (state->t[0] < inc); > >> +} > >> + > >> +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) > >> +{ > >> + int i; > >> + > >> + memset(state, 0, sizeof(*state)); > >> + for (i = 0; i < 8; ++i) > >> + state->h[i] = blake2s_iv[i]; > >> + state->h[0] ^= param; > >> +} > >> + > >> +static void blake2s_init(struct blake2s_state *state, const size_t outlen) > >> +{ > >> + blake2s_init_param(state, 0x01010000 | outlen); > >> + state->outlen = outlen; > >> +} > >> + > >> +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) > >> +{ > >> + uint32_t m[16]; > >> + uint32_t v[16]; > >> + int i; > >> + > >> + while (nblocks > 0) { > >> + blake2s_increment_counter(state, inc); > >> + memcpy(m, block, BLAKE2S_BLOCK_LEN); > >> + le32_to_cpu_array(m, ARRAY_SIZE(m)); > >> + memcpy(v, state->h, 32); > >> + v[ 8] = blake2s_iv[0]; > >> + v[ 9] = blake2s_iv[1]; > >> + v[10] = blake2s_iv[2]; > >> + v[11] = blake2s_iv[3]; > >> + v[12] = blake2s_iv[4] ^ state->t[0]; > >> + v[13] = blake2s_iv[5] ^ state->t[1]; > >> + v[14] = blake2s_iv[6] ^ state->f[0]; > >> + v[15] = blake2s_iv[7] ^ state->f[1]; > >> + > >> +#define G(r, i, a, b, c, d) do { \ > >> + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > >> + d = ror32(d ^ a, 16); \ > >> + c += d; \ > >> + b = ror32(b ^ c, 12); \ > >> + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > >> + d = ror32(d ^ a, 8); \ > >> + c += d; \ > >> + b = ror32(b ^ c, 7); \ > >> +} while (0) > >> + > >> +#define ROUND(r) do { \ > >> + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > >> + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > >> + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > >> + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > >> + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > >> + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > >> + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > >> + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > >> +} while (0) > >> + ROUND(0); > >> + ROUND(1); > >> + ROUND(2); > >> + ROUND(3); > >> + ROUND(4); > >> + ROUND(5); > >> + ROUND(6); > >> + ROUND(7); > >> + ROUND(8); > >> + ROUND(9); > >> + > >> +#undef G > >> +#undef ROUND > >> + > >> + for (i = 0; i < 8; ++i) > >> + state->h[i] ^= v[i] ^ v[i + 8]; > >> + > >> + block += BLAKE2S_BLOCK_LEN; > >> + --nblocks; > >> + } > >> +} > >> + > >> +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) > >> +{ > >> + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; > >> + const uint8_t *in = inp; > >> + > >> + if (!inlen) > >> + return; > >> + if (inlen > fill) { > >> + memcpy(state->buf + state->buflen, in, fill); > >> + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); > >> + state->buflen = 0; > >> + in += fill; > >> + inlen -= fill; > >> + } > >> + if (inlen > BLAKE2S_BLOCK_LEN) { > >> + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); > >> + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); > >> + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); > >> + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); > >> + } > >> + memcpy(state->buf + state->buflen, in, inlen); > >> + state->buflen += inlen; > >> +} > >> + > >> +static void blake2s_final(struct blake2s_state *state, uint8_t *out) > >> +{ > >> + blake2s_set_lastblock(state); > >> + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); > >> + blake2s_compress(state, state->buf, 1, state->buflen); > >> + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); > >> + memcpy(out, state->h, state->outlen); > >> +} > >> + > >> +static size_t determine_optimal_seed_len(void) > >> +{ > >> + size_t ret = 0; > >> + char poolsize_str[11] = { 0 }; > >> + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); > >> + > >> + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { > >> + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); > >> + ret = MIN_SEED_LEN; > >> + } else > >> + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); > >> + if (fd >= 0) > >> + close(fd); > >> + if (ret < MIN_SEED_LEN) > >> + ret = MIN_SEED_LEN; > >> + else if (ret > MAX_SEED_LEN) > >> + ret = MAX_SEED_LEN; > >> + return ret; > >> +} > >> + > >> +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) > >> +{ > >> + ssize_t ret; > >> + int urandom_fd; > >> + > >> + *is_creditable = false; > >> + ret = getrandom(seed, len, GRND_NONBLOCK); > >> + if (ret == (ssize_t)len) { > >> + *is_creditable = true; > >> + return 0; > >> + } else if (ret < 0 && errno == ENOSYS) { > >> + struct pollfd random_fd = { > >> + .fd = open("/dev/random", O_RDONLY), > >> + .events = POLLIN > >> + }; > >> + if (random_fd.fd < 0) > >> + return -errno; > >> + *is_creditable = poll(&random_fd, 1, 0) == 1; > >> + close(random_fd.fd); > >> + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) > >> + return 0; > >> + urandom_fd = open("/dev/urandom", O_RDONLY); > >> + if (urandom_fd < 0) > >> + return -errno; > >> + ret = read(urandom_fd, seed, len); > >> + if (ret == (ssize_t)len) > >> + ret = 0; > >> + else > >> + ret = -errno ? -errno : -EIO; > >> + close(urandom_fd); > >> + return ret; > >> +} > >> + > >> +static int seed_rng(uint8_t *seed, size_t len, bool credit) > >> +{ > >> + struct { > >> + int entropy_count; > >> + int buf_size; > >> + uint8_t buffer[MAX_SEED_LEN]; > >> + } req = { > >> + .entropy_count = credit ? len * 8 : 0, > >> + .buf_size = len > >> + }; > >> + int random_fd, ret; > >> + > >> + if (len > sizeof(req.buffer)) > >> + return -EFBIG; > >> + memcpy(req.buffer, seed, len); > >> + > >> + random_fd = open("/dev/random", O_RDWR); > >> + if (random_fd < 0) > >> + return -errno; > >> + ret = ioctl(random_fd, RNDADDENTROPY, &req); > >> + if (ret) > >> + ret = -errno ? -errno : -EIO; > >> + close(random_fd); > >> + return ret; > >> +} > >> + > >> +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) > >> +{ > >> + uint8_t seed[MAX_SEED_LEN]; > >> + ssize_t seed_len; > >> + int fd, dfd, ret = 0; > >> + > >> + fd = open(filename, O_RDONLY); > >> + if (fd < 0 && errno == ENOENT) > >> + return 0; > >> + else if (fd < 0) { > >> + ret = -errno; > >> + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); > >> + return ret; > >> + } > >> + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); > >> + if (dfd < 0) { > >> + ret = -errno; > >> + close(fd); > >> + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); > >> + return ret; > >> + } > >> + seed_len = read(fd, seed, sizeof(seed)); > >> + if (seed_len < 0) { > >> + ret = -errno; > >> + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); > >> + } > >> + close(fd); > >> + if (ret) { > >> + close(dfd); > >> + return ret; > >> + } > >> + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { > >> + ret = -errno; > >> + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); > >> + } > >> + close(dfd); > >> + if (ret) > >> + return ret; > >> + if (!seed_len) > >> + return 0; > >> + > >> + blake2s_update(hash, &seed_len, sizeof(seed_len)); > >> + blake2s_update(hash, seed, seed_len); > >> + > >> + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); > >> + ret = seed_rng(seed, seed_len, credit); > >> + if (ret < 0) > >> + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); > >> + return ret; > >> +} > >> + > >> +static bool skip_credit(void) > >> +{ > >> + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); > >> + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || > >> + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); > >> +} > >> + > >> +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) > >> +{ > >> + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; > >> + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; > >> + int ret, fd, lock, program_ret = 0; > >> + uint8_t new_seed[MAX_SEED_LEN]; > >> + size_t new_seed_len; > >> + bool new_seed_creditable; > >> + struct timespec realtime = { 0 }, boottime = { 0 }; > >> + struct blake2s_state hash; > >> + > >> + umask(0077); > >> + if (getuid()) { > >> + fprintf(stderr, "ERROR: This program requires root\n"); > >> + return 1; > >> + } > >> + > >> + blake2s_init(&hash, BLAKE2S_HASH_LEN); > >> + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); > >> + clock_gettime(CLOCK_REALTIME, &realtime); > >> + clock_gettime(CLOCK_BOOTTIME, &boottime); > >> + blake2s_update(&hash, &realtime, sizeof(realtime)); > >> + blake2s_update(&hash, &boottime, sizeof(boottime)); > >> + > >> + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { > >> + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); > >> + return 1; > >> + } > >> + > >> + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); > >> + if (lock < 0 || flock(lock, LOCK_EX) < 0) { > >> + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); > >> + return 1; > >> + } > >> + > >> + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); > >> + if (ret < 0) > >> + program_ret |= 1 << 1; > >> + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); > >> + if (ret < 0) > >> + program_ret |= 1 << 2; > >> + > >> + new_seed_len = determine_optimal_seed_len(); > >> + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); > >> + if (ret < 0) { > >> + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); > >> + new_seed_len = BLAKE2S_HASH_LEN; > >> + strncpy((char *)new_seed, seedrng_failure, new_seed_len); > >> + program_ret |= 1 << 3; > >> + } > >> + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); > >> + blake2s_update(&hash, new_seed, new_seed_len); > >> + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); > >> + > >> + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > >> + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > >> + if (fd < 0) { > >> + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > >> + program_ret |= 1 << 4; > >> + goto out; > >> + } > >> + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > >> + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > >> + program_ret |= 1 << 5; > >> + goto out; > >> + } > >> + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > >> + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > >> + program_ret |= 1 << 6; > >> + } > >> +out: > >> + close(fd); > >> + close(lock); > >> + return program_ret; > >> +} > >> diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk > >> index 2c09728c46..a5cbb95feb 100644 > >> --- a/package/urandom-scripts/urandom-scripts.mk > >> +++ b/package/urandom-scripts/urandom-scripts.mk > >> @@ -4,7 +4,17 @@ > >> # > >> ################################################################################ > >> > >> +define URANDOM_SCRIPTS_EXTRACT_CMDS > >> + cp $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c $(@D) > >> +endef > >> + > >> +define URANDOM_SCRIPTS_BUILD_CMDS > >> + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ > >> + $(@D)/seedrng.c -o $(@D)/seedrng > >> +endef > >> + > >> define URANDOM_SCRIPTS_INSTALL_INIT_SYSV > >> + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng > >> $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ > >> $(TARGET_DIR)/etc/init.d/S20urandom > >> endef > >> -- > >> 2.35.1 > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot From james.hilliard1 at gmail.com Sun Mar 27 20:06:51 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 14:06:51 -0600 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.4 Message-ID: <20220327200651.4189748-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac20..3572b25965 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..9feed9c084 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.3 +SYSTEMD_VERSION = 250.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.25.1 From Jason at zx2c4.com Sun Mar 27 20:08:16 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:08:16 -0400 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: Hi James, Arnout, On Sun, Mar 27, 2022 at 3:58 PM James Hilliard wrote: > I'm mostly just thinking that due to this needing to run super early > it may be useful > to be able to override in case say the seed needs to be stored in a non-standard > mount location like the ESP along the lines of systemd: > https://www.freedesktop.org/software/systemd/man/bootctl.html#random-seed If you want to reengineer other things about this, please feel free to do so after with follow-up commits. This keeps the same path location root as the code that it replaces. Let's do one thing at a time. If we do all these things at once, it'll be hard to fix regressions or understand what's happened. This commit here improves one dimension of things. Future ones from you can add additional features or tweaks or whatever else. Jason From Jason at zx2c4.com Sun Mar 27 20:10:34 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:10:34 -0400 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: Hey again, Oh, I didn't see the whole conversation because you failed to reply all. Please keep me in the CC, as I have list mail turned off. I see now you just want an option to do this via environment. This is what I did on OpenRC. I'll send a v2 with that for here. Jason From Jason at zx2c4.com Sun Mar 27 20:24:15 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:24:15 -0400 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: Message-ID: <20220327202415.1248312-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Signed-off-by: Jason A. Donenfeld --- package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 64 +-- package/urandom-scripts/seedrng.c | 455 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 6 + 4 files changed, 479 insertions(+), 50 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..1959fad93b 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -6,63 +6,35 @@ # Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -URANDOM_SEED="/var/lib/random-seed" +# The following knobs can be adjusted by placing uncommented modified lines +# into /etc/default/urandom: +# +# Set these to change where the seed and runtime lock file are stored: +# +# export SEEDRNG_SEED_DIR=/var/lib/seedrng +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock +# +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng: +# +# export SEEDRNG_SKIP_CREDIT=false +# # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in start|restart|reload) # Carry a random seed from start-up to start-up # Load and then save the whole entropy pool - init_rng && save_random_seed;; + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; stop) # Carry a random seed from shut-down to start-up # Save the whole entropy pool - save_random_seed;; + seedrng;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..b3f6381bd8 --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,455 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + + +static const char *SEED_DIR; +static const char *LOCK_FILE; +static char *CREDITABLE_SEED; +static char *NON_CREDITABLE_SEED; + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +static void populate_global_paths(void) +{ + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); + if (!SEED_DIR || !*SEED_DIR) + SEED_DIR = "/var/lib/seedrng"; + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); + if (!LOCK_FILE || !*LOCK_FILE) + LOCK_FILE = "/var/run/seedrng.lock"; + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); + exit(1); + } +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + populate_global_paths(); + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + return 1; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + close(fd); + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..e8526e248a 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,13 @@ # ################################################################################ +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From peter at korsgaard.com Sun Mar 27 20:24:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:24:51 +0200 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix CVE comments In-Reply-To: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:19:21 +0100") References: <20220313111921.1116296-1-fontaine.fabrice@gmail.com> Message-ID: <87zglbb0to.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE > comments > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Sun Mar 27 20:25:29 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 14:25:29 -0600 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: On Sun, Mar 27, 2022 at 2:10 PM Jason A. Donenfeld wrote: > > Hey again, > > Oh, I didn't see the whole conversation because you failed to reply > all. Please keep me in the CC, as I have list mail turned off. Strange, I did use reply all, maybe it ended up in spam? It appears to have been sent correctly from what I can tell: https://lore.kernel.org/buildroot/CADvTj4rJcC8NQnG4A70VgF6uqzj-xGDxg2nOyRB=jxj4wSLpqg at mail.gmail.com/ > > I see now you just want an option to do this via environment. This is > what I did on OpenRC. I'll send a v2 with that for here. Yeah, I'm just suggesting a path override since that's trivial to tweak with the existing script via a rootfs overlay override but slightly more complex to do if one has to modify a binary. > > Jason From peter at korsgaard.com Sun Mar 27 20:25:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:25:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/qt5/qt5base: fix build on sparc v8 In-Reply-To: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:26:33 +0100") References: <20220313112633.1125643-1-fontaine.fabrice@gmail.com> Message-ID: <87v8vzb0rs.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure on sparc v8 raised since commit > 5770a645a3a49a3f0f02972131a4ff5283b4c11e: > ERROR: detected a std::atomic implementation that fails for function pointers. > Please apply the patch corresponding to your Standard Library vendor, found in > qtbase/config.tests/atomicfptr > Fixes: > - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From Jason at zx2c4.com Sun Mar 27 20:26:40 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Sun, 27 Mar 2022 16:26:40 -0400 Subject: [Buildroot] [PATCH] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327054814.942198-1-Jason@zx2c4.com> <8fa95711-9442-c1b9-5ddc-9e1c7859f802@mind.be> Message-ID: Hey James, On Sun, Mar 27, 2022 at 4:25 PM James Hilliard wrote: > Strange, I did use reply all, maybe it ended up in spam? > > It appears to have been sent correctly from what I can tell: > https://lore.kernel.org/buildroot/CADvTj4rJcC8NQnG4A70VgF6uqzj-xGDxg2nOyRB=jxj4wSLpqg at mail.gmail.com/ Indeed I think you're right. MTA issues? I'll investigate. > > > > > I see now you just want an option to do this via environment. This is > > what I did on OpenRC. I'll send a v2 with that for here. > > Yeah, I'm just suggesting a path override since that's trivial to tweak with the > existing script via a rootfs overlay override but slightly more complex to do if > one has to modify a binary. Yep! Already done for the v2: https://lore.kernel.org/buildroot/20220327202415.1248312-1-Jason at zx2c4.com/ Jason From peter at korsgaard.com Sun Mar 27 20:28:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:28:58 +0200 Subject: [Buildroot] [PATCH v2, 1/1] package/nbd: security bump to version 3.24 In-Reply-To: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:33:33 +0100") References: <20220313113333.1125977-1-fontaine.fabrice@gmail.com> Message-ID: <87r16nb0mt.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an > integer overflow with a resultant heap-based buffer overflow. A value of > 0xffffffff in the name length field will cause a zero-sized buffer to be > allocated for the name, resulting in a write to a dangling pointer. This > issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME > messages. > Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a > stack-based buffer overflow. An attacker can cause a buffer overflow in > the parsing of the name field by sending a crafted NBD_OPT_INFO or > NBD_OPT_GO message with an large value as the length of the name. > https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2: > - Tag as a security bump and add CVEs Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Mar 27 20:28:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:28:26 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/nbd: security bump to version 3.24 Message-ID: <20220327202006.9134985E9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c5423f166ced3cd2399c5d98bf7e377c1739fe1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bf2e459bb9fc9fe57147313cda35f7022172e6e8) Signed-off-by: Peter Korsgaard --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs From peter at korsgaard.com Sun Mar 27 20:22:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:22:39 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: fix CVE comments Message-ID: <20220327202020.6EE4385EA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d87883dc8d39bc597171e6f82bf0011b842876c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e forgot to update CVE comments Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8b2adbff1585b2581c76c9abcc8d5529134be60c) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d03253..b20bdea7f6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,8 +12,7 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 # A few comments: From peter at korsgaard.com Sun Mar 27 20:27:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:27:15 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/nbd: security bump to version 3.24 Message-ID: <20220327202020.8260A85EA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98cd43b646001a8617573f44e7e7666595ef861f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-26495: In nbd-server in nbd before 3.24, there is an integer overflow with a resultant heap-based buffer overflow. A value of 0xffffffff in the name length field will cause a zero-sized buffer to be allocated for the name, resulting in a write to a dangling pointer. This issue exists for the NBD_OPT_INFO, NBD_OPT_GO, and NBD_OPT_EXPORT_NAME messages. Fix CVE-2022-26496: In nbd-server in nbd before 3.24, there is a stack-based buffer overflow. An attacker can cause a buffer overflow in the parsing of the name field by sending a crafted NBD_OPT_INFO or NBD_OPT_GO message with an large value as the length of the name. https://github.com/NetworkBlockDevice/nbd/compare/nbd-3.21...nbd-3.24 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bf2e459bb9fc9fe57147313cda35f7022172e6e8) Signed-off-by: Peter Korsgaard --- package/nbd/nbd.hash | 8 ++++---- package/nbd/nbd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc27..f58a89bf9a 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cf..f0fb23910e 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs From peter at korsgaard.com Sun Mar 27 20:25:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:25:38 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: fix build on sparc v8 Message-ID: <20220327202020.7806F85EA3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=482b0099ea11e1ad0ccc839396bad88246992f8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure on sparc v8 raised since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e: ERROR: detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr Fixes: - http://autobuild.buildroot.org/results/5a2/5a20e984a5536165056b3fbd93b8712e8ddbeed4/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ee6d734f08e772202320841208f11a1a239ea49b) Signed-off-by: Peter Korsgaard --- ...b-configure.json-fix-atomicfptr-detection.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 0000000000..5f0f81a4bd --- /dev/null +++ b/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + From james.hilliard1 at gmail.com Sun Mar 27 20:29:39 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 27 Mar 2022 14:29:39 -0600 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220327202415.1248312-1-Jason@zx2c4.com> References: <20220327202415.1248312-1-Jason@zx2c4.com> Message-ID: On Sun, Mar 27, 2022 at 2:24 PM Jason A. Donenfeld wrote: > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. > > Signed-off-by: Jason A. Donenfeld Reviewed-by: James Hilliard > --- > package/urandom-scripts/Config.in | 4 - > package/urandom-scripts/S20urandom | 64 +-- > package/urandom-scripts/seedrng.c | 455 +++++++++++++++++++++ > package/urandom-scripts/urandom-scripts.mk | 6 + > 4 files changed, 479 insertions(+), 50 deletions(-) > create mode 100644 package/urandom-scripts/seedrng.c > > diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in > index 987e442e22..070ffa5e9a 100644 > --- a/package/urandom-scripts/Config.in > +++ b/package/urandom-scripts/Config.in > @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS > depends on !BR2_PACKAGE_SYSTEMD > help > Initscript to preserve the random seed between reboots. > - > - WARNING: this is a poor fit to try and get high-quality > - entropy at boot. There are better ways, like haveged, or > - rng-tools. > diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom > index c6b2ebd48f..1959fad93b 100644 > --- a/package/urandom-scripts/S20urandom > +++ b/package/urandom-scripts/S20urandom > @@ -6,63 +6,35 @@ > # Quietly do nothing if /dev/urandom does not exist > [ -c /dev/urandom ] || exit 0 > > -URANDOM_SEED="/var/lib/random-seed" > +# The following knobs can be adjusted by placing uncommented modified lines > +# into /etc/default/urandom: > +# > +# Set these to change where the seed and runtime lock file are stored: > +# > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > +# > +# Set this to true only if you do not want seed files to actually credit the > +# RNG, for example if you plan to replicate this file system image and do not > +# have the wherewithal to first delete the contents of /var/lib/seedrng: > +# > +# export SEEDRNG_SKIP_CREDIT=false > +# > > # shellcheck source=/dev/null > [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" > > -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then > - pool_size=$((pool_bits/8)) > -else > - pool_size=512 > -fi > - > -init_rng() { > - printf 'Initializing random number generator: ' > - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null > - status=$? > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - return "$status" > -} > - > -save_random_seed() { > - printf 'Saving random seed: ' > - status=1 > - if touch "$URANDOM_SEED.new" 2> /dev/null; then > - old_umask=$(umask) > - umask 077 > - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null > - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ > - | sha256sum \ > - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ > - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 > - rm -f "$URANDOM_SEED.tmp" > - umask "$old_umask" > - if [ "$status" -eq 0 ]; then > - echo "OK" > - else > - echo "FAIL" > - fi > - > - else > - echo "SKIP (read-only file system detected)" > - fi > - return "$status" > -} > - > case "$1" in > start|restart|reload) > # Carry a random seed from start-up to start-up > # Load and then save the whole entropy pool > - init_rng && save_random_seed;; > + # Never fail, as this isn't worth making a fuss > + # over if it doesn't go as planned. > + seedrng || true;; > stop) > # Carry a random seed from shut-down to start-up > # Save the whole entropy pool > - save_random_seed;; > + seedrng;; > *) > echo "Usage: $0 {start|stop|restart|reload}" > exit 1 > diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c > new file mode 100644 > index 0000000000..b3f6381bd8 > --- /dev/null > +++ b/package/urandom-scripts/seedrng.c > @@ -0,0 +1,455 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) > +/* > + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. > + * > + * This is based on code from . > + */ > + > +#define _GNU_SOURCE > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#ifndef GRND_INSECURE > +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ > +#endif > + > + > +static const char *SEED_DIR; > +static const char *LOCK_FILE; > +static char *CREDITABLE_SEED; > +static char *NON_CREDITABLE_SEED; > + > +enum blake2s_lengths { > + BLAKE2S_BLOCK_LEN = 64, > + BLAKE2S_HASH_LEN = 32, > + BLAKE2S_KEY_LEN = 32 > +}; > + > +enum seedrng_lengths { > + MAX_SEED_LEN = 512, > + MIN_SEED_LEN = BLAKE2S_HASH_LEN > +}; > + > +struct blake2s_state { > + uint32_t h[8]; > + uint32_t t[2]; > + uint32_t f[2]; > + uint8_t buf[BLAKE2S_BLOCK_LEN]; > + unsigned int buflen; > + unsigned int outlen; > +}; > + > +#define le32_to_cpup(a) le32toh(*(a)) > +#define cpu_to_le32(a) htole32(a) > +#ifndef ARRAY_SIZE > +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) > +#endif > +#ifndef DIV_ROUND_UP > +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) > +#endif > + > +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = cpu_to_le32(*buf); > + ++buf; > + } > +} > + > +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) > +{ > + while (words--) { > + *buf = le32_to_cpup(buf); > + ++buf; > + } > +} > + > +static inline uint32_t ror32(uint32_t word, unsigned int shift) > +{ > + return (word >> (shift & 31)) | (word << ((-shift) & 31)); > +} > + > +static const uint32_t blake2s_iv[8] = { > + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, > + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL > +}; > + > +static const uint8_t blake2s_sigma[10][16] = { > + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, > + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, > + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, > + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, > + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, > + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, > + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, > + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, > + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, > + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, > +}; > + > +static void blake2s_set_lastblock(struct blake2s_state *state) > +{ > + state->f[0] = -1; > +} > + > +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) > +{ > + state->t[0] += inc; > + state->t[1] += (state->t[0] < inc); > +} > + > +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) > +{ > + int i; > + > + memset(state, 0, sizeof(*state)); > + for (i = 0; i < 8; ++i) > + state->h[i] = blake2s_iv[i]; > + state->h[0] ^= param; > +} > + > +static void blake2s_init(struct blake2s_state *state, const size_t outlen) > +{ > + blake2s_init_param(state, 0x01010000 | outlen); > + state->outlen = outlen; > +} > + > +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) > +{ > + uint32_t m[16]; > + uint32_t v[16]; > + int i; > + > + while (nblocks > 0) { > + blake2s_increment_counter(state, inc); > + memcpy(m, block, BLAKE2S_BLOCK_LEN); > + le32_to_cpu_array(m, ARRAY_SIZE(m)); > + memcpy(v, state->h, 32); > + v[ 8] = blake2s_iv[0]; > + v[ 9] = blake2s_iv[1]; > + v[10] = blake2s_iv[2]; > + v[11] = blake2s_iv[3]; > + v[12] = blake2s_iv[4] ^ state->t[0]; > + v[13] = blake2s_iv[5] ^ state->t[1]; > + v[14] = blake2s_iv[6] ^ state->f[0]; > + v[15] = blake2s_iv[7] ^ state->f[1]; > + > +#define G(r, i, a, b, c, d) do { \ > + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > + d = ror32(d ^ a, 16); \ > + c += d; \ > + b = ror32(b ^ c, 12); \ > + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > + d = ror32(d ^ a, 8); \ > + c += d; \ > + b = ror32(b ^ c, 7); \ > +} while (0) > + > +#define ROUND(r) do { \ > + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > +} while (0) > + ROUND(0); > + ROUND(1); > + ROUND(2); > + ROUND(3); > + ROUND(4); > + ROUND(5); > + ROUND(6); > + ROUND(7); > + ROUND(8); > + ROUND(9); > + > +#undef G > +#undef ROUND > + > + for (i = 0; i < 8; ++i) > + state->h[i] ^= v[i] ^ v[i + 8]; > + > + block += BLAKE2S_BLOCK_LEN; > + --nblocks; > + } > +} > + > +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) > +{ > + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; > + const uint8_t *in = inp; > + > + if (!inlen) > + return; > + if (inlen > fill) { > + memcpy(state->buf + state->buflen, in, fill); > + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); > + state->buflen = 0; > + in += fill; > + inlen -= fill; > + } > + if (inlen > BLAKE2S_BLOCK_LEN) { > + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); > + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); > + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); > + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); > + } > + memcpy(state->buf + state->buflen, in, inlen); > + state->buflen += inlen; > +} > + > +static void blake2s_final(struct blake2s_state *state, uint8_t *out) > +{ > + blake2s_set_lastblock(state); > + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); > + blake2s_compress(state, state->buf, 1, state->buflen); > + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); > + memcpy(out, state->h, state->outlen); > +} > + > +static size_t determine_optimal_seed_len(void) > +{ > + size_t ret = 0; > + char poolsize_str[11] = { 0 }; > + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); > + > + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { > + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); > + ret = MIN_SEED_LEN; > + } else > + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); > + if (fd >= 0) > + close(fd); > + if (ret < MIN_SEED_LEN) > + ret = MIN_SEED_LEN; > + else if (ret > MAX_SEED_LEN) > + ret = MAX_SEED_LEN; > + return ret; > +} > + > +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) > +{ > + ssize_t ret; > + int urandom_fd; > + > + *is_creditable = false; > + ret = getrandom(seed, len, GRND_NONBLOCK); > + if (ret == (ssize_t)len) { > + *is_creditable = true; > + return 0; > + } else if (ret < 0 && errno == ENOSYS) { > + struct pollfd random_fd = { > + .fd = open("/dev/random", O_RDONLY), > + .events = POLLIN > + }; > + if (random_fd.fd < 0) > + return -errno; > + *is_creditable = poll(&random_fd, 1, 0) == 1; > + close(random_fd.fd); > + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) > + return 0; > + urandom_fd = open("/dev/urandom", O_RDONLY); > + if (urandom_fd < 0) > + return -errno; > + ret = read(urandom_fd, seed, len); > + if (ret == (ssize_t)len) > + ret = 0; > + else > + ret = -errno ? -errno : -EIO; > + close(urandom_fd); > + return ret; > +} > + > +static int seed_rng(uint8_t *seed, size_t len, bool credit) > +{ > + struct { > + int entropy_count; > + int buf_size; > + uint8_t buffer[MAX_SEED_LEN]; > + } req = { > + .entropy_count = credit ? len * 8 : 0, > + .buf_size = len > + }; > + int random_fd, ret; > + > + if (len > sizeof(req.buffer)) > + return -EFBIG; > + memcpy(req.buffer, seed, len); > + > + random_fd = open("/dev/random", O_RDWR); > + if (random_fd < 0) > + return -errno; > + ret = ioctl(random_fd, RNDADDENTROPY, &req); > + if (ret) > + ret = -errno ? -errno : -EIO; > + close(random_fd); > + return ret; > +} > + > +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) > +{ > + uint8_t seed[MAX_SEED_LEN]; > + ssize_t seed_len; > + int fd, dfd, ret = 0; > + > + fd = open(filename, O_RDONLY); > + if (fd < 0 && errno == ENOENT) > + return 0; > + else if (fd < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); > + return ret; > + } > + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); > + if (dfd < 0) { > + ret = -errno; > + close(fd); > + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); > + return ret; > + } > + seed_len = read(fd, seed, sizeof(seed)); > + if (seed_len < 0) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); > + } > + close(fd); > + if (ret) { > + close(dfd); > + return ret; > + } > + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { > + ret = -errno; > + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); > + } > + close(dfd); > + if (ret) > + return ret; > + if (!seed_len) > + return 0; > + > + blake2s_update(hash, &seed_len, sizeof(seed_len)); > + blake2s_update(hash, seed, seed_len); > + > + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); > + ret = seed_rng(seed, seed_len, credit); > + if (ret < 0) > + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); > + return ret; > +} > + > +static bool skip_credit(void) > +{ > + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); > + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || > + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); > +} > + > +static void populate_global_paths(void) > +{ > + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); > + if (!SEED_DIR || !*SEED_DIR) > + SEED_DIR = "/var/lib/seedrng"; > + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); > + if (!LOCK_FILE || !*LOCK_FILE) > + LOCK_FILE = "/var/run/seedrng.lock"; > + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || > + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { > + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); > + exit(1); > + } > +} > + > +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) > +{ > + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; > + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; > + int ret, fd, lock, program_ret = 0; > + uint8_t new_seed[MAX_SEED_LEN]; > + size_t new_seed_len; > + bool new_seed_creditable; > + struct timespec realtime = { 0 }, boottime = { 0 }; > + struct blake2s_state hash; > + > + umask(0077); > + if (getuid()) { > + fprintf(stderr, "ERROR: This program requires root\n"); > + return 1; > + } > + > + populate_global_paths(); > + blake2s_init(&hash, BLAKE2S_HASH_LEN); > + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); > + clock_gettime(CLOCK_REALTIME, &realtime); > + clock_gettime(CLOCK_BOOTTIME, &boottime); > + blake2s_update(&hash, &realtime, sizeof(realtime)); > + blake2s_update(&hash, &boottime, sizeof(boottime)); > + > + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { > + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); > + return 1; > + } > + > + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); > + if (lock < 0 || flock(lock, LOCK_EX) < 0) { > + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); > + return 1; > + } > + > + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); > + if (ret < 0) > + program_ret |= 1 << 1; > + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); > + if (ret < 0) > + program_ret |= 1 << 2; > + > + new_seed_len = determine_optimal_seed_len(); > + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); > + if (ret < 0) { > + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); > + new_seed_len = BLAKE2S_HASH_LEN; > + strncpy((char *)new_seed, seedrng_failure, new_seed_len); > + program_ret |= 1 << 3; > + } > + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); > + blake2s_update(&hash, new_seed, new_seed_len); > + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); > + > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > + if (fd < 0) { > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > + program_ret |= 1 << 4; > + goto out; > + } > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > + program_ret |= 1 << 5; > + goto out; > + } > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > + program_ret |= 1 << 6; > + } > +out: > + close(fd); > + close(lock); > + return program_ret; > +} > diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk > index 2c09728c46..e8526e248a 100644 > --- a/package/urandom-scripts/urandom-scripts.mk > +++ b/package/urandom-scripts/urandom-scripts.mk > @@ -4,7 +4,13 @@ > # > ################################################################################ > > +define URANDOM_SCRIPTS_BUILD_CMDS > + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ > + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng > +endef > + > define URANDOM_SCRIPTS_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng > $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ > $(TARGET_DIR)/etc/init.d/S20urandom > endef > -- > 2.35.1 > From fontaine.fabrice at gmail.com Sun Mar 27 20:32:18 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 22:32:18 +0200 Subject: [Buildroot] [PATCH 1/1] package/matio: security bump to version 1.5.22 Message-ID: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash pf COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING -- 2.35.1 From peter at korsgaard.com Sun Mar 27 20:36:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:36:01 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220327202704.26C8285EB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14d329ee1c52563d46165dadd06e923444a01594 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92a3ca0932155498747c46d6f902a939d55c39f4) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Mar 27 20:34:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:34:15 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-twisted: security bump to version 22.2.0 Message-ID: <20220327202719.331C585EBD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3171d7bc1b7b03d97e4c8df549b375742df21b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-21716: Twisted is an event-based framework for internet applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH client and server implement is able to accept an infinite amount of data for the peer's SSH version identifier. This ends up with a buffer using all the available memory. The attach is a simple as `nc -rv localhost 22 < /dev/zero`. A patch is available in version 22.2.0. There are currently no known workarounds. https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92a3ca0932155498747c46d6f902a939d55c39f4) Signed-off-by: Peter Korsgaard --- package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f0..63da0125b8 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 fd252d0b895ca2ab81b5b1454073d890 Twisted-22.2.0.tar.gz +sha256 57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2 Twisted-22.2.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58..e5d643ec05 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Mar 27 20:37:25 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 27 Mar 2022 22:37:25 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 In-Reply-To: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 12:47:41 +0100") References: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> Message-ID: <87mthbb08q.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-21716: Twisted is an event-based framework for internet > applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH > client and server implement is able to accept an infinite amount of data > for the peer's SSH version identifier. This ends up with a buffer using > all the available memory. The attach is a simple as `nc -rv localhost 22 > < /dev/zero`. A patch is available in version 22.2.0. There are > currently no known workarounds. > https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Mar 27 20:57:50 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 22:57:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/unclutter-xfixes: bump to version 1.6 Message-ID: <20220327205750.1448336-1-fontaine.fabrice@gmail.com> Update indentation in hash file (two spaces) https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.6 Signed-off-by: Fabrice Fontaine --- package/unclutter-xfixes/unclutter-xfixes.hash | 4 ++-- package/unclutter-xfixes/unclutter-xfixes.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash index 785825da7a..b0bd5532ef 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.hash +++ b/package/unclutter-xfixes/unclutter-xfixes.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk index 713a84bca6..6da607b660 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.mk +++ b/package/unclutter-xfixes/unclutter-xfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNCLUTTER_XFIXES_VERSION = 1.5 +UNCLUTTER_XFIXES_VERSION = 1.6 UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) UNCLUTTER_XFIXES_LICENSE = MIT UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE -- 2.35.1 From fontaine.fabrice at gmail.com Sun Mar 27 21:15:05 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 27 Mar 2022 23:15:05 +0200 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.13 Message-ID: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine --- ...iple-def-of-invalid_dircache_entries.patch | 25 ------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch -- 2.35.1 From alseycmiller at gmail.com Mon Mar 28 06:00:27 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Mon, 28 Mar 2022 06:00:27 +0000 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries Message-ID: <20220328060027.2483147-1-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/Config.in | 11 + package/foundation/Config.in | 14 ++ package/foundation/foundation.hash | 1 + package/foundation/foundation.mk | 102 ++++++++ package/libdispatch/Config.in | 11 + package/libdispatch/libdispatch.hash | 2 + package/libdispatch/libdispatch.mk | 78 ++++++ package/libswiftdispatch/Config.in | 12 + .../libswiftdispatch/libswiftdispatch.hash | 2 + package/libswiftdispatch/libswiftdispatch.mk | 86 +++++++ package/swift-crypto/Config.in | 10 + .../swift-crypto-shared-lib.patch | 13 + package/swift-crypto/swift-crypto.mk | 36 +++ package/swift-hello/Config.in | 10 + package/swift-hello/src/Package.swift | 22 ++ .../src/Sources/swift-hello/Hello.swift | 31 +++ .../swift-helloTests/swift_helloTests.swift | 47 ++++ package/swift-hello/swift-hello.mk | 33 +++ package/swift/Config.in | 55 +++++ package/swift/Float16.patch | 13 + package/swift/RefCount.h.diff | 18 ++ package/swift/swift-5.6-armv5.patch | 161 ++++++++++++ package/swift/swift.hash | 1 + package/swift/swift.mk | 232 ++++++++++++++++++ 24 files changed, 1001 insertions(+) create mode 100644 package/foundation/Config.in create mode 100644 package/foundation/foundation.hash create mode 100644 package/foundation/foundation.mk create mode 100644 package/libdispatch/Config.in create mode 100644 package/libdispatch/libdispatch.hash create mode 100644 package/libdispatch/libdispatch.mk create mode 100644 package/libswiftdispatch/Config.in create mode 100644 package/libswiftdispatch/libswiftdispatch.hash create mode 100644 package/libswiftdispatch/libswiftdispatch.mk create mode 100644 package/swift-crypto/Config.in create mode 100644 package/swift-crypto/swift-crypto-shared-lib.patch create mode 100644 package/swift-crypto/swift-crypto.mk create mode 100644 package/swift-hello/Config.in create mode 100644 package/swift-hello/src/Package.swift create mode 100644 package/swift-hello/src/Sources/swift-hello/Hello.swift create mode 100644 package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift create mode 100644 package/swift-hello/swift-hello.mk create mode 100644 package/swift/Config.in create mode 100644 package/swift/Float16.patch create mode 100644 package/swift/RefCount.h.diff create mode 100644 package/swift/swift-5.6-armv5.patch create mode 100644 package/swift/swift.hash create mode 100644 package/swift/swift.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..b89a49913e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1422,6 +1422,7 @@ menu "Crypto" source "package/openssl/Config.in" source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" + source "package/swift-crypto/Config.in" source "package/tinydtls/Config.in" source "package/tpm2-pkcs11/Config.in" source "package/tpm2-tss/Config.in" @@ -1939,6 +1940,7 @@ menu "Other" source "package/flann/Config.in" source "package/flatbuffers/Config.in" source "package/flatcc/Config.in" + source "package/foundation/Config.in" source "package/gconf/Config.in" source "package/gflags/Config.in" source "package/gli/Config.in" @@ -1968,6 +1970,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdispatch/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" @@ -2001,6 +2004,7 @@ menu "Other" source "package/libsigc/Config.in" source "package/libsigsegv/Config.in" source "package/libspatialindex/Config.in" + source "package/libswiftdispatch/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" source "package/libtommath/Config.in" @@ -2021,6 +2025,10 @@ comment "linux-pam plugins" endif source "package/liquid-dsp/Config.in" source "package/llvm/Config.in" + source "package/swift/Config.in" + source "package/libdispatch/Config.in" + source "package/libswiftdispatch/Config.in" + source "package/foundation/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" source "package/mpc/Config.in" @@ -2044,6 +2052,7 @@ endif source "package/skalibs/Config.in" source "package/sphinxbase/Config.in" source "package/startup-notification/Config.in" + source "package/swift/Config.in" source "package/tinycbor/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" @@ -2102,6 +2111,7 @@ menu "Mail" endmenu menu "Miscellaneous" + source "package/swift-hello/Config.in" source "package/aespipe/Config.in" source "package/bc/Config.in" source "package/bitcoin/Config.in" @@ -2125,6 +2135,7 @@ menu "Miscellaneous" source "package/rtl_433/Config.in" source "package/shared-mime-info/Config.in" source "package/sunwait/Config.in" + source "package/swift-hello/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" source "package/xmrig/Config.in" diff --git a/package/foundation/Config.in b/package/foundation/Config.in new file mode 100644 index 0000000000..7a9dc8b514 --- /dev/null +++ b/package/foundation/Config.in @@ -0,0 +1,14 @@ +if BR2_PACKAGE_SWIFT + +config BR2_PACKAGE_FOUNDATION + bool "foundation" + depends on BR2_PACKAGE_SWIFT + select BR2_PACKAGE_LIBSWIFTDISPATCH + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXML2 + help + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. + + http://swift.org + +endif diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash new file mode 100644 index 0000000000..f15edb8420 --- /dev/null +++ b/package/foundation/foundation.hash @@ -0,0 +1 @@ +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk new file mode 100644 index 0000000000..93c7cedbdd --- /dev/null +++ b/package/foundation/foundation.mk @@ -0,0 +1,102 @@ +### Foundation +FOUNDATION_VERSION = $(SWIFT_VERSION) +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags +FOUNDATION_LICENSE = Apache-2.0 +FOUNDATION_LICENSE_FILES = LICENSE +FOUNDATION_INSTALL_STAGING = YES +FOUNDATION_INSTALL_TARGET = YES +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch + +FOUNDATION_CONF_OPTS += \ + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ + -DCMAKE_Swift_FLAGS_DEBUG="" \ + -DCMAKE_Swift_FLAGS_RELEASE="" \ + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ + -DCF_DEPLOYMENT_SWIFT=ON \ + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ + +ifeq ($(BR2_PACKAGE_LIBCURL),y) + FOUNDATION_DEPENDENCIES += libcurl + FOUNDATION_CONF_OPTS += \ + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ + +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) + FOUNDATION_DEPENDENCIES += libxml2 + FOUNDATION_CONF_OPTS += \ + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ + +endif + +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) +else +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build +endif + +define FOUNDATION_CONFIGURE_CMDS + # Workaround Dispatch defined with cmake and module + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch + # Clean + rm -rf $(FOUNDATION_BUILDDIR) + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation + # Configure + (mkdir -p $(FOUNDATION_BUILDDIR) && \ + cd $(FOUNDATION_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + $(FOUNDATION_CONF_OPTS) \ + ) +endef + +define FOUNDATION_BUILD_CMDS + # Compile + (cd $(FOUNDATION_BUILDDIR) && ninja) +endef + +define FOUNDATION_INSTALL_TARGET_CMDS + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ +endef + +define FOUNDATION_INSTALL_STAGING_CMDS + # Copy libraries + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ + # Copy CoreFoundation module + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map + # Copy CFXMLInterface module + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map + # Copy CFURLSessionInterface module + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map + # Copy Swift modules + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ + # Restore Dispatch headers + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) + +endef + +$(eval $(generic-package)) diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in new file mode 100644 index 0000000000..2f7c115375 --- /dev/null +++ b/package/libdispatch/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBDISPATCH + bool "libdispatch" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBBSD + + help + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + http://swift.org diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash new file mode 100644 index 0000000000..a89c48c55f --- /dev/null +++ b/package/libdispatch/libdispatch.hash @@ -0,0 +1,2 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk new file mode 100644 index 0000000000..a334c3052d --- /dev/null +++ b/package/libdispatch/libdispatch.mk @@ -0,0 +1,78 @@ +### Grand Central Dispatch (C API) +LIBDISPATCH_VERSION = $(SWIFT_VERSION) +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags +LIBDISPATCH_LICENSE = Apache-2.0 +LIBDISPATCH_LICENSE_FILES = LICENSE +LIBDISPATCH_INSTALL_STAGING = YES +LIBDISPATCH_INSTALL_TARGET = YES +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBDISPATCH_DEPENDENCIES = libbsd +LIBDISPATCH_PATCH = \ + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch + +LIBDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + +ifeq (LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD),YES) +LIBDISPATCH_BUILDDIR = $(LIBDISPATCH_SRCDIR) +else +LIBDISPATCH_BUILDDIR = $(LIBDISPATCH_SRCDIR)/build +endif + +define LIBDISPATCH_CONFIGURE_CMDS + # Clean + rm -rf $(LIBDISPATCH_BUILDDIR) + rm -rf $(STAGING_DIR)/usr/lib/swift/dispatch + # Configure for Ninja + (mkdir -p $(LIBDISPATCH_BUILDDIR) && \ + cd $(LIBDISPATCH_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(LIBDISPATCH_CONF_ENV) $(BR2_CMAKE) -S $(LIBDISPATCH_SRCDIR) -B $(LIBDISPATCH_BUILDDIR) -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(SWIFT_NATIVE_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(SWIFT_EXTRA_FLAGS) -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(SWIFT_EXTRA_FLAGS) -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + $(LIBDISPATCH_CONF_OPTS) \ + ) +endef + +define LIBDISPATCH_BUILD_CMDS + # Compile + (cd $(LIBDISPATCH_BUILDDIR) && ninja) +endef + +define LIBDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +define LIBDISPATCH_INSTALL_STAGING_CMDS + # Copy libraries + cp $(LIBDISPATCH_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/ + # Copy headers + mkdir -p ${STAGING_DIR}/usr/include/dispatch + cp $(LIBDISPATCH_SRCDIR)/dispatch/*.h ${STAGING_DIR}/usr/include/dispatch + mkdir -p ${STAGING_DIR}/usr/include/Block + cp $(LIBDISPATCH_SRCDIR)/src/BlocksRuntime/Block.h ${STAGING_DIR}/usr/include/Block/ + mkdir -p ${STAGING_DIR}/usr/include/os + cp $(LIBDISPATCH_SRCDIR)/os/object.h ${STAGING_DIR}/usr/include/os/ + cp $(LIBDISPATCH_SRCDIR)/os/generic_unix_base.h ${STAGING_DIR}/usr/include/os/ +endef + +$(eval $(generic-package)) diff --git a/package/libswiftdispatch/Config.in b/package/libswiftdispatch/Config.in new file mode 100644 index 0000000000..c16ed3217c --- /dev/null +++ b/package/libswiftdispatch/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBSWIFTDISPATCH + bool "libswiftdispatch" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_LIBBSD + depends on BR2_PACKAGE_SWIFT + + help + Swift overlay for libdispatch. + + http://swift.org diff --git a/package/libswiftdispatch/libswiftdispatch.hash b/package/libswiftdispatch/libswiftdispatch.hash new file mode 100644 index 0000000000..a89c48c55f --- /dev/null +++ b/package/libswiftdispatch/libswiftdispatch.hash @@ -0,0 +1,2 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch diff --git a/package/libswiftdispatch/libswiftdispatch.mk b/package/libswiftdispatch/libswiftdispatch.mk new file mode 100644 index 0000000000..45bef5b8f2 --- /dev/null +++ b/package/libswiftdispatch/libswiftdispatch.mk @@ -0,0 +1,86 @@ +### Grand Central Dispatch with Swift overlay +LIBSWIFTDISPATCH_VERSION = $(SWIFT_VERSION) +LIBSWIFTDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz +LIBSWIFTDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags +LIBSWIFTDISPATCH_LICENSE = Apache-2.0 +LIBSWIFTDISPATCH_LICENSE_FILES = LICENSE +LIBSWIFTDISPATCH_INSTALL_STAGING = YES +LIBSWIFTDISPATCH_INSTALL_TARGET = YES +LIBSWIFTDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBSWIFTDISPATCH_DEPENDENCIES = libbsd swift +LIBSWIFTDISPATCH_PATCH = \ + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch + +LIBSWIFTDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + -DENABLE_SWIFT=YES \ + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ + -DCMAKE_Swift_FLAGS_DEBUG="" \ + -DCMAKE_Swift_FLAGS_RELEASE="" \ + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ + +ifeq (LIBSWIFTDISPATCH_SUPPORTS_IN_SOURCE_BUILD),YES) +LIBSWIFTDISPATCH_BUILDDIR = $(LIBSWIFTDISPATCH_SRCDIR) +else +LIBSWIFTDISPATCH_BUILDDIR = $(LIBSWIFTDISPATCH_SRCDIR)/build +endif + +define LIBSWIFTDISPATCH_CONFIGURE_CMDS + # Clean + rm -rf $(LIBSWIFTDISPATCH_BUILDDIR) + rm -rf $(STAGING_DIR)/usr/lib/swift/dispatch + # Configure for Ninja + (mkdir -p $(LIBSWIFTDISPATCH_BUILDDIR) && \ + cd $(LIBSWIFTDISPATCH_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(LIBSWIFTDISPATCH_CONF_ENV) $(BR2_CMAKE) -S $(LIBSWIFTDISPATCH_SRCDIR) -B $(LIBSWIFTDISPATCH_BUILDDIR) -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(SWIFT_NATIVE_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + $(LIBSWIFTDISPATCH_CONF_OPTS) \ + ) +endef + +define LIBSWIFTDISPATCH_BUILD_CMDS + # Compile + (cd $(LIBSWIFTDISPATCH_BUILDDIR) && ninja) +endef + +define LIBSWIFTDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBSWIFTDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +define LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS + # Copy libraries + cp $(LIBSWIFTDISPATCH_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ + # Copy headers + mkdir -p ${STAGING_DIR}/usr/lib/swift/dispatch + cp $(LIBSWIFTDISPATCH_SRCDIR)/dispatch/*.h ${STAGING_DIR}/usr/lib/swift/dispatch/ + cp $(LIBSWIFTDISPATCH_SRCDIR)/dispatch/module.modulemap ${STAGING_DIR}/usr/lib/swift/dispatch/ + mkdir -p ${STAGING_DIR}/usr/lib/swift/Block + cp $(LIBSWIFTDISPATCH_SRCDIR)/src/BlocksRuntime/Block.h ${STAGING_DIR}/usr/lib/swift/Block/ + mkdir -p ${STAGING_DIR}/usr/lib/swift/os + cp $(LIBSWIFTDISPATCH_SRCDIR)/os/object.h ${STAGING_DIR}/usr/lib/swift/os/ + cp $(LIBSWIFTDISPATCH_SRCDIR)/os/generic_unix_base.h ${STAGING_DIR}/usr/lib/swift/os/ + # Copy Swift modules + cp $(LIBSWIFTDISPATCH_BUILDDIR)/src/swift/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ +endef + +$(eval $(generic-package)) diff --git a/package/swift-crypto/Config.in b/package/swift-crypto/Config.in new file mode 100644 index 0000000000..35c42fdc88 --- /dev/null +++ b/package/swift-crypto/Config.in @@ -0,0 +1,10 @@ +if BR2_PACKAGE_SWIFT + +config BR2_PACKAGE_SWIFT_CRYPTO + bool "swift-crypto" + depends on BR2_PACKAGE_SWIFT + depends on BR2_PACKAGE_FOUNDATION + help + Swift Crypto is an open-source implementation of a substantial portion of the API of Apple CryptoKit suitable for use on Linux platforms. + +endif diff --git a/package/swift-crypto/swift-crypto-shared-lib.patch b/package/swift-crypto/swift-crypto-shared-lib.patch new file mode 100644 index 0000000000..049a1a37d5 --- /dev/null +++ b/package/swift-crypto/swift-crypto-shared-lib.patch @@ -0,0 +1,13 @@ +diff --git a/Package.swift b/Package.swift +index 4991568..2cb150f 100644 +--- a/Package.swift ++++ b/Package.swift +@@ -39,7 +39,7 @@ let package = Package( + .tvOS(.v13), + ], + products: [ +- .library(name: "Crypto", targets: ["Crypto"]), ++ .library(name: "Crypto", type: .dynamic, targets: ["Crypto"]), + .library(name: "_CryptoExtras", targets: ["_CryptoExtras"]), + /* This target is used only for symbol mangling. It's added and removed automatically because it emits build warnings. MANGLE_START + .library(name: "CCryptoBoringSSL", type: .static, targets: ["CCryptoBoringSSL"]), diff --git a/package/swift-crypto/swift-crypto.mk b/package/swift-crypto/swift-crypto.mk new file mode 100644 index 0000000000..c0c34f53b3 --- /dev/null +++ b/package/swift-crypto/swift-crypto.mk @@ -0,0 +1,36 @@ +### Swift CryptoKit library +SWIFT_CRYPTO_VERSION = 2.0.5 +SWIFT_CRYPTO_SOURCE = $(SWIFT_CRYPTO_VERSION).tar.gz +SWIFT_CRYPTO_SITE = https://github.com/apple/swift-crypto/archive/refs/tags/ +SWIFT_CRYPTO_LICENSE = Apache-2.0 +SWIFT_CRYPTO_LICENSE_FILES = LICENSE.txt +SWIFT_CRYPTO_INSTALL_STAGING = YES +SWIFT_CRYPTO_INSTALL_TARGET = YES +SWIFT_CRYPTO_SUPPORTS_IN_SOURCE_BUILD = YES +SWIFT_CRYPTO_DEPENDENCIES = swift foundation +SWIFT_CRYPTO_BUILDDIR = $(SWIFT_CRYPTO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) + +define SWIFT_CRYPTO_BUILD_CMDS + ( \ + cd $(SWIFT_CRYPTO_SRCDIR) && \ + rm -rf .build && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ + ) +endef + +define SWIFT_CRYPTO_INSTALL_TARGET_CMDS + # Copy dynamic libraries + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/libCrypto.so $(TARGET_DIR)/usr/lib/ +endef + +define SWIFT_CRYPTO_INSTALL_STAGING_CMDS + # Copy dynamic libraries + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/libCrypto.so $(STAGING_DIR)/usr/lib/swift/linux/ + # Copy Swift module + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/Crypto.swiftdoc ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/Crypto.swiftmodule ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ + cp -rf $(SWIFT_CRYPTO_BUILDDIR)/Crypto.swiftsourceinfo ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ +endef + +$(eval $(generic-package)) diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in new file mode 100644 index 0000000000..cbeed69667 --- /dev/null +++ b/package/swift-hello/Config.in @@ -0,0 +1,10 @@ +if BR2_PACKAGE_SWIFT + +config BR2_PACKAGE_SWIFT_HELLO + bool "swift-hello" + depends on BR2_PACKAGE_SWIFT + depends on BR2_PACKAGE_FOUNDATION + help + Demo application for Swift. + +endif diff --git a/package/swift-hello/src/Package.swift b/package/swift-hello/src/Package.swift new file mode 100644 index 0000000000..d26517480c --- /dev/null +++ b/package/swift-hello/src/Package.swift @@ -0,0 +1,22 @@ +// swift-tools-version:5.5 +import PackageDescription + +let package = Package( + name: "swift-hello", + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .executableTarget( + name: "swift-hello", + dependencies: [] + ), + .testTarget( + name: "swift-helloTests", + dependencies: ["swift-hello"] + ), + ] +) diff --git a/package/swift-hello/src/Sources/swift-hello/Hello.swift b/package/swift-hello/src/Sources/swift-hello/Hello.swift new file mode 100644 index 0000000000..d68c3fb1a3 --- /dev/null +++ b/package/swift-hello/src/Sources/swift-hello/Hello.swift @@ -0,0 +1,31 @@ +import Foundation +#if canImport(Crypto) +import Crypto +#endif + + at main +struct Hello { + static func main() async throws { + print("Hello, world! ?") + #if canImport(Crypto) + print("Swift Crypto installed") + #endif + let task = Task { + var didCatchError = false + do { try await errorTest() } + catch CocoaError.userCancelled { didCatchError = true } + catch { fatalError() } + print("Task ran") + } + for _ in 0 ..< 10 { + print(UUID()) + try await Task.sleep(1_000_000_000) + } + } +} + +func errorTest() async throws { + print("Will throw") + throw CocoaError(.userCancelled) +} + diff --git a/package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift b/package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift new file mode 100644 index 0000000000..f9ca48cacd --- /dev/null +++ b/package/swift-hello/src/Tests/swift-helloTests/swift_helloTests.swift @@ -0,0 +1,47 @@ +import XCTest +import class Foundation.Bundle + +final class swift_helloTests: XCTestCase { + func testExample() throws { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct + // results. + + // Some of the APIs that we use below are available in macOS 10.13 and above. + guard #available(macOS 10.13, *) else { + return + } + + // Mac Catalyst won't have `Process`, but it is supported for executables. + #if !targetEnvironment(macCatalyst) + + let fooBinary = productsDirectory.appendingPathComponent("swift-hello") + + let process = Process() + process.executableURL = fooBinary + + let pipe = Pipe() + process.standardOutput = pipe + + try process.run() + process.waitUntilExit() + + let data = pipe.fileHandleForReading.readDataToEndOfFile() + let output = String(data: data, encoding: .utf8) + + XCTAssertEqual(output, "Hello, world!\n") + #endif + } + + /// Returns path to the built products directory. + var productsDirectory: URL { + #if os(macOS) + for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") { + return bundle.bundleURL.deletingLastPathComponent() + } + fatalError("couldn't find the products directory") + #else + return Bundle.main.bundleURL + #endif + } +} diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk new file mode 100644 index 0000000000..b3cded3f7c --- /dev/null +++ b/package/swift-hello/swift-hello.mk @@ -0,0 +1,33 @@ +### Swift Demo +SWIFT_HELLO_VERSION = 0.1.0 +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src +SWIFT_HELLO_SITE_METHOD = local +SWIFT_HELLO_INSTALL_STAGING = NO +SWIFT_HELLO_INSTALL_TARGET = YES +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES +SWIFT_HELLO_DEPENDENCIES = swift foundation +SWIFT_HELLO_EXECUTABLES = swift-hello +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) + +define SWIFT_HELLO_BUILD_CMDS + ( \ + cd $(SWIFT_HELLO_SRCDIR) && \ + rm -rf .build && \ + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ + ) +endef + +define SWIFT_HELLO_INSTALL_TARGET_CMDS + # Copy dynamic libraries + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello +endef + +define SWIFT_HELLO_INSTALL_STAGING_CMDS + # Copy dynamic libraries + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello +endef + +$(eval $(generic-package)) diff --git a/package/swift/Config.in b/package/swift/Config.in new file mode 100644 index 0000000000..97c59a8b70 --- /dev/null +++ b/package/swift/Config.in @@ -0,0 +1,55 @@ +config BR2_PACKAGE_SWIFT_ARCH_SUPPORTS + bool + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_RISCV_64 + +config BR2_PACKAGE_SWIFT_TARGET_ARCH + string + default "aarch64" if BR2_aarch64 + default "armv5" if BR2_ARM_CPU_ARMV5 + default "armv6" if BR2_ARM_CPU_ARMV6 + default "armv7" if BR2_ARM_CPU_ARMV7A + default "x86_64" if BR2_x86_64 + default "powerpc" if BR2_powerpc + default "mips" if BR2_mips + default "mipsel" if BR2_mipsel + default "mips64" if BR2_mips64 + default "mips64el" if BR2_mips64el + default "riscv64" if BR2_RISCV_64 + +config BR2_PACKAGE_SWIFT + bool "swift" + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_ICU + select BR2_PACKAGE_LIBDISPATCH + help + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. + + http://swift.org + +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH + +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS + string "Path to host Swift toolchain" + default "/usr/bin" + +config BR2_PACKAGE_SWIFT_LLVM_DIR + string "Path to host LLVM library path" + default "/usr/lib/llvm-12" + +endif + +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/swift/Float16.patch b/package/swift/Float16.patch new file mode 100644 index 0000000000..2768d0cd20 --- /dev/null +++ b/package/swift/Float16.patch @@ -0,0 +1,13 @@ +diff --git a/stdlib/public/runtime/Float16Support.cpp b/stdlib/public/runtime/Float16Support.cpp +index 817739d4cdf..b1896a4e364 100644 +--- a/stdlib/public/runtime/Float16Support.cpp ++++ b/stdlib/public/runtime/Float16Support.cpp +@@ -29,7 +29,7 @@ + + // Android NDK > $(SWIFTPM_DESTINATION_FILE) + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) + + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ + fi + + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ + + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ + fi + + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ + fi + + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) + echo '}' >> $(SWIFTPM_DESTINATION_FILE) + +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) \ No newline at end of file -- 2.30.2 From bugzilla at busybox.net Mon Mar 28 06:11:42 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 06:11:42 +0000 Subject: [Buildroot] [Bug 14701] New: Multiple unresolved symbols while building kernel module package Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 Bug ID: 14701 Summary: Multiple unresolved symbols while building kernel module package Product: buildroot Version: 2021.11.1 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: jose.pekkarinen at unikie.com CC: buildroot at uclibc.org Target Milestone: --- Hi, I'm trying to build a package for sgx driver: https://github.com/intel/linux-sgx The package looks like: sgx-driver.mk: ################################################################################ # # sgx-driver # ################################################################################ SGX_DRIVER_VERSION = 2.14 SGX_DRIVER_SOURCE = sgx_driver_$(SGX_DRIVER_VERSION).tar.gz SGX_DRIVER_SITE = https://github.com/intel/linux-sgx-driver/archive/refs/tags SGX_DRIVER_LICENSE = BSD-3-Clause, GPL-2.0 SGX_DRIVER_LICENSE_FILES = License.txt $(eval $(kernel-module)) $(eval $(generic-package)) Config.in: comment "sgx-driver needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SGX_DRIVER bool "sgx-driver" depends on BR2_LINUX_KERNEL help Intel sgx driver for secured containers. https://github.com/intel/linux-sgx-driver When building with a valid config, the build process stops like this: >>> sgx-driver 2.14 Building kernel module(s) PATH="/usr/src/output/br_admin/output_x86_upxtreme/host/bin:/usr/src/output/br_admin/output_x86_upxtreme/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" PKG_CONFIG="/usr/src/output/br_admin/output_x86_upxtreme/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/usr/src/output/br_admin/output_x86_upxtreme/host/lib/pkgconfig:/usr/src/output/br_admin/output_x86_upxtreme/host/share/pkgconfig" BR_BINARIES_DIR=/usr/src/output/br_admin/output_x86_upxtreme/images KCFLAGS=-Wno-attribute-alias /usr/bin/make -j9 -C /usr/src/output/br_admin/output_x86_upxtreme/build/linux-tc-x86-5.15-sec HOSTCC="/usr/src/output/br_admin/output_x86_upxtreme/host/bin/ccache /usr/bin/gcc -O2 -I/usr/src/output/br_admin/output_x86_upxtreme/host/include -L/usr/src/output/br_admin/output_x86_upxtreme/host/lib -Wl,-rpath,/usr/src/output/br_admin/output_x86_upxtreme/host/lib" ARCH=x86_64 INSTALL_MOD_PATH=/usr/src/output/br_admin/output_x86_upxtreme/target CROSS_COMPILE="/usr/src/output/br_admin/output_x86_upxtreme/host/bin/x86_64-TII-linux-gnu-" DEPMOD=/usr/src/output/br_admin/output_x86_upxtreme/host/sbin/depmod INSTALL_MOD_STRIP=1 PWD=/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/. M=/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/. modules make[2]: Entering directory '/usr/src/output/br_admin/output_x86_upxtreme/build/linux-tc-x86-5.15-sec' CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_main.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_page_cache.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_ioctl.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_vma.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_util.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_encl.o CC [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./sgx_encl2.o LD [M] /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.o MODPOST /usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./Module.symvers ERROR: modpost: "flush_work" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "put_pid" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "up_read" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "boot_cpu_data" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "system_freezing_cnt" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "mmu_notifier_register" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "__warn_printk" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "__x86_indirect_alt_call_rbx" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "__x86_indirect_thunk_rcx" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! ERROR: modpost: "alloc_pages" [/usr/src/output/br_admin/output_x86_upxtreme/build/sgx-driver-2.14/./isgx.ko] undefined! WARNING: modpost: suppressed 65 unresolved symbol warnings because there were too many) WARNING: modpost: modpost: Found 2 writable function pointers. While the symbols can be found in the original source code of the kernel. Am I missing something in the package to resolv the symbols? Thanks! Jos?. -- You are receiving this mail because: You are on the CC list for the bug. From foss+buildroot at 0leil.net Mon Mar 28 10:17:50 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 11:17:50 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/qt5/qt5base: security bump Message-ID: <20220328101751.1606988-1-foss+buildroot@0leil.net> From: Quentin Schulz This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- v3: rebased on top of master branch v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html - point to newer commit in KDE branch instead of including Qt diff v1: http://lists.busybox.net/pipermail/buildroot/2022-March/638184.html package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..5f158bd6f2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at -- 2.35.1 From foss+buildroot at 0leil.net Mon Mar 28 10:17:51 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 11:17:51 +0100 Subject: [Buildroot] [PATCH v3 2/2] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 In-Reply-To: <20220328101751.1606988-1-foss+buildroot@0leil.net> References: <20220328101751.1606988-1-foss+buildroot@0leil.net> Message-ID: <20220328101751.1606988-2-foss+buildroot@0leil.net> From: Quentin Schulz The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- v3: rebased on top of master branch v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638900.html - added in v2 package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 5f158bd6f2..972d217ef1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,7 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 -- 2.35.1 From foss+buildroot at 0leil.net Mon Mar 28 11:14:13 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 13:14:13 +0200 Subject: [Buildroot] [PATCH 2/2] package/qt5wayland: fix compilation when libxkbcommon is disabled In-Reply-To: <20220328111413.1618964-1-foss+buildroot@0leil.net> References: <20220328111413.1618964-1-foss+buildroot@0leil.net> Message-ID: <20220328111413.1618964-2-foss+buildroot@0leil.net> From: Quentin Schulz When libxkbcommon is disabled, QT_CONFIG(xkbcommon) is not defined which means the variable and function pointer in this patch are compiled out from the header, but the cpp code actually still made use of it. This patch fixes the build issue when libxkbcommon package is not to be built. This patch was taken from (merged): https://codereview.qt-project.org/c/qt/qtwayland/+/344916 Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- .../0001-Add-missing-define-guards.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/qt5/qt5wayland/0001-Add-missing-define-guards.patch diff --git a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch new file mode 100644 index 0000000000..adad3768b2 --- /dev/null +++ b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch @@ -0,0 +1,35 @@ +From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 22 Apr 2021 15:29:56 +0300 +Subject: [PATCH] Add missing define guards + +Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState +only if xcbcommon is available. + +Pick-to: 5.15 +Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe +Reviewed-by: Aleix Pol Gonzalez +[Backported from: 05658e127dedfff65789860415537c6920ec574d] +Signed-off-by: Quentin Schulz +--- + src/client/qwaylandinputcontext.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp +index 16e03ea1..cbf63cde 100644 +--- a/src/client/qwaylandinputcontext.cpp ++++ b/src/client/qwaylandinputcontext.cpp +@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const + void QWaylandInputContext::reset() + { + qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; ++#if QT_CONFIG(xkbcommon) + if (m_composeState) + xkb_compose_state_reset(m_composeState); ++#endif + + QPlatformInputContext::reset(); + +-- +2.35.1 + -- 2.35.1 From foss+buildroot at 0leil.net Mon Mar 28 11:14:12 2022 From: foss+buildroot at 0leil.net (Quentin Schulz) Date: Mon, 28 Mar 2022 13:14:12 +0200 Subject: [Buildroot] [PATCH 1/2] package/qt5base: fix race with libxkbcommon Message-ID: <20220328111413.1618964-1-foss+buildroot@0leil.net> From: Quentin Schulz qt5wayland package currently has a bug if the xkbcommon Qt config is not enabled which highlighted a race issues between qt5base, libxkbcommon and qt5wayland. qt5wayland has a dependency on libxkbcommon package if it's enabled. qt5base only has a dependency on libxkbcommon if xcb support is to be enabled. If libxkbcommon package is built before qt5base, qt5base will detect it during its configure step and enable the Qt config accordingly. This will make it available to qt5wayland afterwards, even if xcb support is not enabled in Buildroot Kconfig. However, if qt5base is built before libxkbcommon is, qt5base will not advertise support of xbcommon feature to qt5wayland (which will fail its build because of a bug in the source code). Since the package build order should not impact the outcome of the build, let's explicit the dependency if and only if libxkbcommon package is to be compiled at some point in time so that at least this feature is not susceptible to races. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- package/qt5/qt5base/qt5base.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..891635ad35 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -168,6 +168,11 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) +QT5BASE_CONFIGURE_OPTS += -xkbcommon +QT5BASE_DEPENDENCIES += libxkbcommon +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5BASE_CONFIGURE_OPTS += -xcb QT5BASE_CONFIGURE_OPTS += -xkbcommon -- 2.35.1 From d.lang at abatec.at Mon Mar 28 12:29:22 2022 From: d.lang at abatec.at (Lang Daniel) Date: Mon, 28 Mar 2022 12:29:22 +0000 Subject: [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0 Message-ID: - License has been changed from GPL to LGPL or BSD-3-Clause - Drop upstream patches Signed-off-by: Daniel Lang --- .../0001-gcc11-include-typeinfo.patch | 29 ------ .../0002-cmake-improve-include-paths.patch | 91 ------------------- package/dbus-cxx/0003-sasl-use-uid_t.patch | 41 --------- package/dbus-cxx/dbus-cxx.hash | 4 +- package/dbus-cxx/dbus-cxx.mk | 4 +- 5 files changed, 4 insertions(+), 165 deletions(-) delete mode 100644 package/dbus-cxx/0001-gcc11-include-typeinfo.patch delete mode 100644 package/dbus-cxx/0002-cmake-improve-include-paths.patch delete mode 100644 package/dbus-cxx/0003-sasl-use-uid_t.patch diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch deleted file mode 100644 index b4b7d83de2..0000000000 --- a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 03:42:44 +0100 -Subject: [PATCH] Include typeinfo for typeid() (#83) - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H - diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch deleted file mode 100644 index 1f6a36a2c0..0000000000 --- a/package/dbus-cxx/0002-cmake-improve-include-paths.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Mon, 17 Jan 2022 13:57:55 +0100 -Subject: [PATCH] cmake: improve include paths - -Adding the dbus-cxx subfolders as an include path might override system -headers (signal.h for gcc 10). -By removing the subfolders, includes can happen via #include "..." or -via #include . - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - CMakeLists.txt | 4 +--- - dbus-cxx/matchrule.h | 2 +- - dbus-cxx/sasl.h | 2 +- - dbus-cxx/sendmsgtransport.cpp | 2 +- - dbus-cxx/simpletransport.cpp | 2 +- - 5 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6d28c..e76cd61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS - - set( DBUS_CXX_INCLUDE_DIRECTORIES - ${PROJECT_SOURCE_DIR} -- ${PROJECT_SOURCE_DIR}/dbus-cxx -- ${PROJECT_BINARY_DIR} -- ${PROJECT_BINARY_DIR}/dbus-cxx ) -+ ${PROJECT_BINARY_DIR} ) - include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} - ${dbus_INCLUDE_DIRS} - ${sigc_INCLUDE_DIRS} ) -diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h -index 69fdab7..18c9e81 100644 ---- a/dbus-cxx/matchrule.h -+++ b/dbus-cxx/matchrule.h -@@ -20,7 +20,7 @@ - #define DBUSCXX_MATCH_RULE_H - - #include --#include "dbus-cxx-config.h" -+#include - - namespace DBus { - -diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h -index d7429a3..44edd6e 100644 ---- a/dbus-cxx/sasl.h -+++ b/dbus-cxx/sasl.h -@@ -19,7 +19,7 @@ - #ifndef DBUSCXX_SASL_H - #define DBUSCXX_SASL_H - --#include -+#include - - #include - #include -diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp -index ae053ff..a10ae66 100644 ---- a/dbus-cxx/sendmsgtransport.cpp -+++ b/dbus-cxx/sendmsgtransport.cpp -@@ -21,8 +21,8 @@ - #include "dbus-cxx-private.h" - #include "utility.h" - #include "validator.h" -+#include "message.h" - --#include - #include - #include - #include -diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp -index f291d9f..fed4364 100644 ---- a/dbus-cxx/simpletransport.cpp -+++ b/dbus-cxx/simpletransport.cpp -@@ -18,7 +18,7 @@ - ***************************************************************************/ - #include "simpletransport.h" - --#include -+#include "dbus-cxx-private.h" - #include "demarshaling.h" - #include "message.h" - #include "utility.h" - diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch deleted file mode 100644 index f08769b6c5..0000000000 --- a/package/dbus-cxx/0003-sasl-use-uid_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Fri, 28 Jan 2022 07:53:13 +0100 -Subject: [PATCH] use uid_t instead of __uid_t - -uclibc and glibc define getuid() as -extern __uid_t getuid (void) __THROW; -https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 -which is a typedef for unsigned int. - -musl uses uid_t as return type -uid_t getuid(void); -https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 -which is a typedef to unsigned. - -glibc and uclibc include typedefs from __uid_t to uid_t, -which means one should be able to use uid_t as a replacement -for __uid_t and make compiling with all three c standard libraries -possible. - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 -Signed-off-by: Daniel Lang - ---- - dbus-cxx/sasl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; - - diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 907de1866f..5b3a6188fc 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz -sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 55b2541b9c3f3fa705e51e12e6971f66826ebc7185071e0cd1bb6ec9e5adf47f dbus-cxx-2.2.0.tar.gz +sha256 99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk index 3e89fc9db7..b850d45003 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,9 +4,9 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_VERSION = 2.2.0 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +DBUS_CXX_LICENSE = LGPL-3.0 or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE DBUS_CXX_INSTALL_STAGING = YES DBUS_CXX_DEPENDENCIES = libsigc -- 2.25.1 From peter at korsgaard.com Mon Mar 28 13:17:12 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:17:12 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220328130807.7B77F85E9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afe309d54e5b63bb33dc84443345716dc8d6d2ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used but there's currently no way to do that from a shell script for now. Signed-off-by: Jason A. Donenfeld Signed-off-by: Yann E. MORIN (cherry picked from commit f0986de551f46e72268857fd817986e9be697cd0) Signed-off-by: Peter Korsgaard --- package/urandom-scripts/S20urandom | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" From peter at korsgaard.com Mon Mar 28 13:17:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:17:50 +0200 Subject: [Buildroot] [PATCH v2] package/urandom-scripts: hash old seed with new seed when saving In-Reply-To: <20220324082433.GA3649946@scaer> (Yann E. MORIN's message of "Thu, 24 Mar 2022 09:24:33 +0100") References: <20220323200731.170409-1-Jason@zx2c4.com> <20220324082433.GA3649946@scaer> Message-ID: <87fsn2b4ht.fsf@dell.be.48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Jason, All, > +Peter: candidate for backporting as a security fix > On 2022-03-23 14:07 -0600, Jason A. Donenfeld spake thusly: >> Writing into /dev/urandom doesn't actually credit any entropy bits. And >> while it adds that data to the entropy pool, it won't actually be >> immediately used when reading from /dev/urandom subsequently. This is >> how the kernel's /dev/urandom has always worked, unfortunately. >> >> As a result of this behavior, which may be understandably surprising, >> writing a good seed file into /dev/urandom and then saving a new seed >> file immediately after is dangerous, because the new seed file may wind >> up being entirely deterministic, even if the old seed file was quite >> good. >> >> This has been fixed in systemd with >> , >> and fortunately it's possible to do the same thing in shell script here. >> Specifically, instead of just saving new /dev/urandom output straight >> up, we hash the new /dev/urandom together with the old seed, in order to >> produce the new seed. This way the amount of entropy in the new seed >> will stay the same or get better, but not appreciably regress. >> >> At the same time, the pool size check in this script is useless. Writing >> to /dev/urandom never credits bits anyway, so no matter what, writing >> into /dev/urandom is useful and not harmful. There's also not much of a >> point in seeding with more than 256 bits, which is what the hashing >> operation above produces. So this commit removes the file size check. >> >> As a final note, while this commit improves upon the status quo by >> removing a vulnerability, this shell script still does not actually >> initialize the RNG like it says it does. For initialization via a seed >> file, the RNDADDENTROPY ioctl must be used. >> >> Signed-off-by: Jason A. Donenfeld > Applied to master, thanks. Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 28 06:03:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 08:03:39 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/urandom-scripts: hash old seed with new seed when saving Message-ID: <20220328130849.3680385ECD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=58559ea02181b6b5f5e84a5ff7131c0ddd89a27c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Writing into /dev/urandom doesn't actually credit any entropy bits. And while it adds that data to the entropy pool, it won't actually be immediately used when reading from /dev/urandom subsequently. This is how the kernel's /dev/urandom has always worked, unfortunately. As a result of this behavior, which may be understandably surprising, writing a good seed file into /dev/urandom and then saving a new seed file immediately after is dangerous, because the new seed file may wind up being entirely deterministic, even if the old seed file was quite good. This has been fixed in systemd with , and fortunately it's possible to do the same thing in shell script here. Specifically, instead of just saving new /dev/urandom output straight up, we hash the new /dev/urandom together with the old seed, in order to produce the new seed. This way the amount of entropy in the new seed will stay the same or get better, but not appreciably regress. At the same time, the pool size check in this script is useless. Writing to /dev/urandom never credits bits anyway, so no matter what, writing into /dev/urandom is useful and not harmful. There's also not much of a point in seeding with more than 256 bits, which is what the hashing operation above produces. So this commit removes the file size check. As a final note, while this commit improves upon the status quo by removing a vulnerability, this shell script still does not actually initialize the RNG like it says it does. For initialization via a seed file, the RNDADDENTROPY ioctl must be used but there's currently no way to do that from a shell script for now. Signed-off-by: Jason A. Donenfeld Signed-off-by: Yann E. MORIN (cherry picked from commit f0986de551f46e72268857fd817986e9be697cd0) Signed-off-by: Peter Korsgaard --- package/urandom-scripts/S20urandom | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index e4fd125721..c6b2ebd48f 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -17,43 +17,38 @@ else pool_size=512 fi -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" fi + return "$status" } save_random_seed() { printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then + status=1 + if touch "$URANDOM_SEED.new" 2> /dev/null; then old_umask=$(umask) umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? + dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null + cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ + | sha256sum \ + | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ + mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 + rm -f "$URANDOM_SEED.tmp" umask "$old_umask" if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" fi + else - status=$? echo "SKIP (read-only file system detected)" fi return "$status" From peter at korsgaard.com Mon Mar 28 13:18:59 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:18:59 +0200 Subject: [Buildroot] [PATCH v2 1/1] configs/zynqmp_zcu10x: change git to https In-Reply-To: <20220324123117.2369981-1-neal.frager@amd.com> (Neal Frager's message of "Thu, 24 Mar 2022 06:31:17 -0600") References: <20220324123117.2369981-1-neal.frager@amd.com> Message-ID: <87bkxqb4fw.fsf@dell.be.48ers.dk> >>>>> "Neal" == Neal Frager writes: > This patch migrates Xilinx Linux kernel and U-Boot from git:// to https:// > The git:// location is no longer supported. > For more details: > https://github.blog/2021-09-01-improving-git-protocol-security-github/ > Signed-off-by: Neal Frager Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Mar 28 13:18:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 28 Mar 2022 15:18:37 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] configs/zynqmp_zcu10x: change git to https Message-ID: <20220328130958.B0CA085ED8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9471cbad4d58eb0d95845c0d4e1e8bd846800c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The git:// location is no longer supported by github, so change to https:// For more details: https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard (cherry picked from commit 92f653c24057065a4964f83e9ed70e868eac0f89) Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 4 ++-- configs/zynqmp_zcu106_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e96489179..2dd0817bd8 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa0..d836edfaf0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" From bugzilla at busybox.net Mon Mar 28 13:39:58 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 13:39:58 +0000 Subject: [Buildroot] [Bug 14706] New: nodjs build problem Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14706 Bug ID: 14706 Summary: nodjs build problem Product: buildroot Version: 2022.02 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: w.meganck at televic.com CC: buildroot at uclibc.org Target Milestone: --- Have a build problem with nodejs. mkdir -p /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin ln -sf /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin/python /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/node.gyp /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/tools/v8_gypfiles/v8.gyp (cd /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3; PATH="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PKG_CONFIG="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/pkgconfig:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/share/pkgconfig" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CXXFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" LDFLAGS="-L/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib -Wl,-rpath,/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib" INTLTOOL_PERL=/usr/bin/perl PATH=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin:"/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PYTHON=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 ./configure --prefix=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host --without-dtrace --without-etw --shared-openssl --shared-openssl-includes=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include --shared-openssl-libpath=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib --shared-zlib --no-cross-compiling --with-intl=system-icu ) Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 13:46:31 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 13:46:31 +0000 Subject: [Buildroot] [Bug 14711] New: nodjs build problem missing bzip Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 Bug ID: 14711 Summary: nodjs build problem missing bzip Product: buildroot Version: 2022.02 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: w.meganck at televic.com CC: buildroot at uclibc.org Target Milestone: --- >>> host-nodejs 14.18.3 Configuring mkdir -p /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin ln -sf /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin/python /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/node.gyp /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/tools/v8_gypfiles/v8.gyp (cd /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3; PATH="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PKG_CONFIG="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/pkgconfig:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/share/pkgconfig" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CXXFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" LDFLAGS="-L/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib -Wl,-rpath,/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib" INTLTOOL_PERL=/usr/bin/perl PATH=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin:"/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PYTHON=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 ./configure --prefix=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host --without-dtrace --without-etw --shared-openssl --shared-openssl-includes=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include --shared-openssl-libpath=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib --shared-zlib --no-cross-compiling --with-intl=system-icu ) Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 13:50:04 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 13:50:04 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #1 from Wim Meganck --- >>> host-nodejs 14.18.3 Configuring mkdir -p /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin ln -sf /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin/python /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/node.gyp /bin/sed -i -e "s%@MAYBE_WRAPPER@%%g" /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/tools/v8_gypfiles/v8.gyp (cd /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3; PATH="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PKG_CONFIG="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_LIBDIR="/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/pkgconfig:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/share/pkgconfig" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" CXXFLAGS="-O2 -I/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include" LDFLAGS="-L/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib -Wl,-rpath,/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib" INTLTOOL_PERL=/usr/bin/perl PATH=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/bin:"/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin:/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/microchip/xc16/v1.41/bin:/opt/microchip/xc16/v1.41/bin" PYTHON=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 /home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/bin/python3 ./configure --prefix=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host --without-dtrace --without-etw --shared-openssl --shared-openssl-includes=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/include --shared-openssl-libpath=/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib --shared-zlib --no-cross-compiling --with-intl=system-icu ) Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 19:03:47 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 19:03:47 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #2 from Arnout Vandecappelle --- *** Bug 14706 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 19:03:47 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 19:03:47 +0000 Subject: [Buildroot] [Bug 14706] nodjs build problem In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14706 Arnout Vandecappelle changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #1 from Arnout Vandecappelle --- *** This bug has been marked as a duplicate of bug 14711 *** -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Mon Mar 28 19:17:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Mon, 28 Mar 2022 19:17:17 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #3 from Arnout Vandecappelle --- This shouldn't happen, BR2_PACKAGE_HOST_NODEJS should cause python3 to be built with bzip2 support. Can you check if BR2_PACKAGE_HOST_PYTHON3_BZIP2=y is set in .config? Can you check if _bz2 is in DISABLED_EXTENSIONS in output/build/host-python3-3.10.2? Can you check if _bz2.*.so is indeed missing in output/host/lib/python3.10/lib-dynload? -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Mon Mar 28 19:52:50 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:52:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0 In-Reply-To: References: Message-ID: <88e09ed0-f4d9-bc00-e596-540111c707ce@mind.be> On 28/03/2022 14:29, Lang Daniel via buildroot wrote: > - License has been changed from GPL to LGPL or BSD-3-Clause > - Drop upstream patches > > Signed-off-by: Daniel Lang [snip] > diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk > index 3e89fc9db7..b850d45003 100644 > --- a/package/dbus-cxx/dbus-cxx.mk > +++ b/package/dbus-cxx/dbus-cxx.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -DBUS_CXX_VERSION = 2.1.0 > +DBUS_CXX_VERSION = 2.2.0 > DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) > -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) > +DBUS_CXX_LICENSE = LGPL-3.0 or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) It's LGPL-3.0+ actually. Applied to master with that fixed, thanks. Regards, Arnout > DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE > DBUS_CXX_INSTALL_STAGING = YES > DBUS_CXX_DEPENDENCIES = libsigc From arnout at mind.be Mon Mar 28 19:54:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:54:24 +0200 Subject: [Buildroot] [PATCH 1/2] package/qt5base: fix race with libxkbcommon In-Reply-To: <20220328111413.1618964-1-foss+buildroot@0leil.net> References: <20220328111413.1618964-1-foss+buildroot@0leil.net> Message-ID: <9470c420-5f40-c626-173d-a7e22571ba7a@mind.be> On 28/03/2022 13:14, Quentin Schulz wrote: > From: Quentin Schulz > > qt5wayland package currently has a bug if the xkbcommon Qt config is not > enabled which highlighted a race issues between qt5base, libxkbcommon > and qt5wayland. > > qt5wayland has a dependency on libxkbcommon package if it's enabled. > qt5base only has a dependency on libxkbcommon if xcb support is to be > enabled. > > If libxkbcommon package is built before qt5base, qt5base will detect it > during its configure step and enable the Qt config accordingly. This > will make it available to qt5wayland afterwards, even if xcb support is > not enabled in Buildroot Kconfig. > > However, if qt5base is built before libxkbcommon is, qt5base will not > advertise support of xbcommon feature to qt5wayland (which will fail its > build because of a bug in the source code). > > Since the package build order should not impact the outcome of the > build, let's explicit the dependency if and only if libxkbcommon package > is to be compiled at some point in time so that at least this feature is > not susceptible to races. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz > --- > package/qt5/qt5base/qt5base.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 4418f0d3ba..891635ad35 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -168,6 +168,11 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,- > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) > QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) > > +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) > +QT5BASE_CONFIGURE_OPTS += -xkbcommon > +QT5BASE_DEPENDENCIES += libxkbcommon > +endif > + > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > QT5BASE_CONFIGURE_OPTS += -xcb > QT5BASE_CONFIGURE_OPTS += -xkbcommon The existing entries should be removed. Applied both to master with that fixed, thanks. Regards, Arnout From arnout at mind.be Mon Mar 28 19:54:45 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:54:45 +0200 Subject: [Buildroot] [PATCH v3 1/2] package/qt5/qt5base: security bump In-Reply-To: <20220328101751.1606988-1-foss+buildroot@0leil.net> References: <20220328101751.1606988-1-foss+buildroot@0leil.net> Message-ID: On 28/03/2022 12:17, Quentin Schulz wrote: > From: Quentin Schulz > > This fixes CVE-2022-25255 and CVE-2022-25634. > > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Applied both to master, thanks. Regards, Arnout > --- > > v3: rebased on top of master branch > v2: http://lists.busybox.net/pipermail/buildroot/2022-March/638898.html > - point to newer commit in KDE branch instead of including Qt diff > v1: http://lists.busybox.net/pipermail/buildroot/2022-March/638184.html > > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 1b9ff43ab2..c031f71c77 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 > +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 4418f0d3ba..5f158bd6f2 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe > +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES > > # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch > QT5BASE_IGNORE_CVES += CVE-2021-38593 > +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" > +QT5BASE_IGNORE_CVES += CVE-2022-25255 > +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" > +QT5BASE_IGNORE_CVES += CVE-2022-25634 > > # A few comments: > # * -no-pch to workaround the issue described at From arnout at mind.be Mon Mar 28 19:55:04 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:55:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.13 In-Reply-To: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> References: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 23:15, Fabrice Fontaine wrote: > - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, > CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 > - Drop second patch (already in version) > - Add tarball sha256 > - Update indentation in hash file (two spaces) > > https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...iple-def-of-invalid_dircache_entries.patch | 25 ------------------- > package/netatalk/netatalk.hash | 7 +++--- > package/netatalk/netatalk.mk | 2 +- > 3 files changed, 5 insertions(+), 29 deletions(-) > delete mode 100644 package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch > > diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch > deleted file mode 100644 > index e7ccc52553..0000000000 > --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 > -From: Andrew Bauer > -Date: Wed, 22 Jan 2020 09:59:47 -0600 > -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries > - > -[Retrieved from: > -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] > -Signed-off-by: Fabrice Fontaine > ---- > - etc/afpd/directory.h | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h > -index eb89c606..81bfa9cb 100644 > ---- a/etc/afpd/directory.h > -+++ b/etc/afpd/directory.h > -@@ -91,7 +91,7 @@ struct maccess { > - #define AR_UWRITE (1<<2) > - #define AR_UOWN (1<<7) > - > --q_t *invalid_dircache_entries; > -+extern q_t *invalid_dircache_entries; > - > - typedef int (*dir_loop)(struct dirent *, char *, void *); > - > diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash > index 6c3250a005..6dead5457c 100644 > --- a/package/netatalk/netatalk.hash > +++ b/package/netatalk/netatalk.hash > @@ -1,6 +1,7 @@ > -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ > -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 > -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 > +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ > +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 > +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 > # Locally computed > +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 > sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING > sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT > diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk > index 0c219a2316..7cc950beb6 100644 > --- a/package/netatalk/netatalk.mk > +++ b/package/netatalk/netatalk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NETATALK_VERSION = 3.1.12 > +NETATALK_VERSION = 3.1.13 > NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) > NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 > # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From arnout at mind.be Mon Mar 28 19:55:23 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:55:23 +0200 Subject: [Buildroot] [PATCH 1/1] package/unclutter-xfixes: bump to version 1.6 In-Reply-To: <20220327205750.1448336-1-fontaine.fabrice@gmail.com> References: <20220327205750.1448336-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 22:57, Fabrice Fontaine wrote: > Update indentation in hash file (two spaces) > > https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.6 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/unclutter-xfixes/unclutter-xfixes.hash | 4 ++-- > package/unclutter-xfixes/unclutter-xfixes.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash > index 785825da7a..b0bd5532ef 100644 > --- a/package/unclutter-xfixes/unclutter-xfixes.hash > +++ b/package/unclutter-xfixes/unclutter-xfixes.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz > -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE > +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz > +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE > diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk > index 713a84bca6..6da607b660 100644 > --- a/package/unclutter-xfixes/unclutter-xfixes.mk > +++ b/package/unclutter-xfixes/unclutter-xfixes.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UNCLUTTER_XFIXES_VERSION = 1.5 > +UNCLUTTER_XFIXES_VERSION = 1.6 > UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) > UNCLUTTER_XFIXES_LICENSE = MIT > UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE From arnout at mind.be Mon Mar 28 19:55:38 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:55:38 +0200 Subject: [Buildroot] [PATCH 1/1] package/matio: security bump to version 1.5.22 In-Reply-To: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> References: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 22:32, Fabrice Fontaine wrote: > - Fixed heap-based buffer overflows when reading (crafted) MAT file > (CVE-2020-36428, CVE-2021-36977) > - Update hash pf COPYING (year updated and contributors added: > https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) > > https://github.com/tbeu/matio/releases/tag/v1.5.22 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/matio/matio.hash | 6 +++--- > package/matio/matio.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/matio/matio.hash b/package/matio/matio.hash > index 4dd05dee07..4634074ca0 100644 > --- a/package/matio/matio.hash > +++ b/package/matio/matio.hash > @@ -1,4 +1,4 @@ > -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ > -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz > +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ > +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz > # Locally computed > -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING > +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING > diff --git a/package/matio/matio.mk b/package/matio/matio.mk > index 236466d4d9..d282852d37 100644 > --- a/package/matio/matio.mk > +++ b/package/matio/matio.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MATIO_VERSION = 1.5.21 > +MATIO_VERSION = 1.5.22 > MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) > MATIO_LICENSE = BSD-2-Clause > MATIO_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:56:24 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:56:24 +0200 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.4 In-Reply-To: <20220327200651.4189748-1-james.hilliard1@gmail.com> References: <20220327200651.4189748-1-james.hilliard1@gmail.com> Message-ID: On 27/03/2022 22:06, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/systemd/systemd.hash | 2 +- > package/systemd/systemd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index 81f51eac20..3572b25965 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz > +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index b07fac27d4..9feed9c084 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -19,7 +19,7 @@ > # - Diff sysusers.d with the previous version > # - Diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) > -SYSTEMD_VERSION = 250.3 > +SYSTEMD_VERSION = 250.4 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ From arnout at mind.be Mon Mar 28 19:56:40 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:56:40 +0200 Subject: [Buildroot] [PATCH] package/luasocket: bump to version 3.0.0 In-Reply-To: <20220327194740.1482539-1-francois.perrad@gadz.org> References: <20220327194740.1482539-1-francois.perrad@gadz.org> Message-ID: <5f14a369-6211-9133-881f-2dbb41a6ad1d@mind.be> On 27/03/2022 21:47, Francois Perrad wrote: > moved under the hat of https://github.com/lunarmodules > > diff LICENSE: > -LuaSocket 3.0 license > -Copyright ? 2004-2013 Diego Nehab > +Copyright (C) 2004-2022 Diego Nehab > > Signed-off-by: Francois Perrad Applied to master, thanks. Regards, Arnout > --- > package/luasocket/Config.in | 2 +- > package/luasocket/luasocket.hash | 4 ++-- > package/luasocket/luasocket.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in > index 45263030f..5ad00f5c4 100644 > --- a/package/luasocket/Config.in > +++ b/package/luasocket/Config.in > @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET > It provides easy access to TCP, UDP, DNS, SMTP, > FTP, HTTP, MIME and much more. > > - http://luaforge.net/projects/luasocket/ > + https://github.com/lunarmodules/luasocket > diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash > index 843647b27..b66ae57b9 100644 > --- a/package/luasocket/luasocket.hash > +++ b/package/luasocket/luasocket.hash > @@ -1,3 +1,3 @@ > # computed by luarocks/buildroot > -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock > -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE > +sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock > +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE > diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk > index 20927fc1d..eeece26fd 100644 > --- a/package/luasocket/luasocket.mk > +++ b/package/luasocket/luasocket.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LUASOCKET_VERSION = 3.0rc1-1 > -LUASOCKET_SUBDIR = luasocket-3.0-rc1 > +LUASOCKET_VERSION = 3.0.0-1 > +LUASOCKET_SUBDIR = luasocket > LUASOCKET_LICENSE = MIT > LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE > From arnout at mind.be Mon Mar 28 19:56:59 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:56:59 +0200 Subject: [Buildroot] [PATCH 1/1] package/opus: enable custom modes In-Reply-To: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> References: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 21:39, Fabrice Fontaine wrote: > Enable custom modes to avoid the following build failure with jack2 > raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: > > Checking for header opus/opus_custom.h : not found > The above check failed, but the checkee is required for --opus. > > It should be noted that before this commit, opus was silently disabled > > Fixes: > - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/opus/opus.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/opus/opus.mk b/package/opus/opus.mk > index 3fb2d5d65f..4f816df477 100644 > --- a/package/opus/opus.mk > +++ b/package/opus/opus.mk > @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 > endif > > OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" > +OPUS_CONF_OPTS = --enable-custom-modes > > ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) > OPUS_CONF_OPTS += --enable-fixed-point From arnout at mind.be Mon Mar 28 19:57:16 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:57:16 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.62.0 In-Reply-To: <20220327174130.2577520-1-james.hilliard1@gmail.com> References: <20220327174130.2577520-1-james.hilliard1@gmail.com> Message-ID: On 27/03/2022 19:41, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/meson/meson.hash | 4 ++-- > package/meson/meson.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index 8389adb243..38fa43f6dc 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc > -sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz.asc > +sha256 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb meson-0.62.0.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index e9c3145183..13adc2f2b1 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 0.61.4 > +MESON_VERSION = 0.62.0 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:57:37 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 21:57:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/jack1: bump to version 0.126 In-Reply-To: <20220327192613.1239929-1-fontaine.fabrice@gmail.com> References: <20220327192613.1239929-1-fontaine.fabrice@gmail.com> Message-ID: On 27/03/2022 21:26, Fabrice Fontaine wrote: > - Switch site to get latest release > - libsndfile and readline are not a dependency since removal of > example-clients and tools with > https://github.com/jackaudio/jack1/commit/ca3af4b0d8a8a8fd6c4ae72c24e4df6e18f83af9 > - Update indentation in hash file (two spaces) > > https://jackaudio.org/news/2022/01/15/jack1-v01260-and-jack2-v1920-releases.html > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/jack1/jack1.hash | 8 ++++---- > package/jack1/jack1.mk | 14 +++----------- > 2 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash > index d7787ac2ad..d82b9daffd 100644 > --- a/package/jack1/jack1.hash > +++ b/package/jack1/jack1.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz > -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING > -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL > -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL > +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz > +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING > +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL > +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL > diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk > index 6dca56001f..4e16d7e96e 100644 > --- a/package/jack1/jack1.mk > +++ b/package/jack1/jack1.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -JACK1_VERSION = 0.125.0 > -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz > -JACK1_SITE = http://jackaudio.org/downloads > +JACK1_VERSION = 0.126.0 > +JACK1_SITE = \ > + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) > JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) > JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL > JACK1_INSTALL_STAGING = YES > @@ -17,14 +17,6 @@ ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) > JACK1_DEPENDENCIES += libsamplerate > endif > > -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) > -JACK1_DEPENDENCIES += libsndfile > -endif > - > -ifeq ($(BR2_PACKAGE_READLINE),y) > -JACK1_DEPENDENCIES += readline > -endif > - > JACK1_CONF_OPTS = --without-html-dir --disable-oss > > $(eval $(autotools-package)) From arnout at mind.be Mon Mar 28 18:54:42 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:42 +0200 Subject: [Buildroot] [git commit] package/meson: bump to version 0.62.0 Message-ID: <20220328194854.3B5BB85F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=97abb7a8d5b595acab2d3d0363f117ba78798ec1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 8389adb243..38fa43f6dc 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc -sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz.asc +sha256 06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb meson-0.62.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index e9c3145183..13adc2f2b1 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.4 +MESON_VERSION = 0.62.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 Message-ID: <20220328194854.8A4EE85F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=be3f9cde29f1727e264d6a2a023588273410c800 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 5f158bd6f2..972d217ef1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,7 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 From arnout at mind.be Mon Mar 28 18:54:47 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:47 +0200 Subject: [Buildroot] [git commit] package/opus: enable custom modes Message-ID: <20220328194854.4E54185F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92e436b73df21ff9347c53c25fd33d8fd48a9d43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point From arnout at mind.be Mon Mar 28 19:22:26 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:26 +0200 Subject: [Buildroot] [git commit] package/matio: security bump to version 1.5.22 Message-ID: <20220328194854.694CD85F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f33260685bf9dedd76db5b19f2dce0f4b5cbce2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash of COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From arnout at mind.be Mon Mar 28 19:51:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:51:00 +0200 Subject: [Buildroot] [git commit] package/qt5wayland: fix compilation when libxkbcommon is disabled Message-ID: <20220328194854.99EDB85F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1da911cbde3d744ff70211cf3ea714f55888adc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When libxkbcommon is disabled, QT_CONFIG(xkbcommon) is not defined which means the variable and function pointer in this patch are compiled out from the header, but the cpp code actually still made use of it. This patch fixes the build issue when libxkbcommon package is not to be built. This patch was taken from (merged): https://codereview.qt-project.org/c/qt/qtwayland/+/344916 Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Add-missing-define-guards.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch new file mode 100644 index 0000000000..adad3768b2 --- /dev/null +++ b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch @@ -0,0 +1,35 @@ +From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 22 Apr 2021 15:29:56 +0300 +Subject: [PATCH] Add missing define guards + +Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState +only if xcbcommon is available. + +Pick-to: 5.15 +Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe +Reviewed-by: Aleix Pol Gonzalez +[Backported from: 05658e127dedfff65789860415537c6920ec574d] +Signed-off-by: Quentin Schulz +--- + src/client/qwaylandinputcontext.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp +index 16e03ea1..cbf63cde 100644 +--- a/src/client/qwaylandinputcontext.cpp ++++ b/src/client/qwaylandinputcontext.cpp +@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const + void QWaylandInputContext::reset() + { + qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; ++#if QT_CONFIG(xkbcommon) + if (m_composeState) + xkb_compose_state_reset(m_composeState); ++#endif + + QPlatformInputContext::reset(); + +-- +2.35.1 + From arnout at mind.be Mon Mar 28 18:54:50 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:50 +0200 Subject: [Buildroot] [git commit] package/luasocket: bump to version 3.0.0 Message-ID: <20220328194854.5820185F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab1c99158aa499cca78058ad2284f1e16deb6045 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master moved under the hat of https://github.com/lunarmodules diff LICENSE: -LuaSocket 3.0 license -Copyright ??? 2004-2013 Diego Nehab +Copyright (C) 2004-2022 Diego Nehab Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luasocket/Config.in | 2 +- package/luasocket/luasocket.hash | 4 ++-- package/luasocket/luasocket.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in index 45263030f3..5ad00f5c48 100644 --- a/package/luasocket/Config.in +++ b/package/luasocket/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET It provides easy access to TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more. - http://luaforge.net/projects/luasocket/ + https://github.com/lunarmodules/luasocket diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash index 843647b27f..b66ae57b9b 100644 --- a/package/luasocket/luasocket.hash +++ b/package/luasocket/luasocket.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE +sha256 63fd2dd18dfe242ca5bcc1203839e86a9c8936261a9ca9f3200f2deab431da88 luasocket-3.0.0-1.src.rock +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index 20927fc1d6..eeece26fd5 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUASOCKET_VERSION = 3.0rc1-1 -LUASOCKET_SUBDIR = luasocket-3.0-rc1 +LUASOCKET_VERSION = 3.0.0-1 +LUASOCKET_SUBDIR = luasocket LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/unclutter-xfixes: bump to version 1.6 Message-ID: <20220328194854.710FC85F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f44c5d3f54893195c731523423c01e355978ef6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update indentation in hash file (two spaces) https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unclutter-xfixes/unclutter-xfixes.hash | 4 ++-- package/unclutter-xfixes/unclutter-xfixes.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash index 785825da7a..b0bd5532ef 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.hash +++ b/package/unclutter-xfixes/unclutter-xfixes.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk index 713a84bca6..6da607b660 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.mk +++ b/package/unclutter-xfixes/unclutter-xfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNCLUTTER_XFIXES_VERSION = 1.5 +UNCLUTTER_XFIXES_VERSION = 1.6 UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) UNCLUTTER_XFIXES_LICENSE = MIT UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/netatalk: security bump to version 3.1.13 Message-ID: <20220328194854.7914385F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ed1baa7e2d20c2b6184db265f398d1c2bb0e2e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-multiple-def-of-invalid_dircache_entries.patch | 25 ---------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From arnout at mind.be Mon Mar 28 19:49:39 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:49:39 +0200 Subject: [Buildroot] [git commit] package/qt5base: fix race with libxkbcommon Message-ID: <20220328194854.9205085F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ba8f35eda65d3623967e35547d6bec38f5ebc66a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master qt5wayland package currently has a bug if the xkbcommon Qt config is not enabled which highlighted a race issues between qt5base, libxkbcommon and qt5wayland. qt5wayland has a dependency on libxkbcommon package if it's enabled. qt5base only has a dependency on libxkbcommon if xcb support is to be enabled. If libxkbcommon package is built before qt5base, qt5base will detect it during its configure step and enable the Qt config accordingly. This will make it available to qt5wayland afterwards, even if xcb support is not enabled in Buildroot Kconfig. However, if qt5base is built before libxkbcommon is, qt5base will not advertise support of xbcommon feature to qt5wayland (which will fail its build because of a bug in the source code). Since the package build order should not impact the outcome of the build, let's explicit the dependency if and only if libxkbcommon package is to be compiled at some point in time so that at least this feature is not susceptible to races. Move the xkbcommon entries out of the BR2_PACKAGE_QT5BASE_XCB condition, instead make them depend on BR2_PACKAGE_LIBXKBCOMMON. Since BR2_PACKAGE_QT5BASE_XCB selects BR2_PACKAGE_LIBXKBCOMMON they are still included if xcb is selected. Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: remove the already existing xkbcommon entries] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 972d217ef1..0c811b3ac1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -174,9 +174,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,- QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) +QT5BASE_CONFIGURE_OPTS += -xkbcommon +QT5BASE_DEPENDENCIES += libxkbcommon +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5BASE_CONFIGURE_OPTS += -xcb -QT5BASE_CONFIGURE_OPTS += -xkbcommon QT5BASE_DEPENDENCIES += \ libxcb \ @@ -184,8 +188,7 @@ QT5BASE_DEPENDENCIES += \ xcb-util-image \ xcb-util-keysyms \ xcb-util-renderutil \ - xlib_libX11 \ - libxkbcommon + xlib_libX11 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) QT5BASE_DEPENDENCIES += xlib_libXext endif From arnout at mind.be Mon Mar 28 19:22:36 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:22:36 +0200 Subject: [Buildroot] [git commit] package/qt5/qt5base: security bump Message-ID: <20220328194854.81E2785F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1cae2aa844f5ad0962ec073f6cac103c0dc6af1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 4418f0d3ba..5f158bd6f2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at From arnout at mind.be Mon Mar 28 19:51:00 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 21:51:00 +0200 Subject: [Buildroot] [git commit] package/dbus-cxx: bump to version 2.2.0 Message-ID: <20220328194854.A28A885F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1506ff275b0e53a4ac886d6eed7d4fea9456ae00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - License has been changed from GPL to LGPL or BSD-3-Clause - Drop upstream patches Signed-off-by: Daniel Lang [Arnout: license is actually LGPL-3.0+, not LGPL-3.0] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dbus-cxx/0001-gcc11-include-typeinfo.patch | 29 ------- .../0002-cmake-improve-include-paths.patch | 91 ---------------------- package/dbus-cxx/0003-sasl-use-uid_t.patch | 41 ---------- package/dbus-cxx/dbus-cxx.hash | 4 +- package/dbus-cxx/dbus-cxx.mk | 4 +- 5 files changed, 4 insertions(+), 165 deletions(-) diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch deleted file mode 100644 index b4b7d83de2..0000000000 --- a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 03:42:44 +0100 -Subject: [PATCH] Include typeinfo for typeid() (#83) - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H - diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch deleted file mode 100644 index 1f6a36a2c0..0000000000 --- a/package/dbus-cxx/0002-cmake-improve-include-paths.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Mon, 17 Jan 2022 13:57:55 +0100 -Subject: [PATCH] cmake: improve include paths - -Adding the dbus-cxx subfolders as an include path might override system -headers (signal.h for gcc 10). -By removing the subfolders, includes can happen via #include "..." or -via #include . - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - CMakeLists.txt | 4 +--- - dbus-cxx/matchrule.h | 2 +- - dbus-cxx/sasl.h | 2 +- - dbus-cxx/sendmsgtransport.cpp | 2 +- - dbus-cxx/simpletransport.cpp | 2 +- - 5 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6d28c..e76cd61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS - - set( DBUS_CXX_INCLUDE_DIRECTORIES - ${PROJECT_SOURCE_DIR} -- ${PROJECT_SOURCE_DIR}/dbus-cxx -- ${PROJECT_BINARY_DIR} -- ${PROJECT_BINARY_DIR}/dbus-cxx ) -+ ${PROJECT_BINARY_DIR} ) - include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} - ${dbus_INCLUDE_DIRS} - ${sigc_INCLUDE_DIRS} ) -diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h -index 69fdab7..18c9e81 100644 ---- a/dbus-cxx/matchrule.h -+++ b/dbus-cxx/matchrule.h -@@ -20,7 +20,7 @@ - #define DBUSCXX_MATCH_RULE_H - - #include --#include "dbus-cxx-config.h" -+#include - - namespace DBus { - -diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h -index d7429a3..44edd6e 100644 ---- a/dbus-cxx/sasl.h -+++ b/dbus-cxx/sasl.h -@@ -19,7 +19,7 @@ - #ifndef DBUSCXX_SASL_H - #define DBUSCXX_SASL_H - --#include -+#include - - #include - #include -diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp -index ae053ff..a10ae66 100644 ---- a/dbus-cxx/sendmsgtransport.cpp -+++ b/dbus-cxx/sendmsgtransport.cpp -@@ -21,8 +21,8 @@ - #include "dbus-cxx-private.h" - #include "utility.h" - #include "validator.h" -+#include "message.h" - --#include - #include - #include - #include -diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp -index f291d9f..fed4364 100644 ---- a/dbus-cxx/simpletransport.cpp -+++ b/dbus-cxx/simpletransport.cpp -@@ -18,7 +18,7 @@ - ***************************************************************************/ - #include "simpletransport.h" - --#include -+#include "dbus-cxx-private.h" - #include "demarshaling.h" - #include "message.h" - #include "utility.h" - diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch deleted file mode 100644 index f08769b6c5..0000000000 --- a/package/dbus-cxx/0003-sasl-use-uid_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Fri, 28 Jan 2022 07:53:13 +0100 -Subject: [PATCH] use uid_t instead of __uid_t - -uclibc and glibc define getuid() as -extern __uid_t getuid (void) __THROW; -https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 -which is a typedef for unsigned int. - -musl uses uid_t as return type -uid_t getuid(void); -https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 -which is a typedef to unsigned. - -glibc and uclibc include typedefs from __uid_t to uid_t, -which means one should be able to use uid_t as a replacement -for __uid_t and make compiling with all three c standard libraries -possible. - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 -Signed-off-by: Daniel Lang - ---- - dbus-cxx/sasl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; - - diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 907de1866f..5b3a6188fc 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz -sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 55b2541b9c3f3fa705e51e12e6971f66826ebc7185071e0cd1bb6ec9e5adf47f dbus-cxx-2.2.0.tar.gz +sha256 99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 cmake-modules/LICENSE_1_0.txt sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 tools/libcppgenerate/LICENSE diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk index 3e89fc9db7..c0bcff1c67 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,9 +4,9 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_VERSION = 2.2.0 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +DBUS_CXX_LICENSE = LGPL-3.0+ or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE DBUS_CXX_INSTALL_STAGING = YES DBUS_CXX_DEPENDENCIES = libsigc From arnout at mind.be Mon Mar 28 18:54:53 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:53 +0200 Subject: [Buildroot] [git commit] package/systemd: bump to version 250.4 Message-ID: <20220328194854.608E785F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea04ee34f0078952aae0e27150b683ec3c8defdf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac20..3572b25965 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..9feed9c084 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.3 +SYSTEMD_VERSION = 250.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From arnout at mind.be Mon Mar 28 18:54:45 2022 From: arnout at mind.be (Arnout Vandecappelle (Essensium/Mind)) Date: Mon, 28 Mar 2022 20:54:45 +0200 Subject: [Buildroot] [git commit] package/jack1: bump to version 0.126 Message-ID: <20220328194854.449C385F3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5eefab2d4e211adb51d261700b4022e76c60c20 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Switch site to get latest release - libsndfile and readline are not a dependency since removal of example-clients and tools with https://github.com/jackaudio/jack1/commit/ca3af4b0d8a8a8fd6c4ae72c24e4df6e18f83af9 - Update indentation in hash file (two spaces) https://jackaudio.org/news/2022/01/15/jack1-v01260-and-jack2-v1920-releases.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/jack1/jack1.hash | 8 ++++---- package/jack1/jack1.mk | 14 +++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash index d7787ac2ad..d82b9daffd 100644 --- a/package/jack1/jack1.hash +++ b/package/jack1/jack1.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 6dca56001f..4e16d7e96e 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -4,9 +4,9 @@ # ################################################################################ -JACK1_VERSION = 0.125.0 -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz -JACK1_SITE = http://jackaudio.org/downloads +JACK1_VERSION = 0.126.0 +JACK1_SITE = \ + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES @@ -17,14 +17,6 @@ ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -JACK1_DEPENDENCIES += libsndfile -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK1_DEPENDENCIES += readline -endif - JACK1_CONF_OPTS = --without-html-dir --disable-oss $(eval $(autotools-package)) From fontaine.fabrice at gmail.com Mon Mar 28 20:15:21 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 28 Mar 2022 22:15:21 +0200 Subject: [Buildroot] [PATCH 1/1] Revert "package/tpm2-tss: bump version to 3.2.0" Message-ID: <20220328201521.4084-1-fontaine.fabrice@gmail.com> This reverts commit ed13a65a08cfe315aed9344abc609f5f2b92c782 as it has the following non trivial issues: - pkgconfig files have no version number if we run autoreconf (https://github.com/tpm2-software/tpm2-tss/issues/2329) resulting in the following build failures with tpm2-{abrmd,pkcs11} or libsecret: configure: error: Package requirements (tss2-esys >= 2.0) were not met: Package dependency requirement 'tss2-esys >= 2.0' could not be satisfied. Package 'tss2-esys' has version '', required version is '>= 2.0' - addgroup/groupadd and adduser/useradd are mandatory since https://github.com/tpm2-software/tpm2-tss/commit/7fde604383c62fc764a1e060dff48fc06f79860b: configure: error: addgroup or groupadd are needed. It seems better to find an upstreamable solution to both issues before bumping. Fixes: - http://autobuild.buildroot.org/results/d4d6807af3493deb47951c6f11f427040e5c5e11 - http://autobuild.buildroot.org/results/a304e45bacb8cd7e7ea9bc49e4a8ec9359ca0a3a - http://autobuild.buildroot.org/results/be0befa81e955ac8cf16f9d20723f9b9b174e012 - http://autobuild.buildroot.org/results/d4ebee400423f6df51613193c86db3c58c94ff88 Signed-off-by: Fabrice Fontaine --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index db6b3b7ad0..b6eb3c1f97 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 tpm2-tss-3.2.0.tar.gz +sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 2bb1235177..f475697e40 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.2.0 +TPM2_TSS_VERSION = 3.1.0 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE -- 2.35.1 From fontaine.fabrice at gmail.com Mon Mar 28 20:21:36 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 28 Mar 2022 22:21:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/paho-mqtt-c: bump to version 1.3.10 Message-ID: <20220328202136.7182-1-fontaine.fabrice@gmail.com> Service release. Issues resolved: https://github.com/eclipse/paho.mqtt.c/milestone/17?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.10 Signed-off-by: Fabrice Fontaine --- package/paho-mqtt-c/paho-mqtt-c.hash | 2 +- package/paho-mqtt-c/paho-mqtt-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash index 4cdedfbf9a..931bf5b9c8 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 386c9b5fa1cf6d0d516db12d57fd8f6a410dd0fdc5e9a2da870aae437a2535ed paho-mqtt-c-1.3.9.tar.gz +sha256 c70db96e66adacae411d5d875fbb08bca6ff9945de3d215b3af93cbd22792db5 paho-mqtt-c-1.3.10.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk index 68b58f2e02..d6356a7ccc 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.9 +PAHO_MQTT_C_VERSION = 1.3.10 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE -- 2.35.1 From ju.o at free.fr Mon Mar 28 20:31:39 2022 From: ju.o at free.fr (Julien Olivain) Date: Mon, 28 Mar 2022 22:31:39 +0200 Subject: [Buildroot] [PATCH 1/1] package/fluidsynth: bump to version 2.2.6 Message-ID: <20220328203139.1115402-1-ju.o@free.fr> For change log since v2.2.5, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.6 Signed-off-by: Julien Olivain --- Tested with: make check-package ... 0 warnings generated ./utils/test-pkg -p fluidsynth ... 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0d41c16d8d..20eb9ec49f 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz +sha256 ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f fluidsynth-2.2.6.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index b500944c16..d7c72ed059 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.5 +FLUIDSYNTH_VERSION = 2.2.6 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE -- 2.35.1 From arnout at mind.be Mon Mar 28 20:35:58 2022 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 28 Mar 2022 22:35:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries In-Reply-To: <20220328060027.2483147-1-alseycmiller@gmail.com> References: <20220328060027.2483147-1-alseycmiller@gmail.com> Message-ID: <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> Hi Alsey, Thank you for your contribution! I have a number of review comments below. Please take them into account and send a new patch series. For the time being, I've marked the patch as Changes Requested in patchwork. Firt of all, the patch should be split up in separate patches: one patch per package you add. Make sure all of them are posted together and in the correct order. Each patch should have as subject "package/...: new package". I have a few more comments below, but it's hard to properly review such a big patch so I will probably have missed some things. On 28/03/2022 08:00, Alsey Coleman Miller wrote: > Signed-off-by: Alsey Coleman Miller > --- > package/Config.in | 11 + Please add yourself to the DEVELOPERS file [1] for this package. This way, you'll get an e-mail if the package fails in the autobuilders, or when a new version is released if the package is registered on release-monitoring.org. [snip] > diff --git a/package/foundation/Config.in b/package/foundation/Config.in > new file mode 100644 > index 0000000000..7a9dc8b514 > --- /dev/null > +++ b/package/foundation/Config.in > @@ -0,0 +1,14 @@ > +if BR2_PACKAGE_SWIFT I get that you only want swift-related packages to appear in the menus if swift itself is selected. It would be even better, then, to sort all of them under the swift main entry. Perhaps even prefix all of them with swift-, like is done for python, perl and lua packages. > + > +config BR2_PACKAGE_FOUNDATION > + bool "foundation" > + depends on BR2_PACKAGE_SWIFT > + select BR2_PACKAGE_LIBSWIFTDISPATCH > + select BR2_PACKAGE_LIBCURL > + select BR2_PACKAGE_LIBXML2 > + help > + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. Please make sure indentation is done correctly, as reported by the utils/check-package script. In this case, the line length is way too long. > + > + http://swift.org > + > +endif > diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash > new file mode 100644 > index 0000000000..f15edb8420 > --- /dev/null > +++ b/package/foundation/foundation.hash > @@ -0,0 +1 @@ > +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz > diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk > new file mode 100644 > index 0000000000..93c7cedbdd > --- /dev/null > +++ b/package/foundation/foundation.mk > @@ -0,0 +1,102 @@ > +### Foundation Missin comment header, as reported by check-package (I'm not going to repeat all the other check-package errors). > +FOUNDATION_VERSION = $(SWIFT_VERSION) > +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz > +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags This doesn't look right - shouldn't you be using the github helper? > +FOUNDATION_LICENSE = Apache-2.0 > +FOUNDATION_LICENSE_FILES = LICENSE > +FOUNDATION_INSTALL_STAGING = YES > +FOUNDATION_INSTALL_TARGET = YES _INSTALL_TARGET = YES is not needed, it's done automatically. > +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO > +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch > + > +FOUNDATION_CONF_OPTS += \ > + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ > + -DCMAKE_Swift_FLAGS_DEBUG="" \ Please consistently indent with one tab. > + -DCMAKE_Swift_FLAGS_RELEASE="" \ > + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ > + -DCF_DEPLOYMENT_SWIFT=ON \ > + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ > + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ > + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ > + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ > + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ > + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ > + > +ifeq ($(BR2_PACKAGE_LIBCURL),y) Since Config.in selects libcurl, this is always true. > + FOUNDATION_DEPENDENCIES += libcurl No indentation within make conditions. > + FOUNDATION_CONF_OPTS += \ > + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ > + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ > + > +endif > + > +ifeq ($(BR2_PACKAGE_LIBXML2),y) > + FOUNDATION_DEPENDENCIES += libxml2 > + FOUNDATION_CONF_OPTS += \ > + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ > + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ > + > +endif > + > +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) > +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) > +else > +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build > +endif This stuff is done automatically by the infra. > + > +define FOUNDATION_CONFIGURE_CMDS > + # Workaround Dispatch defined with cmake and module > + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch > + # Clean > + rm -rf $(FOUNDATION_BUILDDIR) > + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation > + # Configure > + (mkdir -p $(FOUNDATION_BUILDDIR) && \ > + cd $(FOUNDATION_BUILDDIR) && \ > + rm -f CMakeCache.txt && \ > + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ > + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ > + -DCMAKE_INSTALL_PREFIX="/usr" \ > + -DBUILD_SHARED_LIBS=ON \ > + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ > + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ > + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ > + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + $(FOUNDATION_CONF_OPTS) \ > + ) I haven't looked at the details, but not using the cmake infrastructure is not a good idea. > +endef > + > +define FOUNDATION_BUILD_CMDS > + # Compile > + (cd $(FOUNDATION_BUILDDIR) && ninja) If the problem is that it only supports the ninja build system: please use [2] and explain in the cover letter of your series that it depends on that. > +endef > + > +define FOUNDATION_INSTALL_TARGET_CMDS > + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ > +endef > + > +define FOUNDATION_INSTALL_STAGING_CMDS > + # Copy libraries > + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ > + # Copy CoreFoundation module > + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation > + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ > + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map > + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map > + # Copy CFXMLInterface module > + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface > + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map > + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map > + # Copy CFURLSessionInterface module > + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface > + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map > + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map > + # Copy Swift modules > + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ > + # Restore Dispatch headers > + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) > + > +endef > + > +$(eval $(generic-package)) > diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in > new file mode 100644 > index 0000000000..2f7c115375 > --- /dev/null > +++ b/package/libdispatch/Config.in > @@ -0,0 +1,11 @@ > +config BR2_PACKAGE_LIBDISPATCH > + bool "libdispatch" > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_USES_GLIBC When there are toolchain dependencies, there should also be a comment that tells the user why the package can't be selected. Look at other packages for examples. Since it's not clear here, you should probably explain in the commit message why these dependencies are needed. > + select BR2_PACKAGE_LIBBSD > + > + help > + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. > + > + http://swift.org > diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash > new file mode 100644 > index 0000000000..a89c48c55f > --- /dev/null > +++ b/package/libdispatch/libdispatch.hash > @@ -0,0 +1,2 @@ > +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz > +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch > diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk > new file mode 100644 > index 0000000000..a334c3052d > --- /dev/null > +++ b/package/libdispatch/libdispatch.mk > @@ -0,0 +1,78 @@ > +### Grand Central Dispatch (C API) > +LIBDISPATCH_VERSION = $(SWIFT_VERSION) > +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz > +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags > +LIBDISPATCH_LICENSE = Apache-2.0 > +LIBDISPATCH_LICENSE_FILES = LICENSE > +LIBDISPATCH_INSTALL_STAGING = YES > +LIBDISPATCH_INSTALL_TARGET = YES > +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO > +LIBDISPATCH_DEPENDENCIES = libbsd > +LIBDISPATCH_PATCH = \ > + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch Downloading a patch from your own gist isn't exactly great for allowing reviews :-). Please instead include the patch directly in Buildroot. Since upstream is managed in git, please make this a git-formatted patch (generated with git format-patch -N) [1]. Make sure it has a summary and description just like any other commit, and also include your Signed-off-by. The latter is needed to ascertain that the patch may be distributed under the upstream project's license (which may be different from Buildroot's). [snip] > diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in > new file mode 100644 > index 0000000000..cbeed69667 > --- /dev/null > +++ b/package/swift-hello/Config.in > @@ -0,0 +1,10 @@ > +if BR2_PACKAGE_SWIFT > + > +config BR2_PACKAGE_SWIFT_HELLO > + bool "swift-hello" > + depends on BR2_PACKAGE_SWIFT > + depends on BR2_PACKAGE_FOUNDATION > + help > + Demo application for Swift. If I understand correctly, this package serves no purpose other than proving that it's possibleto biuld a swift application in Buildroot. Nobody is ever going to select it. Instead, it would be better to move it to the runtime test infrastructure (and of course actually runtime test it, which proves that the generated binaries actually work). [snip] > diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk > new file mode 100644 > index 0000000000..b3cded3f7c > --- /dev/null > +++ b/package/swift-hello/swift-hello.mk > @@ -0,0 +1,33 @@ > +### Swift Demo > +SWIFT_HELLO_VERSION = 0.1.0 > +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src > +SWIFT_HELLO_SITE_METHOD = local > +SWIFT_HELLO_INSTALL_STAGING = NO > +SWIFT_HELLO_INSTALL_TARGET = YES > +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES > +SWIFT_HELLO_DEPENDENCIES = swift foundation > +SWIFT_HELLO_EXECUTABLES = swift-hello > +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) > + > +define SWIFT_HELLO_BUILD_CMDS > + ( \ These parenthesis are actually not needed. They are still used in a lot of places in Buildroot, but that's legacy stuff. > + cd $(SWIFT_HELLO_SRCDIR) && \ > + rm -rf .build && \ > + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ > + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ > + ) > +endef > + > +define SWIFT_HELLO_INSTALL_TARGET_CMDS > + # Copy dynamic libraries > + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ Please don't keep commented-out lines. > + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello > +endef > + > +define SWIFT_HELLO_INSTALL_STAGING_CMDS > + # Copy dynamic libraries > + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ > + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello > +endef > + > +$(eval $(generic-package)) [snip] > +config BR2_PACKAGE_SWIFT > + bool "swift" > + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_USES_GLIBC > + select BR2_PACKAGE_ICU > + select BR2_PACKAGE_LIBDISPATCH > + help > + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. > + > + http://swift.org > + > +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH > + > +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS > + string "Path to host Swift toolchain" > + default "/usr/bin" > + > +config BR2_PACKAGE_SWIFT_LLVM_DIR > + string "Path to host LLVM library path" > + default "/usr/lib/llvm-12" I guess swift is built on top of LLVM. Is it possible to use package/llvm, or is it a patched version? > + > +endif > + > +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" > + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ > + || BR2_STATIC_LIBS || !BR2_USE_WCHAR [snip] > diff --git a/package/swift/swift.mk b/package/swift/swift.mk > new file mode 100644 > index 0000000000..da10aae8fd > --- /dev/null > +++ b/package/swift/swift.mk > @@ -0,0 +1,232 @@ > +### Apple's Swift Programming Language > +SWIFT_VERSION = 5.6 > +SWIFT_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz > +SWIFT_SITE = https://github.com/apple/swift/archive/refs/tags > +SWIFT_LICENSE = Apache-2.0 > +SWIFT_LICENSE_FILES = LICENSE.txt > +SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH)) > +SWIFT_NATIVE_PATH = $(call qstrip,$(BR2_PACKAGE_SWIFT_NATIVE_TOOLS)) > +SWIFT_LLVM_DIR = $(call qstrip,$(BR2_PACKAGE_SWIFT_LLVM_DIR)) > +SWIFT_INSTALL_STAGING = YES > +SWIFT_INSTALL_TARGET = YES > +SWIFT_SUPPORTS_IN_SOURCE_BUILD = NO > +SWIFT_DEPENDENCIES = icu libxml2 libbsd libdispatch > + > +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > +SWIFT_CONF_ENV += LIBS="-latomic" > +endif > + > +HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift > +SWIFTPM_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/$(SWIFT_TARGET_NAME)-toolchain.json This should have simply a SWIFT_ prefix, not SWIFTPM. [snip] > +define SWIFT_INSTALL_STAGING_CMDS > + mkdir -p $(HOST_SWIFT_SUPPORT_DIR) > + # Copy runtime libraries and swift interfaces > + cp -rf $(SWIFT_BUILDDIR)/lib/swift ${STAGING_DIR}/usr/lib/ > + # Generate SwiftPM cross compilation toolchain file > + rm -f $(SWIFTPM_DESTINATION_FILE) > + touch $(SWIFTPM_DESTINATION_FILE) > + echo '{' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) We generally prefer to have a template file (called swift-toolchain.json.in) in the package directory, and use sed to replace @XXXX@ entries. See e.g. how it's done for cmake's toolchainfile. > + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) > + > + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ > + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ > + fi > + > + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ > + > + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ > + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ > + fi > + > + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ > + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ > + fi > + > + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) > + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) > + echo '}' >> $(SWIFTPM_DESTINATION_FILE) > + > +endef > + > +$(eval $(generic-package)) > +$(eval $(host-generic-package)) > \ No newline at end of file Please make sure there's a newline at the end of the file. Regards, Arnout [1] https://buildroot.org/downloads/manual/manual.html#DEVELOPERS [2] https://patchwork.ozlabs.org/project/buildroot/list/?series=282194 [3] https://buildroot.org/manual.html#_format_and_licensing_of_the_package_patches From Matthew.Weber at collins.com Mon Mar 28 20:29:18 2022 From: Matthew.Weber at collins.com (Weber, Matthew L Collins) Date: Mon, 28 Mar 2022 20:29:18 +0000 Subject: [Buildroot] [External] Re: [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 In-Reply-To: References: <20220131015937.4113728-1-james.hilliard1@gmail.com> <20220131104553.715b97ce@windsurf> <731c2ec5-e693-f2d4-5f48-0eaf376c57d1@smile.fr> <6b5d3b43-fe50-0dd2-2903-e404ee7792b9@mind.be> Message-ID: James, > From: James Hilliard > Sent: Wednesday, March 23, 2022 11:30 PM > To: Arnout Vandecappelle > Cc: Romain Naour ; Joseph Kogut ; Thomas Petazzoni ; buildroot ; Romain Naour ; Weber, Matthew L Collins ; Valentin Korenblit > Subject: [External] Re: [Buildroot] [PATCH 1/1] package:{clang, lld, llvm}: bump to version 11.1.0 > [snip] > I think I managed to fix the blockers with libclc in Matt's series > which I've sent as a v12: Thank you for picking up these patches! I can confirm that the "runtest" passes for the CLANG compiler-rt (ARM64 QEMU) and I've successfully built/used an x86 defconfig(GCC8.x / Linux 4.14) I use for fuzzing. Tested-by: Matthew Weber Regards, Matt From Jason at zx2c4.com Tue Mar 29 05:04:01 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Tue, 29 Mar 2022 01:04:01 -0400 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220327202415.1248312-1-Jason@zx2c4.com> References: <20220327202415.1248312-1-Jason@zx2c4.com> Message-ID: <20220329050401.110856-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Reviewed-by: James Hilliard Signed-off-by: Jason A. Donenfeld --- Changes v2->v3: - Some small fixes on the exit path to be a bit cleaner. package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 64 +-- package/urandom-scripts/seedrng.c | 458 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 6 + 4 files changed, 482 insertions(+), 50 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..1959fad93b 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -6,63 +6,35 @@ # Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -URANDOM_SEED="/var/lib/random-seed" +# The following knobs can be adjusted by placing uncommented modified lines +# into /etc/default/urandom: +# +# Set these to change where the seed and runtime lock file are stored: +# +# export SEEDRNG_SEED_DIR=/var/lib/seedrng +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock +# +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng: +# +# export SEEDRNG_SKIP_CREDIT=false +# # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in start|restart|reload) # Carry a random seed from start-up to start-up # Load and then save the whole entropy pool - init_rng && save_random_seed;; + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; stop) # Carry a random seed from shut-down to start-up # Save the whole entropy pool - save_random_seed;; + seedrng;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..2a9df3c914 --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,458 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT OR Apache-2.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + + +static const char *SEED_DIR; +static const char *LOCK_FILE; +static char *CREDITABLE_SEED; +static char *NON_CREDITABLE_SEED; + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +static void populate_global_paths(void) +{ + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); + if (!SEED_DIR || !*SEED_DIR) + SEED_DIR = "/var/lib/seedrng"; + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); + if (!LOCK_FILE || !*LOCK_FILE) + LOCK_FILE = "/var/run/seedrng.lock"; + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); + exit(1); + } +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd = -1, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + populate_global_paths(); + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + program_ret = 1; + goto out; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + if (fd >= 0) + close(fd); + if (lock >= 0) + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..e8526e248a 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,13 @@ # ################################################################################ +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From dan at thejacksons.uk Tue Mar 29 05:57:55 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 05:57:55 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? Message-ID: Hello, Sorry once again if this is a silly/noob question. If I have an existing router device running a 2.6.39.3 kernel, which has a USB port and is capable of supporting USB devices, but the manufacturer has removed/not installed the necessary kernel modules, can I use Buildroot to recreate the missing modules and thus re-enable the missing USB support? If so, how would I do it? This time I successfully managed to build other binaries (e.g. dropbear, busybox) which run OK on the device. Thanks, Dan Jackson. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Tue Mar 29 06:07:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 29 Mar 2022 06:07:59 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #1 from Jos? Pekkarinen --- Is there any way I can set in buildroot KBUILD_MODPOST_WARN? According to the kernel documentation it will set all errors as warning, and this is for testing purposes only, so no matter if it boils out. -- You are receiving this mail because: You are on the CC list for the bug. From David.Laight at ACULAB.COM Tue Mar 29 06:12:41 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Tue, 29 Mar 2022 06:12:41 +0000 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220329050401.110856-1-Jason@zx2c4.com> References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> Message-ID: From: Jason A. Donenfeld > Sent: 29 March 2022 06:04 > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. It isn't that tiny, this bloats out to quite a lot of code. > +#define G(r, i, a, b, c, d) do { \ > + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ > + d = ror32(d ^ a, 16); \ > + c += d; \ > + b = ror32(b ^ c, 12); \ > + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ > + d = ror32(d ^ a, 8); \ > + c += d; \ > + b = ror32(b ^ c, 7); \ > +} while (0) > + > +#define ROUND(r) do { \ > + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ > + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ > + G(r, 2, v[2], v[ 6], v[10], v[14]); \ > + G(r, 3, v[3], v[ 7], v[11], v[15]); \ > + G(r, 4, v[0], v[ 5], v[10], v[15]); \ > + G(r, 5, v[1], v[ 6], v[11], v[12]); \ > + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ > + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ > +} while (0) > + ROUND(0); > + ROUND(1); > + ROUND(2); > + ROUND(3); > + ROUND(4); > + ROUND(5); > + ROUND(6); > + ROUND(7); > + ROUND(8); > + ROUND(9); I've not looked at why the code is doing this. If you are feeding data that has come from the RNG back in as state/entropy why does it contain a copy of blake2? I was expecting to see a program that copied stdin to /dev/urandom in a manner that actually credited entropy. About 10 lines of code. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From bugzilla at busybox.net Tue Mar 29 06:21:17 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 29 Mar 2022 06:21:17 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #2 from Jos? Pekkarinen --- as a workaround I have added to the package the following line: SGX_DRIVER_MAKE_OPTS=KBUILD_MODPOST_WARN=1 That allows to build and test stuff. I'm uncertain this is a kernel bug instead of a buildroot one by now. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Mar 29 07:23:20 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 29 Mar 2022 07:23:20 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #3 from Jos? Pekkarinen --- This is the list of "missing" symbols: depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __put_page depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __check_object_size depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol vmf_insert_pfn depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol misc_deregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol alloc_workqueue depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_insert depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_alt_call_rcx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol platform_driver_unregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol on_each_cpu_cond_mask depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol queue_work_on depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol stackleak_track_stack depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _find_first_bit depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_lookup depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_alt_call_rax depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol finish_wait depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol ioremap_cache depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol iounmap depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _find_first_zero_bit depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol set_freezable depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol zap_vma_ptes depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol ex_handler_default depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol prepare_to_wait_event depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol kthread_should_stop depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __wake_up depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _raw_spin_lock depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol msleep_interruptible depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol wake_up_process depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __refrigerator depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_thunk_rax depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _printk depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol schedule depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol refcount_warn_saturate depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol smp_call_function depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __free_pages depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _dev_info depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol find_vma depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol page_offset_base depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __cond_resched depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_delete depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol init_wait_entry depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol shmem_file_setup depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __list_add_valid depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol fput depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol radix_tree_next_chunk depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol platform_device_unregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol destroy_workqueue depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_thunk_rbx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol shmem_read_mapping_page_gfp depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol apply_to_page_range depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol mmu_notifier_unregister depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __cpu_online_mask depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __list_del_entry_valid depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol kthread_stop depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __mutex_init depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol freezing_slow_path depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol current_task depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol misc_register depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol _copy_to_user depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol down_read depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __platform_driver_register depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol kthread_create_on_node depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol set_page_dirty depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol vmemmap_base depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __ubsan_handle_shift_out_of_bounds depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol platform_device_register_full depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol alloc_pages depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_thunk_rcx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __x86_indirect_alt_call_rbx depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol __warn_printk depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol mmu_notifier_register depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol system_freezing_cnt depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol boot_cpu_data depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol up_read depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol put_pid depmod: WARNING: /usr/src/output/br_admin/output_x86_upxtreme/target/lib/modules/5.15.21-hardened1/extra/isgx.ko needs unknown symbol flush_work -- You are receiving this mail because: You are on the CC list for the bug. From br015 at umbiko.net Tue Mar 29 09:40:26 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Tue, 29 Mar 2022 09:40:26 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: Message-ID: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> Hi Dan, On 2022-03-29 05:58, Dan Jackson wrote: > Hello, > > Sorry once again if this is a silly/noob question. > > If I have an existing router device running a 2.6.39.3 kernel, which > has a USB port and is capable of supporting USB devices, but the > manufacturer has removed/not installed the necessary kernel modules, > can I use Buildroot to recreate the missing modules and thus re-enable > the missing USB support? It might work: the driver is contained in the USB module, so building and loading that module could do the trick. > If so, how would I do it? Supposing the Linux kernel source contained in [1] is the one that is running on your device, you need to configure Buildroot to build a Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some information about how to do this for a Kernel source tree (see chapter 8.14.6). You then need to enable USB support in the kernel (Device Drivers -> USB support), probably CONFIG_USB=m CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y is enough, otherwise try some of the hardware specific (driver) options. Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ to the corresponding location on your device and load the driver with modprobe. Depending on which functionality (e.g. USB_STORAGE) you want on your USB port, additional configurations changes may be necessary. Kind regards, Andreas > This time I successfully managed to build other binaries (e.g. > dropbear, busybox) which run OK on the device. > > Thanks, > Dan Jackson. > -------------- next part -------------- > An HTML attachment was scrubbed... > URL: > [1] https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ [2] https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From dan at thejacksons.uk Tue Mar 29 12:48:51 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 12:48:51 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 29 March 2022 10:40 > To: Dan Jackson > Cc: Buildroot > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > Hi Dan, > > On 2022-03-29 05:58, Dan Jackson wrote: > > > Hello, > > > > Sorry once again if this is a silly/noob question. > > > > If I have an existing router device running a 2.6.39.3 kernel, which > > has a USB port and is capable of supporting USB devices, but the > > manufacturer has removed/not installed the necessary kernel modules, > > can I use Buildroot to recreate the missing modules and thus re-enable > > the missing USB support? > > It might work: the driver is contained in the USB module, so building and > loading that module could do the trick. > > > If so, how would I do it? > > Supposing the Linux kernel source contained in [1] is the one that is running > on your device, you need to configure Buildroot to build a Linux kernel > (BR2_LINUX_KERNEL). The manual [2] has some information about how to > do this for a Kernel source tree (see chapter 8.14.6). It looks like I got that part to work. The buildroot build process definitely seems to be able to see the kernel source tree which is in /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. > > You then need to enable USB support in the kernel (Device Drivers -> USB > support), probably > > CONFIG_USB=m > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_OHCI_HCD=y > > is enough, otherwise try some of the hardware specific (driver) options. This is where I have fallen down. I did "make linux-menuconfig" expecting to be able to configure the kernel/modules (as I couldn't see any options for that in buildroot's own "make menuconfig"). However, at this point it seems like it went off and tried to build the whole kernel from a default configuration. This eventually failed, so I tried "make linux-reconfigure" at that point but that did not work either. Here is the error it gave upon failure: /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux-uclibcgnueabi/bin/ld: /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: error loading plugin: /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: undefined symbol: _onload collect2: error: ld returned 1 exit status Makefile.in:114: recipe for target '../utils/getconf' failed make[3]: *** [../utils/getconf] Error 1 Makefile.in:455: recipe for target 'utils' failed make[2]: *** [utils] Error 2 package/pkg-generic.mk:380: recipe for target '/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed' failed make[1]: *** [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed] Error 2 Makefile:84: recipe for target '_all' failed make: *** [_all] Error 2 Looking at this error message, maybe I need to select an older version of gcc, in my buildroot configuration? Is it that the kernel can only be compiled by gcc versions that existed at the time? > > Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ to the > corresponding location on your device and load the driver with modprobe. > > Depending on which functionality (e.g. USB_STORAGE) you want on your > USB port, additional configurations changes may be necessary. Yes, USB storage functionality is what I would like to add back in. Incidentally, this is a newer router than the one I was experimenting with before; this one has a Puma 6 CPU. Though, oddly I found it necessary to select an armv5 CPU type in buildroot in order to get binaries that work, despite /proc/cpuinfo on the device claiming it is armv6. > > Kind regards, > Andreas > > > This time I successfully managed to build other binaries (e.g. > > dropbear, busybox) which run OK on the device. > > > > Thanks, > > Dan Jackson. > > -------------- next part -------------- An HTML attachment was > > scrubbed... > > URL: > > > 3c49a2d/attachment.html> > > [1] > https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ > [2] > https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From andreynech at gmail.com Tue Mar 29 14:59:04 2022 From: andreynech at gmail.com (Andrey Nechypurenko) Date: Tue, 29 Mar 2022 16:59:04 +0200 Subject: [Buildroot] [PATCH] package/cmake: bump version to 3.22.3 Message-ID: <20220329145904.63900-1-andreynech@gmail.com> Version 3.20 is the first one where the following issue is fixed: https://gitlab.kitware.com/cmake/cmake/-/issues/18299 Was affected by this bug and decide to bump the version to the latest stable --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index da514a6d6b..1749db8c27 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt -sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz +# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt +sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz # Locally calculated sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 4177b119ab..053658fad6 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.18 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 +CMAKE_VERSION_MAJOR = 3.22 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -- 2.32.0 From br015 at umbiko.net Tue Mar 29 15:13:40 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Tue, 29 Mar 2022 15:13:40 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> Message-ID: <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> Hi Dan, On 2022-03-29 12:48, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 29 March 2022 10:40 >> To: Dan Jackson >> Cc: Buildroot >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> Hi Dan, >> >> On 2022-03-29 05:58, Dan Jackson wrote: >> >> > Hello, >> > >> > Sorry once again if this is a silly/noob question. >> > >> > If I have an existing router device running a 2.6.39.3 kernel, which >> > has a USB port and is capable of supporting USB devices, but the >> > manufacturer has removed/not installed the necessary kernel modules, >> > can I use Buildroot to recreate the missing modules and thus re-enable >> > the missing USB support? >> >> It might work: the driver is contained in the USB module, so building >> and >> loading that module could do the trick. >> >> > If so, how would I do it? >> >> Supposing the Linux kernel source contained in [1] is the one that is >> running >> on your device, you need to configure Buildroot to build a Linux >> kernel >> (BR2_LINUX_KERNEL). The manual [2] has some information about how to >> do this for a Kernel source tree (see chapter 8.14.6). > > It looks like I got that part to work. The buildroot build process > definitely seems to be able to see the kernel source tree which is in > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. > >> >> You then need to enable USB support in the kernel (Device Drivers -> >> USB >> support), probably >> >> CONFIG_USB=m >> CONFIG_USB_EHCI_HCD=y >> CONFIG_USB_OHCI_HCD=y >> >> is enough, otherwise try some of the hardware specific (driver) >> options. > > This is where I have fallen down. I did "make linux-menuconfig" > expecting to be able to configure the kernel/modules (as I couldn't > see any options for that in buildroot's own "make menuconfig"). > > However, at this point it seems like it went off and tried to build > the whole kernel from a default configuration. 'make linux-menuconfig' needs a working build system. If they are not present, all dependencies of the Linux package get built. First step is the installation of the kernel source; if Buildroot tries to install a default kernel, something is amiss with your configuration. > This eventually failed, so I tried "make linux-reconfigure" at that > point but that did not work either. > > Here is the error it gave upon failure: > > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux-uclibcgnueabi/bin/ld: > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > error loading plugin: > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot-linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > undefined symbol: _onload > collect2: error: ld returned 1 exit status > Makefile.in:114: recipe for target '../utils/getconf' failed > make[3]: *** [../utils/getconf] Error 1 > Makefile.in:455: recipe for target 'utils' failed > make[2]: *** [utils] Error 2 > package/pkg-generic.mk:380: recipe for target > '/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed' > failed > make[1]: *** > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target_installed] > Error 2 > Makefile:84: recipe for target '_all' failed > make: *** [_all] Error 2 This error is from the uClibc build - do you use an internal or external toolchain? Maybe you have conflicting static /dynamic library options? Again, probably a buildroot misconfiguration ... Maybe you could post your buildroot configuration (the result of make savedefconfig)? > Looking at this error message, maybe I need to select an older version > of gcc, in my buildroot configuration? Is it that the kernel can only > be compiled by gcc versions that existed at the time? Older kernels used to have a include/compiler.h which had predefined includes for specific compiler versions. Use the oldest compiler available in Buildroot and try to either get a compiler-gcc9.h from a newer kernel or make your own. I believe this schema changed somewhere between 3.x and 4.x For newer compilers, this file is comparatively empty. >> >> Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ to >> the >> corresponding location on your device and load the driver with >> modprobe. >> >> Depending on which functionality (e.g. USB_STORAGE) you want on your >> USB port, additional configurations changes may be necessary. > > Yes, USB storage functionality is what I would like to add back in. > Incidentally, this is a newer router than the one I was experimenting > with before; this one has a Puma 6 CPU. Though, oddly I found it > necessary to select an armv5 CPU type in buildroot in order to get > binaries that work, despite /proc/cpuinfo on the device claiming it is > armv6. > >> >> Kind regards, >> Andreas >> >> > This time I successfully managed to build other binaries (e.g. >> > dropbear, busybox) which run OK on the device. >> > >> > Thanks, >> > Dan Jackson. >> > -------------- next part -------------- An HTML attachment was >> > scrubbed... >> > URL: >> > > > 3c49a2d/attachment.html> >> >> [1] >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ >> [2] >> https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From dan at thejacksons.uk Tue Mar 29 16:17:03 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 16:17:03 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 29 March 2022 16:14 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > Hi Dan, > > On 2022-03-29 12:48, Dan Jackson wrote: > >> -----Original Message----- > >> From: Andreas Ziegler > >> Sent: 29 March 2022 10:40 > >> To: Dan Jackson > >> Cc: Buildroot > >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel > >> - > >> possible? > >> > >> Hi Dan, > >> > >> On 2022-03-29 05:58, Dan Jackson wrote: > >> > >> > Hello, > >> > > >> > Sorry once again if this is a silly/noob question. > >> > > >> > If I have an existing router device running a 2.6.39.3 kernel, > >> > which has a USB port and is capable of supporting USB devices, but > >> > the manufacturer has removed/not installed the necessary kernel > >> > modules, can I use Buildroot to recreate the missing modules and > >> > thus re-enable the missing USB support? > >> > >> It might work: the driver is contained in the USB module, so building > >> and loading that module could do the trick. > >> > >> > If so, how would I do it? > >> > >> Supposing the Linux kernel source contained in [1] is the one that is > >> running on your device, you need to configure Buildroot to build a > >> Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some information > >> about how to do this for a Kernel source tree (see chapter 8.14.6). > > > > It looks like I got that part to work. The buildroot build process > > definitely seems to be able to see the kernel source tree which is in > > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. > > > >> > >> You then need to enable USB support in the kernel (Device Drivers -> > >> USB support), probably > >> > >> CONFIG_USB=m > >> CONFIG_USB_EHCI_HCD=y > >> CONFIG_USB_OHCI_HCD=y > >> > >> is enough, otherwise try some of the hardware specific (driver) > >> options. > > > > This is where I have fallen down. I did "make linux-menuconfig" > > expecting to be able to configure the kernel/modules (as I couldn't > > see any options for that in buildroot's own "make menuconfig"). > > > > However, at this point it seems like it went off and tried to build > > the whole kernel from a default configuration. > > 'make linux-menuconfig' needs a working build system. If they are not > present, all dependencies of the Linux package get built. First step is the > installation of the kernel source; if Buildroot tries to install a default kernel, > something is amiss with your configuration. > > > This eventually failed, so I tried "make linux-reconfigure" at that > > point but that did not work either. > > > > Here is the error it gave upon failure: > > > > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot- > linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux- > uclibcgnueabi/bin/ld: > > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- > linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > > error loading plugin: > > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- > linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > > undefined symbol: _onload > > collect2: error: ld returned 1 exit status > > Makefile.in:114: recipe for target '../utils/getconf' failed > > make[3]: *** [../utils/getconf] Error 1 > > Makefile.in:455: recipe for target 'utils' failed > > make[2]: *** [utils] Error 2 > > package/pkg-generic.mk:380: recipe for target > > '/home/danj/buildroot-2022.02/output/build/uclibc- > 1.0.40/.stamp_target_installed' > > failed > > make[1]: *** > > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target > > _installed] > > Error 2 > > Makefile:84: recipe for target '_all' failed > > make: *** [_all] Error 2 > > This error is from the uClibc build - do you use an internal or external > toolchain? Maybe you have conflicting static /dynamic library options? > Again, probably a buildroot misconfiguration ... This turned out to be that I had some wrong environment variables set from a previous attempt. Logged out and back in and now I am past that error. > > Maybe you could post your buildroot configuration (the result of make > savedefconfig)? It's quite short as it turns out: BR2_armeb=y BR2_STATIC_LIBS=y BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_PTHREAD_DEBUG=y BR2_BINUTILS_VERSION_2_37_X=y BR2_GCC_VERSION_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_HOST_GDB=y BR2_GDB_VERSION_9_2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" BR2_PACKAGE_JOE=y I can see I have got a USE_ARCH_DEFAULT_CONFIG in there which I'm guessing is part of my problems? > > > Looking at this error message, maybe I need to select an older version > > of gcc, in my buildroot configuration? Is it that the kernel can only > > be compiled by gcc versions that existed at the time? > > Older kernels used to have a include/compiler.h which had predefined > includes for specific compiler versions. Use the oldest compiler available in > Buildroot and try to either get a compiler-gcc9.h from a newer kernel or > make your own. I believe this schema changed somewhere between 3.x and > 4.x For newer compilers, this file is comparatively empty. GCC 9.x is the oldest option available in current buildroot so I have switched to that. I found a compiler-gcc5.h in kernel 4.1, newer kernels do not have any numbered files of this type at all. I downloaded this one and symlinked it as compiler-gcc9.h and it looks like this got me past this error. However, now I have a new missing file error, and I can't seem to locate a suitable candidate: In file included from /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/system.h:165, from /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/bitops.h:27, from include/linux/bitops.h:22, from include/linux/kernel.h:17, from include/linux/sched.h:55, from arch/arm/kernel/asm-offsets.c:13: /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/memory.h:19:10: fatal error: mach/memory.h: No such file or directory 19 | #include | ^~~~~~~~~~~~~~~ compilation terminated. /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: recipe for target 'arch/arm/kernel/asm-offsets.s' failed make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 Makefile:1009: recipe for target 'prepare0' failed make[2]: *** [prepare0] Error 2 make[2]: *** Waiting for unfinished jobs.... HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/sumversion.o HOSTLD scripts/mod/modpost make[2]: *** wait: No child processes. Stop. package/pkg-generic.mk:289: recipe for target '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' failed make[1]: *** [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] Error 2 Makefile:84: recipe for target '_all' failed make: *** [_all] Error 2 I think maybe I am still doing something wrong because it sure seems to be compiling a lot of stuff instead of letting me configure things. > > >> > >> Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ > >> to the corresponding location on your device and load the driver with > >> modprobe. > >> > >> Depending on which functionality (e.g. USB_STORAGE) you want on your > >> USB port, additional configurations changes may be necessary. > > > > Yes, USB storage functionality is what I would like to add back in. > > Incidentally, this is a newer router than the one I was experimenting > > with before; this one has a Puma 6 CPU. Though, oddly I found it > > necessary to select an armv5 CPU type in buildroot in order to get > > binaries that work, despite /proc/cpuinfo on the device claiming it is > > armv6. > > > >> > >> Kind regards, > >> Andreas > >> > >> > This time I successfully managed to build other binaries (e.g. > >> > dropbear, busybox) which run OK on the device. > >> > > >> > Thanks, > >> > Dan Jackson. > >> > -------------- next part -------------- An HTML attachment was > >> > scrubbed... > >> > URL: > >> > >> > 9/4 > >> > 3c49a2d/attachment.html> > >> > >> [1] > >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ > >> [2] > >> > https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From james.hilliard1 at gmail.com Tue Mar 29 16:40:36 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 10:40:36 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering Message-ID: <20220329164036.4045575-1-james.hilliard1@gmail.com> We need to backport a patch to fix software rendering with cog. Signed-off-by: James Hilliard --- ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch new file mode 100644 index 0000000000..fec21c225c --- /dev/null +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch @@ -0,0 +1,42 @@ +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 26 Mar 2022 13:30:47 -0600 +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release + function name. + +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91) + +Signed-off-by: James Hilliard +[james.hilliard1 at gmail.com: backport from upstream commit +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc] +--- + platform/wayland/cog-platform-wl.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c +index 0ff9e6f..46c5185 100644 +--- a/platform/wayland/cog-platform-wl.c ++++ b/platform/wayland/cog-platform-wl.c +@@ -63,7 +63,7 @@ + + #define DEFAULT_ZOOM_STEP 0.1f + +-#if defined(WPE_WL_CHECK_VERSION) ++#if defined(WPE_FDO_CHECK_VERSION) + # define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0) + # define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1) + #else +@@ -1705,8 +1705,8 @@ static void + shm_buffer_destroy(struct shm_buffer *buffer) + { + if (buffer->exported_buffer) { +- wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, +- buffer->exported_buffer); ++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, ++ buffer->exported_buffer); + } + + wl_buffer_destroy(buffer->buffer); +-- +2.25.1 + -- 2.25.1 From james.hilliard1 at gmail.com Tue Mar 29 16:45:34 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 10:45:34 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.3 Message-ID: <20220329164534.4046877-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 839b12e619..839211ef72 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.3.tar.xz.sums +md5 320d01d8546144fba2e14bed3522c8c7 cog-0.12.3.tar.xz +sha1 8e28b216bb2462325a1df1e8e03ac199487440b0 cog-0.12.3.tar.xz +sha256 f464065057373c0430f6267205d1ab3367b54ac04d15b6b5531683b03212f45f cog-0.12.3.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 2f6ef402fb..22c31f7944 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.1 +COG_VERSION = 0.12.3 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -- 2.25.1 From br015 at umbiko.net Tue Mar 29 17:52:14 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Tue, 29 Mar 2022 17:52:14 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> Message-ID: <54f87d03a99935fb452424992a81409c@umbiko.net> On 2022-03-29 16:17, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 29 March 2022 16:14 >> To: Dan Jackson >> Cc: buildroot at buildroot.org >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> Hi Dan, >> >> On 2022-03-29 12:48, Dan Jackson wrote: >> >> -----Original Message----- >> >> From: Andreas Ziegler >> >> Sent: 29 March 2022 10:40 >> >> To: Dan Jackson >> >> Cc: Buildroot >> >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> >> - >> >> possible? >> >> >> >> Hi Dan, >> >> >> >> On 2022-03-29 05:58, Dan Jackson wrote: >> >> >> >> > Hello, >> >> > >> >> > Sorry once again if this is a silly/noob question. >> >> > >> >> > If I have an existing router device running a 2.6.39.3 kernel, >> >> > which has a USB port and is capable of supporting USB devices, but >> >> > the manufacturer has removed/not installed the necessary kernel >> >> > modules, can I use Buildroot to recreate the missing modules and >> >> > thus re-enable the missing USB support? >> >> >> >> It might work: the driver is contained in the USB module, so building >> >> and loading that module could do the trick. >> >> >> >> > If so, how would I do it? >> >> >> >> Supposing the Linux kernel source contained in [1] is the one that is >> >> running on your device, you need to configure Buildroot to build a >> >> Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some information >> >> about how to do this for a Kernel source tree (see chapter 8.14.6). >> > >> > It looks like I got that part to work. The buildroot build process >> > definitely seems to be able to see the kernel source tree which is in >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src. >> > >> >> >> >> You then need to enable USB support in the kernel (Device Drivers -> >> >> USB support), probably >> >> >> >> CONFIG_USB=m >> >> CONFIG_USB_EHCI_HCD=y >> >> CONFIG_USB_OHCI_HCD=y >> >> >> >> is enough, otherwise try some of the hardware specific (driver) >> >> options. >> > >> > This is where I have fallen down. I did "make linux-menuconfig" >> > expecting to be able to configure the kernel/modules (as I couldn't >> > see any options for that in buildroot's own "make menuconfig"). >> > >> > However, at this point it seems like it went off and tried to build >> > the whole kernel from a default configuration. >> >> 'make linux-menuconfig' needs a working build system. If they are not >> present, all dependencies of the Linux package get built. First step >> is the >> installation of the kernel source; if Buildroot tries to install a >> default kernel, >> something is amiss with your configuration. >> >> > This eventually failed, so I tried "make linux-reconfigure" at that >> > point but that did not work either. >> > >> > Here is the error it gave upon failure: >> > >> > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot- >> linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux- >> uclibcgnueabi/bin/ld: >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: >> > error loading plugin: >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb-buildroot- >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: >> > undefined symbol: _onload >> > collect2: error: ld returned 1 exit status >> > Makefile.in:114: recipe for target '../utils/getconf' failed >> > make[3]: *** [../utils/getconf] Error 1 >> > Makefile.in:455: recipe for target 'utils' failed >> > make[2]: *** [utils] Error 2 >> > package/pkg-generic.mk:380: recipe for target >> > '/home/danj/buildroot-2022.02/output/build/uclibc- >> 1.0.40/.stamp_target_installed' >> > failed >> > make[1]: *** >> > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_target >> > _installed] >> > Error 2 >> > Makefile:84: recipe for target '_all' failed >> > make: *** [_all] Error 2 >> >> This error is from the uClibc build - do you use an internal or >> external >> toolchain? Maybe you have conflicting static /dynamic library options? >> Again, probably a buildroot misconfiguration ... > > This turned out to be that I had some wrong environment variables set > from a previous attempt. Logged out and back in and now I am past that > error. > >> >> Maybe you could post your buildroot configuration (the result of make >> savedefconfig)? > > It's quite short as it turns out: > > BR2_armeb=y > BR2_STATIC_LIBS=y > BR2_KERNEL_HEADERS_VERSION=y > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > BR2_PTHREAD_DEBUG=y > BR2_BINUTILS_VERSION_2_37_X=y > BR2_GCC_VERSION_9_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_HOST_GDB=y > BR2_GDB_VERSION_9_2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_PACKAGE_DROPBEAR=y > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" > BR2_PACKAGE_JOE=y The configuration uses a kernel downloaded from kernel.org, not the vendor kernel. You need to configure Buildroot to use a custom source directory. > I can see I have got a USE_ARCH_DEFAULT_CONFIG in there which I'm > guessing is part of my problems? You need to configure Buildroot to use your existing .config with BR2_LINUX_CUSTOM_KERNEL_CONFIG_FILE. >> >> > Looking at this error message, maybe I need to select an older version >> > of gcc, in my buildroot configuration? Is it that the kernel can only >> > be compiled by gcc versions that existed at the time? >> >> Older kernels used to have a include/compiler.h which had predefined >> includes for specific compiler versions. Use the oldest compiler >> available in >> Buildroot and try to either get a compiler-gcc9.h from a newer kernel >> or >> make your own. I believe this schema changed somewhere between 3.x and >> 4.x For newer compilers, this file is comparatively empty. > > GCC 9.x is the oldest option available in current buildroot so I have > switched to that. > > I found a compiler-gcc5.h in kernel 4.1, newer kernels do not have any > numbered files of this type at all. I downloaded this one and > symlinked it as compiler-gcc9.h and it looks like this got me past > this error. > > However, now I have a new missing file error, and I can't seem to > locate a suitable candidate: > > In file included from > /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/system.h:165, > from > /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/bitops.h:27, > from include/linux/bitops.h:22, > from include/linux/kernel.h:17, > from include/linux/sched.h:55, > from arch/arm/kernel/asm-offsets.c:13: > /home/danj/buildroot-2022.02/output/build/linux-custom/arch/arm/include/asm/memory.h:19:10: > fatal error: mach/memory.h: No such file or directory > 19 | #include > | ^~~~~~~~~~~~~~~ > compilation terminated. > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > Makefile:1009: recipe for target 'prepare0' failed > make[2]: *** [prepare0] Error 2 > make[2]: *** Waiting for unfinished jobs.... > HOSTCC scripts/mod/modpost.o > HOSTCC scripts/mod/sumversion.o > HOSTLD scripts/mod/modpost > make[2]: *** wait: No child processes. Stop. > package/pkg-generic.mk:289: recipe for target > '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' > failed > make[1]: *** > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] > Error 2 > Makefile:84: recipe for target '_all' failed > make: *** [_all] Error 2 This seems not to be the defconfig from above? It now uses linux-custom ... The failure may be due to the default kernel configuration. Try to configure the correct one and see if you get further. > I think maybe I am still doing something wrong because it sure seems > to be compiling a lot of stuff instead of letting me configure things. It gets better once everything necessary is built. >> >> >> >> >> Copy usbcore.ko from Buildroot target/lib/modules/{kernel-version}/ >> >> to the corresponding location on your device and load the driver with >> >> modprobe. >> >> >> >> Depending on which functionality (e.g. USB_STORAGE) you want on your >> >> USB port, additional configurations changes may be necessary. >> > >> > Yes, USB storage functionality is what I would like to add back in. >> > Incidentally, this is a newer router than the one I was experimenting >> > with before; this one has a Puma 6 CPU. Though, oddly I found it >> > necessary to select an armv5 CPU type in buildroot in order to get >> > binaries that work, despite /proc/cpuinfo on the device claiming it is >> > armv6. >> > >> >> >> >> Kind regards, >> >> Andreas >> >> >> >> > This time I successfully managed to build other binaries (e.g. >> >> > dropbear, busybox) which run OK on the device. >> >> > >> >> > Thanks, >> >> > Dan Jackson. >> >> > -------------- next part -------------- An HTML attachment was >> >> > scrubbed... >> >> > URL: >> >> > > >> > 9/4 >> >> > 3c49a2d/attachment.html> >> >> >> >> [1] >> >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103FB/ >> >> [2] >> >> >> https://buildroot.org/downloads/manual/manual.html#_advanced_usage, From alseycmiller at gmail.com Tue Mar 29 18:25:36 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 11:25:36 -0700 Subject: [Buildroot] [PATCH] package/cmake: bump version to 3.22.3 In-Reply-To: <20220329145904.63900-1-andreynech@gmail.com> References: <20220329145904.63900-1-andreynech@gmail.com> Message-ID: <9D9C16F3-628C-4BA5-B218-5066F12FAEFD@gmail.com> This newer version of cmake is also needed to cross compile Apple?s Swift programming language, so it would be great if this got merged. > On Mar 29, 2022, at 7:59 AM, Andrey Nechypurenko wrote: > > Version 3.20 is the first one where the following issue is fixed: > https://gitlab.kitware.com/cmake/cmake/-/issues/18299 > Was affected by this bug and decide to bump the version to the > latest stable > --- > package/cmake/cmake.hash | 4 ++-- > package/cmake/cmake.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash > index da514a6d6b..1749db8c27 100644 > --- a/package/cmake/cmake.hash > +++ b/package/cmake/cmake.hash > @@ -1,5 +1,5 @@ > -# From https://cmake.org/files/v3.18/cmake-3.18.6-SHA-256.txt > -sha256 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600 cmake-3.18.6.tar.gz > +# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt > +sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz > > # Locally calculated > sha256 131b9ff756b64a25b7461c3c1382e70b16c70a5b4833a1577897fa3ea6d88f8d Copyright.txt > diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk > index 4177b119ab..053658fad6 100644 > --- a/package/cmake/cmake.mk > +++ b/package/cmake/cmake.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -CMAKE_VERSION_MAJOR = 3.18 > -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 > +CMAKE_VERSION_MAJOR = 3.22 > +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 > CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) > CMAKE_LICENSE = BSD-3-Clause > CMAKE_LICENSE_FILES = Copyright.txt > -- > 2.32.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Tue Mar 29 18:44:58 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 29 Mar 2022 20:44:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/nbd: needs host-bison Message-ID: <20220329184458.289902-1-fontaine.fabrice@gmail.com> host-bison is mandatory to avoid the following build failure since bump to version 3.24 in commit bf2e459bb9fc9fe57147313cda35f7022172e6e8 and https://github.com/NetworkBlockDevice/nbd/commit/cd099ee7d0602104506bdd5063c0a3db2ec9b550: configure: error: bison is required Fixes: - http://autobuild.buildroot.org/results/05872813c9e9b9f39f960fa9a33ad82dc124c808 Signed-off-by: Fabrice Fontaine --- package/nbd/nbd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index f0fb23910e..50f698dd24 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -8,7 +8,7 @@ NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -NBD_DEPENDENCIES = host-pkgconf libglib2 +NBD_DEPENDENCIES = host-bison host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 NBD_LICENSE_FILES = COPYING NBD_CPE_ID_VENDOR = network_block_device_project -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:56 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:56 +0000 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain Message-ID: <20220329185059.943889-1-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb6..9b36ee2b47 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES - +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) $(2)_BUILDDIR = $$($(2)_SRCDIR) @@ -82,6 +82,7 @@ ifeq ($(4),target) # documented as a standard CMake variable. If a package supports it, # it must handle it explicitly. # +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) define $(2)_CONFIGURE_CMDS (mkdir -p $$($$(PKG)_BUILDDIR) && \ cd $$($$(PKG)_BUILDDIR) && \ @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS ) endef else +define $(2)_CONFIGURE_CMDS + (mkdir -p $$($$(PKG)_BUILDDIR) && \ + cd $$($$(PKG)_BUILDDIR) && \ + rm -f CMakeCache.txt && \ + PATH=$$(BR_PATH) \ + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ + $$(CMAKE_QUIET) \ + $$($$(PKG)_CONF_OPTS) \ + ) +endef +endif +else # Configure package for host define $(2)_CONFIGURE_CMDS -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:57 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:57 +0000 Subject: [Buildroot] [PATCH 2/4] package/libdispatch: add libdispatch package In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <20220329185059.943889-2-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/Config.in | 1 + package/libdispatch/Config.in | 43 ++++++++++++++++++++++ package/libdispatch/libdispatch.hash | 1 + package/libdispatch/libdispatch.mk | 53 ++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 package/libdispatch/Config.in create mode 100644 package/libdispatch/libdispatch.hash create mode 100644 package/libdispatch/libdispatch.mk diff --git a/package/Config.in b/package/Config.in index 0d5d763180..e217ff5282 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdispatch/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in new file mode 100644 index 0000000000..f4fa5e47fb --- /dev/null +++ b/package/libdispatch/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + bool + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH + string + default "aarch64" if BR2_aarch64 + default "armv5" if BR2_ARM_CPU_ARMV5 + default "armv6" if BR2_ARM_CPU_ARMV6 + default "armv7" if BR2_ARM_CPU_ARMV7A + default "x86_64" if BR2_x86_64 + default "powerpc" if BR2_powerpc + default "mips" if BR2_mips + default "mipsel" if BR2_mipsel + default "mips64" if BR2_mips64 + default "mips64el" if BR2_mips64el + default "riscv64" if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH + bool "libdispatch" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBBSD + + help + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + http://swift.org + +comment "libdispatch needs a toolchain w/ Glibc, wchar, threads, C++, dynamic library" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ No newline at end of file diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash new file mode 100644 index 0000000000..64543b56eb --- /dev/null +++ b/package/libdispatch/libdispatch.hash @@ -0,0 +1 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab libdispatch-swift-5.6-RELEASE.tar.gz diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk new file mode 100644 index 0000000000..a3b441ba36 --- /dev/null +++ b/package/libdispatch/libdispatch.mk @@ -0,0 +1,53 @@ +### Grand Central Dispatch +LIBDISPATCH_VERSION = 5.6 +LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE) +LIBDISPATCH_LICENSE = Apache-2.0 +LIBDISPATCH_LICENSE_FILES = LICENSE +LIBDISPATCH_INSTALL_STAGING = YES +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN = NO +LIBDISPATCH_DEPENDENCIES = host-clang host-lld libbsd + +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv7) +LIBDISPATCH_TARGET_NAME = armv7-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv6) +LIBDISPATCH_TARGET_NAME = armv6-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_TARGET_NAME = armv5-unknown-linux-gnueabi +else +LIBDISPATCH_TARGET_NAME = $(LIBDISPATCH_TARGET_ARCH)-unknown-linux-gnu +endif + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 +else +LIBDISPATCH_EXTRA_FLAGS = +endif + +LIBDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + -DCMAKE_C_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + +define LIBDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +$(eval $(cmake-package)) -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:58 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:58 +0000 Subject: [Buildroot] [PATCH 3/4] package/libdispatch: add fix for 32-bit arm In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <20220329185059.943889-3-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/libdispatch/arm-yield.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/libdispatch/arm-yield.patch diff --git a/package/libdispatch/arm-yield.patch b/package/libdispatch/arm-yield.patch new file mode 100644 index 0000000000..fa7cf7cce4 --- /dev/null +++ b/package/libdispatch/arm-yield.patch @@ -0,0 +1,13 @@ +diff --git a/src/shims/yield.c b/src/shims/yield.c +index 43f0017..d0c5fff 100644 +--- a/src/shims/yield.c ++++ b/src/shims/yield.c +@@ -36,7 +36,7 @@ void * + _dispatch_wait_for_enqueuer(void **ptr) + { + #if !DISPATCH_HW_CONFIG_UP +-#if defined(__arm__) || defined(__arm64__) ++#if (defined(__arm__) && defined(__APPLE__)) || defined(__arm64__) + int spins = DISPATCH_WAIT_SPINS_WFE; + void *value; + while (unlikely(spins-- > 0)) { -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:50:59 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 18:50:59 +0000 Subject: [Buildroot] [PATCH 4/4] DEVELOPERS: add Alsey Miller for libdispatch In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <20220329185059.943889-4-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a66b9d7eee..555ec0175b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -122,6 +122,9 @@ F: boot/opensbi/ F: configs/hifive_unleashed_defconfig F: package/xen/ +N: Alsey Miller +F: package/libdispatch/ + N: Alvaro G. M F: package/dcron/ F: package/libxmlrpc/ -- 2.35.1 From alseycmiller at gmail.com Tue Mar 29 18:54:56 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 11:54:56 -0700 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries In-Reply-To: <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> References: <20220328060027.2483147-1-alseycmiller@gmail.com> <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> Message-ID: I have submitted new patches for only libdispatch and minimal changes to cmake to support building Apple?s (and Clang based) projects. > On Mar 28, 2022, at 1:35 PM, Arnout Vandecappelle wrote: > > Hi Alsey, > > Thank you for your contribution! I have a number of review comments below. Please take them into account and send a new patch series. For the time being, I've marked the patch as Changes Requested in patchwork. > > Firt of all, the patch should be split up in separate patches: one patch per package you add. Make sure all of them are posted together and in the correct order. Each patch should have as subject "package/...: new package". > > I have a few more comments below, but it's hard to properly review such a big patch so I will probably have missed some things. > > On 28/03/2022 08:00, Alsey Coleman Miller wrote: >> Signed-off-by: Alsey Coleman Miller >> --- >> package/Config.in | 11 + > > > Please add yourself to the DEVELOPERS file [1] for this package. This way, you'll get an e-mail if the package fails in the autobuilders, or when a new version is released if the package is registered on release-monitoring.org. > > [snip] >> diff --git a/package/foundation/Config.in b/package/foundation/Config.in >> new file mode 100644 >> index 0000000000..7a9dc8b514 >> --- /dev/null >> +++ b/package/foundation/Config.in >> @@ -0,0 +1,14 @@ >> +if BR2_PACKAGE_SWIFT > > I get that you only want swift-related packages to appear in the menus if swift itself is selected. It would be even better, then, to sort all of them under the swift main entry. Perhaps even prefix all of them with swift-, like is done for python, perl and lua packages. > >> + >> +config BR2_PACKAGE_FOUNDATION >> + bool "foundation" >> + depends on BR2_PACKAGE_SWIFT >> + select BR2_PACKAGE_LIBSWIFTDISPATCH >> + select BR2_PACKAGE_LIBCURL >> + select BR2_PACKAGE_LIBXML2 >> + help >> + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. > > Please make sure indentation is done correctly, as reported by the utils/check-package script. In this case, the line length is way too long. > >> + >> + http://swift.org >> + >> +endif >> diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash >> new file mode 100644 >> index 0000000000..f15edb8420 >> --- /dev/null >> +++ b/package/foundation/foundation.hash >> @@ -0,0 +1 @@ >> +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz >> diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk >> new file mode 100644 >> index 0000000000..93c7cedbdd >> --- /dev/null >> +++ b/package/foundation/foundation.mk >> @@ -0,0 +1,102 @@ >> +### Foundation > > Missin comment header, as reported by check-package (I'm not going to repeat all the other check-package errors). > >> +FOUNDATION_VERSION = $(SWIFT_VERSION) >> +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags > > This doesn't look right - shouldn't you be using the github helper? > >> +FOUNDATION_LICENSE = Apache-2.0 >> +FOUNDATION_LICENSE_FILES = LICENSE >> +FOUNDATION_INSTALL_STAGING = YES >> +FOUNDATION_INSTALL_TARGET = YES > > _INSTALL_TARGET = YES is not needed, it's done automatically. > >> +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO >> +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch >> + >> +FOUNDATION_CONF_OPTS += \ >> + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ >> + -DCMAKE_Swift_FLAGS_DEBUG="" \ > > Please consistently indent with one tab. > >> + -DCMAKE_Swift_FLAGS_RELEASE="" \ >> + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ >> + -DCF_DEPLOYMENT_SWIFT=ON \ >> + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ >> + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +ifeq ($(BR2_PACKAGE_LIBCURL),y) > > Since Config.in selects libcurl, this is always true. > >> + FOUNDATION_DEPENDENCIES += libcurl > > No indentation within make conditions. > >> + FOUNDATION_CONF_OPTS += \ >> + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ >> + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +endif >> + >> +ifeq ($(BR2_PACKAGE_LIBXML2),y) >> + FOUNDATION_DEPENDENCIES += libxml2 >> + FOUNDATION_CONF_OPTS += \ >> + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ >> + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ >> + >> +endif >> + >> +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) >> +else >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build >> +endif > > This stuff is done automatically by the infra. > >> + >> +define FOUNDATION_CONFIGURE_CMDS >> + # Workaround Dispatch defined with cmake and module >> + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch >> + # Clean >> + rm -rf $(FOUNDATION_BUILDDIR) >> + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation >> + # Configure >> + (mkdir -p $(FOUNDATION_BUILDDIR) && \ >> + cd $(FOUNDATION_BUILDDIR) && \ >> + rm -f CMakeCache.txt && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ >> + -DCMAKE_INSTALL_PREFIX="/usr" \ >> + -DBUILD_SHARED_LIBS=ON \ >> + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ >> + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ >> + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ >> + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + $(FOUNDATION_CONF_OPTS) \ >> + ) > > I haven't looked at the details, but not using the cmake infrastructure is not a good idea. > > >> +endef >> + >> +define FOUNDATION_BUILD_CMDS >> + # Compile >> + (cd $(FOUNDATION_BUILDDIR) && ninja) > > If the problem is that it only supports the ninja build system: please use [2] and explain in the cover letter of your series that it depends on that. > >> +endef >> + >> +define FOUNDATION_INSTALL_TARGET_CMDS >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ >> +endef >> + >> +define FOUNDATION_INSTALL_STAGING_CMDS >> + # Copy libraries >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + # Copy CoreFoundation module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation >> + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ >> + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + # Copy CFXMLInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + # Copy CFURLSessionInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + # Copy Swift modules >> + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ >> + # Restore Dispatch headers >> + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) >> + >> +endef >> + >> +$(eval $(generic-package)) >> diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in >> new file mode 100644 >> index 0000000000..2f7c115375 >> --- /dev/null >> +++ b/package/libdispatch/Config.in >> @@ -0,0 +1,11 @@ >> +config BR2_PACKAGE_LIBDISPATCH >> + bool "libdispatch" >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC > > When there are toolchain dependencies, there should also be a comment that tells the user why the package can't be selected. Look at other packages for examples. > > Since it's not clear here, you should probably explain in the commit message why these dependencies are needed. > >> + select BR2_PACKAGE_LIBBSD >> + >> + help >> + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. >> + >> + http://swift.org >> diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash >> new file mode 100644 >> index 0000000000..a89c48c55f >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.hash >> @@ -0,0 +1,2 @@ >> +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz >> +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch >> diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk >> new file mode 100644 >> index 0000000000..a334c3052d >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.mk >> @@ -0,0 +1,78 @@ >> +### Grand Central Dispatch (C API) >> +LIBDISPATCH_VERSION = $(SWIFT_VERSION) >> +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags >> +LIBDISPATCH_LICENSE = Apache-2.0 >> +LIBDISPATCH_LICENSE_FILES = LICENSE >> +LIBDISPATCH_INSTALL_STAGING = YES >> +LIBDISPATCH_INSTALL_TARGET = YES >> +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO >> +LIBDISPATCH_DEPENDENCIES = libbsd >> +LIBDISPATCH_PATCH = \ >> + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch > > Downloading a patch from your own gist isn't exactly great for allowing reviews :-). Please instead include the patch directly in Buildroot. Since upstream is managed in git, please make this a git-formatted patch (generated with git format-patch -N) [1]. Make sure it has a summary and description just like any other commit, and also include your Signed-off-by. The latter is needed to ascertain that the patch may be distributed under the upstream project's license (which may be different from Buildroot's). > > [snip] >> diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in >> new file mode 100644 >> index 0000000000..cbeed69667 >> --- /dev/null >> +++ b/package/swift-hello/Config.in >> @@ -0,0 +1,10 @@ >> +if BR2_PACKAGE_SWIFT >> + >> +config BR2_PACKAGE_SWIFT_HELLO >> + bool "swift-hello" >> + depends on BR2_PACKAGE_SWIFT >> + depends on BR2_PACKAGE_FOUNDATION >> + help >> + Demo application for Swift. > > If I understand correctly, this package serves no purpose other than proving that it's possibleto biuld a swift application in Buildroot. Nobody is ever going to select it. Instead, it would be better to move it to the runtime test infrastructure (and of course actually runtime test it, which proves that the generated binaries actually work). > > [snip] >> diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk >> new file mode 100644 >> index 0000000000..b3cded3f7c >> --- /dev/null >> +++ b/package/swift-hello/swift-hello.mk >> @@ -0,0 +1,33 @@ >> +### Swift Demo >> +SWIFT_HELLO_VERSION = 0.1.0 >> +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src >> +SWIFT_HELLO_SITE_METHOD = local >> +SWIFT_HELLO_INSTALL_STAGING = NO >> +SWIFT_HELLO_INSTALL_TARGET = YES >> +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES >> +SWIFT_HELLO_DEPENDENCIES = swift foundation >> +SWIFT_HELLO_EXECUTABLES = swift-hello >> +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) >> + >> +define SWIFT_HELLO_BUILD_CMDS >> + ( \ > > These parenthesis are actually not needed. They are still used in a lot of places in Buildroot, but that's legacy stuff. > >> + cd $(SWIFT_HELLO_SRCDIR) && \ >> + rm -rf .build && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ >> + ) >> +endef >> + >> +define SWIFT_HELLO_INSTALL_TARGET_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ > > Please don't keep commented-out lines. > >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello >> +endef >> + >> +define SWIFT_HELLO_INSTALL_STAGING_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello >> +endef >> + >> +$(eval $(generic-package)) > > [snip] >> +config BR2_PACKAGE_SWIFT >> + bool "swift" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC >> + select BR2_PACKAGE_ICU >> + select BR2_PACKAGE_LIBDISPATCH >> + help >> + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. >> + >> + http://swift.org >> + >> +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH >> + >> +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS >> + string "Path to host Swift toolchain" >> + default "/usr/bin" >> + >> +config BR2_PACKAGE_SWIFT_LLVM_DIR >> + string "Path to host LLVM library path" >> + default "/usr/lib/llvm-12" > > I guess swift is built on top of LLVM. Is it possible to use package/llvm, or is it a patched version? > >> + >> +endif >> + >> +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ >> + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > > [snip] >> diff --git a/package/swift/swift.mk b/package/swift/swift.mk >> new file mode 100644 >> index 0000000000..da10aae8fd >> --- /dev/null >> +++ b/package/swift/swift.mk >> @@ -0,0 +1,232 @@ >> +### Apple's Swift Programming Language >> +SWIFT_VERSION = 5.6 >> +SWIFT_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +SWIFT_SITE = https://github.com/apple/swift/archive/refs/tags >> +SWIFT_LICENSE = Apache-2.0 >> +SWIFT_LICENSE_FILES = LICENSE.txt >> +SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH)) >> +SWIFT_NATIVE_PATH = $(call qstrip,$(BR2_PACKAGE_SWIFT_NATIVE_TOOLS)) >> +SWIFT_LLVM_DIR = $(call qstrip,$(BR2_PACKAGE_SWIFT_LLVM_DIR)) >> +SWIFT_INSTALL_STAGING = YES >> +SWIFT_INSTALL_TARGET = YES >> +SWIFT_SUPPORTS_IN_SOURCE_BUILD = NO >> +SWIFT_DEPENDENCIES = icu libxml2 libbsd libdispatch >> + >> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) >> +SWIFT_CONF_ENV += LIBS="-latomic" >> +endif >> + >> +HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift >> +SWIFTPM_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/$(SWIFT_TARGET_NAME)-toolchain.json > > This should have simply a SWIFT_ prefix, not SWIFTPM. > > [snip] >> +define SWIFT_INSTALL_STAGING_CMDS >> + mkdir -p $(HOST_SWIFT_SUPPORT_DIR) >> + # Copy runtime libraries and swift interfaces >> + cp -rf $(SWIFT_BUILDDIR)/lib/swift ${STAGING_DIR}/usr/lib/ >> + # Generate SwiftPM cross compilation toolchain file >> + rm -f $(SWIFTPM_DESTINATION_FILE) >> + touch $(SWIFTPM_DESTINATION_FILE) >> + echo '{' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) > > We generally prefer to have a template file (called swift-toolchain.json.in) in the package directory, and use sed to replace @XXXX@ entries. See e.g. how it's done for cmake's toolchainfile. > >> + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ >> + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) >> + echo '}' >> $(SWIFTPM_DESTINATION_FILE) >> + >> +endef >> + >> +$(eval $(generic-package)) >> +$(eval $(host-generic-package)) >> \ No newline at end of file > > Please make sure there's a newline at the end of the file. > > Regards, > Arnout > > [1] https://buildroot.org/downloads/manual/manual.html#DEVELOPERS > [2] https://patchwork.ozlabs.org/project/buildroot/list/?series=282194 > [3] https://buildroot.org/manual.html#_format_and_licensing_of_the_package_patches From alseycmiller at gmail.com Tue Mar 29 19:17:50 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 12:17:50 -0700 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: <20220329185059.943889-1-alseycmiller@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. > On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: > > Signed-off-by: Alsey Coleman Miller > --- > package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 3b1db35fb6..9b36ee2b47 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > > $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > - > +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES > > ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) > $(2)_BUILDDIR = $$($(2)_SRCDIR) > @@ -82,6 +82,7 @@ ifeq ($(4),target) > # documented as a standard CMake variable. If a package supports it, > # it must handle it explicitly. > # > +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) > define $(2)_CONFIGURE_CMDS > (mkdir -p $$($$(PKG)_BUILDDIR) && \ > cd $$($$(PKG)_BUILDDIR) && \ > @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS > ) > endef > else > +define $(2)_CONFIGURE_CMDS > + (mkdir -p $$($$(PKG)_BUILDDIR) && \ > + cd $$($$(PKG)_BUILDDIR) && \ > + rm -f CMakeCache.txt && \ > + PATH=$$(BR_PATH) \ > + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > + -DCMAKE_INSTALL_PREFIX="/usr" \ > + -DCMAKE_COLOR_MAKEFILE=OFF \ > + -DBUILD_DOC=OFF \ > + -DBUILD_DOCS=OFF \ > + -DBUILD_EXAMPLE=OFF \ > + -DBUILD_EXAMPLES=OFF \ > + -DBUILD_TEST=OFF \ > + -DBUILD_TESTS=OFF \ > + -DBUILD_TESTING=OFF \ > + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ > + $$(CMAKE_QUIET) \ > + $$($$(PKG)_CONF_OPTS) \ > + ) > +endef > +endif > +else > > # Configure package for host > define $(2)_CONFIGURE_CMDS > -- > 2.35.1 > From dan at thejacksons.uk Tue Mar 29 19:19:52 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Tue, 29 Mar 2022 19:19:52 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <54f87d03a99935fb452424992a81409c@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 29 March 2022 18:52 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > On 2022-03-29 16:17, Dan Jackson wrote: > >> -----Original Message----- > >> From: Andreas Ziegler > >> Sent: 29 March 2022 16:14 > >> To: Dan Jackson > >> Cc: buildroot at buildroot.org > >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel > >> - > >> possible? > >> > >> Hi Dan, > >> > >> On 2022-03-29 12:48, Dan Jackson wrote: > >> >> -----Original Message----- > >> >> From: Andreas Ziegler > >> >> Sent: 29 March 2022 10:40 > >> >> To: Dan Jackson > >> >> Cc: Buildroot > >> >> Subject: Re: Adding USB support to existing device on 2.6.39.3 > >> >> kernel > >> >> - > >> >> possible? > >> >> > >> >> Hi Dan, > >> >> > >> >> On 2022-03-29 05:58, Dan Jackson wrote: > >> >> > >> >> > Hello, > >> >> > > >> >> > Sorry once again if this is a silly/noob question. > >> >> > > >> >> > If I have an existing router device running a 2.6.39.3 kernel, > >> >> > which has a USB port and is capable of supporting USB devices, > >> >> > but the manufacturer has removed/not installed the necessary > >> >> > kernel modules, can I use Buildroot to recreate the missing > >> >> > modules and thus re-enable the missing USB support? > >> >> > >> >> It might work: the driver is contained in the USB module, so > >> >> building and loading that module could do the trick. > >> >> > >> >> > If so, how would I do it? > >> >> > >> >> Supposing the Linux kernel source contained in [1] is the one that > >> >> is running on your device, you need to configure Buildroot to > >> >> build a Linux kernel (BR2_LINUX_KERNEL). The manual [2] has some > >> >> information about how to do this for a Kernel source tree (see chapter > 8.14.6). > >> > > >> > It looks like I got that part to work. The buildroot build process > >> > definitely seems to be able to see the kernel source tree which is > >> > in /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux- > 2.6.39.3/src. > >> > > >> >> > >> >> You then need to enable USB support in the kernel (Device Drivers > >> >> -> USB support), probably > >> >> > >> >> CONFIG_USB=m > >> >> CONFIG_USB_EHCI_HCD=y > >> >> CONFIG_USB_OHCI_HCD=y > >> >> > >> >> is enough, otherwise try some of the hardware specific (driver) > >> >> options. > >> > > >> > This is where I have fallen down. I did "make linux-menuconfig" > >> > expecting to be able to configure the kernel/modules (as I couldn't > >> > see any options for that in buildroot's own "make menuconfig"). > >> > > >> > However, at this point it seems like it went off and tried to build > >> > the whole kernel from a default configuration. > >> > >> 'make linux-menuconfig' needs a working build system. If they are not > >> present, all dependencies of the Linux package get built. First step > >> is the installation of the kernel source; if Buildroot tries to > >> install a default kernel, something is amiss with your configuration. > >> > >> > This eventually failed, so I tried "make linux-reconfigure" at that > >> > point but that did not work either. > >> > > >> > Here is the error it gave upon failure: > >> > > >> > /home/danj/buildroot-2022.02/output/host/lib/gcc/armeb-buildroot- > >> linux-uclibcgnueabi/11.2.0/../../../../armeb-buildroot-linux- > >> uclibcgnueabi/bin/ld: > >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb- > buildroo > >> > t- > >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > >> > error loading plugin: > >> > /home/danj/buildroot-2022.02/output/host/libexec/gcc/armeb- > buildroo > >> > t- > >> linux-uclibcgnueabi/11.2.0/liblto_plugin.so: > >> > undefined symbol: _onload > >> > collect2: error: ld returned 1 exit status > >> > Makefile.in:114: recipe for target '../utils/getconf' failed > >> > make[3]: *** [../utils/getconf] Error 1 > >> > Makefile.in:455: recipe for target 'utils' failed > >> > make[2]: *** [utils] Error 2 > >> > package/pkg-generic.mk:380: recipe for target > >> > '/home/danj/buildroot-2022.02/output/build/uclibc- > >> 1.0.40/.stamp_target_installed' > >> > failed > >> > make[1]: *** > >> > [/home/danj/buildroot-2022.02/output/build/uclibc-1.0.40/.stamp_tar > >> > get > >> > _installed] > >> > Error 2 > >> > Makefile:84: recipe for target '_all' failed > >> > make: *** [_all] Error 2 > >> > >> This error is from the uClibc build - do you use an internal or > >> external toolchain? Maybe you have conflicting static /dynamic > >> library options? > >> Again, probably a buildroot misconfiguration ... > > > > This turned out to be that I had some wrong environment variables set > > from a previous attempt. Logged out and back in and now I am past that > > error. > > > >> > >> Maybe you could post your buildroot configuration (the result of make > >> savedefconfig)? > > > > It's quite short as it turns out: > > > > BR2_armeb=y > > BR2_STATIC_LIBS=y > > BR2_KERNEL_HEADERS_VERSION=y > > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > > BR2_PTHREAD_DEBUG=y > > BR2_BINUTILS_VERSION_2_37_X=y > > BR2_GCC_VERSION_9_X=y > > BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_PACKAGE_HOST_GDB=y > > BR2_GDB_VERSION_9_2=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_PACKAGE_DROPBEAR=y > > > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions > .h" > > BR2_PACKAGE_JOE=y > > The configuration uses a kernel downloaded from kernel.org, not the vendor > kernel. You need to configure Buildroot to use a custom source directory. > > > I can see I have got a USE_ARCH_DEFAULT_CONFIG in there which I'm > > guessing is part of my problems? > > You need to configure Buildroot to use your existing .config with > BR2_LINUX_CUSTOM_KERNEL_CONFIG_FILE. > > >> > >> > Looking at this error message, maybe I need to select an older > >> > version of gcc, in my buildroot configuration? Is it that the > >> > kernel can only be compiled by gcc versions that existed at the time? > >> > >> Older kernels used to have a include/compiler.h which had predefined > >> includes for specific compiler versions. Use the oldest compiler > >> available in Buildroot and try to either get a compiler-gcc9.h from a > >> newer kernel or make your own. I believe this schema changed > >> somewhere between 3.x and 4.x For newer compilers, this file is > >> comparatively empty. > > > > GCC 9.x is the oldest option available in current buildroot so I have > > switched to that. > > > > I found a compiler-gcc5.h in kernel 4.1, newer kernels do not have any > > numbered files of this type at all. I downloaded this one and > > symlinked it as compiler-gcc9.h and it looks like this got me past > > this error. > > > > However, now I have a new missing file error, and I can't seem to > > locate a suitable candidate: > > > > In file included from > > /home/danj/buildroot-2022.02/output/build/linux- > custom/arch/arm/include/asm/system.h:165, > > from > > /home/danj/buildroot-2022.02/output/build/linux- > custom/arch/arm/include/asm/bitops.h:27, > > from include/linux/bitops.h:22, > > from include/linux/kernel.h:17, > > from include/linux/sched.h:55, > > from arch/arm/kernel/asm-offsets.c:13: > > /home/danj/buildroot-2022.02/output/build/linux- > custom/arch/arm/include/asm/memory.h:19:10: > > fatal error: mach/memory.h: No such file or directory > > 19 | #include > > | ^~~~~~~~~~~~~~~ > > compilation terminated. > > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: > > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > > Makefile:1009: recipe for target 'prepare0' failed > > make[2]: *** [prepare0] Error 2 > > make[2]: *** Waiting for unfinished jobs.... > > HOSTCC scripts/mod/modpost.o > > HOSTCC scripts/mod/sumversion.o > > HOSTLD scripts/mod/modpost > > make[2]: *** wait: No child processes. Stop. > > package/pkg-generic.mk:289: recipe for target > > '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' > > failed > > make[1]: *** > > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] > > Error 2 > > Makefile:84: recipe for target '_all' failed > > make: *** [_all] Error 2 > > This seems not to be the defconfig from above? It now uses linux-custom ... > The failure may be due to the default kernel configuration. Try to configure > the correct one and see if you get further. > > > I think maybe I am still doing something wrong because it sure seems > > to be compiling a lot of stuff instead of letting me configure things. > > It gets better once everything necessary is built. Still no luck I'm afraid. Same error with mach/memory.h as above. Buildroot defconfig now looks like this: BR2_armeb=y BR2_STATIC_LIBS=y BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_PTHREAD_DEBUG=y BR2_BINUTILS_VERSION_2_37_X=y BR2_GCC_VERSION_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_HOST_GDB=y BR2_GDB_VERSION_9_2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" BR2_PACKAGE_JOE=y I forgot to mention this before but the buildroot manual page you mentioned said to create a local.mk file in order to use external source, this looks like this: LINUX_OVERRIDE_SRCDIR = /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ For the kernel configuration I entered the kernel source dir and did "make menuconfig", I left everything at the defaults except for enabling the USB related items. The resulting configuration file is attached as a text file. Unfortunately it's been literally decades since I last actually compiled a kernel, so I'm afraid I have no idea what bits would be suitable to disable/remove to get the results I want (I'm guessing this will be the most likely way to eliminate the error I'm getting?) > > >> > >> >> > >> >> Copy usbcore.ko from Buildroot > >> >> target/lib/modules/{kernel-version}/ > >> >> to the corresponding location on your device and load the driver > >> >> with modprobe. > >> >> > >> >> Depending on which functionality (e.g. USB_STORAGE) you want on > >> >> your USB port, additional configurations changes may be necessary. > >> > > >> > Yes, USB storage functionality is what I would like to add back in. > >> > Incidentally, this is a newer router than the one I was > >> > experimenting with before; this one has a Puma 6 CPU. Though, oddly > >> > I found it necessary to select an armv5 CPU type in buildroot in > >> > order to get binaries that work, despite /proc/cpuinfo on the > >> > device claiming it is armv6. > >> > > >> >> > >> >> Kind regards, > >> >> Andreas > >> >> > >> >> > This time I successfully managed to build other binaries (e.g. > >> >> > dropbear, busybox) which run OK on the device. > >> >> > > >> >> > Thanks, > >> >> > Dan Jackson. > >> >> > -------------- next part -------------- An HTML attachment was > >> >> > scrubbed... > >> >> > URL: > >> >> > >> >> > 032 > >> >> > 9/4 > >> >> > 3c49a2d/attachment.html> > >> >> > >> >> [1] > >> >> https://sourceforge.net/projects/dg3270.arris/files/DG3270_9.1.103 > >> >> FB/ > >> >> [2] > >> >> > >> > https://buildroot.org/downloads/manual/manual.html#_advanced_usage, -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: kernelconfiguration.txt URL: From james.hilliard1 at gmail.com Tue Mar 29 19:26:35 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 13:26:35 -0600 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: > > This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. I think this is probably a better way of dealing with the issue: https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > > > On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: > > > > Signed-off-by: Alsey Coleman Miller > > --- > > package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- > > 1 file changed, 24 insertions(+), 1 deletion(-) > > > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > > index 3b1db35fb6..9b36ee2b47 100644 > > --- a/package/pkg-cmake.mk > > +++ b/package/pkg-cmake.mk > > @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > > $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > > > > $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > > - > > +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES > > > > ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) > > $(2)_BUILDDIR = $$($(2)_SRCDIR) > > @@ -82,6 +82,7 @@ ifeq ($(4),target) > > # documented as a standard CMake variable. If a package supports it, > > # it must handle it explicitly. > > # > > +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) > > define $(2)_CONFIGURE_CMDS > > (mkdir -p $$($$(PKG)_BUILDDIR) && \ > > cd $$($$(PKG)_BUILDDIR) && \ > > @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS > > ) > > endef > > else > > +define $(2)_CONFIGURE_CMDS > > + (mkdir -p $$($$(PKG)_BUILDDIR) && \ > > + cd $$($$(PKG)_BUILDDIR) && \ > > + rm -f CMakeCache.txt && \ > > + PATH=$$(BR_PATH) \ > > + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > > + -DCMAKE_INSTALL_PREFIX="/usr" \ > > + -DCMAKE_COLOR_MAKEFILE=OFF \ > > + -DBUILD_DOC=OFF \ > > + -DBUILD_DOCS=OFF \ > > + -DBUILD_EXAMPLE=OFF \ > > + -DBUILD_EXAMPLES=OFF \ > > + -DBUILD_TEST=OFF \ > > + -DBUILD_TESTS=OFF \ > > + -DBUILD_TESTING=OFF \ > > + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ > > + $$(CMAKE_QUIET) \ > > + $$($$(PKG)_CONF_OPTS) \ > > + ) > > +endef > > +endif > > +else > > > > # Configure package for host > > define $(2)_CONFIGURE_CMDS > > -- > > 2.35.1 > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Mar 29 19:34:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:34:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: switch to autotools-package In-Reply-To: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 13 Mar 2022 18:39:19 +0100") References: <20220313173919.1162577-1-fontaine.fabrice@gmail.com> Message-ID: <8735j0bliq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Switch to autotools-package to avoid the following static build failure > since commit d661740201405970f65c16c39a79f4148705af30: > [ 56%] Linking C executable rtl_biast > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: > attempted static link of dynamic object > `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' > collect2: error: ld returned 1 exit status > Drop both cmake-related patches > Fixes: > - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:42:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:42:05 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.3 In-Reply-To: <20220314183014.2173419-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 14 Mar 2022 12:30:14 -0600") References: <20220314183014.2173419-1-james.hilliard1@gmail.com> Message-ID: <87y20sa6lu.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:44:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:39 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.4.1 In-Reply-To: <20220314183234.2174325-1-james.hilliard1@gmail.com> (James Hilliard's message of "Mon, 14 Mar 2022 12:32:34 -0600") References: <20220314183234.2174325-1-james.hilliard1@gmail.com> Message-ID: <87tubga6hk.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:45:09 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:45:09 +0200 Subject: [Buildroot] [PATCH] DEVELOPERS: Add some more entries for Thomas Huth In-Reply-To: <20220314203226.4481-1-huth@tuxfamily.org> (Thomas Huth's message of "Mon, 14 Mar 2022 21:32:26 +0100") References: <20220314203226.4481-1-huth@tuxfamily.org> Message-ID: <87pmm4a6gq.fsf@dell.be.48ers.dk> >>>>> "Thomas" == Thomas Huth writes: > I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU > machine, so I could help to have a look on these files, too. > Signed-off-by: Thomas Huth Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:44:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:56 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220329193608.546C985F4F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=658763f397e5e418c115e367aca20b18132764d9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3396e945dfc1482cb21b65e5451abc5ec96a796b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3397565457..d299eb79c8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2525,8 +2525,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni From peter at korsgaard.com Tue Mar 29 19:47:56 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:47:56 +0200 Subject: [Buildroot] [PATCH] fakeroot: Fix segfault on ppc64le In-Reply-To: <20220315130737.428449-1-joel@jms.id.au> (Joel Stanley's message of "Tue, 15 Mar 2022 23:37:37 +1030") References: <20220315130737.428449-1-joel@jms.id.au> Message-ID: <87lewsa6c3.fsf@dell.be.48ers.dk> >>>>> "Joel" == Joel Stanley writes: > When generating a filesystem image on a power10 build machine running > Ubuntu, we see a segfault when fakeroot is running chmod. > This has been reported and fixed upstream in Debian in version 1.26-1.2: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 > Add the samae patch to resolve the segfault. > Signed-off-by: Joel Stanley > --- > This isn't a commit in the fakeroot tree, rather a patch from the Debian > packaging. > I would appreciate if this was added to the 2022.02 stable tree. > Signed-off-by: Joel Stanley Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:48:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:48:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-rpi-gpio: enable package on aarch64 In-Reply-To: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> (Mirza Kapetanovic's message of "Tue, 15 Mar 2022 15:26:40 +0100") References: <20220315142640.2268645-1-mirza.kapetanovic@gmail.com> Message-ID: <87h77ga6al.fsf@dell.be.48ers.dk> >>>>> "Mirza" == Mirza Kapetanovic writes: > Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested > this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. > Signed-off-by: Mirza Kapetanovic Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:52:58 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:52:58 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 18:32:31 +0100") References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> Message-ID: <87czi4a63p.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > reintroduction of the package in commit > 16ff948444c3978d63f483344a3d92d994c64312: Huh? This is the commit where ola was reintroduced, but this is a failure in grpc and the config doesn't even have ola enabled? > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: > undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 > Signed-off-by: Fabrice Fontaine > --- > package/grpc/grpc.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > index 23b92f1750..9138b4ea59 100644 > --- a/package/grpc/grpc.mk > +++ b/package/grpc/grpc.mk > @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf > # which doesn't do this. These CARES settings trick the gRPC cmake code into > # not looking for c-ares at all and yet still linking with the library. > GRPC_CONF_OPTS = \ > + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ > -DgRPC_ABSL_PROVIDER=package \ > -D_gRPC_CARES_LIBRARIES=cares \ > -DgRPC_CARES_PROVIDER=none \ > @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ > -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > +GRPC_DEPENDENCIES += libexecinfo > +GRPC_EXE_LINKER_FLAGS += -lexecinfo > +endif > + > # grpc can use __atomic builtins, so we need to link with > # libatomic when available > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > +GRPC_EXE_LINKER_FLAGS += -latomic > endif > GRPC_CFLAGS = $(TARGET_CFLAGS) > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:56:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:56:43 +0200 Subject: [Buildroot] [PATCH 1/1] package/rygel: fix g_ir_compiler calls In-Reply-To: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 21:59:18 +0100") References: <20220315205918.2211690-1-fontaine.fabrice@gmail.com> Message-ID: <878rssa5xg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 0.40.2 in > commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: > [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command > FAILED: src/librygel-core/RygelCore-2.6.typelib > /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler > --output src/librygel-core/RygelCore-2.6.typelib > /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir > Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir > error parsing file > /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: > Failed to parse included gir GUPnP-1.2 > Fixes: > - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 19:57:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:57:46 +0200 Subject: [Buildroot] [PATCH 1/2] package/python-avro: renumber patch In-Reply-To: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 22:16:52 +0100") References: <20220315211653.2297582-1-fontaine.fabrice@gmail.com> Message-ID: <874k3ga5vp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber > patch > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From alseycmiller at gmail.com Tue Mar 29 19:58:25 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 12:58:25 -0700 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: References: <20220329185059.943889-1-alseycmiller@gmail.com> Message-ID: <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> That commit is not merged and only seems to override the C flags. How can we force cmake to use Clang for target packages? I would be fine with basing my work that patch if support for using Clang and as the C and C++ compiler is added. > On Mar 29, 2022, at 12:26 PM, James Hilliard wrote: > > On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: >> >> This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. > > I think this is probably a better way of dealing with the issue: > https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > >> >>> On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: >>> >>> Signed-off-by: Alsey Coleman Miller >>> --- >>> package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- >>> 1 file changed, 24 insertions(+), 1 deletion(-) >>> >>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk >>> index 3b1db35fb6..9b36ee2b47 100644 >>> --- a/package/pkg-cmake.mk >>> +++ b/package/pkg-cmake.mk >>> @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast >>> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast >>> >>> $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES >>> - >>> +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES >>> >>> ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) >>> $(2)_BUILDDIR = $$($(2)_SRCDIR) >>> @@ -82,6 +82,7 @@ ifeq ($(4),target) >>> # documented as a standard CMake variable. If a package supports it, >>> # it must handle it explicitly. >>> # >>> +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) >>> define $(2)_CONFIGURE_CMDS >>> (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>> cd $$($$(PKG)_BUILDDIR) && \ >>> @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS >>> ) >>> endef >>> else >>> +define $(2)_CONFIGURE_CMDS >>> + (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>> + cd $$($$(PKG)_BUILDDIR) && \ >>> + rm -f CMakeCache.txt && \ >>> + PATH=$$(BR_PATH) \ >>> + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ >>> + -DCMAKE_INSTALL_PREFIX="/usr" \ >>> + -DCMAKE_COLOR_MAKEFILE=OFF \ >>> + -DBUILD_DOC=OFF \ >>> + -DBUILD_DOCS=OFF \ >>> + -DBUILD_EXAMPLE=OFF \ >>> + -DBUILD_EXAMPLES=OFF \ >>> + -DBUILD_TEST=OFF \ >>> + -DBUILD_TESTS=OFF \ >>> + -DBUILD_TESTING=OFF \ >>> + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ >>> + $$(CMAKE_QUIET) \ >>> + $$($$(PKG)_CONF_OPTS) \ >>> + ) >>> +endef >>> +endif >>> +else >>> >>> # Configure package for host >>> define $(2)_CONFIGURE_CMDS >>> -- >>> 2.35.1 >>> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Tue Mar 29 20:01:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:01:11 +0200 Subject: [Buildroot] [PATCH 1/1] package/libbluray: bump to version 1.3.1 In-Reply-To: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 23:03:05 +0100") References: <20220315220305.2439467-1-fontaine.fabrice@gmail.com> Message-ID: <87zgl88r5k.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From james.hilliard1 at gmail.com Tue Mar 29 20:10:12 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 14:10:12 -0600 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> References: <20220329185059.943889-1-alseycmiller@gmail.com> <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> Message-ID: On Tue, Mar 29, 2022 at 1:58 PM Alsey Miller wrote: > > That commit is not merged and only seems to override the C flags. How can we force cmake to use Clang for target packages? I would be fine with basing my work that patch if support for using Clang and as the C and C++ compiler is added. It should allow overriding any of the toolchain variables like this: https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-6-james.hilliard1 at gmail.com/ I think this will pretty much work as is with your libdispatch patch: https://patchwork.ozlabs.org/project/buildroot/patch/20220329185059.943889-2-alseycmiller at gmail.com/ It should allow you to drop this part: LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN = NO You might also be able to drop some of the other conf opts since the toolchain file can then still be used with partial overrides. > > > On Mar 29, 2022, at 12:26 PM, James Hilliard wrote: > > > > On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: > >> > >> This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. > > > > I think this is probably a better way of dealing with the issue: > > https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ > > > >> > >>> On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: > >>> > >>> Signed-off-by: Alsey Coleman Miller > >>> --- > >>> package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- > >>> 1 file changed, 24 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > >>> index 3b1db35fb6..9b36ee2b47 100644 > >>> --- a/package/pkg-cmake.mk > >>> +++ b/package/pkg-cmake.mk > >>> @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast > >>> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast > >>> > >>> $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES > >>> - > >>> +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES > >>> > >>> ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) > >>> $(2)_BUILDDIR = $$($(2)_SRCDIR) > >>> @@ -82,6 +82,7 @@ ifeq ($(4),target) > >>> # documented as a standard CMake variable. If a package supports it, > >>> # it must handle it explicitly. > >>> # > >>> +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) > >>> define $(2)_CONFIGURE_CMDS > >>> (mkdir -p $$($$(PKG)_BUILDDIR) && \ > >>> cd $$($$(PKG)_BUILDDIR) && \ > >>> @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS > >>> ) > >>> endef > >>> else > >>> +define $(2)_CONFIGURE_CMDS > >>> + (mkdir -p $$($$(PKG)_BUILDDIR) && \ > >>> + cd $$($$(PKG)_BUILDDIR) && \ > >>> + rm -f CMakeCache.txt && \ > >>> + PATH=$$(BR_PATH) \ > >>> + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ > >>> + -DCMAKE_INSTALL_PREFIX="/usr" \ > >>> + -DCMAKE_COLOR_MAKEFILE=OFF \ > >>> + -DBUILD_DOC=OFF \ > >>> + -DBUILD_DOCS=OFF \ > >>> + -DBUILD_EXAMPLE=OFF \ > >>> + -DBUILD_EXAMPLES=OFF \ > >>> + -DBUILD_TEST=OFF \ > >>> + -DBUILD_TESTS=OFF \ > >>> + -DBUILD_TESTING=OFF \ > >>> + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ > >>> + $$(CMAKE_QUIET) \ > >>> + $$($$(PKG)_CONF_OPTS) \ > >>> + ) > >>> +endef > >>> +endif > >>> +else > >>> > >>> # Configure package for host > >>> define $(2)_CONFIGURE_CMDS > >>> -- > >>> 2.35.1 > >>> > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Tue Mar 29 20:15:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:15:52 +0200 Subject: [Buildroot] [PATCH 1/1] package/dav1d: use official tarball In-Reply-To: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 15 Mar 2022 23:10:11 +0100") References: <20220315221011.2440571-1-fontaine.fabrice@gmail.com> Message-ID: <87v8vw8qh3.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 20:18:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:18:21 +0200 Subject: [Buildroot] [PATCH 1/2] package/ell: bump to version 0.49 In-Reply-To: <97a25507-2a9c-4928-eb14-388693a3766b@mind.be> (Arnout Vandecappelle's message of "Thu, 24 Mar 2022 22:46:38 +0100") References: <20220316190545.3618918-1-james.hilliard1@gmail.com> <97a25507-2a9c-4928-eb14-388693a3766b@mind.be> Message-ID: <87r16k8qcy.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 16/03/2022 20:05, James Hilliard wrote: >> Signed-off-by: James Hilliard > Applied both to master, thanks. > As Peter said, a changelog would be nice (so Peter K. knows if it > needs to be backported to the stable branches), but I've applied > as-is anyway. Is it needed for 2022.02.x? -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 20:29:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:29:03 +0200 Subject: [Buildroot] [PATCH] package/unbound: use system libevent In-Reply-To: <20220317162530.427876-1-kyle@balena.io> (Kyle Harding via buildroot's message of "Thu, 17 Mar 2022 12:25:30 -0400") References: <20220317162530.427876-1-kyle@balena.io> Message-ID: <87mth88pv4.fsf@dell.be.48ers.dk> >>>>> "Kyle" == Kyle Harding via buildroot writes: > The file descriptor limit when using the builtin mini-event > cannot handle more than 1024 file descriptors. > https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent > Signed-off-by: Kyle Harding Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Mar 29 20:19:53 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:19:53 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/unbound: use system libevent Message-ID: <20220329202014.2F01485F4E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a1c2492d29b7b51e1ce4b563e9ec09b109d2802 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Without explicit --with-libevent, it uses the builtin mini-event. Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 929df7c483d19cf08badc36ef19a56735896b5d5) Signed-off-by: Peter Korsgaard --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 37456db416..78a817fdb3 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr From peter at korsgaard.com Tue Mar 29 19:57:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:57:32 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/python-avro: renumber patch Message-ID: <20220329202014.2764A85F63@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=45fcdf9bf9a54401f77b8f268d5494151de93c90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4a23f6b7b011fee47812bb70a11c21b9d68844b0) Signed-off-by: Peter Korsgaard --- ...ing.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From peter at korsgaard.com Tue Mar 29 19:44:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:50 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] DEVELOPERS: Add some more entries for Thomas Huth Message-ID: <20220329202022.33AAB85F8A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8909b3739761dce8f67f9f0afdd79757d7839de0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x I'm involved in the upstream kvm-unit-tests and the mcf5208 QEMU machine, so I could help to have a look on these files, too. Signed-off-by: Thomas Huth Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3396e945dfc1482cb21b65e5451abc5ec96a796b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c3d7c4a6fe..9d77673f3c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2749,8 +2749,11 @@ F: utils/size-stats-compare F: toolchain/ N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni From peter at korsgaard.com Tue Mar 29 19:57:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:57:14 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-avro: renumber patch Message-ID: <20220329202022.5429585F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c2f016736037f22c2c286ee63ea82189b5a3968 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Commit 77704462c9e2422b6f9a07d35d88918e790e6940 forgot to renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4a23f6b7b011fee47812bb70a11c21b9d68844b0) Signed-off-by: Peter Korsgaard --- ...ing.patch => 0001-drop-install-time-linting-and-imports-sorting.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch similarity index 100% rename from package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch rename to package/python-avro/0001-drop-install-time-linting-and-imports-sorting.patch From peter at korsgaard.com Tue Mar 29 19:41:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:41:34 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/meson: bump to version 0.61.3 Message-ID: <20220329202022.22DE485F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=525813a9e02492b73c71e1106fc50cf2441cb429 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ffb0c357397a67ceaadd215669bf00dcb27bd558) Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d4..d909709b24 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc +sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd46..4615e839fe 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 0.61.3 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From peter at korsgaard.com Tue Mar 29 20:19:32 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:19:32 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/unbound: use system libevent Message-ID: <20220329202022.6FC2D85F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01b2a04486d56f78fc166a164e8efb2d3c9fbc21 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The file descriptor limit when using the builtin mini-event cannot handle more than 1024 file descriptors. https://unbound.docs.nlnetlabs.nl/en/latest/topics/performance.html?highlight=libevent#using-libevent Without explicit --with-libevent, it uses the builtin mini-event. Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 929df7c483d19cf08badc36ef19a56735896b5d5) Signed-off-by: Peter Korsgaard --- package/unbound/unbound.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..d9be639244 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -17,6 +17,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr From peter at korsgaard.com Tue Mar 29 19:48:44 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:48:44 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-rpi-gpio: enable package on aarch64 Message-ID: <20220329202022.446F885F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0009e18a52ad6bb7152a6de9910dad863157537f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Enable the python-rpi-gpio package on 64-bit ARM architectures. I've tested this with a Raspberry Pi 4 64-bit and Python 3 build and it works as expected. Signed-off-by: Mirza Kapetanovic Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 45f2609ca2eb5577ec5e6e204aec5a3eb2e80253) Signed-off-by: Peter Korsgaard --- package/python-rpi-gpio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb06..f3c0928c62 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. From peter at korsgaard.com Tue Mar 29 19:46:51 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:46:51 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] fakeroot: Fix segfault on ppc64le Message-ID: <20220329202022.3BD3885F89@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bd54a26cb32187432f56504cd358fb09186c303 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x When generating a filesystem image on a power10 build machine running Ubuntu, we see a segfault when fakeroot is running chmod. This has been reported and fixed upstream in Debian in version 1.26-1.2: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=995393#53 Add the same patch to resolve the segfault. Signed-off-by: Joel Stanley [Arnout: add patch signoff and give proper name (check-package)] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a38c6827dba0a5ccee5504167344ea6bba44e9d9) Signed-off-by: Peter Korsgaard --- .../fakeroot/0001-fix-prototype-generation.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/package/fakeroot/0001-fix-prototype-generation.patch b/package/fakeroot/0001-fix-prototype-generation.patch new file mode 100644 index 0000000000..960bad2129 --- /dev/null +++ b/package/fakeroot/0001-fix-prototype-generation.patch @@ -0,0 +1,61 @@ +Subject: Fix prototype generation for openat +Author: Christoph Biedl +Date: 2021-12-30 +Bug-Debian: https://bugs.debian.org/995393 +Forwarded: Yes (implicitely) + + As jrtc27 pointed out in IRC, ppc64el is more strict than other + architectures when it comes to va_arg handling: + + it's that ppc64le uses the elfv2 abi, and for variadic calls you + must reserve space for a parameter save area + + So enhance wrapawk to create a proper prototype and argument + handling although it's specific to the openat call. Also add the + missing documentation for the sixth column to wrapfunc.inp. + +Signed-off-by: Joel Stanley + +--- a/wrapawk ++++ b/wrapawk +@@ -37,7 +37,25 @@ + argtype=$3; + argname=$4; + MACRO=$5; +- if(MACRO){ ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ + print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; + print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; + print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -9,8 +9,10 @@ + /**/ */ + /* each line of this file lists 4 fields, seperated by a ";". */ + /* The first field is the name of the wrapped function, then it's return */ +-/* value. After that come the function arguments with types, and the last */ ++/* value. After that come the function arguments with types, and the fifth */ + /* field contains the function arguments without types. */ ++/* A sixth field is a special needed when wrapping the openat syscall. */ ++/* Otherwise it's like the third (function arguments with types). */ + /**/ + + /* __*xstat are used on glibc systems instead of just *xstat. */ From peter at korsgaard.com Tue Mar 29 19:55:40 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:55:40 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/rygel: fix g_ir_compiler calls Message-ID: <20220329202022.4C27F85F8A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06e2a7273572f4264eda6538391adb2da2b65c48 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised since bump to version 0.40.2 in commit 6acdbb81c8d6cdd3ecb476ae24e72fd4547011c3: [108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command FAILED: src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 Fixes: - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 94515b902c74d51aeb32654a4795ca92d6dd7279) Signed-off-by: Peter Korsgaard --- .../0002-meson.build-fix-g_ir_compiler-calls.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 0000000000..3961ad0564 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + From peter at korsgaard.com Tue Mar 29 19:33:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:33:39 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/librtlsdr: switch to autotools-package Message-ID: <20220329202022.1709985F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=711534ce860776a9274db04d3f01abfac3f98741 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Switch to autotools-package to avoid the following static build failure since commit d661740201405970f65c16c39a79f4148705af30: [ 56%] Linking C executable rtl_biast /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.3.0/../../../../riscv64-buildroot-linux-musl/bin/ld: attempted static link of dynamic object `/home/peko/autobuild/instance-1/output-1/host/riscv64-buildroot-linux-musl/sysroot/lib/libatomic.so' collect2: error: ld returned 1 exit status Drop both cmake-related patches Fixes: - http://autobuild.buildroot.org/results/cf84759682848db8ed5610e1abe5a92337d0e957 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 26a16ed9d84cbd934fbad4d6042dfd10dc8063b4) Signed-off-by: Peter Korsgaard --- ...m-respect-DESTDIR-with-install-udev-rules.patch | 31 +++++ ...01-disable_shared_library_target_in_build.patch | 130 --------------------- ...es-Version.cmake-don-t-use-Git-version-if.patch | 47 -------- package/librtlsdr/librtlsdr.mk | 26 ++--- 4 files changed, 42 insertions(+), 192 deletions(-) diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 0000000000..1aec8166cc --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465de..0000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41..0000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a..908be158b1 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) From peter at korsgaard.com Tue Mar 29 19:44:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 21:44:33 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/python-aioconsole: bump to version 0.4.1 Message-ID: <20220329202022.2B0E585F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df1fe3d8e8cba5ba0856a4d029dc6a2499fa67d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a3a1593b74048eec038cd351b06a6654e8bba0c4) Signed-off-by: Peter Korsgaard --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b2..af8b5c4de9 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 105adca78033ef1f0b62d8e81d3efcac aioconsole-0.4.1.tar.gz +sha256 0c0acb66b4e72d6606c9fa14ac9eb001a222c37c885b8fbdf65f41824cfa855f aioconsole-0.4.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d4..a58fd33a61 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.4.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c5/16/a9de89d859eeaa0f9fdf5675a97ea1416265e1ebc039c7b9ea2c9e5433ac PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From peter at korsgaard.com Tue Mar 29 20:02:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:02:19 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/dav1d: use official tarball Message-ID: <20220329202022.6695185F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5adb8c23fdd0537fa04a9e7b673b7d9daf5d4d1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0bdf40b1b0a36212fefef0b19632545f94c06423) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 3 ++- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae7..5e838b0951 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 +sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8..ecc4cc55c3 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -5,8 +5,8 @@ ################################################################################ DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES From peter at korsgaard.com Tue Mar 29 20:00:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 29 Mar 2022 22:00:54 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/libbluray: bump to version 1.3.1 Message-ID: <20220329202022.5C7F285F88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a66f78923985a838ba5a8b2ed945ba2f77c7fb11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x https://code.videolan.org/videolan/libbluray/-/blob/1.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 49413c6d97b72ef5f44341a3dc720b902a88279b) Signed-off-by: Peter Korsgaard --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c85866..6e62bb49a1 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 +sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38d..a9eb3c67c6 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES From vincent.stehle at laposte.net Tue Mar 29 20:51:36 2022 From: vincent.stehle at laposte.net (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Tue, 29 Mar 2022 22:51:36 +0200 Subject: [Buildroot] [PATCH] configs/qemu_xtensa_lx60_nommu: use busybox minimal config Message-ID: <20220329205136.32435-1-vincent.stehle@laposte.net> Update the qemu_xtensa_lx60_nommu_defconfig to use the busybox-minimal.config, to make it more consistent with the other no-MMU defconfigs. After commit 3de486f8b052 ("package/busybox: fix udhcpc options in minimal config"), this has the benefit of fixing the following network initialization failure: udhcpc: invalid option -- b Signed-off-by: Vincent Stehl? Cc: Romain Naour Cc: Gerome Burlats --- configs/qemu_xtensa_lx60_nommu_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c4473fb32a..44fb81bd74 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -7,6 +7,9 @@ BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/ BR2_PACKAGE_HOST_ELF2FLT=y # BR2_USE_MMU is not set +# Use minimal busybox with hush and networking tools +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" + # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -- 2.35.1 From fontaine.fabrice at gmail.com Tue Mar 29 21:22:30 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 29 Mar 2022 23:22:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <87czi4a63p.fsf@dell.be.48ers.dk> References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> <87czi4a63p.fsf@dell.be.48ers.dk> Message-ID: Le mar. 29 mars 2022 ? 21:53, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > Fix the following build failure raised on uclibc and musl since the > > reintroduction of the package in commit > > 16ff948444c3978d63f483344a3d92d994c64312: > > Huh? This is the commit where ola was reintroduced, but this is a > failure in grpc and the config doesn't even have ola enabled? Indeed, I made a copy / paste error, the correct commit message should have been: "Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4" > > > /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > > /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_stacktrace.so.2111.0.0: > > undefined reference to `backtrace' > > > Fixes: > > - http://autobuild.buildroot.org/results/63ab2bc86cad03d5258492b17d1707078761d9b3 > > > Signed-off-by: Fabrice Fontaine > > --- > > package/grpc/grpc.mk | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk > > index 23b92f1750..9138b4ea59 100644 > > --- a/package/grpc/grpc.mk > > +++ b/package/grpc/grpc.mk > > @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf > > # which doesn't do this. These CARES settings trick the gRPC cmake code into > > # not looking for c-ares at all and yet still linking with the library. > > GRPC_CONF_OPTS = \ > > + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ > > -DgRPC_ABSL_PROVIDER=package \ > > -D_gRPC_CARES_LIBRARIES=cares \ > > -DgRPC_CARES_PROVIDER=none \ > > @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ > > -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ > > -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF > > > +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) > > +GRPC_DEPENDENCIES += libexecinfo > > +GRPC_EXE_LINKER_FLAGS += -lexecinfo > > +endif > > + > > # grpc can use __atomic builtins, so we need to link with > > # libatomic when available > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > > +GRPC_EXE_LINKER_FLAGS += -latomic > > endif > > > GRPC_CFLAGS = $(TARGET_CFLAGS) > > -- > > > 2.35.1 > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From alseycmiller at gmail.com Tue Mar 29 21:54:32 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 21:54:32 +0000 Subject: [Buildroot] [PATCH 1/2] package/libdispatch: add libdispatch package Message-ID: <20220329215433.1018660-1-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/libdispatch/Config.in | 43 +++++++++++++++++++++++ package/libdispatch/libdispatch.hash | 1 + package/libdispatch/libdispatch.mk | 52 ++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 package/libdispatch/Config.in create mode 100644 package/libdispatch/libdispatch.hash create mode 100644 package/libdispatch/libdispatch.mk diff --git a/DEVELOPERS b/DEVELOPERS index a66b9d7eee..555ec0175b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -122,6 +122,9 @@ F: boot/opensbi/ F: configs/hifive_unleashed_defconfig F: package/xen/ +N: Alsey Miller +F: package/libdispatch/ + N: Alvaro G. M F: package/dcron/ F: package/libxmlrpc/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..e217ff5282 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdispatch/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in new file mode 100644 index 0000000000..f4fa5e47fb --- /dev/null +++ b/package/libdispatch/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + bool + default y if BR2_x86_64 + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH + string + default "aarch64" if BR2_aarch64 + default "armv5" if BR2_ARM_CPU_ARMV5 + default "armv6" if BR2_ARM_CPU_ARMV6 + default "armv7" if BR2_ARM_CPU_ARMV7A + default "x86_64" if BR2_x86_64 + default "powerpc" if BR2_powerpc + default "mips" if BR2_mips + default "mipsel" if BR2_mipsel + default "mips64" if BR2_mips64 + default "mips64el" if BR2_mips64el + default "riscv64" if BR2_RISCV_64 + +config BR2_PACKAGE_LIBDISPATCH + bool "libdispatch" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBBSD + + help + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. + + http://swift.org + +comment "libdispatch needs a toolchain w/ Glibc, wchar, threads, C++, dynamic library" + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ No newline at end of file diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash new file mode 100644 index 0000000000..64543b56eb --- /dev/null +++ b/package/libdispatch/libdispatch.hash @@ -0,0 +1 @@ +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab libdispatch-swift-5.6-RELEASE.tar.gz diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk new file mode 100644 index 0000000000..79fc4f7780 --- /dev/null +++ b/package/libdispatch/libdispatch.mk @@ -0,0 +1,52 @@ +### Grand Central Dispatch +LIBDISPATCH_VERSION = 5.6 +LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE) +LIBDISPATCH_LICENSE = Apache-2.0 +LIBDISPATCH_LICENSE_FILES = LICENSE +LIBDISPATCH_INSTALL_STAGING = YES +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBDISPATCH_DEPENDENCIES = host-clang host-lld libbsd + +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv7) +LIBDISPATCH_TARGET_NAME = armv7-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv6) +LIBDISPATCH_TARGET_NAME = armv6-unknown-linux-gnueabihf +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_TARGET_NAME = armv5-unknown-linux-gnueabi +else +LIBDISPATCH_TARGET_NAME = $(LIBDISPATCH_TARGET_ARCH)-unknown-linux-gnu +endif + +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) +LIBDISPATCH_EXTRA_FLAGS = -msoft-float +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 +else +LIBDISPATCH_EXTRA_FLAGS = +endif + +LIBDISPATCH_CONF_OPTS += \ + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ + -DCMAKE_C_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang \ + -DCMAKE_CXX_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang++ \ + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ + -DCMAKE_CXX_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ + +define LIBDISPATCH_INSTALL_TARGET_CMDS + (cd $(LIBDISPATCH_BUILDDIR) && \ + cp ./*.so $(TARGET_DIR)/usr/lib/ \ + ) +endef + +$(eval $(cmake-package)) -- 2.30.2 From alseycmiller at gmail.com Tue Mar 29 21:54:33 2022 From: alseycmiller at gmail.com (Alsey Coleman Miller) Date: Tue, 29 Mar 2022 21:54:33 +0000 Subject: [Buildroot] [PATCH 2/2] package/libdispatch: add fix for 32-bit arm In-Reply-To: <20220329215433.1018660-1-alseycmiller@gmail.com> References: <20220329215433.1018660-1-alseycmiller@gmail.com> Message-ID: <20220329215433.1018660-2-alseycmiller@gmail.com> Signed-off-by: Alsey Coleman Miller --- package/libdispatch/arm-yield.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/libdispatch/arm-yield.patch diff --git a/package/libdispatch/arm-yield.patch b/package/libdispatch/arm-yield.patch new file mode 100644 index 0000000000..fa7cf7cce4 --- /dev/null +++ b/package/libdispatch/arm-yield.patch @@ -0,0 +1,13 @@ +diff --git a/src/shims/yield.c b/src/shims/yield.c +index 43f0017..d0c5fff 100644 +--- a/src/shims/yield.c ++++ b/src/shims/yield.c +@@ -36,7 +36,7 @@ void * + _dispatch_wait_for_enqueuer(void **ptr) + { + #if !DISPATCH_HW_CONFIG_UP +-#if defined(__arm__) || defined(__arm64__) ++#if (defined(__arm__) && defined(__APPLE__)) || defined(__arm64__) + int spins = DISPATCH_WAIT_SPINS_WFE; + void *value; + while (unlikely(spins-- > 0)) { -- 2.30.2 From alseycmiller at gmail.com Tue Mar 29 21:57:14 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 14:57:14 -0700 Subject: [Buildroot] [PATCH 1/2] package/libdispatch: add libdispatch package In-Reply-To: <20220329215433.1018660-1-alseycmiller@gmail.com> References: <20220329215433.1018660-1-alseycmiller@gmail.com> Message-ID: <2B3FDE91-2C84-4F3B-BDB8-DB0E85EFB3FF@gmail.com> This patch successfully builds with https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ applied. Although its not required for this package, I suggest merging https://patchwork.ozlabs.org/project/buildroot/patch/20220329145904.63900-1-andreynech at gmail.com/ as well. > On Mar 29, 2022, at 2:54 PM, Alsey Coleman Miller wrote: > > Signed-off-by: Alsey Coleman Miller > --- > DEVELOPERS | 3 ++ > package/Config.in | 1 + > package/libdispatch/Config.in | 43 +++++++++++++++++++++++ > package/libdispatch/libdispatch.hash | 1 + > package/libdispatch/libdispatch.mk | 52 ++++++++++++++++++++++++++++ > 5 files changed, 100 insertions(+) > create mode 100644 package/libdispatch/Config.in > create mode 100644 package/libdispatch/libdispatch.hash > create mode 100644 package/libdispatch/libdispatch.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index a66b9d7eee..555ec0175b 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -122,6 +122,9 @@ F: boot/opensbi/ > F: configs/hifive_unleashed_defconfig > F: package/xen/ > > +N: Alsey Miller > +F: package/libdispatch/ > + > N: Alvaro G. M > F: package/dcron/ > F: package/libxmlrpc/ > diff --git a/package/Config.in b/package/Config.in > index 0d5d763180..e217ff5282 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1968,6 +1968,7 @@ menu "Other" > source "package/libcrossguid/Config.in" > source "package/libcsv/Config.in" > source "package/libdaemon/Config.in" > + source "package/libdispatch/Config.in" > source "package/libeastl/Config.in" > source "package/libee/Config.in" > source "package/libev/Config.in" > diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in > new file mode 100644 > index 0000000000..f4fa5e47fb > --- /dev/null > +++ b/package/libdispatch/Config.in > @@ -0,0 +1,43 @@ > +config BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS > + bool > + default y if BR2_x86_64 > + default y if BR2_aarch64 > + default y if BR2_arm > + default y if BR2_powerpc > + default y if BR2_mips > + default y if BR2_mipsel > + default y if BR2_mips64 > + default y if BR2_mips64el > + default y if BR2_RISCV_64 > + > +config BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH > + string > + default "aarch64" if BR2_aarch64 > + default "armv5" if BR2_ARM_CPU_ARMV5 > + default "armv6" if BR2_ARM_CPU_ARMV6 > + default "armv7" if BR2_ARM_CPU_ARMV7A > + default "x86_64" if BR2_x86_64 > + default "powerpc" if BR2_powerpc > + default "mips" if BR2_mips > + default "mipsel" if BR2_mipsel > + default "mips64" if BR2_mips64 > + default "mips64el" if BR2_mips64el > + default "riscv64" if BR2_RISCV_64 > + > +config BR2_PACKAGE_LIBDISPATCH > + bool "libdispatch" > + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_USES_GLIBC > + select BR2_PACKAGE_LIBBSD > + > + help > + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. > + > + http://swift.org > + > +comment "libdispatch needs a toolchain w/ Glibc, wchar, threads, C++, dynamic library" > + depends on BR2_PACKAGE_LIBDISPATCH_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ > + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > \ No newline at end of file > diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash > new file mode 100644 > index 0000000000..64543b56eb > --- /dev/null > +++ b/package/libdispatch/libdispatch.hash > @@ -0,0 +1 @@ > +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab libdispatch-swift-5.6-RELEASE.tar.gz > diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk > new file mode 100644 > index 0000000000..79fc4f7780 > --- /dev/null > +++ b/package/libdispatch/libdispatch.mk > @@ -0,0 +1,52 @@ > +### Grand Central Dispatch > +LIBDISPATCH_VERSION = 5.6 > +LIBDISPATCH_SITE = $(call github,apple,swift-corelibs-libdispatch,swift-$(LIBDISPATCH_VERSION)-RELEASE) > +LIBDISPATCH_LICENSE = Apache-2.0 > +LIBDISPATCH_LICENSE_FILES = LICENSE > +LIBDISPATCH_INSTALL_STAGING = YES > +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO > +LIBDISPATCH_DEPENDENCIES = host-clang host-lld libbsd > + > +LIBDISPATCH_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBDISPATCH_TARGET_ARCH)) > +LIBDISPATCH_CLANG_PATH = $(HOST_DIR)/bin > + > +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv7) > +LIBDISPATCH_TARGET_NAME = armv7-unknown-linux-gnueabihf > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv6) > +LIBDISPATCH_TARGET_NAME = armv6-unknown-linux-gnueabihf > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) > +LIBDISPATCH_TARGET_NAME = armv5-unknown-linux-gnueabi > +else > +LIBDISPATCH_TARGET_NAME = $(LIBDISPATCH_TARGET_ARCH)-unknown-linux-gnu > +endif > + > +ifeq ($(LIBDISPATCH_TARGET_ARCH),armv5) > +LIBDISPATCH_EXTRA_FLAGS = -march=armv5te > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),riscv64) > +LIBDISPATCH_EXTRA_FLAGS = -mno-relax -mabi=lp64 -march=rv64imac -mfloat-abi=soft > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mipsel) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),mips64el) > +LIBDISPATCH_EXTRA_FLAGS = -msoft-float > +else ifeq ($(LIBDISPATCH_TARGET_ARCH),powerpc) > +LIBDISPATCH_EXTRA_FLAGS = -mcpu=7400 > +else > +LIBDISPATCH_EXTRA_FLAGS = > +endif > + > +LIBDISPATCH_CONF_OPTS += \ > + -DLibRT_LIBRARIES="${STAGING_DIR}/usr/lib/librt.a" \ > + -DCMAKE_C_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang \ > + -DCMAKE_CXX_COMPILER=$(LIBDISPATCH_CLANG_PATH)/clang++ \ > + -DCMAKE_C_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ > + -DCMAKE_C_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + -DCMAKE_CXX_FLAGS="-w -fuse-ld=lld $(LIBDISPATCH_EXTRA_FLAGS) -target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR) -I$(STAGING_DIR)/usr/include -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/ -I$(HOST_DIR)/$(GNU_TARGET_NAME)/include/c++/$(call qstrip,$(BR2_GCC_VERSION))/$(GNU_TARGET_NAME) -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ > + -DCMAKE_CXX_LINK_FLAGS="-target $(LIBDISPATCH_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ > + > +define LIBDISPATCH_INSTALL_TARGET_CMDS > + (cd $(LIBDISPATCH_BUILDDIR) && \ > + cp ./*.so $(TARGET_DIR)/usr/lib/ \ > + ) > +endef > + > +$(eval $(cmake-package)) > -- > 2.30.2 > -------------- next part -------------- An HTML attachment was scrubbed... URL: From aperez at igalia.com Tue Mar 29 22:34:03 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 30 Mar 2022 01:34:03 +0300 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering In-Reply-To: <20220329164036.4045575-1-james.hilliard1@gmail.com> References: <20220329164036.4045575-1-james.hilliard1@gmail.com> Message-ID: <20220330013403.GB1671742@momiji> Hi James, On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard wrote: > We need to backport a patch to fix software rendering with cog. I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am planning to release version 0.12.4 in the next hours. WDYT about waiting until we have that and skip ahead to .4 -- that way it will not be needed to import this patch in Buildroot. Cheers, -Adrian > Signed-off-by: James Hilliard > --- > ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++ > 1 file changed, 42 insertions(+) > create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > new file mode 100644 > index 0000000000..fec21c225c > --- /dev/null > +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > @@ -0,0 +1,42 @@ > +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +Date: Sat, 26 Mar 2022 13:30:47 -0600 > +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release > + function name. > + > +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91) > + > +Signed-off-by: James Hilliard > +[james.hilliard1 at gmail.com: backport from upstream commit > +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc] > +--- > + platform/wayland/cog-platform-wl.c | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c > +index 0ff9e6f..46c5185 100644 > +--- a/platform/wayland/cog-platform-wl.c > ++++ b/platform/wayland/cog-platform-wl.c > +@@ -63,7 +63,7 @@ > + > + #define DEFAULT_ZOOM_STEP 0.1f > + > +-#if defined(WPE_WL_CHECK_VERSION) > ++#if defined(WPE_FDO_CHECK_VERSION) > + # define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0) > + # define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1) > + #else > +@@ -1705,8 +1705,8 @@ static void > + shm_buffer_destroy(struct shm_buffer *buffer) > + { > + if (buffer->exported_buffer) { > +- wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > +- buffer->exported_buffer); > ++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > ++ buffer->exported_buffer); > + } > + > + wl_buffer_destroy(buffer->buffer); > +-- > +2.25.1 > + > -- > 2.25.1 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From james.hilliard1 at gmail.com Tue Mar 29 23:07:57 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 29 Mar 2022 17:07:57 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering In-Reply-To: <20220330013403.GB1671742@momiji> References: <20220329164036.4045575-1-james.hilliard1@gmail.com> <20220330013403.GB1671742@momiji> Message-ID: On Tue, Mar 29, 2022 at 4:34 PM Adrian Perez de Castro wrote: > > Hi James, > > On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard wrote: > > We need to backport a patch to fix software rendering with cog. > > I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am > planning to release version 0.12.4 in the next hours. WDYT about waiting > until we have that and skip ahead to .4 -- that way it will not be needed to > import this patch in Buildroot. Yeah, that's probably better. > > Cheers, > -Adrian > > > Signed-off-by: James Hilliard > > --- > > ...K_VERSION-macro-name-and-fdo-buffer-.patch | 42 +++++++++++++++++++ > > 1 file changed, 42 insertions(+) > > create mode 100644 package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > > > diff --git a/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > new file mode 100644 > > index 0000000000..fec21c225c > > --- /dev/null > > +++ b/package/cog/0001-Fix-WPE_FDO_CHECK_VERSION-macro-name-and-fdo-buffer-.patch > > @@ -0,0 +1,42 @@ > > +From 717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc Mon Sep 17 00:00:00 2001 > > +From: James Hilliard > > +Date: Sat, 26 Mar 2022 13:30:47 -0600 > > +Subject: [PATCH] Fix WPE_FDO_CHECK_VERSION macro name and fdo buffer release > > + function name. > > + > > +(cherry picked from commit d2720103ff8a5c3c5c056487586ed0b5acdc2b91) > > + > > +Signed-off-by: James Hilliard > > +[james.hilliard1 at gmail.com: backport from upstream commit > > +717fadb2f16fcb28b3b72dc6d796c8ce9ae14afc] > > +--- > > + platform/wayland/cog-platform-wl.c | 6 +++--- > > + 1 file changed, 3 insertions(+), 3 deletions(-) > > + > > +diff --git a/platform/wayland/cog-platform-wl.c b/platform/wayland/cog-platform-wl.c > > +index 0ff9e6f..46c5185 100644 > > +--- a/platform/wayland/cog-platform-wl.c > > ++++ b/platform/wayland/cog-platform-wl.c > > +@@ -63,7 +63,7 @@ > > + > > + #define DEFAULT_ZOOM_STEP 0.1f > > + > > +-#if defined(WPE_WL_CHECK_VERSION) > > ++#if defined(WPE_FDO_CHECK_VERSION) > > + # define HAVE_SHM_EXPORTED_BUFFER WPE_FDO_CHECK_VERSION(1, 9, 0) > > + # define HAVE_FULLSCREEN_HANDLING WPE_FDO_CHECK_VERSION(1, 11, 1) > > + #else > > +@@ -1705,8 +1705,8 @@ static void > > + shm_buffer_destroy(struct shm_buffer *buffer) > > + { > > + if (buffer->exported_buffer) { > > +- wpe_view_backend_exportable_wl_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > > +- buffer->exported_buffer); > > ++ wpe_view_backend_exportable_fdo_egl_dispatch_release_shm_exported_buffer(wpe_host_data.exportable, > > ++ buffer->exported_buffer); > > + } > > + > > + wl_buffer_destroy(buffer->buffer); > > +-- > > +2.25.1 > > + > > -- > > 2.25.1 From aperez at igalia.com Tue Mar 29 23:11:25 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 30 Mar 2022 02:11:25 +0300 Subject: [Buildroot] [PATCH 1/1] package/cog: fix software rendering In-Reply-To: <20220330013403.GB1671742@momiji> References: <20220329164036.4045575-1-james.hilliard1@gmail.com> <20220330013403.GB1671742@momiji> Message-ID: <20220330021125.GB1680234@momiji> On Wed, 30 Mar 2022 01:34:03 +0300 Adrian Perez de Castro wrote: > On Tue, 29 Mar 2022 10:40:36 -0600 James Hilliard wrote: > > We need to backport a patch to fix software rendering with cog. > > I have cherry-picked this fix (and one more) in the cog-0.12 branch, and I am > planning to release version 0.12.4 in the next hours. WDYT about waiting > until we have that and skip ahead to .4 -- that way it will not be needed to > import this patch in Buildroot. Here it goes: https://wpewebkit.org/release/cog-0.12.4.html Cheers, -Adrian -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From alseycmiller at gmail.com Tue Mar 29 23:18:42 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 16:18:42 -0700 Subject: [Buildroot] [PATCH 1/1] package/swift: add Swift runtime libraries In-Reply-To: <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> References: <20220328060027.2483147-1-alseycmiller@gmail.com> <8f356e94-2fe6-2d89-4d50-b8c2da1c96b7@mind.be> Message-ID: <5AD70D34-E7F5-4A51-A104-1642AFCEA532@gmail.com> I?ve submitted a new patch that deals only with libdispatch. Once that is merged I will submit smaller patches for each individual package. > On Mar 28, 2022, at 1:35 PM, Arnout Vandecappelle wrote: > > Hi Alsey, > > Thank you for your contribution! I have a number of review comments below. Please take them into account and send a new patch series. For the time being, I've marked the patch as Changes Requested in patchwork. > > Firt of all, the patch should be split up in separate patches: one patch per package you add. Make sure all of them are posted together and in the correct order. Each patch should have as subject "package/...: new package". > > I have a few more comments below, but it's hard to properly review such a big patch so I will probably have missed some things. > > On 28/03/2022 08:00, Alsey Coleman Miller wrote: >> Signed-off-by: Alsey Coleman Miller >> --- >> package/Config.in | 11 + > > > Please add yourself to the DEVELOPERS file [1] for this package. This way, you'll get an e-mail if the package fails in the autobuilders, or when a new version is released if the package is registered on release-monitoring.org. > > [snip] >> diff --git a/package/foundation/Config.in b/package/foundation/Config.in >> new file mode 100644 >> index 0000000000..7a9dc8b514 >> --- /dev/null >> +++ b/package/foundation/Config.in >> @@ -0,0 +1,14 @@ >> +if BR2_PACKAGE_SWIFT > > I get that you only want swift-related packages to appear in the menus if swift itself is selected. It would be even better, then, to sort all of them under the swift main entry. Perhaps even prefix all of them with swift-, like is done for python, perl and lua packages. > >> + >> +config BR2_PACKAGE_FOUNDATION >> + bool "foundation" >> + depends on BR2_PACKAGE_SWIFT >> + select BR2_PACKAGE_LIBSWIFTDISPATCH >> + select BR2_PACKAGE_LIBCURL >> + select BR2_PACKAGE_LIBXML2 >> + help >> + The Foundation framework defines a base layer of functionality that is required for almost all applications. It provides primitive classes and introduces several paradigms that define functionality not provided by either the Objective-C runtime and language or Swift standard library and language. > > Please make sure indentation is done correctly, as reported by the utils/check-package script. In this case, the line length is way too long. > >> + >> + http://swift.org >> + >> +endif >> diff --git a/package/foundation/foundation.hash b/package/foundation/foundation.hash >> new file mode 100644 >> index 0000000000..f15edb8420 >> --- /dev/null >> +++ b/package/foundation/foundation.hash >> @@ -0,0 +1 @@ >> +sha256 3fa96321729ea1e99847320bc3b5eefcbc39ba57eb8750a16700afa0173b6bb0 swift-5.6-RELEASE.tar.gz >> diff --git a/package/foundation/foundation.mk b/package/foundation/foundation.mk >> new file mode 100644 >> index 0000000000..93c7cedbdd >> --- /dev/null >> +++ b/package/foundation/foundation.mk >> @@ -0,0 +1,102 @@ >> +### Foundation > > Missin comment header, as reported by check-package (I'm not going to repeat all the other check-package errors). > >> +FOUNDATION_VERSION = $(SWIFT_VERSION) >> +FOUNDATION_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +FOUNDATION_SITE = https://github.com/apple/swift-corelibs-foundation/archive/refs/tags > > This doesn't look right - shouldn't you be using the github helper? > >> +FOUNDATION_LICENSE = Apache-2.0 >> +FOUNDATION_LICENSE_FILES = LICENSE >> +FOUNDATION_INSTALL_STAGING = YES >> +FOUNDATION_INSTALL_TARGET = YES > > _INSTALL_TARGET = YES is not needed, it's done automatically. > >> +FOUNDATION_SUPPORTS_IN_SOURCE_BUILD = NO >> +FOUNDATION_DEPENDENCIES = icu libxml2 libcurl swift libswiftdispatch >> + >> +FOUNDATION_CONF_OPTS += \ >> + -DCMAKE_Swift_FLAGS=${SWIFTC_FLAGS} \ >> + -DCMAKE_Swift_FLAGS_DEBUG="" \ > > Please consistently indent with one tab. > >> + -DCMAKE_Swift_FLAGS_RELEASE="" \ >> + -DCMAKE_Swift_FLAGS_RELWITHDEBINFO="" \ >> + -DCF_DEPLOYMENT_SWIFT=ON \ >> + -Ddispatch_DIR="$(LIBSWIFTDISPATCH_BUILDDIR)/cmake/modules" \ >> + -DICU_I18N_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_I18N_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicui18n.so \ >> + -DICU_UC_LIBRARY_DEBUG=${STAGING_DIR}/usr/lib/libicuuc.so \ >> + -DICU_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +ifeq ($(BR2_PACKAGE_LIBCURL),y) > > Since Config.in selects libcurl, this is always true. > >> + FOUNDATION_DEPENDENCIES += libcurl > > No indentation within make conditions. > >> + FOUNDATION_CONF_OPTS += \ >> + -DCURL_LIBRARY_RELEASE=${STAGING_DIR}/usr/lib/libcurl.so \ >> + -DCURL_INCLUDE_DIR="${STAGING_DIR}/usr/include" \ >> + >> +endif >> + >> +ifeq ($(BR2_PACKAGE_LIBXML2),y) >> + FOUNDATION_DEPENDENCIES += libxml2 >> + FOUNDATION_CONF_OPTS += \ >> + -DLIBXML2_LIBRARY=${STAGING_DIR}/usr/lib/libxml2.so \ >> + -DLIBXML2_INCLUDE_DIR=${STAGING_DIR}/usr/include/libxml2 \ >> + >> +endif >> + >> +ifeq (FOUNDATION_SUPPORTS_IN_SOURCE_BUILD),YES) >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR) >> +else >> +FOUNDATION_BUILDDIR = $(FOUNDATION_SRCDIR)/build >> +endif > > This stuff is done automatically by the infra. > >> + >> +define FOUNDATION_CONFIGURE_CMDS >> + # Workaround Dispatch defined with cmake and module >> + rm -rf ${STAGING_DIR}/usr/lib/swift/dispatch >> + # Clean >> + rm -rf $(FOUNDATION_BUILDDIR) >> + rm -rf $(STAGING_DIR)/usr/lib/swift/CoreFoundation >> + # Configure >> + (mkdir -p $(FOUNDATION_BUILDDIR) && \ >> + cd $(FOUNDATION_BUILDDIR) && \ >> + rm -f CMakeCache.txt && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(FOUNDATION_CONF_ENV) $(BR2_CMAKE) -S $(FOUNDATION_SRCDIR) -B $(FOUNDATION_BUILDDIR) -G Ninja \ >> + -DCMAKE_INSTALL_PREFIX="/usr" \ >> + -DBUILD_SHARED_LIBS=ON \ >> + -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_RUNTIME_DEBUG),Debug,Release) \ >> + -DCMAKE_C_COMPILER=$(SWIFT_NATIVE_PATH)/clang \ >> + -DCMAKE_C_FLAGS="-w -fuse-ld=lld -target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR) $(SWIFT_EXTRA_FLAGS) -I$(STAGING_DIR)/usr/include -B$(STAGING_DIR)/usr/lib -B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION)) -L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))" \ >> + -DCMAKE_C_LINK_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + -DCMAKE_ASM_FLAGS="-target $(SWIFT_TARGET_NAME) --sysroot=$(STAGING_DIR)" \ >> + $(FOUNDATION_CONF_OPTS) \ >> + ) > > I haven't looked at the details, but not using the cmake infrastructure is not a good idea. > > >> +endef >> + >> +define FOUNDATION_BUILD_CMDS >> + # Compile >> + (cd $(FOUNDATION_BUILDDIR) && ninja) > > If the problem is that it only supports the ninja build system: please use [2] and explain in the cover letter of your series that it depends on that. > >> +endef >> + >> +define FOUNDATION_INSTALL_TARGET_CMDS >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(TARGET_DIR)/usr/lib/ >> +endef >> + >> +define FOUNDATION_INSTALL_STAGING_CMDS >> + # Copy libraries >> + cp $(FOUNDATION_BUILDDIR)/lib/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + # Copy CoreFoundation module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CoreFoundation >> + cp $(FOUNDATION_BUILDDIR)/CoreFoundation.framework/Headers/*.h ${STAGING_DIR}/usr/lib/swift/CoreFoundation/ >> + touch ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + echo 'framework module CoreFoundation [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CoreFoundation/CoreFoundation.h" }' > ${STAGING_DIR}/usr/lib/swift/CoreFoundation/module.map >> + # Copy CFXMLInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFXMLInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + echo 'framework module CFXMLInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFXMLInterface/CFXMLInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFXMLInterface/module.map >> + # Copy CFURLSessionInterface module >> + mkdir -p ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface >> + touch ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + echo 'framework module CFURLSessionInterface [extern_c] [system] { umbrella header "${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/CFURLSessionInterface.h" }' > ${STAGING_DIR}/usr/lib/swift/CFURLSessionInterface/module.map >> + # Copy Swift modules >> + cp $(FOUNDATION_BUILDDIR)/swift/* ${STAGING_DIR}/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)/ >> + # Restore Dispatch headers >> + $(LIBSWIFTDISPATCH_INSTALL_STAGING_CMDS) >> + >> +endef >> + >> +$(eval $(generic-package)) >> diff --git a/package/libdispatch/Config.in b/package/libdispatch/Config.in >> new file mode 100644 >> index 0000000000..2f7c115375 >> --- /dev/null >> +++ b/package/libdispatch/Config.in >> @@ -0,0 +1,11 @@ >> +config BR2_PACKAGE_LIBDISPATCH >> + bool "libdispatch" >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC > > When there are toolchain dependencies, there should also be a comment that tells the user why the package can't be selected. Look at other packages for examples. > > Since it's not clear here, you should probably explain in the commit message why these dependencies are needed. > >> + select BR2_PACKAGE_LIBBSD >> + >> + help >> + Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. >> + >> + http://swift.org >> diff --git a/package/libdispatch/libdispatch.hash b/package/libdispatch/libdispatch.hash >> new file mode 100644 >> index 0000000000..a89c48c55f >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.hash >> @@ -0,0 +1,2 @@ >> +sha256 d2bbfb5b98d129caa2c6bd7662c850bf57cb434572d09844b56641c4558906ab swift-5.6-RELEASE.tar.gz >> +sha256 c83647dac6a1e36795a62626e3a9c7dab7ed4b46919a757afb5562d5ed49da73 libdispatch-5.5.3-armv5.patch >> diff --git a/package/libdispatch/libdispatch.mk b/package/libdispatch/libdispatch.mk >> new file mode 100644 >> index 0000000000..a334c3052d >> --- /dev/null >> +++ b/package/libdispatch/libdispatch.mk >> @@ -0,0 +1,78 @@ >> +### Grand Central Dispatch (C API) >> +LIBDISPATCH_VERSION = $(SWIFT_VERSION) >> +LIBDISPATCH_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +LIBDISPATCH_SITE = https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags >> +LIBDISPATCH_LICENSE = Apache-2.0 >> +LIBDISPATCH_LICENSE_FILES = LICENSE >> +LIBDISPATCH_INSTALL_STAGING = YES >> +LIBDISPATCH_INSTALL_TARGET = YES >> +LIBDISPATCH_SUPPORTS_IN_SOURCE_BUILD = NO >> +LIBDISPATCH_DEPENDENCIES = libbsd >> +LIBDISPATCH_PATCH = \ >> + https://gist.githubusercontent.com/colemancda/e19ec96d8b3caa7f4a3f9ec9a82f356a/raw/a8a62d61856de09f02618d32d14ac637017cc44f/libdispatch-5.5.3-armv5.patch > > Downloading a patch from your own gist isn't exactly great for allowing reviews :-). Please instead include the patch directly in Buildroot. Since upstream is managed in git, please make this a git-formatted patch (generated with git format-patch -N) [1]. Make sure it has a summary and description just like any other commit, and also include your Signed-off-by. The latter is needed to ascertain that the patch may be distributed under the upstream project's license (which may be different from Buildroot's). > > [snip] >> diff --git a/package/swift-hello/Config.in b/package/swift-hello/Config.in >> new file mode 100644 >> index 0000000000..cbeed69667 >> --- /dev/null >> +++ b/package/swift-hello/Config.in >> @@ -0,0 +1,10 @@ >> +if BR2_PACKAGE_SWIFT >> + >> +config BR2_PACKAGE_SWIFT_HELLO >> + bool "swift-hello" >> + depends on BR2_PACKAGE_SWIFT >> + depends on BR2_PACKAGE_FOUNDATION >> + help >> + Demo application for Swift. > > If I understand correctly, this package serves no purpose other than proving that it's possibleto biuld a swift application in Buildroot. Nobody is ever going to select it. Instead, it would be better to move it to the runtime test infrastructure (and of course actually runtime test it, which proves that the generated binaries actually work). > > [snip] >> diff --git a/package/swift-hello/swift-hello.mk b/package/swift-hello/swift-hello.mk >> new file mode 100644 >> index 0000000000..b3cded3f7c >> --- /dev/null >> +++ b/package/swift-hello/swift-hello.mk >> @@ -0,0 +1,33 @@ >> +### Swift Demo >> +SWIFT_HELLO_VERSION = 0.1.0 >> +SWIFT_HELLO_SITE = $(SWIFT_HELLO_PKGDIR)/src >> +SWIFT_HELLO_SITE_METHOD = local >> +SWIFT_HELLO_INSTALL_STAGING = NO >> +SWIFT_HELLO_INSTALL_TARGET = YES >> +SWIFT_HELLO_SUPPORTS_IN_SOURCE_BUILD = YES >> +SWIFT_HELLO_DEPENDENCIES = swift foundation >> +SWIFT_HELLO_EXECUTABLES = swift-hello >> +SWIFT_HELLO_BUILDDIR = $(SWIFT_HELLO_SRCDIR)/.build/$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) >> + >> +define SWIFT_HELLO_BUILD_CMDS >> + ( \ > > These parenthesis are actually not needed. They are still used in a lot of places in Buildroot, but that's legacy stuff. > >> + cd $(SWIFT_HELLO_SRCDIR) && \ >> + rm -rf .build && \ >> + PATH=$(BR_PATH):$(SWIFT_NATIVE_PATH) \ >> + $(SWIFT_NATIVE_PATH)/swift build -c $(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) --destination $(SWIFTPM_DESTINATION_FILE) \ >> + ) >> +endef >> + >> +define SWIFT_HELLO_INSTALL_TARGET_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(TARGET_DIR)/usr/lib/ > > Please don't keep commented-out lines. > >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(TARGET_DIR)/usr/bin/hello >> +endef >> + >> +define SWIFT_HELLO_INSTALL_STAGING_CMDS >> + # Copy dynamic libraries >> + #cp $(SWIFT_HELLO_BUILDDIR)/*.so $(STAGING_DIR)/usr/lib/swift/linux/ >> + cp $(SWIFT_HELLO_BUILDDIR)/swift-hello $(STAGING_DIR)/usr/bin/hello >> +endef >> + >> +$(eval $(generic-package)) > > [snip] >> +config BR2_PACKAGE_SWIFT >> + bool "swift" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on !BR2_STATIC_LIBS >> + depends on BR2_TOOLCHAIN_USES_GLIBC >> + select BR2_PACKAGE_ICU >> + select BR2_PACKAGE_LIBDISPATCH >> + help >> + Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design patterns. >> + >> + http://swift.org >> + >> +if BR2_PACKAGE_SWIFT || BR2_PACKAGE_LIBDISPATCH >> + >> +config BR2_PACKAGE_SWIFT_NATIVE_TOOLS >> + string "Path to host Swift toolchain" >> + default "/usr/bin" >> + >> +config BR2_PACKAGE_SWIFT_LLVM_DIR >> + string "Path to host LLVM library path" >> + default "/usr/lib/llvm-12" > > I guess swift is built on top of LLVM. Is it possible to use package/llvm, or is it a patched version? > >> + >> +endif >> + >> +comment "swift needs a toolchain w/ Glibc, ICU, wchar, threads, C++, dynamic library" >> + depends on BR2_PACKAGE_SWIFT_ARCH_SUPPORTS >> + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ >> + || BR2_STATIC_LIBS || !BR2_USE_WCHAR > > [snip] >> diff --git a/package/swift/swift.mk b/package/swift/swift.mk >> new file mode 100644 >> index 0000000000..da10aae8fd >> --- /dev/null >> +++ b/package/swift/swift.mk >> @@ -0,0 +1,232 @@ >> +### Apple's Swift Programming Language >> +SWIFT_VERSION = 5.6 >> +SWIFT_SOURCE = swift-$(SWIFT_VERSION)-RELEASE.tar.gz >> +SWIFT_SITE = https://github.com/apple/swift/archive/refs/tags >> +SWIFT_LICENSE = Apache-2.0 >> +SWIFT_LICENSE_FILES = LICENSE.txt >> +SWIFT_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_SWIFT_TARGET_ARCH)) >> +SWIFT_NATIVE_PATH = $(call qstrip,$(BR2_PACKAGE_SWIFT_NATIVE_TOOLS)) >> +SWIFT_LLVM_DIR = $(call qstrip,$(BR2_PACKAGE_SWIFT_LLVM_DIR)) >> +SWIFT_INSTALL_STAGING = YES >> +SWIFT_INSTALL_TARGET = YES >> +SWIFT_SUPPORTS_IN_SOURCE_BUILD = NO >> +SWIFT_DEPENDENCIES = icu libxml2 libbsd libdispatch >> + >> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) >> +SWIFT_CONF_ENV += LIBS="-latomic" >> +endif >> + >> +HOST_SWIFT_SUPPORT_DIR = $(HOST_DIR)/usr/share/swift >> +SWIFTPM_DESTINATION_FILE = $(HOST_SWIFT_SUPPORT_DIR)/$(SWIFT_TARGET_NAME)-toolchain.json > > This should have simply a SWIFT_ prefix, not SWIFTPM. > > [snip] >> +define SWIFT_INSTALL_STAGING_CMDS >> + mkdir -p $(HOST_SWIFT_SUPPORT_DIR) >> + # Copy runtime libraries and swift interfaces >> + cp -rf $(SWIFT_BUILDDIR)/lib/swift ${STAGING_DIR}/usr/lib/ >> + # Generate SwiftPM cross compilation toolchain file >> + rm -f $(SWIFTPM_DESTINATION_FILE) >> + touch $(SWIFTPM_DESTINATION_FILE) >> + echo '{' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "version":1,' >> $(SWIFTPM_DESTINATION_FILE) > > We generally prefer to have a template file (called swift-toolchain.json.in) in the package directory, and use sed to replace @XXXX@ entries. See e.g. how it's done for cmake's toolchainfile. > >> + echo ' "sdk":"$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "toolchain-bin-dir":"$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "target":"$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "dynamic-library-extension":"so",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-fPIC"' >> $(SWIFTPM_DESTINATION_FILE) >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-swiftc-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-target", "$(SWIFT_TARGET_NAME)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-use-ld=lld",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-tools-directory", "$(SWIFT_NATIVE_PATH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-rpath", "-Xlinker", "/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(STAGING_DIR)/usr/lib/swift/linux/$(SWIFT_TARGET_ARCH)",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "-L$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xlinker", "--build-id=sha1",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/include",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-I$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-resource-dir", "$(STAGING_DIR)/usr/lib/swift",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(STAGING_DIR)/usr/lib",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-B$(HOST_DIR)/lib/gcc/$(GNU_TARGET_NAME)/$(call qstrip,$(BR2_GCC_VERSION))",' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-Xclang-linker", "-latomic",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "powerpc" ]; then\ >> + echo ' "-Xcc", "-mcpu=7400",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + @if [ "$(SWIFT_TARGET_ARCH)" = "armv5" ]; then\ >> + echo ' "-Xcc", "-march=armv5te",' >> $(SWIFTPM_DESTINATION_FILE);\ >> + fi >> + >> + echo ' "-sdk", "$(STAGING_DIR)"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ],' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "extra-cpp-flags":[' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' "-lstdc++"' >> $(SWIFTPM_DESTINATION_FILE) >> + echo ' ]' >> $(SWIFTPM_DESTINATION_FILE) >> + echo '}' >> $(SWIFTPM_DESTINATION_FILE) >> + >> +endef >> + >> +$(eval $(generic-package)) >> +$(eval $(host-generic-package)) >> \ No newline at end of file > > Please make sure there's a newline at the end of the file. > > Regards, > Arnout > > [1] https://buildroot.org/downloads/manual/manual.html#DEVELOPERS > [2] https://patchwork.ozlabs.org/project/buildroot/list/?series=282194 > [3] https://buildroot.org/manual.html#_format_and_licensing_of_the_package_patches From alseycmiller at gmail.com Tue Mar 29 23:19:33 2022 From: alseycmiller at gmail.com (Alsey Miller) Date: Tue, 29 Mar 2022 16:19:33 -0700 Subject: [Buildroot] [PATCH 1/4] package/pkg-cmake: allow overriding toolchain In-Reply-To: References: <20220329185059.943889-1-alseycmiller@gmail.com> <6DD9DC86-9DF3-4CF8-9D7E-92F238643AA6@gmail.com> Message-ID: <057A8C3C-8DAC-46A3-86AB-2DAA92A9368B@gmail.com> I?ve submitted a new series of patches that I?ve tested with your patch. So the `LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN` line is remove and all `pkg-cmake` changes. > On Mar 29, 2022, at 1:10 PM, James Hilliard wrote: > > On Tue, Mar 29, 2022 at 1:58 PM Alsey Miller wrote: >> >> That commit is not merged and only seems to override the C flags. How can we force cmake to use Clang for target packages? I would be fine with basing my work that patch if support for using Clang and as the C and C++ compiler is added. > > It should allow overriding any of the toolchain variables like this: > https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-6-james.hilliard1 at gmail.com/ > > I think this will pretty much work as is with your libdispatch patch: > https://patchwork.ozlabs.org/project/buildroot/patch/20220329185059.943889-2-alseycmiller at gmail.com/ > > It should allow you to drop this part: > LIBDISPATCH_SUPPORTS_CMAKE_TOOLCHAIN = NO > > You might also be able to drop some of the other conf opts since the toolchain > file can then still be used with partial overrides. > >> >>> On Mar 29, 2022, at 12:26 PM, James Hilliard wrote: >>> >>> On Tue, Mar 29, 2022 at 1:18 PM Alsey Miller wrote: >>>> >>>> This change is necessary because if you specify the toolchain it will always use the GCC toolchain and C flags instead of the Clang cross compiler and custom C flags. This is not an issue for host packages, only for target. >>> >>> I think this is probably a better way of dealing with the issue: >>> https://patchwork.ozlabs.org/project/buildroot/patch/20220322232224.2842266-5-james.hilliard1 at gmail.com/ >>> >>>> >>>>> On Mar 29, 2022, at 11:50 AM, Alsey Coleman Miller wrote: >>>>> >>>>> Signed-off-by: Alsey Coleman Miller >>>>> --- >>>>> package/pkg-cmake.mk | 25 ++++++++++++++++++++++++- >>>>> 1 file changed, 24 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk >>>>> index 3b1db35fb6..9b36ee2b47 100644 >>>>> --- a/package/pkg-cmake.mk >>>>> +++ b/package/pkg-cmake.mk >>>>> @@ -57,7 +57,7 @@ $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast >>>>> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast >>>>> >>>>> $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES >>>>> - >>>>> +$(3)_SUPPORTS_CMAKE_TOOLCHAIN ?= YES >>>>> >>>>> ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) >>>>> $(2)_BUILDDIR = $$($(2)_SRCDIR) >>>>> @@ -82,6 +82,7 @@ ifeq ($(4),target) >>>>> # documented as a standard CMake variable. If a package supports it, >>>>> # it must handle it explicitly. >>>>> # >>>>> +ifeq ($(3)_SUPPORTS_CMAKE_TOOLCHAIN),YES) >>>>> define $(2)_CONFIGURE_CMDS >>>>> (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>>>> cd $$($$(PKG)_BUILDDIR) && \ >>>>> @@ -104,6 +105,28 @@ define $(2)_CONFIGURE_CMDS >>>>> ) >>>>> endef >>>>> else >>>>> +define $(2)_CONFIGURE_CMDS >>>>> + (mkdir -p $$($$(PKG)_BUILDDIR) && \ >>>>> + cd $$($$(PKG)_BUILDDIR) && \ >>>>> + rm -f CMakeCache.txt && \ >>>>> + PATH=$$(BR_PATH) \ >>>>> + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ >>>>> + -DCMAKE_INSTALL_PREFIX="/usr" \ >>>>> + -DCMAKE_COLOR_MAKEFILE=OFF \ >>>>> + -DBUILD_DOC=OFF \ >>>>> + -DBUILD_DOCS=OFF \ >>>>> + -DBUILD_EXAMPLE=OFF \ >>>>> + -DBUILD_EXAMPLES=OFF \ >>>>> + -DBUILD_TEST=OFF \ >>>>> + -DBUILD_TESTS=OFF \ >>>>> + -DBUILD_TESTING=OFF \ >>>>> + -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ >>>>> + $$(CMAKE_QUIET) \ >>>>> + $$($$(PKG)_CONF_OPTS) \ >>>>> + ) >>>>> +endef >>>>> +endif >>>>> +else >>>>> >>>>> # Configure package for host >>>>> define $(2)_CONFIGURE_CMDS >>>>> -- >>>>> 2.35.1 >>>>> >>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >> From dpb at corrigendum.ru Tue Mar 29 23:24:48 2022 From: dpb at corrigendum.ru (=?UTF-8?B?0KDQvtC80LDQvSDQlNC+0L3Rh9C10L3QutC+?=) Date: Wed, 30 Mar 2022 02:24:48 +0300 Subject: [Buildroot] Should the CONFIG_STACK_OPTIMIZATION_386 BusyBox option default to off? Message-ID: <6ef1aeb2-ce3c-eb63-fa59-9c666fe37856@corrigendum.ru> Hi, I tried to build a system using Buildroot with the x86-core2 glibc bleeding-edge toolchain. When testing the result, I discovered that the BusyBox shell segfaults upon executing any command. I investigated this, and found out that BusyBox calls libc routines with a misaligned stack. Apparently the i386 ABI was changed in version 1.1 [1] to require ESP+4 to be a multiple of 16 on function entry, and the version of glibc included with the toolchain expects that. On the other hand, BusyBox is built with -mpreferred-stack-boundary=2, so it ensures only that ESP is a multiple of 4. The -mpreferred-stack-boundary=2 option is controlled by BusyBox's CONFIG_STACK_OPTIMIZATION_386 configuration option, which in Buildroot is set to "y" by default. Since this configuration is incompatible with at least some toolchains and violates the ABI, perhaps the default ought to be "n" instead? -Roman. [1] , section 2.2.2 From vincent.stehle at laposte.net Wed Mar 30 00:28:13 2022 From: vincent.stehle at laposte.net (=?UTF-8?q?Vincent=20Stehl=C3=A9?=) Date: Wed, 30 Mar 2022 02:28:13 +0200 Subject: [Buildroot] [PATCH] package/zerofree: new package Message-ID: <20220330002813.19070-1-vincent.stehle@laposte.net> zerofree is a utility which scans the free blocks in an ext2 filesystem and fills any non-zero blocks with zeroes. https://frippery.org/uml/ Signed-off-by: Vincent Stehl? Cc: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/zerofree/Config.in | 14 ++++++++++++++ package/zerofree/zerofree.hash | 3 +++ package/zerofree/zerofree.mk | 22 ++++++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 package/zerofree/Config.in create mode 100644 package/zerofree/zerofree.hash create mode 100644 package/zerofree/zerofree.mk diff --git a/DEVELOPERS b/DEVELOPERS index a66b9d7eee..04e2bad5a2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2897,6 +2897,7 @@ F: configs/uevm5432_defconfig F: package/i7z/ F: package/msr-tools/ F: package/pixz/ +F: package/zerofree/ N: Vinicius Tinti F: package/python-thrift/ diff --git a/package/Config.in b/package/Config.in index 0d5d763180..0e58cbc832 100644 --- a/package/Config.in +++ b/package/Config.in @@ -238,6 +238,7 @@ menu "Filesystem and flash utilities" source "package/udftools/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" + source "package/zerofree/Config.in" source "package/zfs/Config.in" endmenu diff --git a/package/zerofree/Config.in b/package/zerofree/Config.in new file mode 100644 index 0000000000..c90add442e --- /dev/null +++ b/package/zerofree/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_ZEROFREE + bool "zerofree" + depends on BR2_USE_MMU # e2fsprogs + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_E2FSPROGS + help + zerofree is a utility which scans the free blocks in an ext2 + filesystem and fills any non-zero blocks with zeroes. + + https://frippery.org/uml/ + +comment "zerofree needs MMU, dynamic library and does not build with musl" + depends on !BR2_USE_MMU || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/zerofree/zerofree.hash b/package/zerofree/zerofree.hash new file mode 100644 index 0000000000..3399611787 --- /dev/null +++ b/package/zerofree/zerofree.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 956bc861b55ba0a2b7593c58d32339dab1a0e7da6ea2b813d27c80f08b723867 zerofree-1.1.1.tgz +sha256 90daae00475a992a367da5b0658469a5d1c4449dbbe964c5b7246e1aec92f491 COPYING diff --git a/package/zerofree/zerofree.mk b/package/zerofree/zerofree.mk new file mode 100644 index 0000000000..63c9fd57d8 --- /dev/null +++ b/package/zerofree/zerofree.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# zerofree +# +################################################################################ + +ZEROFREE_VERSION = 1.1.1 +ZEROFREE_SOURCE = zerofree-$(ZEROFREE_VERSION).tgz +ZEROFREE_SITE = https://frippery.org/uml +ZEROFREE_LICENSE = GPL-2.0 +ZEROFREE_LICENSE_FILE = COPYING +ZEROFREE_DEPENDENCIES = e2fsprogs + +define ZEROFREE_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all +endef + +define ZEROFREE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/zerofree $(TARGET_DIR)/usr/bin +endef + +$(eval $(generic-package)) -- 2.35.1 From bugzilla at busybox.net Wed Mar 30 00:39:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 00:39:59 +0000 Subject: [Buildroot] [Bug 14721] New: python-argon2_cffi no longer works Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14721 Bug ID: 14721 Summary: python-argon2_cffi no longer works Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: emile.cormier.jr at gmail.com CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9256 --> https://bugs.busybox.net/attachment.cgi?id=9256&action=edit Snippet of the build log concerning argon2-cffi and argon2-cffi-bindings Commit https://github.com/buildroot/buildroot/commit/e2957f5ce743cfaf4fb3aaa98d619e83e8e6989e breaks the argon2-cffi Python package for my ARM target (Beaglebone Black). The installation of the argon2-cffi Python package somehow got broken with the version bump. Just before that commit, I get (via serial terminal): # python -c 'help("modules")' | grep argon2 __future__ argon2 gzip selectors # python -c 'from argon2 import PasswordHasher; print(PasswordHasher().hash("cor rect horse battery staple"));' $argon2id$v=19$m=102400,t=2,p=8$qHc/evoNvfGlp98pE26Ayw$tZWcHYjxFTKDUoaSysapPA And just after that commit, I get: # python -c 'help("modules")' | grep argon2 _argon2_cffi_bindings ast hmac shutil Traceback (most recent call last): File "", line 1, in ModuleNotFoundError: No module named 'argon2' argon2-cffi is the only Python package I have enabled via menu xconfig for this test. I've attached a snippet of the build log concerning argon2-cffi and argon2-cffi-bindings. -- You are receiving this mail because: You are on the CC list for the bug. From emile.cormier.jr at gmail.com Wed Mar 30 00:54:18 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Tue, 29 Mar 2022 21:54:18 -0300 Subject: [Buildroot] python-argon2-cffi no longer works Message-ID: Hi Everyone, Commit https://github.com/buildroot/buildroot/commit e2957f5ce743cfaf4fb3aaa98d619e83e8e6989e breaks the argon2-cffi Python package for my ARM target (Beaglebone Black). The installation of the argon2-cffi Python package somehow got broken with the version bump. Just before that commit, I get (via serial terminal): # python -c 'help("modules")' | grep argon2 __future__ argon2 gzip selectors # python -c 'from argon2 import PasswordHasher; print(PasswordHasher().hash("cor rect horse battery staple"));' $argon2id$v=19$m=102400,t=2,p=8$qHc/evoNvfGlp98pE26Ayw$tZWcHYjxFTKDUoaSysapPA And just after that commit, I get: # python -c 'help("modules")' | grep argon2 _argon2_cffi_bindings ast hmac shutil Traceback (most recent call last): File "", line 1, in ModuleNotFoundError: No module named 'argon2' argon2-cffi is the only Python package I have enabled via make xconfig for this test. Any hints on how I can track down the problem would be appreciated. Note that I'm not an expert in Python or how its package management system works. I'm working on a project that is dependent on another Python project that depends on argon2-cffi. I submitted this bug report: https://bugs.busybox.net/show_bug.cgi?id=14721 Cheers, Emile Cormier -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 30 03:17:59 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 03:17:59 +0000 Subject: [Buildroot] [Bug 14721] python-argon2_cffi no longer works In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14721 --- Comment #1 from Emile Cormier --- TL;DR: The new Python flit setup infrastructure seems to be deploying to the wrong destination directory. ----- I see now that argon2-cffi now uses the new flit setup type. The argon2-cffi package now gets installed under /lib/python3.10/site-packages/argon2 whereas it used to be installed under /usr/lib/python3.10/site-packages Here's the output of 'python -m site' on my BeagleBone Black device: sys.path = [ '/lib/python3.10/site-packages/argon2', '/usr/lib/python310.zip', '/usr/lib/python3.10', '/usr/lib/python3.10/lib-dynload', '/usr/lib/python3.10/site-packages', ] USER_BASE: '/root/.local' (doesn't exist) USER_SITE: '/root/.local/lib/python3.10/site-packages' (doesn't exist) ENABLE_USER_SITE: True If I add /lib/python3.10/site-packages to the "real" system-wide site-packages via: echo "/lib/python3.10/site-packages" > /usr/lib/python3.10/site-packages/extra.pth then argon2 now appears in python -c 'help("modules")' and the following test command works! # python -c 'from argon2 import PasswordHasher; print(PasswordHasher().hash("correct horse battery staple"));' $argon2id$v=19$m=65536,t=3,p=4$CZO2H3qcZr/Vp9w0qVpLxA$eAz24Ry+cvSdRTJaPYDcf9HTc/Zyq/PmoFkFFPcQHm0 -- You are receiving this mail because: You are on the CC list for the bug. From emile.cormier.jr at gmail.com Wed Mar 30 04:05:36 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 01:05:36 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path Message-ID: package/pkg-python.mk: fix PEP517 purelib deployment path This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..6aaca1f465 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -149,7 +149,7 @@ HOST_PKG_PYTHON_PEP517_ENV = \ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(HOST_DIR)/usr/bin \ --data=$(HOST_DIR)/usr -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 30 04:11:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 04:11:23 +0000 Subject: [Buildroot] [Bug 14721] python-argon2_cffi no longer works In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14721 --- Comment #2 from Emile Cormier --- I've tracked it down to package/pkg-python.mk using /lib/python$(PYTHON3_VERSION_MAJOR)/site-packages instead of /usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages Submitted a patch via the mailing list: https://lists.buildroot.org/pipermail/buildroot/2022-March/639798.html I can import and use the argon2 module in a Python program with those changes. -- You are receiving this mail because: You are on the CC list for the bug. From emile.cormier.jr at gmail.com Wed Mar 30 04:21:31 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 01:21:31 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: Sorry, forgot to CC the relevant developers (at least who I think are relevant). I'm more accustomed to modern software collaboration tools like GitHub / GitLab / JIRA, to be honest. On Wed, Mar 30, 2022 at 1:05 AM Emile Cormier wrote: > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..6aaca1f465 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > + > --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - > --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + > --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -149,7 +149,7 @@ HOST_PKG_PYTHON_PEP517_ENV = \ > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + > --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(HOST_DIR)/usr/bin \ > --data=$(HOST_DIR)/usr > -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla at busybox.net Wed Mar 30 05:15:47 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 05:15:47 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #4 from Wim Meganck --- If I add BR2_PACKAGE_HOST_PYTHON3_BZIP2=y in the .config file is it gone after make. _bz2 is in the list of DISABLED_EXTENSIONS _bz2.*.so is indeed missing in output/host/lib/python3.10/lib-dynload -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 30 05:33:06 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 05:33:06 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #5 from Wim Meganck --- I made following changes in the .config: BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_PYTHON3_BZIP2=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_PYTHON3_BZIP2=y Rebuild bzip and python3. Run make _bz2 is still in the list of DISABLED_EXTENSIONS _bz2.*.so is still missing in output/host/lib/python3.10/lib-dynload But still same error Node.js configure: Found Python 3.10.2... Traceback (most recent call last): File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/./configure", line 30, in import configure File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/configure.py", line 14, in import bz2 File "/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/host/lib/python3.10/bz2.py", line 17, in from _bz2 import BZ2Compressor, BZ2Decompressor ModuleNotFoundError: No module named '_bz2' package/pkg-generic.mk:272: recipe for target '/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured' failed make[1]: *** [/home/wm/projects/televic/dev/buildroot-new4/output_confidea_g4_wcap/build/host-nodejs-14.18.3/.stamp_configured] Error 1 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Wed Mar 30 05:37:38 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 30 Mar 2022 05:37:38 +0000 Subject: [Buildroot] [Bug 14701] Multiple unresolved symbols while building kernel module package In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14701 --- Comment #4 from Jos? Pekkarinen --- I want to highlight that this may be a buildroot issue, and not a driver, or a linux one. This is because I tried the same kernel version on my laptop: $ uname -r 5.15.21-hardened1 And this is the building output of the module: make make -C /lib/modules/5.15.21-hardened1/build M=/home/pekkari/linux-sgx-driver-sgx_driver_2.14 modules make[1]: Entering directory '/usr/src/linux-headers-5.15.21-hardened1' CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_main.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_page_cache.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_ioctl.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_vma.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_util.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_encl.o CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/sgx_encl2.o LD [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/isgx.o MODPOST /home/pekkari/linux-sgx-driver-sgx_driver_2.14/Module.symvers WARNING: modpost: modpost: Found 2 writable function pointers. To see full details build your kernel with: 'make CONFIG_DEBUG_WRITABLE_FUNCTION_POINTERS_VERBOSE=y' CC [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/isgx.mod.o LD [M] /home/pekkari/linux-sgx-driver-sgx_driver_2.14/isgx.ko make[1]: Leaving directory '/usr/src/linux-headers-5.15.21-hardened1' and installing and loading the module I can see in dmesg: [ 233.145965] isgx: loading out-of-tree module taints kernel. [ 233.146006] isgx: module verification failed: signature and/or required key missing - tainting kernel [ 233.146559] intel_sgx: the CPU is missing SGX So symbols are in place, kernel is not wrong, module either, but buildroot configures the linker in a way the symbols are not found. Thanks! -- You are receiving this mail because: You are on the CC list for the bug. From james.hilliard1 at gmail.com Wed Mar 30 07:06:53 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 01:06:53 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Tue, Mar 29, 2022 at 10:06 PM Emile Cormier wrote: > > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..6aaca1f465 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ I must have copy pasted that wrong, usually /usr/lib is merged with /usr so worked for me when runtime testing. > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -149,7 +149,7 @@ HOST_PKG_PYTHON_PEP517_ENV = \ > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(HOST_DIR)/usr/bin \ > --data=$(HOST_DIR)/usr For the host I think all these paths should not be under /usr. > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Wed Mar 30 07:12:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:12:28 +0200 Subject: [Buildroot] [PATCH 2/3] package/qt5/qt5base: remove leftover patch In-Reply-To: <20220317163823.2913753-2-foss+buildroot@0leil.net> (Quentin Schulz's message of "Thu, 17 Mar 2022 17:38:22 +0100") References: <20220317163823.2913753-1-foss+buildroot@0leil.net> <20220317163823.2913753-2-foss+buildroot@0leil.net> Message-ID: <87ilrv9an7.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > From: Quentin Schulz > CVE-2021-38593 fixes originally missed a usecase that was covered by the > to-be-removed patch. However, this patch was incorrect and added some > issues on its own, which was then fixed by now-removed > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. > Unfortunately for us, the to-be-removed patch (fixed by > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually > be applied (with fuzz; by `patch` only) on top of the now-removed patch. > When the move to KDE Qt fork was made, some patches were removed as they > were already part of the new git fork. However, the to-be-removed patch > was not. This means the > 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually > undone when Buildroot patched qt5base. > Let's remove this patch to fix this oversight. > As a reference: > e7ea2ed27c Improve fix for avoiding huge number of tiny dashes > fixed by > 65b3aa6a1c Refix for avoiding huge number of tiny dashes > in the git repo. > Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From br015 at umbiko.net Wed Mar 30 07:13:32 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 30 Mar 2022 07:13:32 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> Message-ID: <35c2351b33bcb44d81333adfa848d221@umbiko.net> Hi Dan, cutting some old content. On 2022-03-29 19:19, Dan Jackson wrote: >> > However, now I have a new missing file error, and I can't seem to >> > locate a suitable candidate: >> > >> > In file included from >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/arch/arm/include/asm/system.h:165, >> > from >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/arch/arm/include/asm/bitops.h:27, >> > from include/linux/bitops.h:22, >> > from include/linux/kernel.h:17, >> > from include/linux/sched.h:55, >> > from arch/arm/kernel/asm-offsets.c:13: >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/arch/arm/include/asm/memory.h:19:10: >> > fatal error: mach/memory.h: No such file or directory >> > 19 | #include >> > | ^~~~~~~~~~~~~~~ >> > compilation terminated. >> > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 >> > Makefile:1009: recipe for target 'prepare0' failed >> > make[2]: *** [prepare0] Error 2 >> > make[2]: *** Waiting for unfinished jobs.... >> > HOSTCC scripts/mod/modpost.o >> > HOSTCC scripts/mod/sumversion.o >> > HOSTLD scripts/mod/modpost >> > make[2]: *** wait: No child processes. Stop. >> > package/pkg-generic.mk:289: recipe for target >> > '/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built' >> > failed >> > make[1]: *** >> > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_built] >> > Error 2 >> > Makefile:84: recipe for target '_all' failed >> > make: *** [_all] Error 2 >> >> This seems not to be the defconfig from above? It now uses >> linux-custom ... >> The failure may be due to the default kernel configuration. Try to >> configure >> the correct one and see if you get further. >> >> > I think maybe I am still doing something wrong because it sure seems >> > to be compiling a lot of stuff instead of letting me configure things. >> >> It gets better once everything necessary is built. > > Still no luck I'm afraid. Same error with mach/memory.h as above. > > Buildroot defconfig now looks like this: > > BR2_armeb=y > BR2_STATIC_LIBS=y > BR2_KERNEL_HEADERS_VERSION=y > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > BR2_PTHREAD_DEBUG=y > BR2_BINUTILS_VERSION_2_37_X=y > BR2_GCC_VERSION_9_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_HOST_GDB=y > BR2_GDB_VERSION_9_2=y > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" > BR2_PACKAGE_DROPBEAR=y > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions.h" > BR2_PACKAGE_JOE=y > > I forgot to mention this before but the buildroot manual page you > mentioned said to create a local.mk file in order to use external > source, this looks like this: > > LINUX_OVERRIDE_SRCDIR = > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ > > For the kernel configuration I entered the kernel source dir and did > "make menuconfig", I left everything at the defaults except for > enabling the USB related items. > > The resulting configuration file is attached as a text file. > Unfortunately it's been literally decades since I last actually > compiled a kernel, so I'm afraid I have no idea what bits would be > suitable to disable/remove to get the results I want (I'm guessing > this will be the most likely way to eliminate the error I'm getting?) I did a compile test this morning, the Buildroot version was some early 2022.02 version, not up-to-date. You have a potential header mismatch, Select Toolchain -> Kernel Headers -> Same as kernel being built to use the vendor source also for the headers. I could configure Linux with make menuconfig, did not encounter the missing memory.h error above, but the build stops during Linux kernel compilation with this error: /tmp/ccSO8f6S.s: Assembler messages: /tmp/ccSO8f6S.s:950: Error: .err encountered make[3]: *** [scripts/Makefile.build:284: arch/arm/kernel/sys_oabi-compat.o] Error 1 make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 make[1]: *** [package/pkg-generic.mk:292: /home/data/test/buildroot/output/build/linux-custom/.stamp_built] Error 2 make: *** [Makefile:84: _all] Error 2 Full error log is here: https://pastebin.com/VrXqSVsD You might now do some research: https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly-error-when-building-linux-kernel-3-14-17-in-buildroot-2020 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 or try to switch to an older compiler ... -- Andreas From peter at korsgaard.com Wed Mar 30 07:13:31 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:13:31 +0200 Subject: [Buildroot] [PATCH v1] package/qt5base: fix eglconvenience compile (missing QList include) In-Reply-To: <20220316182440.17393-1-ps.report@gmx.net> (Peter Seiderer's message of "Wed, 16 Mar 2022 19:24:40 +0100") References: <20220316182440.17393-1-ps.report@gmx.net> Message-ID: <87ee2j9alg.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - add 0008-eglconvenience-add-missing-QList-include.patch to fix > eglconvenience compile (missing QList include) > Fixes: > qeglconvenience.cpp:418:23: error: variable ?QList extensions? has initializer but incomplete type > 418 | QList extensions = > | ^~~~~~~~~~ > qeglconvenience.cpp:420:65: error: invalid use of incomplete type ?class QList? > 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); > | ^ > Signed-off-by: Peter Seiderer Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 07:12:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:12:54 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5base: fix eglconvenience compile (missing QList include) Message-ID: <20220330070437.AA0FE85FB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=988f192a659fff3b54e5ad00ebbb5b2615a03d7a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - add 0008-eglconvenience-add-missing-QList-include.patch to fix eglconvenience compile (missing QList include) Fixes: qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type 418 | QList extensions = | ^~~~~~~~~~ qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); | ^ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 68159373d1a1fcb542a1ad411141dc910b8e1d49) Signed-off-by: Peter Korsgaard --- ...-eglconvenience-add-missing-QList-include.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 0000000000..c7127291e4 --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ???QList extensions??? has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ???class QList??? + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + From peter at korsgaard.com Wed Mar 30 06:50:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 08:50:49 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: remove leftover patch Message-ID: <20220330070437.A0D1D85FB8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b2992d27bd63adc3d1c6f265b57e07746f0761f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x CVE-2021-38593 fixes originally missed a usecase that was covered by the to-be-removed patch. However, this patch was incorrect and added some issues on its own, which was then fixed by now-removed 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch. Unfortunately for us, the to-be-removed patch (fixed by 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually be applied (with fuzz; by `patch` only) on top of the now-removed patch. When the move to KDE Qt fork was made, some patches were removed as they were already part of the new git fork. However, the to-be-removed patch was not. This means the 0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually undone when Buildroot patched qt5base. Let's remove this patch to fix this oversight. As a reference: e7ea2ed27c Improve fix for avoiding huge number of tiny dashes fixed by 65b3aa6a1c Refix for avoiding huge number of tiny dashes in the git repo. Fixes: 5770a645a3a49 "package/qt5: bump packages to latest kde submodule versions" Cc: Quentin Schulz Signed-off-by: Quentin Schulz [Arnout: renumber patches 0007 and 0008] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3857bccca5e59dfe90fc5b5823bfe672a1847cd5) Signed-off-by: Peter Korsgaard --- ...scv32.patch => 0006-Fix-build-on-riscv32.patch} | 0 ...x-for-avoiding-huge-number-of-tiny-dashes.patch | 37 ---------------------- ...-configure.json-fix-atomicfptr-detection.patch} | 0 3 files changed, 37 deletions(-) diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch similarity index 100% rename from package/qt5/qt5base/0007-Fix-build-on-riscv32.patch rename to package/qt5/qt5base/0006-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200..0000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert L??hning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - diff --git a/package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch similarity index 100% rename from package/qt5/qt5base/0008-src-corelib-configure.json-fix-atomicfptr-detection.patch rename to package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch From james.hilliard1 at gmail.com Wed Mar 30 07:14:49 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 01:14:49 -0600 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.4 Message-ID: <20220330071449.4060342-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 839b12e619..00d3a4e191 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.12.4.tar.xz.sums +md5 cdb8acdc3acc9b5082e7db9c279155c3 cog-0.12.4.tar.xz +sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz +sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 2f6ef402fb..f2ca0af93d 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.1 +COG_VERSION = 0.12.4 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -- 2.25.1 From emile.cormier.jr at gmail.com Wed Mar 30 07:19:06 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 04:19:06 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 4:07 AM James Hilliard wrote: > On Tue, Mar 29, 2022 at 10:06 PM Emile Cormier > wrote: > > > > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > + > --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > --scripts=$(HOST_DIR)/usr/bin \ > > --data=$(HOST_DIR)/usr > > For the host I think all these paths should not be under /usr. > For me output/host/usr is a simlink to output/host: ls -l output/host total 48 drwxr-xr-x 3 emile emile 4096 Mar 30 01:27 arm-buildroot-linux-gnueabihf drwxr-xr-x 2 emile emile 12288 Mar 30 01:40 bin drwxr-xr-x 3 emile emile 4096 Mar 30 01:38 doc drwxr-xr-x 5 emile emile 4096 Mar 30 01:40 etc drwxr-xr-x 19 emile emile 4096 Mar 30 01:39 include drwxr-xr-x 7 emile emile 4096 Mar 30 01:39 lib lrwxrwxrwx 1 emile emile 3 Mar 30 01:27 lib64 -> lib drwxr-xr-x 2 emile emile 4096 Mar 30 01:32 libexec drwxr-xr-x 3 emile emile 4096 Mar 30 01:28 opt drwxr-xr-x 2 emile emile 4096 Mar 30 01:29 sbin drwxr-xr-x 22 emile emile 4096 Mar 30 01:38 share lrwxrwxrwx 1 emile emile 1 Mar 30 01:27 usr -> . -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 07:23:04 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 01:23:04 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 1:19 AM Emile Cormier wrote: > > > > On Wed, Mar 30, 2022 at 4:07 AM James Hilliard wrote: >> >> On Tue, Mar 29, 2022 at 10:06 PM Emile Cormier >> wrote: >> > >> > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > + --purelib=$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > --scripts=$(HOST_DIR)/usr/bin \ >> > --data=$(HOST_DIR)/usr >> >> For the host I think all these paths should not be under /usr. > > > For me output/host/usr is a simlink to output/host: Yeah, I think it usually works but should not have /usr for consistency. > ls -l output/host > total 48 > drwxr-xr-x 3 emile emile 4096 Mar 30 01:27 arm-buildroot-linux-gnueabihf > drwxr-xr-x 2 emile emile 12288 Mar 30 01:40 bin > drwxr-xr-x 3 emile emile 4096 Mar 30 01:38 doc > drwxr-xr-x 5 emile emile 4096 Mar 30 01:40 etc > drwxr-xr-x 19 emile emile 4096 Mar 30 01:39 include > drwxr-xr-x 7 emile emile 4096 Mar 30 01:39 lib > lrwxrwxrwx 1 emile emile 3 Mar 30 01:27 lib64 -> lib > drwxr-xr-x 2 emile emile 4096 Mar 30 01:32 libexec > drwxr-xr-x 3 emile emile 4096 Mar 30 01:28 opt > drwxr-xr-x 2 emile emile 4096 Mar 30 01:29 sbin > drwxr-xr-x 22 emile emile 4096 Mar 30 01:38 share > lrwxrwxrwx 1 emile emile 1 Mar 30 01:27 usr -> . From peter at korsgaard.com Wed Mar 30 07:29:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:29:05 +0200 Subject: [Buildroot] [PATCH] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series In-Reply-To: <20220322082939.2153092-1-peter@korsgaard.com> (Peter Korsgaard's message of "Tue, 22 Mar 2022 09:29:38 +0100") References: <20220322082939.2153092-1-peter@korsgaard.com> Message-ID: <87a6d799vi.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > 4.4.x is now EOL, so no more updates for that series. > Signed-off-by: Peter Korsgaard Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 07:28:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:28:24 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220330072006.72AA485FC0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e94e0515f22b99f142206c8006c91e3f8b0f8c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard (cherry picked from commit 607c5986a9b3bde0cacdbe38eeaea2ab456a6e80) [Peter: drop 5.15.x / 5.16.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index da50a2ced5..8276d1f737 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.103" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.107" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 2589f43b1d..fb96894977 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 2554d4aace..f1b031a46e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -347,11 +347,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From peter at korsgaard.com Wed Mar 30 07:26:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:26:13 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series Message-ID: <20220330072044.D31E085FC4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dcc62e62f8728b6d73ec43a419c1ce6abc93e05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 4.4.x is now EOL, so no more updates for that series. Signed-off-by: Peter Korsgaard (cherry picked from commit 607c5986a9b3bde0cacdbe38eeaea2ab456a6e80) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f21beb4222..f25b662aa5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.15.30" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 976f1d07c0..87a0f0465b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 cca7d6e053e33f44af1b39f7becec73a387911d81ede5a84ecf671692533138f linux-5.16.16.tar.xz +sha256 254ea2fe08f0aa07e4f7fffe95d12463df7fa6ff8a9ba72f321da15e50fa7132 linux-5.15.30.tar.xz +sha256 c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea linux-5.10.107.tar.xz +sha256 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9 linux-5.4.186.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 47470f83aa64e0098830a53176c959740742973663fead7ca7cc7b84e1f9d0f7 linux-4.9.307.tar.xz +sha256 9b6178099cf33c534c971f3f065c0debe92788f0f504d54badb2f8c2ee089d69 linux-4.14.272.tar.xz +sha256 530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 linux-4.19.235.tar.xz # Locally computed sha256 63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e linux-cip-5.10.104-cip3.tar.gz sha256 9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e linux-cip-5.10.104-cip3-rt3.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831..479f64b72e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -381,13 +381,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.9.307" if BR2_KERNEL_HEADERS_4_9 + default "4.14.272" if BR2_KERNEL_HEADERS_4_14 + default "4.19.235" if BR2_KERNEL_HEADERS_4_19 + default "5.4.186" if BR2_KERNEL_HEADERS_5_4 + default "5.10.107" if BR2_KERNEL_HEADERS_5_10 + default "5.15.30" if BR2_KERNEL_HEADERS_5_15 + default "5.16.16" if BR2_KERNEL_HEADERS_5_16 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From fperrad at gmail.com Wed Mar 30 07:31:52 2022 From: fperrad at gmail.com (Francois Perrad) Date: Wed, 30 Mar 2022 09:31:52 +0200 Subject: [Buildroot] [PATCH] package/luaexpt: bump to version 1.4.0 Message-ID: <20220330073152.1804932-1-francois.perrad@gadz.org> moved under the hat of https://github.com/lunarmodules remove upstream patch diff LICENSE: -The MIT License (MIT) -Copyright (c) 2013 Tom?s Guisasola +Copyright (C) 2003-2007 The Kepler Project, 2013-2022 Matthew Wild Signed-off-by: Francois Perrad --- .../0001-restore-getcurrentbytecount.patch | 40 ------------------- package/luaexpat/Config.in | 2 +- package/luaexpat/luaexpat.hash | 4 +- package/luaexpat/luaexpat.mk | 3 +- 4 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 package/luaexpat/0001-restore-getcurrentbytecount.patch diff --git a/package/luaexpat/0001-restore-getcurrentbytecount.patch b/package/luaexpat/0001-restore-getcurrentbytecount.patch deleted file mode 100644 index 6cf219267..000000000 --- a/package/luaexpat/0001-restore-getcurrentbytecount.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77cb691f781918908dfe34785f00a5ff75d5cc20 Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sat, 16 Feb 2019 15:56:00 +0100 -Subject: [PATCH] restore getcurrentbytecount - -see https://github.com/tomasguisasola/luaexpat/issues/3 - -Fetch from: https://github.com/tomasguisasola/luaexpat/commit/0926f2d705109b7d35b721344264b39c1169e0de - -Signed-off-by: Francois Perrad ---- - src/lxplib.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/luaexpat-1.3.3/src/lxplib.c b/luaexpat-1.3.3/src/lxplib.c -index 7726913..35bec3c 100644 ---- a/luaexpat-1.3.3/src/lxplib.c -+++ b/luaexpat-1.3.3/src/lxplib.c -@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) { - return 1; - } - -+static int lxp_getcurrentbytecount (lua_State* L) { -+ lxp_userdata *xpu = checkparser(L, 1); -+ lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser)); -+ return 1; -+} -+ - static const luaL_Reg lxp_meths[] = { - {"parse", lxp_parse}, - {"close", lxp_close}, - {"__gc", parser_gc}, - {"pos", lxp_pos}, -+ {"getcurrentbytecount", lxp_getcurrentbytecount}, - {"setencoding", lxp_setencoding}, - {"getcallbacks", getcallbacks}, - {"getbase", getbase}, --- -2.17.1 - diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in index 2322dc430..25b067460 100644 --- a/package/luaexpat/Config.in +++ b/package/luaexpat/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUAEXPAT help LuaExpat is a SAX XML parser based on the Expat library. - http://www.keplerproject.org/luaexpat/ + https://lunarmodules.github.io/luaexpat diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index dd1cf40e5..fbfb623fc 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b55908fcd7df490a59aab25284460add8283f1c6b94ab584900fe3e49775172a luaexpat-1.3.3-1.src.rock -sha256 7f5cb0c1750babcbb09637b7f0ff34972d51cf23b7f413bef902b47aa65febcd luaexpat-1.3.3/LICENSE +sha256 bee88ddc1063f49c5685b75b6696e8df0607a388432cbcb189cd0b8291d956aa luaexpat-1.4.0-1.src.rock +sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index 8c86b24f2..c176fb8c1 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,8 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.3.3-1 +LUAEXPAT_VERSION = 1.4.0-1 +LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE LUAEXPAT_DEPENDENCIES = expat -- 2.32.0 From aperez at igalia.com Wed Mar 30 07:44:19 2022 From: aperez at igalia.com (Adrian Perez de Castro) Date: Wed, 30 Mar 2022 10:44:19 +0300 Subject: [Buildroot] [PATCH 1/1] package/cog: bump to version 0.12.4 In-Reply-To: <20220330071449.4060342-1-james.hilliard1@gmail.com> References: <20220330071449.4060342-1-james.hilliard1@gmail.com> Message-ID: <20220330104419.GB1721679@momiji> Hi, Thanks James for the patch and for waiting until .4 was released to update it :) On Wed, 30 Mar 2022 01:14:49 -0600 James Hilliard wrote: > Signed-off-by: James Hilliard Acked-by: Adrian Perez de Castro > --- > package/cog/cog.hash | 8 ++++---- > package/cog/cog.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/cog/cog.hash b/package/cog/cog.hash > index 839b12e619..00d3a4e191 100644 > --- a/package/cog/cog.hash > +++ b/package/cog/cog.hash > @@ -1,7 +1,7 @@ > -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums > -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz > -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz > -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz > +# From https://wpewebkit.org/releases/cog-0.12.4.tar.xz.sums > +md5 cdb8acdc3acc9b5082e7db9c279155c3 cog-0.12.4.tar.xz > +sha1 600b30efadf55bf94ea5062a0a1b2ea0b74053e5 cog-0.12.4.tar.xz > +sha256 9983c621c8e14fca3792ff566cb6b86d6a1f17446eb4c083af4a5a749112982f cog-0.12.4.tar.xz > > # Hashes for license files: > sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING > diff --git a/package/cog/cog.mk b/package/cog/cog.mk > index 2f6ef402fb..f2ca0af93d 100644 > --- a/package/cog/cog.mk > +++ b/package/cog/cog.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -COG_VERSION = 0.12.1 > +COG_VERSION = 0.12.4 > COG_SITE = https://wpewebkit.org/releases > COG_SOURCE = cog-$(COG_VERSION).tar.xz > COG_INSTALL_STAGING = YES > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From peter at korsgaard.com Wed Mar 30 07:52:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 09:52:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: (Fabrice Fontaine's message of "Tue, 29 Mar 2022 23:22:30 +0200") References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> <87czi4a63p.fsf@dell.be.48ers.dk> Message-ID: <875ynv98sa.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Le mar. 29 mars 2022 ? 21:53, Peter Korsgaard a ?crit : >> >> >>>>> "Fabrice" == Fabrice Fontaine writes: >> >> > Fix the following build failure raised on uclibc and musl since the >> > reintroduction of the package in commit >> > 16ff948444c3978d63f483344a3d92d994c64312: >> >> Huh? This is the commit where ola was reintroduced, but this is a >> failure in grpc and the config doesn't even have ola enabled? > Indeed, I made a copy / paste error, the correct commit message should > have been: > "Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4" Ahh, so it also applies to the version we have in 2022.02.x (1.43.0)? Strangely enough we only have autobuilder failures for 1.44.0. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Wed Mar 30 09:53:40 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 11:53:40 +0200 Subject: [Buildroot] [PATCH 1/1] package/grpc: fix build with libexecinfo In-Reply-To: <875ynv98sa.fsf@dell.be.48ers.dk> References: <20220315173231.1943484-1-fontaine.fabrice@gmail.com> <87czi4a63p.fsf@dell.be.48ers.dk> <875ynv98sa.fsf@dell.be.48ers.dk> Message-ID: Le mer. 30 mars 2022 ? 09:52, Peter Korsgaard a ?crit : > > >>>>> "Fabrice" == Fabrice Fontaine writes: > > > Le mar. 29 mars 2022 ? 21:53, Peter Korsgaard a ?crit : > >> > >> >>>>> "Fabrice" == Fabrice Fontaine writes: > >> > >> > Fix the following build failure raised on uclibc and musl since the > >> > reintroduction of the package in commit > >> > 16ff948444c3978d63f483344a3d92d994c64312: > >> > >> Huh? This is the commit where ola was reintroduced, but this is a > >> failure in grpc and the config doesn't even have ola enabled? > > > Indeed, I made a copy / paste error, the correct commit message should > > have been: > > "Fix the following build failure raised on uclibc and musl since the > > addition of libexecinfo package in commit > > eea8ba446c10701a273432552108d80fb2224ef4" > > Ahh, so it also applies to the version we have in 2022.02.x (1.43.0)? > Strangely enough we only have autobuilder failures for 1.44.0. After further investigation, the build failure is raised by a library provided by libabseil-cpp. libabseil-cpp uses execinfo.h since version 20210324.0 and https://github.com/abseil/abseil-cpp/commit/dc969f34a79d019497abb61c2a3f79b5b4be2ea9 2022.02.x uses 20211102.0 so I think this patch should be applied to this branch. > > -- > Bye, Peter Korsgaard Best Regards, Fabrice From br015 at umbiko.net Wed Mar 30 13:27:49 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 30 Mar 2022 15:27:49 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: disable expat explicitly unless target package exists Message-ID: <20220330132749.1417115-1-br015@umbiko.net> Background: During configuration, mpd tries to determine the availability of optional dependencies using (host) pkgconfig and CMake. If host and target architecture are identical, it locates host-libexpat (CMake dependency) and tries to incorporate it into the build process. The link step fails subsequently, because some dependencies of host binaries come from the build machine, and are not present on the target. This results in the following build error: /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: warning: libc.so.6, needed by /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7, not found (try using -rpath or -rpath-link) /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7: undefined reference to `__errno_location at GLIBC_2.2.5' The link step fails, because libexpat was built against the build machine's C library. The optional expat dependency is disabled, unless the expat target package is selected. This is in line with BR2_PACKAGE_MPD_UPNP_* handling logic, which selects the target package and needs to enable the expat option. The grey area of expat present on the target for other reasons, but not explicitly needed for mpd, is accepted to avoid making the logic too complicated. Signed-off-by: Andreas Ziegler --- package/mpd/mpd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 12da36098f..c1ad1bc6c6 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -21,6 +21,11 @@ MPD_CONF_OPTS = \ -Dpipewire=disabled \ -Dsnapcast=false +# Disable expat explicitly, unless the target package is selected +ifneq ($(BR2_PACKAGE_EXPAT),y) +MPD_CONF_OPTS += -Dexpat=disabled +endif + # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) MPD_DEPENDENCIES += avahi -- 2.34.1 From dgouarin at gmail.com Wed Mar 30 15:30:13 2022 From: dgouarin at gmail.com (David GOUARIN) Date: Wed, 30 Mar 2022 17:30:13 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix build with BR2_ENABLE_DEBUG Message-ID: <20220330153013.16091-1-david.gouarin@thalesgroup.com> Signed-off-by: David GOUARIN --- package/pkg-cargo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index f7e3f39503..cf5ee2ae54 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -155,6 +155,7 @@ define $(2)_INSTALL_TARGET_CMDS $$($(2)_CARGO_ENV) \ cargo install \ --offline \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,) \ --root $$(TARGET_DIR)/usr/ \ --bins \ --path ./ \ -- 2.17.1 From dgouarin at gmail.com Wed Mar 30 16:04:36 2022 From: dgouarin at gmail.com (David GOUARIN) Date: Wed, 30 Mar 2022 18:04:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo.mk: fix build with BR2_ENABLE_DEBUG Message-ID: <20220330160436.16357-1-david.gouarin@thalesgroup.com> When building with BR2_ENABLE_DEBUG, cargo packages are first built with --debug, then the installation step rebuilds the sources in release mode with cargo install. This is because cargo install forces a rebuild when the --path option is used. This patch adds a --debug to the cargo install command line as a workaround when necessary, but it does not address the root cause, which is that cargo install will rebuild the sources, possibly with different build options. For example, when one use PKG_CARGO_BUILD_OPTS = --features myfeature, one must also use PKG_CARGO_INSTALL_OPTS = --features myfeature. Signed-off-by: David GOUARIN --- package/pkg-cargo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index f7e3f39503..cf5ee2ae54 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -155,6 +155,7 @@ define $(2)_INSTALL_TARGET_CMDS $$($(2)_CARGO_ENV) \ cargo install \ --offline \ + $$(if $$(BR2_ENABLE_DEBUG),--debug,) \ --root $$(TARGET_DIR)/usr/ \ --bins \ --path ./ \ -- 2.17.1 From peter at korsgaard.com Wed Mar 30 16:32:39 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 18:32:39 +0200 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220329050401.110856-1-Jason@zx2c4.com> (Jason A. Donenfeld's message of "Tue, 29 Mar 2022 01:04:01 -0400") References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> Message-ID: <871qyj8kpk.fsf@dell.be.48ers.dk> >>>>> "Jason" == Jason A Donenfeld writes: Hi, > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. As discussed on IRC, I think it would be nicer to just add a normal seedrng package and depend on that from urandom-scripts, so the standard version/license info/.. stuff works. I can do that change if needed. You mentioned something on IRC about this containing differences from what it is seedrng.git. Those changes/fixes are presumably not specific to Buildroot, will you add those changes to the git repo as well? > +# The following knobs can be adjusted by placing uncommented modified lines > +# into /etc/default/urandom: > +# > +# Set these to change where the seed and runtime lock file are stored: > +# > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > +# Will you add the logic for these features to seedrng.git? If not, then I don't think we should have them here either. A bunch of other code already expects "normal" locations, so people generally have to handle such customizations by symlinks in their rootfs(-overlay). If this customization is left in, then it should ideally use the existing (directory part of) URANDOM_SEED, which used to be how the location could be customized for backwards compatibility. > case "$1" in > start|restart|reload) > # Carry a random seed from start-up to start-up > # Load and then save the whole entropy pool > - init_rng && save_random_seed;; > + # Never fail, as this isn't worth making a fuss > + # over if it doesn't go as planned. > + seedrng || true;; > stop) > # Carry a random seed from shut-down to start-up > # Save the whole entropy pool > - save_random_seed;; > + seedrng;; Nice and short! The comments above are not really correct any more, as the stop logic also loads. > +++ b/package/urandom-scripts/seedrng.c .. > +#define le32_to_cpup(a) le32toh(*(a)) > +#define cpu_to_le32(a) htole32(a) What is the purpose of the to/from le32 stuff in this use case? > + > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); The 0400 confused me a bit, as that would normally cause the open to fail when the file exists, but it happens to work as you unlink above / use the lock file. > + if (fd < 0) { > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); > + program_ret |= 1 << 4; > + goto out; > + } > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); > + program_ret |= 1 << 5; > + goto out; > + } > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); > + program_ret |= 1 << 6; > + } > +out: > + if (fd >= 0) > + close(fd); > + if (lock >= 0) > + close(lock); No fsync of the directory like you do in seed_from_file_if_exists()? -- Bye, Peter Korsgaard From David.Laight at ACULAB.COM Wed Mar 30 16:57:37 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Wed, 30 Mar 2022 16:57:37 +0000 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <871qyj8kpk.fsf@dell.be.48ers.dk> References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: <50a8049df34e4adcba0476bc66ba8f08@AcuMS.aculab.com> From: Peter Korsgaard > Sent: 30 March 2022 17:33 > > Hi, > > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, the seedrng project provides a > > basic script meant to be copy and pasted into projects like buildroot > > and tweaked as needed: . > > > This commit imports it into buildroot and wires up the init scripts to > > call it. This also is a significant improvement over the current init > > script, which doesn't credit entropy and whose hashing in shell scripts > > is sort of fragile. > > > As seedrng.c is a short tiny C program, we include this here in the > > package, like a few other packages do. Later we'll investigate adding > > this to busybox, but for now, this is a good start and a positive step > > in the right direction. > > As discussed on IRC, I think it would be nicer to just add a normal > seedrng package and depend on that from urandom-scripts, so the standard > version/license info/.. stuff works. I can do that change if needed. > > You mentioned something on IRC about this containing differences from > what it is seedrng.git. Those changes/fixes are presumably not specific > to Buildroot, will you add those changes to the git repo as well? I remember this 'not so little' program limiting the amount of data saved and restored to a fairly small amount. I think it referred to a limit in the kernel. I just wrote a 10 line program to copy a file to /dev/urandom using the ioctl so that the 'entropy' is credited. AFAICT the kernel copied all the data into the pool and would credit quite a lot of entropy. There is a loop that uses an 128 byte on-stack buffer. But it is a loop. Another thing I noticed is that the script is S20urandom. This runs rather late, things like udev have already tried to read random numbers. The script really needs to run much sooner. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From fontaine.fabrice at gmail.com Wed Mar 30 16:57:02 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 18:57:02 +0200 Subject: [Buildroot] [PATCH v2,1/1] package/pango: fix empty-body Message-ID: <20220330165702.1018014-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.50.5 in commit 68b0efbae49a42d0e14d6040e5e7e573d382ff75: ../utils/viewer-cairo.c: In function 'cairo_vector_view_create': ../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] ; ^ Fixes: - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Arnout Vandecappelle): - Fix error instead of dropping -Werror ...-utils-viewer-cairo-c-fix-empty-body.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch diff --git a/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch b/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch new file mode 100644 index 0000000000..4b7b5f9b19 --- /dev/null +++ b/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch @@ -0,0 +1,40 @@ +From 5372a0cfd641776ece77db5590bf0d265e810086 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 29 Mar 2022 21:39:03 +0000 +Subject: [PATCH] utils/viewer-cairo.c: fix empty-body + +Fix the following build failure raised +since version 1.50.5 and +https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e: + +../utils/viewer-cairo.c: In function 'cairo_vector_view_create': +../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] + ; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://gitlab.gnome.org/GNOME/pango/-/commit/5372a0cfd641776ece77db5590bf0d265e810086] +--- + utils/viewer-cairo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/viewer-cairo.c b/utils/viewer-cairo.c +index ca98c1cd..f15b3fb9 100644 +--- a/utils/viewer-cairo.c ++++ b/utils/viewer-cairo.c +@@ -225,7 +225,7 @@ cairo_vector_view_create (const PangoViewer *klass G_GNUC_UNUSED) + return NULL; + + if (0) +- ; ++ {} + #ifdef CAIRO_HAS_SVG_SURFACE + else if (0 == g_ascii_strcasecmp (extension, "svg")) + constructor = cairo_svg_surface_create; +-- +GitLab + -- 2.35.1 From hrsourabh011 at gmail.com Wed Mar 30 17:04:11 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 30 Mar 2022 19:04:11 +0200 Subject: [Buildroot] Run-time dependency error | C shared or static library 'acl' not found Message-ID: Hello All, I am building casync to use with the "rauc" tool. And I am using Buildroot 2022.02 as build system and I have enabled "host meson-tools " in Buildroot "menuconfig ". But while building using https://github.com/systemd/casync#building-casync meson build && ninja -C build && sudo ninja -C build install I am getting the below errors: Found pkg-config: /root/raspcm4/sources/output/host/bin/pkg-config (1.6.3) Run-time dependency liblzma found: YES 5.2.5 Run-time dependency zlib found: YES 1.2.11 Run-time dependency libzstd found: YES 1.5.2 Run-time dependency libcurl found: YES 7.81.0 Run-time dependency openssl found: YES 1.1.1m meson.build:135:0: ERROR: C shared or static library 'acl' not found But BR2_PACKAGE_ACL=y is already selected. Can you please let me know what is the proper package that should be selected in Buildroot? And also what are the other Run-time dependencies (libs/packages) that should be selected in Buildroot? Your help will be much appreciated. Thanks in advance Kind Regards, Sourabh -------------- next part -------------- An HTML attachment was scrubbed... URL: From Jason at zx2c4.com Wed Mar 30 17:13:08 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Wed, 30 Mar 2022 13:13:08 -0400 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <871qyj8kpk.fsf@dell.be.48ers.dk> References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: Hi Peter, On 3/30/22, Peter Korsgaard wrote: >>>>>> "Jason" == Jason A Donenfeld writes: > > Hi, > > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, the seedrng project provides a > > basic script meant to be copy and pasted into projects like buildroot > > and tweaked as needed: . > > > This commit imports it into buildroot and wires up the init scripts to > > call it. This also is a significant improvement over the current init > > script, which doesn't credit entropy and whose hashing in shell scripts > > is sort of fragile. > > > As seedrng.c is a short tiny C program, we include this here in the > > package, like a few other packages do. Later we'll investigate adding > > this to busybox, but for now, this is a good start and a positive step > > in the right direction. > > As discussed on IRC, I think it would be nicer to just add a normal > seedrng package and depend on that from urandom-scripts, so the standard > version/license info/.. stuff works. I can do that change if needed. > > You mentioned something on IRC about this containing differences from > what it is seedrng.git. Those changes/fixes are presumably not specific > to Buildroot, will you add those changes to the git repo as well? Absolutely not. This 100% does not work for me. I have made it abundantly clear to you that seedrng is code that's meant to be copied into individual distros and tweaked as needed, which I've done for Buildroot. Do not attempt to package it from any repos I may have. If you try to do that, I will intentionally interfere with those operations server side, and take whatever other adversarial steps to ensure my server is not misused for that purpose. I also will not incorporate buildroot-specific tweaks into the sample code repo. That repo supplies sample code. After Yann's absence, I took the necessary steps that a maintainer like him would have done to customize it to Buildroot's needs, incorporating it into the project, and taking into account James' comments. You now have the result of that work here, and I think it'd be silly not to take it. I am offering to maintain this code inside of Buildroot for you. I'm generally very much on top of things in that regard. I'm not offering to start and maintain an external project at your request, no matter how much pressure and conditionalization you apply on this mailing list or IRC. That's not work I'll do for you. However, again, I am offering to maintain this for you inside the buildroot repo as this patch does. That's my offer; take it or leave it. > > > > +# The following knobs can be adjusted by placing uncommented modified > lines > > +# into /etc/default/urandom: > > +# > > +# Set these to change where the seed and runtime lock file are stored: > > +# > > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > > +# > > Will you add the logic for these features to seedrng.git? If not, then I > don't think we should have them here either. A bunch of other code already > expects "normal" locations, so people generally have to handle such > customizations by symlinks in their rootfs(-overlay). > > If this customization is left in, then it should ideally use the > existing (directory part of) URANDOM_SEED, which used to be how the > location could be customized for backwards compatibility. As mentioned, no tweaks go up to seedrng.git. That's sample code. I'm inclined to agree with James' assessment about this, that Buildroot needs it to be customizable. Happy to send a v4 of this patch adjusting the defaults to have paths similar to what was there before. > > > > case "$1" in > > start|restart|reload) > > # Carry a random seed from start-up to start-up > > # Load and then save the whole entropy pool > > - init_rng && save_random_seed;; > > + # Never fail, as this isn't worth making a fuss > > + # over if it doesn't go as planned. > > + seedrng || true;; > > stop) > > # Carry a random seed from shut-down to start-up > > # Save the whole entropy pool > > - save_random_seed;; > > + seedrng;; > > Nice and short! The comments above are not really correct any more, as > the stop logic also loads. Ack, will get rid of those comments for v4. > > > > +++ b/package/urandom-scripts/seedrng.c > .. > > > +#define le32_to_cpup(a) le32toh(*(a)) > > +#define cpu_to_le32(a) htole32(a) > > What is the purpose of the to/from le32 stuff in this use case? So that blake2s passes its test vectors. We're not about to go messing around with the internal encoding of a hash function. B2s specifies little endian, so that's what we use. > > > + > > + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", > new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); > > + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); > > The 0400 confused me a bit, as that would normally cause the open to > fail when the file exists, but it happens to work as you unlink above / > use the lock file. > > >> + if (fd < 0) { > > + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", > strerror(errno)); > > + program_ret |= 1 << 4; > > + goto out; > > + } > > + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || > fsync(fd) < 0) { > > + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", > strerror(errno)); > > + program_ret |= 1 << 5; > > + goto out; > > + } > > + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) > < 0) { > > + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", > strerror(errno)); > > + program_ret |= 1 << 6; > > + } > > +out: > > + if (fd >= 0) > > + close(fd); > > + if (lock >= 0) > > + close(lock); > > No fsync of the directory like you do in seed_from_file_if_exists()? No, it's not necessary here, because this is a transition from no-credit to credit, so if the power clicks off at the bad moment, it fails closed instead of open. From peter at korsgaard.com Wed Mar 30 17:19:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:19:54 +0200 Subject: [Buildroot] [PATCH 1/1] package/libgee: needs gcc >= 4.9 In-Reply-To: <20220317190027.183976-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 17 Mar 2022 20:00:27 +0100") References: <20220317190027.183976-1-fontaine.fabrice@gmail.com> Message-ID: <87wngb73yd.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised since bump to version 0.20.5 > in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and > https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: > task.c:59:1: error: initializer element is not constant > static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; > ^ > Fixes: > - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 17:21:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:21:02 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/spidev_test: fix spidev_test.c version in Config.in help text In-Reply-To: <20220318082446.18552-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 09:24:45 +0100") References: <20220318082446.18552-1-ps.report@gmx.net> Message-ID: <87sfqz73wh.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - fix spidev_test.c version in Config.in help text, version update to 4.10 > (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) > [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 17:20:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:20:38 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220330171238.9084285FCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cff54794f668598f64e45b95a11ddbe8f5a6046 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 53da16e3786cbf4c7637dacfddeef58c315cce66) Signed-off-by: Peter Korsgaard --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..aa57b5edbf 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. From peter at korsgaard.com Wed Mar 30 17:19:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:19:36 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/libgee: needs gcc >= 4.9 Message-ID: <20220330171246.D348C85FD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b78b4fedb5c19e87d866fdef0acd028c633fa900 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised since bump to version 0.20.5 in commit 10780e8d6df83d7a92b6dd3282e91fdc0ba369af and https://gitlab.gnome.org/GNOME/libgee/-/commit/f0ccfe94ff731929e93601a38f931a12d52e5c2e: task.c:59:1: error: initializer element is not constant static GOnce gee_task_data_async_pool = (GOnce) G_ONCE_INIT; ^ Fixes: - http://autobuild.buildroot.org/results/8354ea4192bcf2eb9c3be74d93b640db52ced10a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit de59a62af68593303bf420338e719a17e1a5e243) Signed-off-by: Peter Korsgaard --- package/granite/Config.in | 6 ++++-- package/libgee/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d..9519e16d45 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985..cb33ec9ec2 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From peter at korsgaard.com Wed Mar 30 17:20:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:20:21 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/spidev_test: fix spidev_test.c version in Config.in help text Message-ID: <20220330171246.DCE2B85FD2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=997ac4e38bb9a98dfa3db8b046fcaaae192d5291 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - fix spidev_test.c version in Config.in help text, version update to 4.10 (missing from commit 'spidev_test: bump to version in Linux 4.10' [1]) [1] https://git.buildroot.net/buildroot/commit/?id=a497a9fd6cdb518572282b1478279f476f870fb7 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 53da16e3786cbf4c7637dacfddeef58c315cce66) Signed-off-by: Peter Korsgaard --- package/spidev_test/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b6..aa57b5edbf 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 + if it's older than 3.15 then 3.0 is used, otherwise 4.10 is used. This means you won't have quad-pumped SPI support if your toolchain is too old. From peter at korsgaard.com Wed Mar 30 17:25:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:25:24 +0200 Subject: [Buildroot] [PATCH v1 1/2] package/libcamera-apps: X11 support needs libdrm In-Reply-To: <20220318131058.32240-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 18 Mar 2022 14:10:57 +0100") References: <20220318131058.32240-1-ps.report@gmx.net> Message-ID: <87o81n73p7.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - X11 support needs libdrm (optional libdrm dependency already > present in libcamera-apps.mk) > Fixes: > http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e > .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 18 | #include > | ^~~~~~~~~~~~~~~~~~~~~ > Signed-off-by: Peter Seiderer Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 17:24:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 19:24:35 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/libcamera-apps: X11 support needs libdrm Message-ID: <20220330171617.74A7285FD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=208aee57beb66f8b2739033c694277cd03bc9718 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - X11 support needs libdrm (optional libdrm dependency already present in libcamera-apps.mk) Fixes: http://autobuild.buildroot.net/results/5df48038df5deb4f1e85287cde9a403c5681c28e .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:18:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 18 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e2bc5e916beedc1965da2a7bf9a86e74b24a5562) Signed-off-by: Peter Korsgaard --- package/libcamera-apps/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d23..492a99cf55 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 From bernd.kuhls at t-online.de Wed Mar 30 17:29:15 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 30 Mar 2022 19:29:15 +0200 Subject: [Buildroot] [PATCH 1/1] package/libzlib: security bump version to 1.2.12 Message-ID: <20220330172915.265828-1-bernd.kuhls@t-online.de> Fixes CVE-2018-25032. Release notes: http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html Changelog: https://github.com/madler/zlib/blob/master/ChangeLog Updated license hash due to version bump, reformatted hashes: https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 Signed-off-by: Bernd Kuhls --- package/libzlib/libzlib.hash | 4 ++-- package/libzlib/libzlib.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b1011..e6ca974e2f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d1..933732d6ba 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.12 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib -- 2.30.2 From fontaine.fabrice at gmail.com Wed Mar 30 17:32:37 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 19:32:37 +0200 Subject: [Buildroot] [PATCH 1/1] package/upower: add gobject-introspection optional dependency Message-ID: <20220330173237.1377195-1-fontaine.fabrice@gmail.com> gobject-introspection is an optional dependency which is enabled by default since https://gitlab.freedesktop.org/upower/upower/-/commit/0d7bf34ed6702c60028fa80e5d481621e9741d09 Signed-off-by: Fabrice Fontaine --- package/upower/upower.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/upower/upower.mk b/package/upower/upower.mk index 8989ca9f5d..a6f39d2f46 100644 --- a/package/upower/upower.mk +++ b/package/upower/upower.mk @@ -22,4 +22,11 @@ UPOWER_DEPENDENCIES = \ UPOWER_CONF_OPTS = --disable-man-pages --disable-tests +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +UPOWER_CONF_OPTS += --enable-introspection +UPOWER_DEPENDENCIES += gobject-introspection +else +UPOWER_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) -- 2.35.1 From emile.cormier.jr at gmail.com Wed Mar 30 17:37:41 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 14:37:41 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 4:23 AM James Hilliard wrote: > On Wed, Mar 30, 2022 at 1:19 AM Emile Cormier > wrote: > > For me output/host/usr is a simlink to output/host: > > Yeah, I think it usually works but should not have /usr for consistency. > I tried removing 'usr/' from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS, and the print(PasswordHasher().hash("foo")) test still works for me on the target device. Do you want me to issue another patch with the 'usr/' portion removed from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS? I don't care about receiving credit for such trivial changes. Please do whatever is most expedient to fix the problem. -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 18:01:11 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 12:01:11 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. On Wed, Mar 30, 2022 at 11:37 AM Emile Cormier wrote: > > On Wed, Mar 30, 2022 at 4:23 AM James Hilliard wrote: >> >> On Wed, Mar 30, 2022 at 1:19 AM Emile Cormier >> wrote: >> > For me output/host/usr is a simlink to output/host: >> >> Yeah, I think it usually works but should not have /usr for consistency. > > > I tried removing 'usr/' from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS, and the print(PasswordHasher().hash("foo")) test still works for me on the target device. > > Do you want me to issue another patch with the 'usr/' portion removed from PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS as well as HOST_PKG_PYTHON_PEP517_INSTALL_OPTS? I don't care about receiving credit for such trivial changes. Please do whatever is most expedient to fix the problem. From bernd.kuhls at t-online.de Wed Mar 30 18:06:05 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 30 Mar 2022 20:06:05 +0200 Subject: [Buildroot] [PATCH v2 1/1] package/libzlib: security bump version to 1.2.12 Message-ID: <20220330180605.557933-1-bernd.kuhls@t-online.de> Fixes CVE-2018-25032. Release notes: http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html Changelog: https://github.com/madler/zlib/blob/master/ChangeLog Added upstream patch to fix build error. Updated license hash due to version bump, reformatted hashes: https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 Signed-off-by: Bernd Kuhls --- v2: added upstream patch to fix build error ...hat-discarded-provided-CC-definition.patch | 28 +++++++++++++++++++ package/libzlib/libzlib.hash | 4 +-- package/libzlib/libzlib.mk | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch new file mode 100644 index 0000000000..398e1c9481 --- /dev/null +++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch @@ -0,0 +1,28 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +Downloaded from upstream commit: +https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d + +Signed-off-by: Bernd Kuhls +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b1011..e6ca974e2f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d1..933732d6ba 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.12 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib -- 2.30.2 From emile.cormier.jr at gmail.com Wed Mar 30 18:51:45 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 15:51:45 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 3:01 PM James Hilliard wrote: > I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. > Alright, I've changed it as you suggested and it still works for me. I'll post an updated patch. -------------- next part -------------- An HTML attachment was scrubbed... URL: From emile.cormier.jr at gmail.com Wed Mar 30 18:52:26 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 15:52:26 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: package/pkg-python.mk: fix PEP517 purelib deployment path This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..ab4f7af6a6 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR)/usr ################################################################################ On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier wrote: > On Wed, Mar 30, 2022 at 3:01 PM James Hilliard > wrote: > >> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. >> > > Alright, I've changed it as you suggested and it still works for me. I'll > post an updated patch. > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dan at thejacksons.uk Wed Mar 30 19:18:10 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Wed, 30 Mar 2022 19:18:10 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <35c2351b33bcb44d81333adfa848d221@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 30 March 2022 08:14 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > Hi Dan, > > cutting some old content. > > On 2022-03-29 19:19, Dan Jackson wrote: > > > > >> > However, now I have a new missing file error, and I can't seem to > >> > locate a suitable candidate: > >> > > >> > In file included from > >> > /home/danj/buildroot-2022.02/output/build/linux- > >> custom/arch/arm/include/asm/system.h:165, > >> > from > >> > /home/danj/buildroot-2022.02/output/build/linux- > >> custom/arch/arm/include/asm/bitops.h:27, > >> > from include/linux/bitops.h:22, > >> > from include/linux/kernel.h:17, > >> > from include/linux/sched.h:55, > >> > from arch/arm/kernel/asm-offsets.c:13: > >> > /home/danj/buildroot-2022.02/output/build/linux- > >> custom/arch/arm/include/asm/memory.h:19:10: > >> > fatal error: mach/memory.h: No such file or directory > >> > 19 | #include > >> > | ^~~~~~~~~~~~~~~ > >> > compilation terminated. > >> > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: > >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > >> > Makefile:1009: recipe for target 'prepare0' failed > >> > make[2]: *** [prepare0] Error 2 > >> > make[2]: *** Waiting for unfinished jobs.... > >> > HOSTCC scripts/mod/modpost.o > >> > HOSTCC scripts/mod/sumversion.o > >> > HOSTLD scripts/mod/modpost > >> > make[2]: *** wait: No child processes. Stop. > >> > package/pkg-generic.mk:289: recipe for target > >> > '/home/danj/buildroot-2022.02/output/build/linux- > custom/.stamp_built' > >> > failed > >> > make[1]: *** > >> > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_buil > >> > t] > >> > Error 2 > >> > Makefile:84: recipe for target '_all' failed > >> > make: *** [_all] Error 2 > >> > >> This seems not to be the defconfig from above? It now uses > >> linux-custom ... > >> The failure may be due to the default kernel configuration. Try to > >> configure the correct one and see if you get further. > >> > >> > I think maybe I am still doing something wrong because it sure > >> > seems to be compiling a lot of stuff instead of letting me configure > things. > >> > >> It gets better once everything necessary is built. > > > > Still no luck I'm afraid. Same error with mach/memory.h as above. > > > > Buildroot defconfig now looks like this: > > > > BR2_armeb=y > > BR2_STATIC_LIBS=y > > BR2_KERNEL_HEADERS_VERSION=y > > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > > BR2_PTHREAD_DEBUG=y > > BR2_BINUTILS_VERSION_2_37_X=y > > BR2_GCC_VERSION_9_X=y > > BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_PACKAGE_HOST_GDB=y > > BR2_GDB_VERSION_9_2=y > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > > > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 > FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" > > BR2_PACKAGE_DROPBEAR=y > > > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions > .h" > > BR2_PACKAGE_JOE=y > > > > I forgot to mention this before but the buildroot manual page you > > mentioned said to create a local.mk file in order to use external > > source, this looks like this: > > > > LINUX_OVERRIDE_SRCDIR = > > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ > > > > For the kernel configuration I entered the kernel source dir and did > > "make menuconfig", I left everything at the defaults except for > > enabling the USB related items. > > > > The resulting configuration file is attached as a text file. > > Unfortunately it's been literally decades since I last actually > > compiled a kernel, so I'm afraid I have no idea what bits would be > > suitable to disable/remove to get the results I want (I'm guessing > > this will be the most likely way to eliminate the error I'm getting?) > > I did a compile test this morning, the Buildroot version was some early > 2022.02 version, not up-to-date. > > You have a potential header mismatch, Select Toolchain -> Kernel Headers > -> Same as kernel being built to use the vendor source also for the > headers. > > I could configure Linux with make menuconfig, did not encounter the > missing memory.h error above, but the build stops during Linux kernel > compilation with this error: > > /tmp/ccSO8f6S.s: Assembler messages: > /tmp/ccSO8f6S.s:950: Error: .err encountered > make[3]: *** [scripts/Makefile.build:284: > arch/arm/kernel/sys_oabi-compat.o] Error 1 > make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 > make[1]: *** [package/pkg-generic.mk:292: > /home/data/test/buildroot/output/build/linux-custom/.stamp_built] Error > 2 > make: *** [Makefile:84: _all] Error 2 > > Full error log is here: https://pastebin.com/VrXqSVsD Looking at the error log, it seems like vfp has been selected? But my target device only has Features: swp half thumb fastmult edsp java. Also, OABI does not seem like it is the correct ABI. For example, if I run "file" against the busybox binary the device comes with, I get: busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped > > You might now do some research: > > https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- > error-when-building-linux-kernel-3-14-17-in-buildroot-2020 > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 > > or try to switch to an older compiler ... > > -- > Andreas > > From noreply at uclibc.org Wed Mar 30 17:36:15 2022 From: noreply at uclibc.org (uclibc.org) Date: 30 Mar 2022 19:36:15 +0200 Subject: [Buildroot] Bonus/Allowance payment reviews. Message-ID: <20220330193615.765E8AC4BEC9CDC9@uclibc.org> An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 19:25:25 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 13:25:25 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 12:52 PM Emile Cormier wrote: > > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..ab4f7af6a6 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(HOST_DIR)/usr/bin \ > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(HOST_DIR)/bin \ > --data=$(HOST_DIR)/usr I think it should be something like this for the host: HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR) > > ################################################################################ > > On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier wrote: >> >> On Wed, Mar 30, 2022 at 3:01 PM James Hilliard wrote: >>> >>> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. >> >> >> Alright, I've changed it as you suggested and it still works for me. I'll post an updated patch. From peter at korsgaard.com Wed Mar 30 19:38:46 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:38:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: update to version 0.23.6 In-Reply-To: <20220319061115.1641-1-br015@umbiko.net> (Andreas Ziegler's message of "Sat, 19 Mar 2022 07:11:15 +0100") References: <20220319061115.1641-1-br015@umbiko.net> Message-ID: <87k0cb6xix.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part > of this release > Change log: > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS > Signed-off-by: Andreas Ziegler Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 19:43:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:43:01 +0200 Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd In-Reply-To: <20220320114138.433796-1-br015@umbiko.net> (Andreas Ziegler's message of "Sun, 20 Mar 2022 12:41:38 +0100") References: <20211227074056.13882-1-br015@umbiko.net> <20220320114138.433796-1-br015@umbiko.net> Message-ID: <87fsmz6xbu.fsf@dell.be.48ers.dk> >>>>> "Andreas" == Andreas Ziegler writes: > The current released version of zziplib copies static libraries with appended > major version, but omits creating the necessary links to the base file names. > This prevents the linker to find the libraries via the search path. > The issue (https://github.com/gdraheim/zziplib/issues/117) has been > fixed upstream; this patch extracts the necessary part of commit > 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of > symlinks. > This resolves the following autobuild issues: > http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 > http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 > http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 > Signed-off-by: Andreas Ziegler > --- > Changes v1 -> v2: > - extract link creation from commit 0e8d35f > Changes v2 -> v3: > - update failure list Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 19:42:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:42:26 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/zziplib: fix static build failure with mpd Message-ID: <20220330193403.3F66985FDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b57789a0845007a9ba560f0e31090965142cc42c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0f3d6d2e6a924b9075accb27cf5d7351a30d8f17) Signed-off-by: Peter Korsgaard --- .../0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..780d990ab7 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From peter at korsgaard.com Wed Mar 30 19:40:41 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:40:41 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/zziplib: fix static build failure with mpd Message-ID: <20220330193409.8843A85FE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43fd3fd836d142a7c5d16c8b25366d59bdb6d8fc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0f3d6d2e6a924b9075accb27cf5d7351a30d8f17) Signed-off-by: Peter Korsgaard --- .../0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..780d990ab7 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") From peter at korsgaard.com Wed Mar 30 19:26:15 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:26:15 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/mpd: update to version 0.23.6 Message-ID: <20220330193409.7CBFC85FDF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c129d19ac2a657044b98b0c4e4f7515646bffe8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Remove 0002-lib-alsa-Error-add-missing-include.patch, the upstream fix is part of this release Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS Signed-off-by: Andreas Ziegler Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8974c6fa26f626021aa170678989c57fa81e8faf) Signed-off-by: Peter Korsgaard --- .../0002-lib-alsa-Error-add-missing-include.patch | 25 ---------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54..0000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf..b09140abf5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed mpd-0.23.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2..12da36098f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From peter at korsgaard.com Wed Mar 30 20:02:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 22:02:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads In-Reply-To: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 16:47:50 +0100") References: <20220320154750.1273563-1-fontaine.fabrice@gmail.com> Message-ID: <87bkxn6wf7.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without threads and openvpn raised since > commit 0199dc161769e5f28e9aebc634230ece08ff5008: > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: > /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: > undefined reference to `_pkcs11h_slotevent_init' > Fixes: > - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Mar 30 19:43:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 30 Mar 2022 21:43:42 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkcs11-helper: fix build without threads Message-ID: <20220330195929.D7AB585FE1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2f706a26074f701c0205b4e92263cce32990cce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure without threads and openvpn raised since commit 0199dc161769e5f28e9aebc634230ece08ff5008: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' Fixes: - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d76b7564f1bb61762181ecd1fc69c72a925ed25c) Signed-off-by: Peter Korsgaard --- ...kcs11h-core.c-fix-build-without-slotevent.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch new file mode 100644 index 0000000000..5b2829c5ca --- /dev/null +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch @@ -0,0 +1,37 @@ +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 20 Mar 2022 08:50:15 +0100 +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent + +Fix the following build failure with --disable-slotevent: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init' + +Fixes: + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50] +--- + lib/pkcs11h-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c +index d7bb4cd..0bf11e8 100644 +--- a/lib/pkcs11h-core.c ++++ b/lib/pkcs11h-core.c +@@ -726,9 +726,11 @@ pkcs11h_setProperty ( + + switch (property) { + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK: ++#if defined(ENABLE_PKCS11H_SLOTEVENT) + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) { + goto cleanup; + } ++#endif + break; + } + cleanup: +-- +2.35.1 + From bernd.kuhls at t-online.de Wed Mar 30 20:10:09 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Wed, 30 Mar 2022 22:10:09 +0200 Subject: [Buildroot] [PATCH 1/1] package/stellarium: bump version to 0.22.0 Message-ID: <20220330201009.1459182-1-bernd.kuhls@t-online.de> Release notes: http://stellarium.org/release/2022/03/27/stellarium-0.22.0.html Added upstream patch to fix build error. Added dependency to qt5charts following upstream commit: https://github.com/Stellarium/stellarium/commit/5b8fece8d03c64f27f37469f0604efd88d54393d#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR487 Added configure option to disable qt5webengine support, the package is broken: https://bugs.busybox.net/show_bug.cgi?id=14681 Signed-off-by: Bernd Kuhls --- ...uilding-Stellarium-without-scripting.patch | 49 +++++++++++++++++++ package/stellarium/Config.in | 1 + package/stellarium/stellarium.hash | 4 +- package/stellarium/stellarium.mk | 4 +- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch diff --git a/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch b/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch new file mode 100644 index 0000000000..57f15a8eff --- /dev/null +++ b/package/stellarium/0001-Fixed-building-Stellarium-without-scripting.patch @@ -0,0 +1,49 @@ +From 710d1c5acd9e962260ce395474819ded2eb6ce12 Mon Sep 17 00:00:00 2001 +From: "Alexander V. Wolf" +Date: Tue, 29 Mar 2022 18:57:06 +0700 +Subject: [PATCH] Fixed building Stellarium without scripting + +Downloaded from upstream commit: +https://github.com/Stellarium/stellarium/commit/710d1c5acd9e962260ce395474819ded2eb6ce12 + +Signed-off-by: Bernd Kuhls +--- + plugins/Calendars/src/Calendars.cpp | 2 ++ + plugins/Calendars/src/Calendars.hpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/plugins/Calendars/src/Calendars.cpp b/plugins/Calendars/src/Calendars.cpp +index e5d89a4c063..4df6caee42e 100644 +--- a/plugins/Calendars/src/Calendars.cpp ++++ b/plugins/Calendars/src/Calendars.cpp +@@ -251,6 +251,7 @@ void Calendars::init() + } + } + ++#ifdef ENABLE_SCRIPTING + // Add calendar as scriptable object! Some scripting functions won't work though, as they use object types unknown to the scripting engine. + void Calendars::makeCalendarsScriptable(StelScriptMgr *ssm) + { +@@ -260,6 +261,7 @@ void Calendars::makeCalendarsScriptable(StelScriptMgr *ssm) + ssm->addObject(cal); + } + } ++#endif + + void Calendars::loadSettings() + { +diff --git a/plugins/Calendars/src/Calendars.hpp b/plugins/Calendars/src/Calendars.hpp +index 461ae1bd9ba..4696183d9d2 100644 +--- a/plugins/Calendars/src/Calendars.hpp ++++ b/plugins/Calendars/src/Calendars.hpp +@@ -145,8 +145,10 @@ class Calendars : public StelModule + //! TODO: ADD HERE: Chinese, NewHinduSolar, NewHinduLunar, ... + Calendar* getCal(QString name); + ++ #ifdef ENABLE_SCRIPTING + //! to be called after program startup, when StelScriptMgr has been set up. + void makeCalendarsScriptable(StelScriptMgr *ssm); ++ #endif + + signals: + //void jdChanged(double jd); diff --git a/package/stellarium/Config.in b/package/stellarium/Config.in index 5922162d44..566f8edc83 100644 --- a/package/stellarium/Config.in +++ b/package/stellarium/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_STELLARIUM select BR2_PACKAGE_QT5BASE_OPENGL select BR2_PACKAGE_QT5BASE_PRINTSUPPORT select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5CHARTS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5MULTIMEDIA select BR2_PACKAGE_ZLIB diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index c3f2e0e8d4..f8185869be 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,5 +1,5 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 a3396c403050e073c592da695faeb048c1d5e19b stellarium-0.21.3.tar.gz -sha256 8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f stellarium-0.21.3.tar.gz +sha1 c4a00fd756c66fb7df633f496dd3be4300bf1d2b stellarium-0.22.0.tar.gz +sha256 0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885 stellarium-0.22.0.tar.gz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index ca5c07b2a7..1226b1190d 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,18 +4,20 @@ # ################################################################################ -STELLARIUM_VERSION = 0.21.3 +STELLARIUM_VERSION = 0.22.0 STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING STELLARIUM_DEPENDENCIES = \ qt5base \ + qt5charts \ qt5location \ qt5multimedia \ zlib STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_QTWEBENGINE=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) -- 2.30.2 From emile.cormier.jr at gmail.com Wed Mar 30 20:17:50 2022 From: emile.cormier.jr at gmail.com (Emile Cormier) Date: Wed, 30 Mar 2022 17:17:50 -0300 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: Oops, missed the interpreter option for HOST_PKG_PYTHON_PEP517_INSTALL_OPTS. I made the change as you suggested and it still works. Revised patch follows: ----- package/pkg-python.mk: fix PEP517 purelib deployment path This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..81c33ba557 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -147,11 +147,11 @@ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ + --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR)/usr ################################################################################ On Wed, Mar 30, 2022 at 4:25 PM James Hilliard wrote: > On Wed, Mar 30, 2022 at 12:52 PM Emile Cormier > wrote: > > > > package/pkg-python.mk: fix PEP517 purelib deployment path > > > > This allows the Python interpreter to find packages built via the new > Flit > > infrastructure and fixes bug #14721. > > Signed-off-by: Emile Cormier > > > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > > index 52ce402281..ab4f7af6a6 100644 > > --- a/package/pkg-python.mk > > +++ b/package/pkg-python.mk > > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > > --interpreter=/usr/bin/python \ > > --script-kind=posix \ > > - > --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > > + > --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > --scripts=$(TARGET_DIR)/usr/bin \ > > --data=$(TARGET_DIR)/usr > > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > > --interpreter=/usr/bin/python \ > > --script-kind=posix \ > > - > --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > > + > --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > --scripts=$(STAGING_DIR)/usr/bin \ > > --data=$(STAGING_DIR)/usr > > @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > > --interpreter=/usr/bin/python \ > > --script-kind=posix \ > > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages > \ > > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > > - --scripts=$(HOST_DIR)/usr/bin \ > > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > > + --scripts=$(HOST_DIR)/bin \ > > --data=$(HOST_DIR)/usr > > I think it should be something like this for the host: > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > --interpreter=/bin/python \ > --script-kind=posix \ > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(HOST_DIR)/bin \ > --data=$(HOST_DIR) > > > > > > > ################################################################################ > > > > On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier < > emile.cormier.jr at gmail.com> wrote: > >> > >> On Wed, Mar 30, 2022 at 3:01 PM James Hilliard < > james.hilliard1 at gmail.com> wrote: > >>> > >>> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. > >> > >> > >> Alright, I've changed it as you suggested and it still works for me. > I'll post an updated patch. > -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Wed Mar 30 20:51:12 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 22:51:12 +0200 Subject: [Buildroot] [PATCH 1/1] package/libabseil-cpp: fix uclibc-ng build Message-ID: <20220330205112.1378968-1-fontaine.fabrice@gmail.com> Fix the following build failure with uclibc-ng and grpc raised on arm and ppc: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_random_internal_randen_hwaes.so.2111.0.0: undefined reference to `getauxval' Strangely enough it seems there is only one autobuilder failure despite the fact that libabseil-cpp is unconditionally using getauxval since its addition in commit 93568440eda120b12bcbfe267af8f0182484c3b6: https://github.com/abseil/abseil-cpp/blob/20200225/absl/random/internal/randen_detect.cc Perhaps this build failure is an unexpected side effect of commit 8251d8c2559b25f11684776fc343059cf100657d Fixes: - http://autobuild.buildroot.org/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 Signed-off-by: Fabrice Fontaine --- .../0002-fix-build-with-uclibc-ng.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch diff --git a/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch b/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch new file mode 100644 index 0000000000..0797d8e51b --- /dev/null +++ b/package/libabseil-cpp/0002-fix-build-with-uclibc-ng.patch @@ -0,0 +1,62 @@ +From b9ad9bbfed92199a1a58504306d026cd2597539e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 30 Mar 2022 21:56:20 +0200 +Subject: [PATCH] Fix build with uclibc-ng (#1145) + +uclibc-ng doesn't provide getauxval which results in the following build +failure on arm or ppc with any user of abseil-cpp such as grpc: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libabsl_random_internal_randen_hwaes.so.2111.0.0: undefined reference to `getauxval' + +To fix this build failure, check that __UCLIBC__ is not defined before +using getauxval (as Babel is not able to check function availability) + +Fixes: + - http://autobuild.buildroot.org/results/775f3ca3dedebff29e212b29dfa896b7613b7a02 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/abseil/abseil-cpp/commit/b9ad9bbfed92199a1a58504306d026cd2597539e] +--- + absl/debugging/internal/vdso_support.cc | 2 +- + absl/random/internal/randen_detect.cc | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/absl/debugging/internal/vdso_support.cc b/absl/debugging/internal/vdso_support.cc +index c655cf452..e63ac4a3b 100644 +--- a/absl/debugging/internal/vdso_support.cc ++++ b/absl/debugging/internal/vdso_support.cc +@@ -33,7 +33,7 @@ + #endif + #include + +-#if defined(__GLIBC__) && \ ++#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ + (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) + #define ABSL_HAVE_GETAUXVAL + #endif +diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc +index 9bb58fc68..6dababa35 100644 +--- a/absl/random/internal/randen_detect.cc ++++ b/absl/random/internal/randen_detect.cc +@@ -24,6 +24,11 @@ + + #include "absl/random/internal/platform.h" + ++#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ ++ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) ++#define ABSL_HAVE_GETAUXVAL ++#endif ++ + #if defined(ABSL_ARCH_X86_64) + #define ABSL_INTERNAL_USE_X86_CPUID + #elif defined(ABSL_ARCH_PPC) || defined(ABSL_ARCH_ARM) || \ +@@ -31,7 +36,7 @@ + #if defined(__ANDROID__) + #define ABSL_INTERNAL_USE_ANDROID_GETAUXVAL + #define ABSL_INTERNAL_USE_GETAUXVAL +-#elif defined(__linux__) ++#elif defined(__linux__) && defined(ABSL_HAVE_GETAUXVAL) + #define ABSL_INTERNAL_USE_LINUX_GETAUXVAL + #define ABSL_INTERNAL_USE_GETAUXVAL + #endif -- 2.35.1 From fontaine.fabrice at gmail.com Wed Mar 30 20:58:29 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 30 Mar 2022 22:58:29 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-paramiko: security bump to version 2.10.3 Message-ID: <20220330205829.1380283-1-fontaine.fabrice@gmail.com> Fix CVE-2022-24302: Creation of new private key files using PKey subclasses was subject to a race condition between file creation & mode modification, which could be exploited by an attacker with knowledge of where the Paramiko-using code would write out such files. https://github.com/paramiko/paramiko/blob/2.10.3/sites/www/changelog.rst Signed-off-by: Fabrice Fontaine --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b11acf1dbc..951bd8e114 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 44136d79da4cd7619e368018ad022619 paramiko-2.7.2.tar.gz -sha256 7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 paramiko-2.7.2.tar.gz +md5 6e47947882e2c1b81f35b4133e8e62b9 paramiko-2.10.3.tar.gz +sha256 ddb1977853aef82804b35d72a0e597b244fa326c404c350bd00c5b01dbfee71a paramiko-2.10.3.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 3c135cf9b1..46209f5823 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.7.2 +PYTHON_PARAMIKO_VERSION = 2.10.3 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cf/a1/20d00ce559a692911f11cadb7f94737aca3ede1c51de16e002c7d3a888e0 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/d4/93/1a1eb7f214e6774099d56153db9e612f93cb8ffcdfd2eca243fcd5bb3a78 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE -- 2.35.1 From hrsourabh011 at gmail.com Wed Mar 30 21:22:43 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Wed, 30 Mar 2022 23:22:43 +0200 Subject: [Buildroot] Run-time dependency error | C shared or static library 'acl' not found In-Reply-To: References: Message-ID: Hello All, After including libraries in Buildroot I am getting below eros related "error adding symbols: file in wrong format": ninja: Entering directory `build' [1/29] Linking target test-cachunker FAILED: test-cachunker cc -o test-cachunker test-cachunker.p/test_test-cachunker.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [2/29] Linking target test-cadigest FAILED: test-cadigest cc -o test-cadigest test-cadigest.p/test_test-cadigest.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [3/29] Linking target test-cachunker-histogram FAILED: test-cachunker-histogram cc -o test-cachunker-histogram test-cachunker-histogram.p/test_test-cachunker-histogram.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [4/29] Linking target casync-http FAILED: casync-http cc -o casync-http casync-http.p/src_casync-http.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm -Wl,--end-group /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [5/29] Linking target test-caencoder FAILED: test-caencoder cc -o test-caencoder test-caencoder.p/test_test-caencoder.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [6/29] Linking target test-cachunk FAILED: test-cachunk cc -o test-cachunk test-cachunk.p/test_test-cachunk.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [7/29] Linking target test-calocation FAILED: test-calocation cc -o test-calocation test-calocation.p/test_test-calocation.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [8/29] Linking target test-camakebst FAILED: test-camakebst cc -o test-camakebst test-camakebst.p/test_test-camakebst.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [9/29] Linking target casync FAILED: casync cc -o casync casync.p/src_casync-tool.c.o casync.p/src_canbd.c.o casync.p/src_signal-handler.c.o casync.p/src_cafuse.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libfuse.so -pthread /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libudev.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libfuse.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [10/29] Compiling C object test-caorigin.p/test_test-caorigin.c.o ninja: build stopped: subcommand failed. I don't understand why I am getting these errors. Can anyone please let me know how to resolve this? When asked in systemd/casync git, they suggested checking with Buildroot channel. Your help will be much appreciated. Thanks in advance On Wed, 30 Mar 2022 at 19:04, Sourabh Hegde wrote: > Hello All, > > I am building casync to use with the "rauc" tool. And I am using Buildroot > 2022.02 as build system and I have enabled "host meson-tools " in > Buildroot "menuconfig ". But while building using > https://github.com/systemd/casync#building-casync > > meson build && ninja -C build && sudo ninja -C build install > > I am getting the below errors: > > Found pkg-config: /root/raspcm4/sources/output/host/bin/pkg-config (1.6.3) > Run-time dependency liblzma found: YES 5.2.5 > Run-time dependency zlib found: YES 1.2.11 > Run-time dependency libzstd found: YES 1.5.2 > Run-time dependency libcurl found: YES 7.81.0 > Run-time dependency openssl found: YES 1.1.1m > > meson.build:135:0: ERROR: C shared or static library 'acl' not found > > But BR2_PACKAGE_ACL=y is already selected. > > Can you please let me know what is the proper package that should be > selected in Buildroot? And also what are the other Run-time dependencies > (libs/packages) that should be selected in Buildroot? > > Your help will be much appreciated. > > Thanks in advance > > > Kind Regards, > > Sourabh > -------------- next part -------------- An HTML attachment was scrubbed... URL: From james.hilliard1 at gmail.com Wed Mar 30 22:45:21 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 16:45:21 -0600 Subject: [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths Message-ID: <20220330224521.4142504-1-james.hilliard1@gmail.com> From: Emile Cormier Use /usr target/staging prefix and / host prefix. This allows the Python interpreter to find packages built via the new Flit infrastructure and fixes bug #14721. Signed-off-by: Emile Cormier Signed-off-by: James Hilliard --- Changes v1 -> v2: - fixup formatting - fix all pep517 prefix paths --- package/pkg-python.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 52ce402281..867341fc7b 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -127,16 +127,16 @@ PKG_PYTHON_PEP517_ENV = \ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix \ - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \ --data=$(STAGING_DIR)/usr @@ -147,12 +147,12 @@ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ + --interpreter=/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/usr/bin \ - --data=$(HOST_DIR)/usr + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) ################################################################################ # inner-python-package -- defines how the configuration, compilation -- 2.25.1 From james.hilliard1 at gmail.com Wed Mar 30 22:53:13 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 30 Mar 2022 16:53:13 -0600 Subject: [Buildroot] [PATCH 1/1] package/pkg-python.mk: fix PEP517 purelib deployment path In-Reply-To: References: Message-ID: On Wed, Mar 30, 2022 at 2:18 PM Emile Cormier wrote: > > Oops, missed the interpreter option for HOST_PKG_PYTHON_PEP517_INSTALL_OPTS. I made the change as you suggested and it still works. Revised patch follows: You also missed data there as well, and it seems your patch has formatting issues, I went ahead and cleaned it up here, see if that works ok for you: https://patchwork.ozlabs.org/project/buildroot/patch/20220330224521.4142504-1-james.hilliard1 at gmail.com/ FYI I think your email client is corrupting the patch a bit as it didn't apply cleanly, see guide here: https://buildroot.org/downloads/manual/manual.html#submitting-patches Make sure you send the patch using git send-email which should make sure the formatting isn't messed with by your email client. > > ----- > > package/pkg-python.mk: fix PEP517 purelib deployment path > > This allows the Python interpreter to find packages built via the new Flit > infrastructure and fixes bug #14721. > Signed-off-by: Emile Cormier > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 52ce402281..81c33ba557 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(TARGET_DIR)/usr/bin \ > --data=$(TARGET_DIR)/usr > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ > --interpreter=/usr/bin/python \ > --script-kind=posix \ > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > --scripts=$(STAGING_DIR)/usr/bin \ > --data=$(STAGING_DIR)/usr > @@ -147,11 +147,11 @@ HOST_PKG_PYTHON_PEP517_ENV = \ > $(HOST_CONFIGURE_OPTS) > > HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ > - --interpreter=/usr/bin/python \ > + --interpreter=/bin/python \ > --script-kind=posix \ > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(HOST_DIR)/usr/bin \ > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(HOST_DIR)/bin \ > --data=$(HOST_DIR)/usr > > ################################################################################ > > On Wed, Mar 30, 2022 at 4:25 PM James Hilliard wrote: >> >> On Wed, Mar 30, 2022 at 12:52 PM Emile Cormier >> wrote: >> > >> > package/pkg-python.mk: fix PEP517 purelib deployment path >> > >> > This allows the Python interpreter to find packages built via the new Flit >> > infrastructure and fixes bug #14721. >> > Signed-off-by: Emile Cormier >> > >> > diff --git a/package/pkg-python.mk b/package/pkg-python.mk >> > index 52ce402281..ab4f7af6a6 100644 >> > --- a/package/pkg-python.mk >> > +++ b/package/pkg-python.mk >> > @@ -127,7 +127,7 @@ PKG_PYTHON_PEP517_ENV = \ >> > PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ >> > --interpreter=/usr/bin/python \ >> > --script-kind=posix \ >> > - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > --scripts=$(TARGET_DIR)/usr/bin \ >> > --data=$(TARGET_DIR)/usr >> > @@ -135,7 +135,7 @@ PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ >> > PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ >> > --interpreter=/usr/bin/python \ >> > --script-kind=posix \ >> > - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > --scripts=$(STAGING_DIR)/usr/bin \ >> > --data=$(STAGING_DIR)/usr >> > @@ -150,8 +150,8 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ >> > --interpreter=/usr/bin/python \ >> > --script-kind=posix \ >> > --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> > - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ >> > - --scripts=$(HOST_DIR)/usr/bin \ >> > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ >> > + --scripts=$(HOST_DIR)/bin \ >> > --data=$(HOST_DIR)/usr >> >> I think it should be something like this for the host: >> HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ >> --interpreter=/bin/python \ >> --script-kind=posix \ >> --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ >> --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ >> --scripts=$(HOST_DIR)/bin \ >> --data=$(HOST_DIR) >> >> >> > >> > ################################################################################ >> > >> > On Wed, Mar 30, 2022 at 3:51 PM Emile Cormier wrote: >> >> >> >> On Wed, Mar 30, 2022 at 3:01 PM James Hilliard wrote: >> >>> >> >>> I think keep /usr for STAGING/TARGET OPTS but remove for HOST OPTS. >> >> >> >> >> >> Alright, I've changed it as you suggested and it still works for me. I'll post an updated patch. From bugzilla at busybox.net Thu Mar 31 04:16:27 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 31 Mar 2022 04:16:27 +0000 Subject: [Buildroot] [Bug 14711] nodjs build problem missing bzip In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14711 --- Comment #6 from Wim Meganck --- Problem solved by adding BR2_PACKAGE_HOST_PYTHON3=y and BR2_PACKAGE_HOST_PYTHON3_BZIP2=y in the config file and did a full rebuild. -- You are receiving this mail because: You are on the CC list for the bug. From br015 at umbiko.net Thu Mar 31 05:57:59 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 05:57:59 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> Message-ID: <7a56c449ef38559922b9858eee8d1799@umbiko.net> On 2022-03-30 19:18, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 30 March 2022 08:14 >> To: Dan Jackson >> Cc: buildroot at buildroot.org >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> Hi Dan, >> >> cutting some old content. >> >> On 2022-03-29 19:19, Dan Jackson wrote: >> >> >> >> >> > However, now I have a new missing file error, and I can't seem to >> >> > locate a suitable candidate: >> >> > >> >> > In file included from >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> custom/arch/arm/include/asm/system.h:165, >> >> > from >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> custom/arch/arm/include/asm/bitops.h:27, >> >> > from include/linux/bitops.h:22, >> >> > from include/linux/kernel.h:17, >> >> > from include/linux/sched.h:55, >> >> > from arch/arm/kernel/asm-offsets.c:13: >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> custom/arch/arm/include/asm/memory.h:19:10: >> >> > fatal error: mach/memory.h: No such file or directory >> >> > 19 | #include >> >> > | ^~~~~~~~~~~~~~~ >> >> > compilation terminated. >> >> > /home/danj/buildroot-2022.02/output/build/linux-custom/./Kbuild:81: >> >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed >> >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 >> >> > Makefile:1009: recipe for target 'prepare0' failed >> >> > make[2]: *** [prepare0] Error 2 >> >> > make[2]: *** Waiting for unfinished jobs.... >> >> > HOSTCC scripts/mod/modpost.o >> >> > HOSTCC scripts/mod/sumversion.o >> >> > HOSTLD scripts/mod/modpost >> >> > make[2]: *** wait: No child processes. Stop. >> >> > package/pkg-generic.mk:289: recipe for target >> >> > '/home/danj/buildroot-2022.02/output/build/linux- >> custom/.stamp_built' >> >> > failed >> >> > make[1]: *** >> >> > [/home/danj/buildroot-2022.02/output/build/linux-custom/.stamp_buil >> >> > t] >> >> > Error 2 >> >> > Makefile:84: recipe for target '_all' failed >> >> > make: *** [_all] Error 2 >> >> >> >> This seems not to be the defconfig from above? It now uses >> >> linux-custom ... >> >> The failure may be due to the default kernel configuration. Try to >> >> configure the correct one and see if you get further. >> >> >> >> > I think maybe I am still doing something wrong because it sure >> >> > seems to be compiling a lot of stuff instead of letting me configure >> things. >> >> >> >> It gets better once everything necessary is built. >> > >> > Still no luck I'm afraid. Same error with mach/memory.h as above. >> > >> > Buildroot defconfig now looks like this: >> > >> > BR2_armeb=y >> > BR2_STATIC_LIBS=y >> > BR2_KERNEL_HEADERS_VERSION=y >> > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" >> > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y >> > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y >> > BR2_PTHREAD_DEBUG=y >> > BR2_BINUTILS_VERSION_2_37_X=y >> > BR2_GCC_VERSION_9_X=y >> > BR2_TOOLCHAIN_BUILDROOT_CXX=y >> > BR2_PACKAGE_HOST_GDB=y >> > BR2_GDB_VERSION_9_2=y >> > BR2_LINUX_KERNEL=y >> > BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" >> > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >> > >> BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 >> FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" >> > BR2_PACKAGE_DROPBEAR=y >> > >> BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions >> .h" >> > BR2_PACKAGE_JOE=y >> > >> > I forgot to mention this before but the buildroot manual page you >> > mentioned said to create a local.mk file in order to use external >> > source, this looks like this: >> > >> > LINUX_OVERRIDE_SRCDIR = >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ >> > >> > For the kernel configuration I entered the kernel source dir and did >> > "make menuconfig", I left everything at the defaults except for >> > enabling the USB related items. >> > >> > The resulting configuration file is attached as a text file. >> > Unfortunately it's been literally decades since I last actually >> > compiled a kernel, so I'm afraid I have no idea what bits would be >> > suitable to disable/remove to get the results I want (I'm guessing >> > this will be the most likely way to eliminate the error I'm getting?) >> >> I did a compile test this morning, the Buildroot version was some >> early >> 2022.02 version, not up-to-date. >> >> You have a potential header mismatch, Select Toolchain -> Kernel >> Headers >> -> Same as kernel being built to use the vendor source also for the >> headers. >> >> I could configure Linux with make menuconfig, did not encounter the >> missing memory.h error above, but the build stops during Linux kernel >> compilation with this error: >> >> /tmp/ccSO8f6S.s: Assembler messages: >> /tmp/ccSO8f6S.s:950: Error: .err encountered >> make[3]: *** [scripts/Makefile.build:284: >> arch/arm/kernel/sys_oabi-compat.o] Error 1 >> make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 >> make[1]: *** [package/pkg-generic.mk:292: >> /home/data/test/buildroot/output/build/linux-custom/.stamp_built] >> Error >> 2 >> make: *** [Makefile:84: _all] Error 2 >> >> Full error log is here: https://pastebin.com/VrXqSVsD > > Looking at the error log, it seems like vfp has been selected? But my > target device only has Features: swp half thumb fastmult edsp java. This is just a warning, I would ignore it at this point in time. Compiler syntax checks tend to get more strict over time ... > Also, OABI does not seem like it is the correct ABI. For example, if I > run "file" against the busybox binary the device comes with, I get: > > busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), > dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped It seems to be a compatibility layer for legacy software; disabling OABI_COMPAT is an option, because you probably will never need it. I used the source tree and unmodified .config contained in the Touchstone DG3270 Cable Gateway project on SourceForge for the test. The original build instructions seem to indicate that more software is needed to build the device firmware. This might be the reason for missing files ... Also, take a look at psp_drivers.Kconfig for the options necessary to enable USB support. >> >> You might now do some research: >> >> https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- >> error-when-building-linux-kernel-3-14-17-in-buildroot-2020 >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 >> >> or try to switch to an older compiler ... >> >> -- >> Andreas >> >> From thomas.petazzoni at bootlin.com Thu Mar 31 06:08:25 2022 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 31 Mar 2022 06:08:25 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-30 Message-ID: <20220331060828.F2A2883E9B@smtp1.osuosl.org> Hello, Autobuild statistics for 2022-03-30 =================================== branch | OK | NOK | TIM | TOT | 2021.02.x | 63 | 6 | 0 | 69 | 2022.02.x | 16 | 12 | 1 | 29 | master | 60 | 42 | 0 | 102 | Classification of failures by reason for master ----------------------------------------------- dhcp-4.4.2-P1 | 8 pango-1.50.5 | 7 tpm2-abrmd-2.3.3 | 6 tpm2-tss-3.2.0 | 5 tpm2-tools-5.2 | 3 frr-8.2.2 | 1 glslsandbox-player-2021.08.24 | 1 jack2-1.9.20 | 1 libsecret-0.20.5 | 1 mongodb-4.2.18 | 1 mpd-0.23.6 | 1 qt-webkit-kiosk-a7720e50f2b... | 1 sg3_utils-1.47 | 1 tpm2-pkcs11-1.7.0 | 1 ulog-0389d243352255f6182326... | 1 unknown | 1 vlc-3.0.16 | 1 wavemon-0.9.4 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/75beeb024a022513c17b25b9070083402045c1d3 | ORPH sh4 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/9144569593c077af0b840b8308f44aa56537545e | ORPH powerpc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/66920b50afea6b510b1aea2ab26178f79e7d25e4 | ORPH arm | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/69da641c4bd6de1718f49bc04dafa081968dda96 | ORPH arc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/d18b006dce7b46631ce8f4c72fb97eb861993939 | ORPH riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/32ea3d9366102da76e64c48e13f641fda6dced71 | ORPH riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/1ae01f53b213923113d4def79c2ef86d8f265dc2 | ORPH powerpc64le | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/2e6b6cb0a40c9ac972a562e6dc17353e5e4003c1 | ORPH mips64el | frr-8.2.2 | NOK | http://autobuild.buildroot.net/results/a8bd63dfc2012fbec48872b7a6cf4ba59829375c | aarch64 | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/bd4e3fc903cbe0e328c5c46c77770682228ac1ed | m68k | jack2-1.9.20 | NOK | http://autobuild.buildroot.net/results/b59f60b60d51eb495780635ab31b1bb431282ed1 | aarch64 | libsecret-0.20.5 | NOK | http://autobuild.buildroot.net/results/8c025659eaa2bedbc2f349891ca2e4722fb7830e | ORPH arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/b9d211d388701d4588db760df26f8114a9d4677c | arm | mpd-0.23.6 | NOK | http://autobuild.buildroot.net/results/f0a9e719114f19dc9d20622ed85dd4f8e968c20f | powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/f7d227a39e4ec475c0967da031e90eca7399dbca | ORPH mips | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7c3c2ea2b4ca326ebc11b40120993c9e20a22463 | ORPH powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/cef923b7e4847e8bd0d6d7f9bf469ce6fa740363 | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/9589433c7340b2a6137c8134218e78726e38798c | ORPH m68k | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/21669e18d0d8659fa23697eb4656db082ba7e5d5 | ORPH mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7147895b373436a3a9edb42aac1562a2c171d3cd | ORPH nios2 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/b9dea403ee400d5448c1491bc265ad72847035e8 | ORPH arc | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/8029b01ce5816cbafd412b14985becce7a22e09d | m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/dcc93ec2d1f861c4f3796d6b8ea5f609e8339161 | or1k | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/f43d80dc23916f78168494da0d3b9b1574d92f87 | ORPH powerpc64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/e031c62fe0180d403ab56da473b19da9f6161562 | ORPH riscv64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/65e2bef20fe1bb1d820a1bfee289f58423dc14f7 | ORPH mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/9ba07ae640ba9bea01c555a5d5ba6d230781ca49 | ORPH mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/5a3ec27e213fe1d7092bd7f51511a3fb703fca78 | ORPH xtensa | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/239e4a5b8923fee53542845d1cffa67277a4480a | ORPH x86_64 | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/66323bd7d5f868874771aa743e08b93f0f6e69e0 | aarch64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/28cfd0284a01473c26c25cc2992b43c4bf9720c6 | ORPH x86_64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/bcc9f0eb135873d665540c3c8a138f0e21bbe089 | ORPH arm | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/8900940ad30946c40e42ccc7c116153aa9c04741 | ORPH riscv32 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/0a01e354928a67a119edb4c9553025f3b2808c6a | ORPH nds32le | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4a1f3212d570128ce8743dda7a9920b5d67cc9a2 | ORPH x86_64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/89b5764d0a5c0f29d027f2b79c219f8347408955 | ORPH sparc64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/785bb203e884c31845ef46774360fc47c27649e0 | ORPH arm | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4ecf58b1d4483386945dca736c3e763b607cabc1 | ORPH s390x | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/b861aa6c0bc9ab39ba01c0afb658496e4f02d26e | arm | unknown | NOK | http://autobuild.buildroot.net/results/56c8cacd93d9aff83a216b13a20be5afbcd3c09e | arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/ef891307af29deecc89209bfc3ad25b33d70eca6 | x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e02d2df8f05e209e3dcca2fbb9d9ce793509c7c | Classification of failures by reason for 2021.02.x -------------------------------------------------- host-sentry-cli-1.57.0 | 2 apache-2.4.53 | 1 heirloom-mailx-12.5 | 1 monkey-f54856ce250c4e257354... | 1 zeromq-4.3.4 | 1 Detail of failures for 2021.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- riscv32 | apache-2.4.53 | NOK | http://autobuild.buildroot.net/results/f2caf6ac63f50dd2fd59dbc0d3135c6f03a293eb | sh4 | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/07e2147e57478e490741f3a40465b487c13ac06c | arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c5016c945fd218a26d1de6914d53f4f797851075 | xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4398bf4ea42569012e541ab2a7badd833ce560d5 | s390x | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0e3e5d0437f25fb014a381e91fe28b76ca8c76bd | or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/b0af23591a6cd6255a2548259c01dbe6c219d687 | Classification of failures by reason for 2022.02.x -------------------------------------------------- pango-1.50.5 | 4 dhcp-4.4.2-P1 | 1 host-pango-1.50.5 | 1 libuwsc | 1 nbd-3.24 | 1 ndisc6-1.0.5 | 1 opencv4-4.5.5 | 1 protozero-1.7.1 | 1 unknown | 1 wpa_supplicant-2.10 | 1 Detail of failures for 2022.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/11b0fc25b99d223b9648d822563aeb746de5eb01 | ORPH arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/8bb4bf8414fc20e3ada64b12e579e9c65c6d9643 | ORPH x86_64 | libuwsc | TIM | http://autobuild.buildroot.net/results/555b87bb5e9e003a9fd16b0c26cb62d10cee69b1 | riscv32 | nbd-3.24 | NOK | http://autobuild.buildroot.net/results/10a90ace1cdc5d93bd98fb18ca5134a64a56318e | arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/56df999d86a5d343447d23580e5bbbfad8d05fba | ORPH x86_64 | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8ca60c6b072299ad08abaab4638ac544e6612b19 | mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/37218057bb3850609f1cde22d302fa828123d22d | ORPH arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/44e0caf61871e25b1aa22b5b30e2fdf70ca6fb44 | ORPH mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/63e220221242385f9cd1631dcbd858a09a73f8e4 | ORPH powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/96f2a226ff1793156f1364a52ae3a2675d1a9f3a | ORPH s390x | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/ed941b92d306564d657ba6810006dc00e2ec20e8 | xtensa | unknown | NOK | http://autobuild.buildroot.net/results/b418dd5179b31a2a3921c731ca69128bb0f35b14 | mipsel | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/2dea7dee521794b306cc610601fda322987e6cd0 | -- http://autobuild.buildroot.net From dan at thejacksons.uk Thu Mar 31 06:19:37 2022 From: dan at thejacksons.uk (Dan Jackson) Date: Thu, 31 Mar 2022 06:19:37 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: <7a56c449ef38559922b9858eee8d1799@umbiko.net> References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> <7a56c449ef38559922b9858eee8d1799@umbiko.net> Message-ID: > -----Original Message----- > From: Andreas Ziegler > Sent: 31 March 2022 06:58 > To: Dan Jackson > Cc: buildroot at buildroot.org > Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel - > possible? > > On 2022-03-30 19:18, Dan Jackson wrote: > >> -----Original Message----- > >> From: Andreas Ziegler > >> Sent: 30 March 2022 08:14 > >> To: Dan Jackson > >> Cc: buildroot at buildroot.org > >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel > >> - > >> possible? > >> > >> Hi Dan, > >> > >> cutting some old content. > >> > >> On 2022-03-29 19:19, Dan Jackson wrote: > >> > >> > >> > >> >> > However, now I have a new missing file error, and I can't seem > >> >> > to locate a suitable candidate: > >> >> > > >> >> > In file included from > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > >> >> custom/arch/arm/include/asm/system.h:165, > >> >> > from > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > >> >> custom/arch/arm/include/asm/bitops.h:27, > >> >> > from include/linux/bitops.h:22, > >> >> > from include/linux/kernel.h:17, > >> >> > from include/linux/sched.h:55, > >> >> > from arch/arm/kernel/asm-offsets.c:13: > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > >> >> custom/arch/arm/include/asm/memory.h:19:10: > >> >> > fatal error: mach/memory.h: No such file or directory > >> >> > 19 | #include > >> >> > | ^~~~~~~~~~~~~~~ > >> >> > compilation terminated. > >> >> > /home/danj/buildroot-2022.02/output/build/linux- > custom/./Kbuild:81: > >> >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed > >> >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 > >> >> > Makefile:1009: recipe for target 'prepare0' failed > >> >> > make[2]: *** [prepare0] Error 2 > >> >> > make[2]: *** Waiting for unfinished jobs.... > >> >> > HOSTCC scripts/mod/modpost.o > >> >> > HOSTCC scripts/mod/sumversion.o > >> >> > HOSTLD scripts/mod/modpost > >> >> > make[2]: *** wait: No child processes. Stop. > >> >> > package/pkg-generic.mk:289: recipe for target > >> >> > '/home/danj/buildroot-2022.02/output/build/linux- > >> custom/.stamp_built' > >> >> > failed > >> >> > make[1]: *** > >> >> > [/home/danj/buildroot-2022.02/output/build/linux- > custom/.stamp_b > >> >> > uil > >> >> > t] > >> >> > Error 2 > >> >> > Makefile:84: recipe for target '_all' failed > >> >> > make: *** [_all] Error 2 > >> >> > >> >> This seems not to be the defconfig from above? It now uses > >> >> linux-custom ... > >> >> The failure may be due to the default kernel configuration. Try to > >> >> configure the correct one and see if you get further. > >> >> > >> >> > I think maybe I am still doing something wrong because it sure > >> >> > seems to be compiling a lot of stuff instead of letting me > >> >> > configure > >> things. > >> >> > >> >> It gets better once everything necessary is built. > >> > > >> > Still no luck I'm afraid. Same error with mach/memory.h as above. > >> > > >> > Buildroot defconfig now looks like this: > >> > > >> > BR2_armeb=y > >> > BR2_STATIC_LIBS=y > >> > BR2_KERNEL_HEADERS_VERSION=y > >> > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" > >> > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y > >> > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y > >> > BR2_PTHREAD_DEBUG=y > >> > BR2_BINUTILS_VERSION_2_37_X=y > >> > BR2_GCC_VERSION_9_X=y > >> > BR2_TOOLCHAIN_BUILDROOT_CXX=y > >> > BR2_PACKAGE_HOST_GDB=y > >> > BR2_GDB_VERSION_9_2=y > >> > BR2_LINUX_KERNEL=y > >> > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >> > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" > >> > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > >> > > >> > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 > >> FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" > >> > BR2_PACKAGE_DROPBEAR=y > >> > > >> > BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions > >> .h" > >> > BR2_PACKAGE_JOE=y > >> > > >> > I forgot to mention this before but the buildroot manual page you > >> > mentioned said to create a local.mk file in order to use external > >> > source, this looks like this: > >> > > >> > LINUX_OVERRIDE_SRCDIR = > >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ > >> > > >> > For the kernel configuration I entered the kernel source dir and > >> > did "make menuconfig", I left everything at the defaults except for > >> > enabling the USB related items. > >> > > >> > The resulting configuration file is attached as a text file. > >> > Unfortunately it's been literally decades since I last actually > >> > compiled a kernel, so I'm afraid I have no idea what bits would be > >> > suitable to disable/remove to get the results I want (I'm guessing > >> > this will be the most likely way to eliminate the error I'm > >> > getting?) > >> > >> I did a compile test this morning, the Buildroot version was some > >> early > >> 2022.02 version, not up-to-date. > >> > >> You have a potential header mismatch, Select Toolchain -> Kernel > >> Headers > >> -> Same as kernel being built to use the vendor source also for the > >> headers. > >> > >> I could configure Linux with make menuconfig, did not encounter the > >> missing memory.h error above, but the build stops during Linux kernel > >> compilation with this error: > >> > >> /tmp/ccSO8f6S.s: Assembler messages: > >> /tmp/ccSO8f6S.s:950: Error: .err encountered > >> make[3]: *** [scripts/Makefile.build:284: > >> arch/arm/kernel/sys_oabi-compat.o] Error 1 > >> make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 > >> make[1]: *** [package/pkg-generic.mk:292: > >> /home/data/test/buildroot/output/build/linux-custom/.stamp_built] > >> Error > >> 2 > >> make: *** [Makefile:84: _all] Error 2 > >> > >> Full error log is here: https://pastebin.com/VrXqSVsD > > > > Looking at the error log, it seems like vfp has been selected? But my > > target device only has Features: swp half thumb fastmult edsp java. > > This is just a warning, I would ignore it at this point in time. > Compiler syntax checks tend to get more strict over time ... > > > Also, OABI does not seem like it is the correct ABI. For example, if I > > run "file" against the busybox binary the device comes with, I get: > > > > busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), > > dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped > > It seems to be a compatibility layer for legacy software; disabling > OABI_COMPAT is an option, because you probably will never need it. > > I used the source tree and unmodified .config contained in the Touchstone > DG3270 Cable Gateway project on SourceForge for the test. > > The original build instructions seem to indicate that more software is needed > to build the device firmware. This might be the reason for missing files ... > > Also, take a look at psp_drivers.Kconfig for the options necessary to enable > USB support. It's starting to seem like it might be a better option to try to get the original software development kit to work instead of trying to use its components with modern buildroot. Ironically the SDK is itself based on ancient buildroot - in /proc/version on the target device I can see: (gcc version 4.7.3 (Buildroot 2013.08.1) ) > > >> > >> You might now do some research: > >> > >> https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- > >> error-when-building-linux-kernel-3-14-17-in-buildroot-2020 > >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 > >> > >> or try to switch to an older compiler ... > >> > >> -- > >> Andreas > >> > >> From peter at korsgaard.com Thu Mar 31 06:21:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:21:36 +0200 Subject: [Buildroot] [PATCH 1/1] package/bluez5_utils: hid and hog needs headers >= 3.18 In-Reply-To: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 17:20:12 +0100") References: <20220320162012.1527261-1-fontaine.fabrice@gmail.com> Message-ID: <877d8a7ibz.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure with hid and hog raised since their > addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 > https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd > because UHID_GET_REPORT is only available since kernel 3.18 and > https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: > profiles/input/device.c: In function 'uhid_send_get_report_reply': > profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' > if (size > sizeof(ev.u.get_report_reply.data)) > ^ > profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' > size = sizeof(ev.u.get_report_reply.data); > ^ > profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) > ev.type = UHID_GET_REPORT_REPLY; > ^ > Fixes: > - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:22:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:22:55 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack1: libsamplerate is optional, not mandatory In-Reply-To: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 22:18:14 +0100") References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> Message-ID: <8735iy7i9s.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libsamplerate is only needed to build the NetJack backend and internal > client > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:23:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:23:06 +0200 Subject: [Buildroot] [PATCH 2/2] package/jack1: libsndfile is optional, not mandatory In-Reply-To: <20220320211815.1798812-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 20 Mar 2022 22:18:15 +0100") References: <20220320211815.1798812-1-fontaine.fabrice@gmail.com> <20220320211815.1798812-2-fontaine.fabrice@gmail.com> Message-ID: <87y20q63p1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libsndfile is only needed to build jackrec example client > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:27:05 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:27:05 +0200 Subject: [Buildroot] [PATCH] package/busybox: fix udhcpc options in minimal config In-Reply-To: <20220321145322.23881-1-vincent.stehle@laposte.net> ("Vincent =?utf-8?Q?Stehl=C3=A9?= via buildroot"'s message of "Mon, 21 Mar 2022 15:53:22 +0100") References: <20220321145322.23881-1-vincent.stehle@laposte.net> Message-ID: <87tube63ie.fsf@dell.be.48ers.dk> >>>>> "Vincent" == Vincent Stehl? via buildroot writes: > The busybox-minimal.config, which is used by systems without an MMU, specifies > the "-b" command line option for udhcpc. However, this option is not supported > by BusyBox udhcpc anymore since version 1.27.0 when building for systems > without an MMU. > Remove the "-b" option from busybox-minimal.config to repair network > initialization on systems without an MMU. > This fixes the following network initialization failure: > udhcpc: invalid option -- b > FAIL > Signed-off-by: Vincent Stehl? > --- Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:22:23 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:22:23 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack1: libsamplerate is optional, not mandatory Message-ID: <20220331061813.DD90285FE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9479d366376de8ff7a23905173386ae8c24967b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libsamplerate is only needed to build the NetJack backend and internal client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 05bbdfa382ec8b26d9b2f98b1696cb884ed7c2ca) Signed-off-by: Peter Korsgaard --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f10332..625afdf8c1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba0..39183826a4 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,7 +11,11 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate +endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline From peter at korsgaard.com Thu Mar 31 06:22:29 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:22:29 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack1: libsndfile is optional, not mandatory Message-ID: <20220331061813.ECD5686009@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0bda6dd18e9276cc00813e62c6c53680c318c67 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x libsndfile is only needed to build jackrec example client Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 9a78a756134831da20c471dee575f3e8108f62a4) Signed-off-by: Peter Korsgaard --- package/jack1/Config.in | 1 - package/jack1/jack1.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 625afdf8c1..5b3116e2f1 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 39183826a4..6dca56001f 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -11,12 +11,16 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) JACK1_DEPENDENCIES += libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK1_DEPENDENCIES += libsndfile +endif + ifeq ($(BR2_PACKAGE_READLINE),y) JACK1_DEPENDENCIES += readline endif From peter at korsgaard.com Thu Mar 31 06:04:38 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:04:38 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/bluez5_utils: hid and hog needs headers >= 3.18 Message-ID: <20220331061813.D4A3985FF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9112ccd069958f34ced18b02d0e3dc386312f60a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure with hid and hog raised since their addition in commit fb9fc969d91f69851b4c70dba512b607e52bda7b and https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9b58288693680b021e5dcbc6f8bea80b5be89311 https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=646db71713b05d50b2b0c421da34e80ed4c54fbd because UHID_GET_REPORT is only available since kernel 3.18 and https://github.com/torvalds/linux/commit/fa71f32b5de2be1644ee671ddbe211d79be7847f: profiles/input/device.c: In function 'uhid_send_get_report_reply': profiles/input/device.c:222:24: error: 'union ' has no member named 'get_report_reply' if (size > sizeof(ev.u.get_report_reply.data)) ^ profiles/input/device.c:223:21: error: 'union ' has no member named 'get_report_reply' size = sizeof(ev.u.get_report_reply.data); ^ profiles/input/device.c:231:12: error: 'UHID_GET_REPORT_REPLY' undeclared (first use in this function) ev.type = UHID_GET_REPORT_REPLY; ^ Fixes: - http://autobuild.buildroot.org/results/1db406eac7620e3f76d997414eb7af7d2ac6cfe6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 328516a5add9e6f260d3a8e0d372c474ae30b2c1) Signed-off-by: Peter Korsgaard --- package/bluez5_utils/Config.in | 16 ++++++++++++++++ package/brltty/Config.in | 2 +- package/cwiid/Config.in | 6 +++--- package/kodi/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced..49bb719102 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e20..3527df6161 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_BRLTTY depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help A daemon providing access to the Linux console for a blind person using a refreshable braille display. diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac9405..7e8cdc3086 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on !BR2_USE_MMU diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 6896e85e7b..fd530064ac 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -135,9 +135,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf058..319415754a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. From peter at korsgaard.com Thu Mar 31 06:25:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:25:36 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/busybox: fix udhcpc options in minimal config Message-ID: <20220331061814.02FEC85FF2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0467bb87de58a9e6f0f8117e80ed510604ffa9e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The busybox-minimal.config, which is used by systems without an MMU, specifies the "-b" command line option for udhcpc. However, this option is not supported by BusyBox udhcpc anymore since version 1.27.0 when building for systems without an MMU. Remove the "-b" option from busybox-minimal.config to repair network initialization on systems without an MMU. This fixes the following network initialization failure: udhcpc: invalid option -- b FAIL Signed-off-by: Vincent Stehl?? Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 3de486f8b052b25c8e29a82903b334ca90f25735) Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4..1fb4e39e21 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities From peter at korsgaard.com Thu Mar 31 06:43:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:43:48 +0200 Subject: [Buildroot] [PATCH v3] package/wget: bump version to 1.21.3 In-Reply-To: (Arnout Vandecappelle's message of "Sun, 27 Mar 2022 18:08:01 +0200") References: <20220321192947.20712-1-ps.report@gmx.net> Message-ID: <87pmm262qj.fsf@dell.be.48ers.dk> >>>>> "Arnout" == Arnout Vandecappelle writes: > On 21/03/2022 20:29, Peter Seiderer wrote: >> - bump version to 1.21.3 (for details see [1]) >> - remove legacy --with-libidn option (see [2]), replace with >> --enable-iri option in case locale support and libidn2 are available >> [1] >> https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html >> [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 >> Signed-off-by: Peter Seiderer > Applied to master, thanks. Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:49:57 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:49:57 +0200 Subject: [Buildroot] [PATCH 1/2] package/jack2: fix build with libexecinfo In-Reply-To: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Mar 2022 18:48:38 +0100") References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> Message-ID: <87lewq62ga.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure raised on uclibc and musl since the > addition of libexecinfo package in commit > eea8ba446c10701a273432552108d80fb2224ef4: > /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: > dbus/sigsegv.c.17.o: in function `signal_segv': > sigsegv.c:(.text+0x98): undefined reference to `backtrace' > Fixes: > - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:50:03 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:50:03 +0200 Subject: [Buildroot] [PATCH 2/2] package/jack2: explicitly {dis, en}able opus and readline In-Reply-To: <20220322174839.2189015-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Mar 2022 18:48:39 +0100") References: <20220322174839.2189015-1-fontaine.fabrice@gmail.com> <20220322174839.2189015-2-fontaine.fabrice@gmail.com> Message-ID: <87h77e62g4.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Explicitly disable or enable opus and readline which have been added by > commits 055cf588427b40533da74d16df1830e483c5618e and > f658b1934f91e8c416fd7519c9f7e3ab86dca076 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From br015 at umbiko.net Thu Mar 31 06:50:24 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 06:50:24 +0000 Subject: [Buildroot] Adding USB support to existing device on 2.6.39.3 kernel - possible? In-Reply-To: References: <2854f91f1188e166bf02e3a6ab6249a4@umbiko.net> <0b1ebd93c431e1c06678303eaffd8a79@umbiko.net> <54f87d03a99935fb452424992a81409c@umbiko.net> <35c2351b33bcb44d81333adfa848d221@umbiko.net> <7a56c449ef38559922b9858eee8d1799@umbiko.net> Message-ID: <75f3a440a863eb293c61223e81bc171b@umbiko.net> On 2022-03-31 06:19, Dan Jackson wrote: >> -----Original Message----- >> From: Andreas Ziegler >> Sent: 31 March 2022 06:58 >> To: Dan Jackson >> Cc: buildroot at buildroot.org >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> - >> possible? >> >> On 2022-03-30 19:18, Dan Jackson wrote: >> >> -----Original Message----- >> >> From: Andreas Ziegler >> >> Sent: 30 March 2022 08:14 >> >> To: Dan Jackson >> >> Cc: buildroot at buildroot.org >> >> Subject: Re: Adding USB support to existing device on 2.6.39.3 kernel >> >> - >> >> possible? >> >> >> >> Hi Dan, >> >> >> >> cutting some old content. >> >> >> >> On 2022-03-29 19:19, Dan Jackson wrote: >> >> >> >> >> >> >> >> >> > However, now I have a new missing file error, and I can't seem >> >> >> > to locate a suitable candidate: >> >> >> > >> >> >> > In file included from >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> >> custom/arch/arm/include/asm/system.h:165, >> >> >> > from >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> >> custom/arch/arm/include/asm/bitops.h:27, >> >> >> > from include/linux/bitops.h:22, >> >> >> > from include/linux/kernel.h:17, >> >> >> > from include/linux/sched.h:55, >> >> >> > from arch/arm/kernel/asm-offsets.c:13: >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> >> >> custom/arch/arm/include/asm/memory.h:19:10: >> >> >> > fatal error: mach/memory.h: No such file or directory >> >> >> > 19 | #include >> >> >> > | ^~~~~~~~~~~~~~~ >> >> >> > compilation terminated. >> >> >> > /home/danj/buildroot-2022.02/output/build/linux- >> custom/./Kbuild:81: >> >> >> > recipe for target 'arch/arm/kernel/asm-offsets.s' failed >> >> >> > make[3]: *** [arch/arm/kernel/asm-offsets.s] Error 1 >> >> >> > Makefile:1009: recipe for target 'prepare0' failed >> >> >> > make[2]: *** [prepare0] Error 2 >> >> >> > make[2]: *** Waiting for unfinished jobs.... >> >> >> > HOSTCC scripts/mod/modpost.o >> >> >> > HOSTCC scripts/mod/sumversion.o >> >> >> > HOSTLD scripts/mod/modpost >> >> >> > make[2]: *** wait: No child processes. Stop. >> >> >> > package/pkg-generic.mk:289: recipe for target >> >> >> > '/home/danj/buildroot-2022.02/output/build/linux- >> >> custom/.stamp_built' >> >> >> > failed >> >> >> > make[1]: *** >> >> >> > [/home/danj/buildroot-2022.02/output/build/linux- >> custom/.stamp_b >> >> >> > uil >> >> >> > t] >> >> >> > Error 2 >> >> >> > Makefile:84: recipe for target '_all' failed >> >> >> > make: *** [_all] Error 2 >> >> >> >> >> >> This seems not to be the defconfig from above? It now uses >> >> >> linux-custom ... >> >> >> The failure may be due to the default kernel configuration. Try to >> >> >> configure the correct one and see if you get further. >> >> >> >> >> >> > I think maybe I am still doing something wrong because it sure >> >> >> > seems to be compiling a lot of stuff instead of letting me >> >> >> > configure >> >> things. >> >> >> >> >> >> It gets better once everything necessary is built. >> >> > >> >> > Still no luck I'm afraid. Same error with mach/memory.h as above. >> >> > >> >> > Buildroot defconfig now looks like this: >> >> > >> >> > BR2_armeb=y >> >> > BR2_STATIC_LIBS=y >> >> > BR2_KERNEL_HEADERS_VERSION=y >> >> > BR2_DEFAULT_KERNEL_VERSION="2.6.39.3" >> >> > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y >> >> > BR2_TOOLCHAIN_BUILDROOT_LOCALE=y >> >> > BR2_PTHREAD_DEBUG=y >> >> > BR2_BINUTILS_VERSION_2_37_X=y >> >> > BR2_GCC_VERSION_9_X=y >> >> > BR2_TOOLCHAIN_BUILDROOT_CXX=y >> >> > BR2_PACKAGE_HOST_GDB=y >> >> > BR2_GDB_VERSION_9_2=y >> >> > BR2_LINUX_KERNEL=y >> >> > BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> >> > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.39.3" >> >> > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y >> >> > >> >> >> BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="/home/danj/DG3270_9.1.103 >> >> FB/sourcecode/ti_linux/linux-2.6.39.3/src/.config" >> >> > BR2_PACKAGE_DROPBEAR=y >> >> > >> >> >> BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE="/home/danj/localoptions >> >> .h" >> >> > BR2_PACKAGE_JOE=y >> >> > >> >> > I forgot to mention this before but the buildroot manual page you >> >> > mentioned said to create a local.mk file in order to use external >> >> > source, this looks like this: >> >> > >> >> > LINUX_OVERRIDE_SRCDIR = >> >> > /home/danj/DG3270_9.1.103FB/sourcecode/ti_linux/linux-2.6.39.3/src/ >> >> > >> >> > For the kernel configuration I entered the kernel source dir and >> >> > did "make menuconfig", I left everything at the defaults except for >> >> > enabling the USB related items. >> >> > >> >> > The resulting configuration file is attached as a text file. >> >> > Unfortunately it's been literally decades since I last actually >> >> > compiled a kernel, so I'm afraid I have no idea what bits would be >> >> > suitable to disable/remove to get the results I want (I'm guessing >> >> > this will be the most likely way to eliminate the error I'm >> >> > getting?) >> >> >> >> I did a compile test this morning, the Buildroot version was some >> >> early >> >> 2022.02 version, not up-to-date. >> >> >> >> You have a potential header mismatch, Select Toolchain -> Kernel >> >> Headers >> >> -> Same as kernel being built to use the vendor source also for the >> >> headers. >> >> >> >> I could configure Linux with make menuconfig, did not encounter the >> >> missing memory.h error above, but the build stops during Linux kernel >> >> compilation with this error: >> >> >> >> /tmp/ccSO8f6S.s: Assembler messages: >> >> /tmp/ccSO8f6S.s:950: Error: .err encountered >> >> make[3]: *** [scripts/Makefile.build:284: >> >> arch/arm/kernel/sys_oabi-compat.o] Error 1 >> >> make[2]: *** [Makefile:969: arch/arm/kernel] Error 2 >> >> make[1]: *** [package/pkg-generic.mk:292: >> >> /home/data/test/buildroot/output/build/linux-custom/.stamp_built] >> >> Error >> >> 2 >> >> make: *** [Makefile:84: _all] Error 2 >> >> >> >> Full error log is here: https://pastebin.com/VrXqSVsD >> > >> > Looking at the error log, it seems like vfp has been selected? But my >> > target device only has Features: swp half thumb fastmult edsp java. >> >> This is just a warning, I would ignore it at this point in time. >> Compiler syntax checks tend to get more strict over time ... >> >> > Also, OABI does not seem like it is the correct ABI. For example, if I >> > run "file" against the busybox binary the device comes with, I get: >> > >> > busybox: ELF 32-bit MSB executable, ARM, EABI5 version 1 (SYSV), >> > dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped >> >> It seems to be a compatibility layer for legacy software; disabling >> OABI_COMPAT is an option, because you probably will never need it. >> >> I used the source tree and unmodified .config contained in the >> Touchstone >> DG3270 Cable Gateway project on SourceForge for the test. >> >> The original build instructions seem to indicate that more software is >> needed >> to build the device firmware. This might be the reason for missing >> files ... >> >> Also, take a look at psp_drivers.Kconfig for the options necessary to >> enable >> USB support. > > It's starting to seem like it might be a better option to try to get > the original software development kit to work instead of trying to use > its components with modern buildroot. > > Ironically the SDK is itself based on ancient buildroot - in > /proc/version on the target device I can see: > > (gcc version 4.7.3 (Buildroot 2013.08.1) ) Now I understand ... no, it is not. Buildroot is used to generate the toolchain, the firmware build uses makefiles and kconfig. >> >> >> >> >> You might now do some research: >> >> >> >> https://stackoverflow.com/questions/61235299/gcc-8-3-arm-assembly- >> >> error-when-building-linux-kernel-3-14-17-in-buildroot-2020 >> >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 >> >> >> >> or try to switch to an older compiler ... >> >> >> >> -- >> >> Andreas >> >> >> >> From peter at korsgaard.com Thu Mar 31 06:50:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:50:26 +0200 Subject: [Buildroot] [PATCH 1/1] package/jack2: bump to version 1.9.20 In-Reply-To: (Jan Havran's message of "Mon, 7 Mar 2022 10:35:00 +0100") References: Message-ID: <87czi262fh.fsf@dell.be.48ers.dk> >>>>> "Jan" == Jan Havran writes: > - Fix URL for 'JACK DBus packaging' GitHub Wiki page. > https://github.com/jackaudio/jack2/releases/tag/v1.9.18 > https://github.com/jackaudio/jack2/releases/tag/v1.9.19 > https://github.com/jackaudio/jack2/releases/tag/v1.9.20 > Signed-off-by: Jan Havran Committed to 2022.02.x given the fixes, thanks. > --- > package/jack2/Config.in | 4 ++-- > package/jack2/jack2.hash | 2 +- > package/jack2/jack2.mk | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > diff --git a/package/jack2/Config.in b/package/jack2/Config.in > index bc883190d5..8abdda6376 100644 > --- a/package/jack2/Config.in > +++ b/package/jack2/Config.in > @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY > help > Build and use jackd. > - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging > + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging > config BR2_PACKAGE_JACK2_DBUS > bool "dbus jack2" > @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS > help > Build and use jackdbus. > - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging > + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging > endif > diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash > index df708f7ca5..6361473cf7 100644 > --- a/package/jack2/jack2.hash > +++ b/package/jack2/jack2.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz > +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz > sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING > diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk > index e6a036bac9..2e55169984 100644 > --- a/package/jack2/jack2.mk > +++ b/package/jack2/jack2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -JACK2_VERSION = 1.9.17 > +JACK2_VERSION = 1.9.20 > JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) > JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) > JACK2_LICENSE_FILES = COPYING > -- > 2.35.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 06:47:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:47:28 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack2: explicitly {dis, en}able opus and readline Message-ID: <20220331064151.A7F8886016@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6439b8dbe01b2a80f8cd7202277b8ccd822cc7e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc) Signed-off-by: Peter Korsgaard --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 127c99eed1..6939aac9a6 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -21,10 +21,16 @@ endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) From peter at korsgaard.com Thu Mar 31 06:46:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:46:16 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack2: bump to version 1.9.20 Message-ID: <20220331064151.9118386016@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9820d4903ea09a5640ed9bad83385243c3528eaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fix URL for 'JACK DBus packaging' GitHub Wiki page. https://github.com/jackaudio/jack2/releases/tag/v1.9.18 https://github.com/jackaudio/jack2/releases/tag/v1.9.19 https://github.com/jackaudio/jack2/releases/tag/v1.9.20 Signed-off-by: Jan Havran Signed-off-by: Peter Korsgaard (cherry picked from commit 26ca7fec041836c31f29c5566365fe40eb552bca) Signed-off-by: Peter Korsgaard --- package/jack2/Config.in | 4 ++-- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d5..8abdda6376 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +42,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca5..6361473cf7 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d jack2-1.9.20.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..2e55169984 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.20 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 06:46:24 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:46:24 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/jack2: fix build with libexecinfo Message-ID: <20220331064151.9D11286014@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a5119afa0eceaf03493142d89b8bf2407f9b983 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure raised on uclibc and musl since the addition of libexecinfo package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: dbus/sigsegv.c.17.o: in function `signal_segv': sigsegv.c:(.text+0x98): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/dca49cb9b3e66fac921601560e9358bcce9acffc Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 930db465d9d9f2fd558e67bd808914309c2d4619) Signed-off-by: Peter Korsgaard --- package/jack2/jack2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 2e55169984..127c99eed1 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -14,6 +14,11 @@ JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif From peter at korsgaard.com Thu Mar 31 06:43:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:43:19 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/wget: bump version to 1.21.3 Message-ID: <20220331064151.846C686014@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33951d7933c3162265cc44acfa0de7a61a5752f0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - bump version to 1.21.3 (for details see [1]) - remove legacy --with-libidn option (see [2]), replace with --enable-iri option in case locale support and libidn2 are available [1] https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html [2] https://git.savannah.gnu.org/cgit/wget.git/commit/configure.ac?id=a24e67e239ef949cc77a4c4e5a0beb703026a296 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b5f82a4a5a6f14b4d178a4d662784d7bd6f7fada) Signed-off-by: Peter Korsgaard --- package/wget/wget.hash | 4 ++-- package/wget/wget.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88..22674650a2 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8a73c33699..455faaed12 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -33,11 +33,12 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) From peter at korsgaard.com Thu Mar 31 06:47:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 08:47:36 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/jack2: explicitly {dis, en}able opus and readline Message-ID: <20220331064235.1111886024@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46f748347a6f0e289022a0533ce76f8567f71a73 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Explicitly disable or enable opus and readline which have been added by commits 055cf588427b40533da74d16df1830e483c5618e and f658b1934f91e8c416fd7519c9f7e3ab86dca076 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc) Signed-off-by: Peter Korsgaard --- package/jack2/jack2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac9..63b20ef0f7 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -16,10 +16,16 @@ JACK2_CONF_OPTS = --alsa ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) From yegorslists at googlemail.com Thu Mar 31 08:03:57 2022 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Thu, 31 Mar 2022 10:03:57 +0200 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2022-03-30 In-Reply-To: <20220331060828.F2A2883E9B@smtp1.osuosl.org> References: <20220331060828.F2A2883E9B@smtp1.osuosl.org> Message-ID: Hi All, On Thu, Mar 31, 2022 at 8:08 AM Thomas Petazzoni via buildroot wrote: > > Hello, > > Autobuild statistics for 2022-03-30 > =================================== > > branch | OK | NOK | TIM | TOT | > 2021.02.x | 63 | 6 | 0 | 69 | > 2022.02.x | 16 | 12 | 1 | 29 | > master | 60 | 42 | 0 | 102 | > > Classification of failures by reason for master > ----------------------------------------------- > > dhcp-4.4.2-P1 | 8 > pango-1.50.5 | 7 > tpm2-abrmd-2.3.3 | 6 > tpm2-tss-3.2.0 | 5 > tpm2-tools-5.2 | 3 > frr-8.2.2 | 1 > glslsandbox-player-2021.08.24 | 1 > jack2-1.9.20 | 1 > libsecret-0.20.5 | 1 > mongodb-4.2.18 | 1 > mpd-0.23.6 | 1 > qt-webkit-kiosk-a7720e50f2b... | 1 > sg3_utils-1.47 | 1 > tpm2-pkcs11-1.7.0 | 1 > ulog-0389d243352255f6182326... | 1 > unknown | 1 > vlc-3.0.16 | 1 > wavemon-0.9.4 | 1 > > > Detail of failures for master > ----------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > aarch64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/75beeb024a022513c17b25b9070083402045c1d3 | ORPH > sh4 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/9144569593c077af0b840b8308f44aa56537545e | ORPH > powerpc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/66920b50afea6b510b1aea2ab26178f79e7d25e4 | ORPH > arm | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/69da641c4bd6de1718f49bc04dafa081968dda96 | ORPH > arc | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/d18b006dce7b46631ce8f4c72fb97eb861993939 | ORPH > riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/32ea3d9366102da76e64c48e13f641fda6dced71 | ORPH > riscv64 | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/1ae01f53b213923113d4def79c2ef86d8f265dc2 | ORPH > powerpc64le | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/2e6b6cb0a40c9ac972a562e6dc17353e5e4003c1 | ORPH > mips64el | frr-8.2.2 | NOK | http://autobuild.buildroot.net/results/a8bd63dfc2012fbec48872b7a6cf4ba59829375c | > aarch64 | glslsandbox-player-2021.08.24 | NOK | http://autobuild.buildroot.net/results/bd4e3fc903cbe0e328c5c46c77770682228ac1ed | > m68k | jack2-1.9.20 | NOK | http://autobuild.buildroot.net/results/b59f60b60d51eb495780635ab31b1bb431282ed1 | > aarch64 | libsecret-0.20.5 | NOK | http://autobuild.buildroot.net/results/8c025659eaa2bedbc2f349891ca2e4722fb7830e | ORPH > arm | mongodb-4.2.18 | NOK | http://autobuild.buildroot.net/results/b9d211d388701d4588db760df26f8114a9d4677c | > arm | mpd-0.23.6 | NOK | http://autobuild.buildroot.net/results/f0a9e719114f19dc9d20622ed85dd4f8e968c20f | > powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/f7d227a39e4ec475c0967da031e90eca7399dbca | ORPH > mips | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7c3c2ea2b4ca326ebc11b40120993c9e20a22463 | ORPH > powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/cef923b7e4847e8bd0d6d7f9bf469ce6fa740363 | ORPH > arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/9589433c7340b2a6137c8134218e78726e38798c | ORPH > m68k | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/21669e18d0d8659fa23697eb4656db082ba7e5d5 | ORPH > mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/7147895b373436a3a9edb42aac1562a2c171d3cd | ORPH > nios2 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/b9dea403ee400d5448c1491bc265ad72847035e8 | ORPH > arc | qt-webkit-kiosk-a7720e50f2b... | NOK | http://autobuild.buildroot.net/results/8029b01ce5816cbafd412b14985becce7a22e09d | > m68k | sg3_utils-1.47 | NOK | http://autobuild.buildroot.net/results/dcc93ec2d1f861c4f3796d6b8ea5f609e8339161 | > or1k | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/f43d80dc23916f78168494da0d3b9b1574d92f87 | ORPH > powerpc64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/e031c62fe0180d403ab56da473b19da9f6161562 | ORPH > riscv64 | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/65e2bef20fe1bb1d820a1bfee289f58423dc14f7 | ORPH > mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/9ba07ae640ba9bea01c555a5d5ba6d230781ca49 | ORPH > mipsel | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/5a3ec27e213fe1d7092bd7f51511a3fb703fca78 | ORPH > xtensa | tpm2-abrmd-2.3.3 | NOK | http://autobuild.buildroot.net/results/239e4a5b8923fee53542845d1cffa67277a4480a | ORPH > x86_64 | tpm2-pkcs11-1.7.0 | NOK | http://autobuild.buildroot.net/results/66323bd7d5f868874771aa743e08b93f0f6e69e0 | > aarch64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/28cfd0284a01473c26c25cc2992b43c4bf9720c6 | ORPH > x86_64 | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/bcc9f0eb135873d665540c3c8a138f0e21bbe089 | ORPH > arm | tpm2-tools-5.2 | NOK | http://autobuild.buildroot.net/results/8900940ad30946c40e42ccc7c116153aa9c04741 | ORPH > riscv32 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/0a01e354928a67a119edb4c9553025f3b2808c6a | ORPH > nds32le | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4a1f3212d570128ce8743dda7a9920b5d67cc9a2 | ORPH > x86_64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/89b5764d0a5c0f29d027f2b79c219f8347408955 | ORPH > sparc64 | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/785bb203e884c31845ef46774360fc47c27649e0 | ORPH > arm | tpm2-tss-3.2.0 | NOK | http://autobuild.buildroot.net/results/4ecf58b1d4483386945dca736c3e763b607cabc1 | ORPH > s390x | ulog-0389d243352255f6182326... | NOK | http://autobuild.buildroot.net/results/b861aa6c0bc9ab39ba01c0afb658496e4f02d26e | > arm | unknown | NOK | http://autobuild.buildroot.net/results/56c8cacd93d9aff83a216b13a20be5afbcd3c09e | > arm | vlc-3.0.16 | NOK | http://autobuild.buildroot.net/results/ef891307af29deecc89209bfc3ad25b33d70eca6 | > x86_64 | wavemon-0.9.4 | NOK | http://autobuild.buildroot.net/results/0e02d2df8f05e209e3dcca2fbb9d9ce793509c7c | > > > Classification of failures by reason for 2021.02.x > -------------------------------------------------- > > host-sentry-cli-1.57.0 | 2 > apache-2.4.53 | 1 > heirloom-mailx-12.5 | 1 > monkey-f54856ce250c4e257354... | 1 > zeromq-4.3.4 | 1 > > > Detail of failures for 2021.02.x > -------------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > riscv32 | apache-2.4.53 | NOK | http://autobuild.buildroot.net/results/f2caf6ac63f50dd2fd59dbc0d3135c6f03a293eb | > sh4 | heirloom-mailx-12.5 | NOK | http://autobuild.buildroot.net/results/07e2147e57478e490741f3a40465b487c13ac06c | > arm | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/c5016c945fd218a26d1de6914d53f4f797851075 | > xtensa | host-sentry-cli-1.57.0 | NOK | http://autobuild.buildroot.net/results/4398bf4ea42569012e541ab2a7badd833ce560d5 | > s390x | monkey-f54856ce250c4e257354... | NOK | http://autobuild.buildroot.net/results/0e3e5d0437f25fb014a381e91fe28b76ca8c76bd | > or1k | zeromq-4.3.4 | NOK | http://autobuild.buildroot.net/results/b0af23591a6cd6255a2548259c01dbe6c219d687 | > > > Classification of failures by reason for 2022.02.x > -------------------------------------------------- > > pango-1.50.5 | 4 > dhcp-4.4.2-P1 | 1 > host-pango-1.50.5 | 1 > libuwsc | 1 > nbd-3.24 | 1 > ndisc6-1.0.5 | 1 > opencv4-4.5.5 | 1 > protozero-1.7.1 | 1 > unknown | 1 > wpa_supplicant-2.10 | 1 > > > Detail of failures for 2022.02.x > -------------------------------- > > arch | reason | OK? | url | orph? > -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- > m68k | dhcp-4.4.2-P1 | NOK | http://autobuild.buildroot.net/results/11b0fc25b99d223b9648d822563aeb746de5eb01 | ORPH > arm | host-pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/8bb4bf8414fc20e3ada64b12e579e9c65c6d9643 | ORPH > x86_64 | libuwsc | TIM | http://autobuild.buildroot.net/results/555b87bb5e9e003a9fd16b0c26cb62d10cee69b1 | > riscv32 | nbd-3.24 | NOK | http://autobuild.buildroot.net/results/10a90ace1cdc5d93bd98fb18ca5134a64a56318e | > arm | ndisc6-1.0.5 | NOK | http://autobuild.buildroot.net/results/56df999d86a5d343447d23580e5bbbfad8d05fba | ORPH > x86_64 | opencv4-4.5.5 | NOK | http://autobuild.buildroot.net/results/8ca60c6b072299ad08abaab4638ac544e6612b19 | > mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/37218057bb3850609f1cde22d302fa828123d22d | ORPH > arm | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/44e0caf61871e25b1aa22b5b30e2fdf70ca6fb44 | ORPH > mips64el | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/63e220221242385f9cd1631dcbd858a09a73f8e4 | ORPH > powerpc64 | pango-1.50.5 | NOK | http://autobuild.buildroot.net/results/96f2a226ff1793156f1364a52ae3a2675d1a9f3a | ORPH > s390x | protozero-1.7.1 | NOK | http://autobuild.buildroot.net/results/ed941b92d306564d657ba6810006dc00e2ec20e8 | > xtensa | unknown | NOK | http://autobuild.buildroot.net/results/b418dd5179b31a2a3921c731ca69128bb0f35b14 | > mipsel | wpa_supplicant-2.10 | NOK | http://autobuild.buildroot.net/results/2dea7dee521794b306cc610601fda322987e6cd0 | According to this commit [1], CONFIG_DRIVER_MACSEC_LINUX, that requires libnl, is enabled by default. Should we just enable libnl unconditionally? [1] https://w1.fi/cgit/hostap/commit/?id=a383db0646e177c18beddd52044046f0f16acff8 Regards, Yegor > > > > -- > http://autobuild.buildroot.net > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From stefan at agner.ch Thu Mar 31 08:53:00 2022 From: stefan at agner.ch (Stefan Agner) Date: Thu, 31 Mar 2022 10:53:00 +0200 Subject: [Buildroot] [PATCH] package/openocd: Allow to build BCM2835 on aarch64 Message-ID: Allow to build the BCM2835 bitbang interface on aarch64. Signed-off-by: Stefan Agner --- package/openocd/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/openocd/Config.in b/package/openocd/Config.in index b14f940b27..cef109b511 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -190,13 +190,17 @@ config BR2_PACKAGE_OPENOCD_AT91RM help Enable building support for AT91RM9200 based SBCs +endif # BR2_arm + +if BR2_arm || BR2_aarch64 + config BR2_PACKAGE_OPENOCD_BCM2835 bool "bitbanging on BCM2835" help Enable building support for bitbanging on BCM2835 (as found in Raspberry Pi) -endif # BR2_arm +endif # BR2_arm || BR2_aarch64 config BR2_PACKAGE_OPENOCD_GW16012 bool "Gateworks GW16012 JTAG Programmer" -- 2.35.1 From peter at korsgaard.com Thu Mar 31 11:21:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:21:54 +0200 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix target loaders.cache In-Reply-To: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 22 Mar 2022 20:00:32 +0100") References: <20220322190032.2566880-1-fontaine.fabrice@gmail.com> Message-ID: <878rsq5pv1.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > As reported by Rutger Sassen in > https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, > target loaders.cache is broken since commit > 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ > to relative host paths > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:24:01 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:24:01 +0200 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson: add cmake dependency support In-Reply-To: <20220324055602.3021498-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 23 Mar 2022 23:56:02 -0600") References: <20220324055602.3021498-1-james.hilliard1@gmail.com> Message-ID: <874k3e5pri.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Meson dependencies and variables can be provided by cmake similar to > how they can be provided by pkgconfig, for this to work we need to > ensure that cmake_prefix_path is set for both cross and native > targets along with the cmake binary path. > See: > https://mesonbuild.com/Dependencies.html#cmake > https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways > https://mesonbuild.com/Machine-files.html#meson-builtin-options > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:20:43 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:20:43 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220331112525.1003285FC3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f976d735e96a2b82542d3eddd599b6ed5a36e393 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 39ceb94fdb96da47a350b92e86513ddc57a657eb) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9..329c05520e 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From peter at korsgaard.com Thu Mar 31 11:23:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:23:00 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/pkg-meson: add cmake dependency support Message-ID: <20220331112525.1978885FEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a28617d676bd223c7440c1c00d58a1869e5a121c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Meson dependencies and variables can be provided by cmake similar to how they can be provided by pkgconfig, for this to work we need to ensure that cmake_prefix_path is set for both cross and native targets along with the cmake binary path. See: https://mesonbuild.com/Dependencies.html#cmake https://mesonbuild.com/Dependencies.html#arbitrary-variables-from-dependencies-that-can-be-found-multiple-ways https://mesonbuild.com/Machine-files.html#meson-builtin-options Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit b848117699707390b6507e59e2e705c54acdc9fc) Signed-off-by: Peter Korsgaard --- package/pkg-meson.mk | 2 ++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a..9e70d49b60 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -79,6 +79,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ @@ -136,6 +137,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ + -Dbuild.cmake_prefix_path=$$(HOST_DIR)/lib/cmake \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e..1977a83501 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,7 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -18,6 +19,7 @@ c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true From peter at korsgaard.com Thu Mar 31 11:21:36 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:21:36 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/gdk-pixbuf: fix target loaders.cache Message-ID: <20220331112536.3EDF88601F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=558fe27fb367add4a75d07e176da3a915dbce187 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x As reported by Rutger Sassen in https://lists.buildroot.org/pipermail/buildroot/2022-March/638895.html, target loaders.cache is broken since commit 75361a9aba042799040591fb84192802b137fc3a so fix it by prepending /usr/ to relative host paths Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 39ceb94fdb96da47a350b92e86513ddc57a657eb) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9..329c05520e 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -70,14 +70,14 @@ endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE From peter at korsgaard.com Thu Mar 31 11:36:55 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:36:55 +0200 Subject: [Buildroot] [PATCH 1/1] package/protozero: fix build with clang-tidy In-Reply-To: <20220324223218.27767-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 24 Mar 2022 23:32:18 +0100") References: <20220324223218.27767-1-fontaine.fabrice@gmail.com> Message-ID: <87zgl64alk.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure if clang-tidy is found on host (and > protobuf is built before protozero) which is raised since tests are > disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: > CMake Error at CMakeLists.txt:77 (add_dependencies): > The dependency target "writer_tests" of target "clang-tidy" does not exist. > Fixes: > - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e > Signed-off-by: Fabrice Fontaine Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:35:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:35:35 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/protozero: fix build with clang-tidy Message-ID: <20220331112752.1A9CF86034@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90d633e632636b77dd5c7ce0dd23eec3692f20b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix the following build failure if clang-tidy is found on host (and protobuf is built before protozero) which is raised since tests are disabled in commit be4869f393561aa5c297b631efc62dfd5e1c3f3f: CMake Error at CMakeLists.txt:77 (add_dependencies): The dependency target "writer_tests" of target "clang-tidy" does not exist. Fixes: - http://autobuild.buildroot.org/results/c3ae3b5caf79eb30c8a1786f58abea4f2b41a26e Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e54b82306d005eeb4ed013a4cbd39e59e5ea8f19) Signed-off-by: Peter Korsgaard --- ...sts.txt-protobuf-is-only-needed-for-tests.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 0000000000..3033e24aa2 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + From peter at korsgaard.com Thu Mar 31 11:44:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:44:37 +0200 Subject: [Buildroot] [PATCH v1] package/wireshark: fix compile with ccache enabled In-Reply-To: <20220325190934.24982-1-ps.report@gmx.net> (Peter Seiderer's message of "Fri, 25 Mar 2022 20:09:34 +0100") References: <20220325190934.24982-1-ps.report@gmx.net> Message-ID: <87v8vu4a8q.fsf@dell.be.48ers.dk> >>>>> "Peter" == Peter Seiderer writes: > - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER > Fixes: > [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] > [...] > [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o > .../host/bin/ccache: invalid option -- 'D' > Reported-by: Dan Ambrosio > Signed-off-by: Peter Seiderer Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:44:16 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:44:16 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/wireshark: fix compile with ccache enabled Message-ID: <20220331113621.DBE4486062@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=275c5fcfb5168a22a42c4a61f8ba3d9678b088b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 082076ffc186392f2b794facaa0545529e4f5851) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5c811319be..a55d9f2848 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -24,7 +24,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Thu Mar 31 11:44:08 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:44:08 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/wireshark: fix compile with ccache enabled Message-ID: <20220331113626.B35B086069@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2e94303667b66a42f22f185ecfb12bef32728d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - use HOSTCC_NOCCACHE (instead of HOSTCC) for LEMON_C_COMPILER Fixes: [...] /usr/bin/cmake [...] -DLEMON_C_COMPILER=.../host/bin/ccache /usr/bin/gcc [...] [...] [ 0%] Building C object tools/lemon/CMakeFiles/lemon.dir/lemon.c.o .../host/bin/ccache: invalid option -- 'D' Reported-by: Dan Ambrosio Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 082076ffc186392f2b794facaa0545529e4f5851) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73..1a549f7037 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -25,7 +25,7 @@ WIRESHARK_CONF_OPTS = \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic From peter at korsgaard.com Thu Mar 31 11:47:33 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:47:33 +0200 Subject: [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.4 In-Reply-To: <20220325212405.25243-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 25 Mar 2022 15:24:05 -0600") References: <20220325212405.25243-1-james.hilliard1@gmail.com> Message-ID: <87r16i4a3u.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:49:00 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:49:00 +0200 Subject: [Buildroot] [PATCH 1/1] package/vim: security bump to version 8.2.4632 In-Reply-To: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 26 Mar 2022 21:49:15 +0100") References: <20220326204915.1019331-1-fontaine.fabrice@gmail.com> Message-ID: <87mth64a1f.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub > repository vim/vim prior to 8.2.4563. > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:48:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:48:49 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/vim: security bump to version 8.2.4632 Message-ID: <20220331114131.6327986070@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98eccb68f27144d6b4686eabf02a4688442c31c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b66fdc55fa097d139590d979f24c15b694e8bc3) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Thu Mar 31 11:47:26 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:47:26 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/meson: bump to version 0.61.4 Message-ID: <20220331114137.3EE8586074@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e9d3f2e8819d2a3cbd35913406060f33d2aec25a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 148e2115c0359ce0e39a75012f36ce985472e57f) Signed-off-by: Peter Korsgaard --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index d909709b24..8389adb243 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.3/meson-0.61.3.tar.gz.asc -sha256 9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b meson-0.61.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.4/meson-0.61.4.tar.gz.asc +sha256 4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 meson-0.61.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 4615e839fe..e9c3145183 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.3 +MESON_VERSION = 0.61.4 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 11:48:42 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:48:42 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/vim: security bump to version 8.2.4632 Message-ID: <20220331114137.4970386075@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a80eca365eba8a77f250917e5c11d28eb24b073 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Fix CVE-2022-0943: Heap-based Buffer Overflow occurs in vim in GitHub repository vim/vim prior to 8.2.4563. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7b66fdc55fa097d139590d979f24c15b694e8bc3) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f..d2c91dcfa5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz +sha256 acca7330e41d01b53d4455ff98fafbf13282ba6461cd92eb1188836f6b03ec0f vim-8.2.4632.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef..71aa735eff 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 8.2.4632 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From peter at korsgaard.com Thu Mar 31 11:53:11 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:53:11 +0200 Subject: [Buildroot] [PATCH] package/luasec: bump to version 1.0.2 In-Reply-To: <20220327142048.1477306-1-francois.perrad@gadz.org> (Francois Perrad's message of "Sun, 27 Mar 2022 16:20:48 +0200") References: <20220327142048.1477306-1-francois.perrad@gadz.org> Message-ID: <87ilru49ug.fsf@dell.be.48ers.dk> >>>>> "Francois" == Francois Perrad writes: > diff LICENSE: > -LuaSec 1.0 license > +LuaSec 1.0.2 license > Signed-off-by: Francois Perrad Committed to 2022.02.x as it looks to be only bugfixes, thanks: https://github.com/brunoos/luasec/blob/master/CHANGELOG -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:52:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:52:35 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/luasec: bump to version 1.0.2 Message-ID: <20220331114401.0CA2A8607A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=898593378c1a89b4d6cb8c97c2bb610480e52f85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x diff LICENSE: -LuaSec 1.0 license +LuaSec 1.0.2 license Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6b609e77bfab37ee71d31eeff24640a302946a44) Signed-off-by: Peter Korsgaard --- package/luasec/luasec.hash | 4 ++-- package/luasec/luasec.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9b..1e381612bd 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 7ed5d08aad8f0e8659abb3f43c935da1c898474d4dc121e9edfbeae5c4c67fb0 luasec-1.0.2-1.src.rock +sha256 84376baf33cefbcc1e9adbca23fcf87f51c1107956660cda2880feaef86d6075 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14daf..4ace94d168 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.0.2-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE From peter at korsgaard.com Thu Mar 31 12:02:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:02:06 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/opus: enable custom modes Message-ID: <20220331115418.5804C86080@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=363284a04df1e4117e9789ee6b0eebbc3fee94c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92e436b73df21ff9347c53c25fd33d8fd48a9d43) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point From peter at korsgaard.com Thu Mar 31 12:03:49 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:03:49 +0200 Subject: [Buildroot] [PATCH 1/1] package/opus: enable custom modes In-Reply-To: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Mar 2022 21:39:55 +0200") References: <20220327193955.1277972-1-fontaine.fabrice@gmail.com> Message-ID: <87ee2i49cq.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Enable custom modes to avoid the following build failure with jack2 > raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: > Checking for header opus/opus_custom.h : not found > The above check failed, but the checkee is required for --opus. > It should be noted that before this commit, opus was silently disabled > Fixes: > - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 11:56:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 13:56:10 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/opus: enable custom modes Message-ID: <20220331115555.76A6986083@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a51644aa58832fbd78f205f5390ca90a8095c41e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Enable custom modes to avoid the following build failure with jack2 raised since commit 618a23100fe5ff54b90ada1a8f23453f6c5a77dc: Checking for header opus/opus_custom.h : not found The above check failed, but the checkee is required for --opus. It should be noted that before this commit, opus was silently disabled Fixes: - http://autobuild.buildroot.org/results/b1c050ccd6152c43a6da5f5d2174c3cc0dc2ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 92e436b73df21ff9347c53c25fd33d8fd48a9d43) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f..4f816df477 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -17,6 +17,7 @@ OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point From peter at korsgaard.com Thu Mar 31 12:13:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:13:50 +0200 Subject: [Buildroot] [PATCH 1/1] package/systemd: bump to version 250.4 In-Reply-To: <20220327200651.4189748-1-james.hilliard1@gmail.com> (James Hilliard's message of "Sun, 27 Mar 2022 14:06:51 -0600") References: <20220327200651.4189748-1-james.hilliard1@gmail.com> Message-ID: <87a6d648w1.fsf@dell.be.48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 12:07:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:07:02 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/systemd: bump to version 250.4 Message-ID: <20220331120508.DBEC086085@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5045b4de6de6c42ce36e31fbc9216dfb3e6a1493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ea04ee34f0078952aae0e27150b683ec3c8defdf) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac20..3572b25965 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 d2bda9d225da11dc9ff48b48e59fc36798d3e66902ed400a9f78fa370c596864 systemd-250.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4..9feed9c084 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 250.3 +SYSTEMD_VERSION = 250.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From peter at korsgaard.com Thu Mar 31 12:15:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:15:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/matio: security bump to version 1.5.22 In-Reply-To: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Mar 2022 22:32:18 +0200") References: <20220327203218.1331528-1-fontaine.fabrice@gmail.com> Message-ID: <875ynu48tp.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixed heap-based buffer overflows when reading (crafted) MAT file > (CVE-2020-36428, CVE-2021-36977) > - Update hash pf COPYING (year updated and contributors added: > https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) > https://github.com/tbeu/matio/releases/tag/v1.5.22 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 12:15:02 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:15:02 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/matio: Bump version to 1.5.21 Message-ID: <20220331120606.3B77F86089@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8d1f9e2bfce5b766f0a69c9d89c03658d9d5d0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Yann E. MORIN (cherry picked from commit 4047e10ed6e20492bae572d4929eaa5d67eed746) Signed-off-by: Peter Korsgaard --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 55e57338c8..4dd05dee07 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.18/ -sha512 c43e562a101348d64139a056f28bce37c59c6667d701200255ccf9d8b6adf7a92ae9c11c8d921ec8a652cdc81c5de9ab247907279c54c52905adfd65bc3fb90f matio-1.5.18.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ +sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz # Locally computed -sha256 19494e9c9154a5e3f834e99d65fab0653b84280df7c98d1886a98d2bd28369c1 COPYING +sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 0ebba13435..236466d4d9 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.18 +MATIO_VERSION = 1.5.21 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 12:15:06 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:15:06 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/matio: security bump to version 1.5.22 Message-ID: <20220331120606.454CC8608A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff8555763aa51a43a108dccf4011406bce2d00d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash of COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f33260685bf9dedd76db5b19f2dce0f4b5cbce2b) Signed-off-by: Peter Korsgaard --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 12:17:47 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:17:47 +0200 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.13 In-Reply-To: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 27 Mar 2022 23:15:05 +0200") References: <20220327211505.1621268-1-fontaine.fabrice@gmail.com> Message-ID: <871qyi48pg.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, > CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 > - Drop second patch (already in version) > - Add tarball sha256 > - Update indentation in hash file (two spaces) > https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 > Signed-off-by: Fabrice Fontaine Committed to 2021.02.x and 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 12:17:35 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:17:35 +0200 Subject: [Buildroot] [git commit branch/2021.02.x] package/netatalk: security bump to version 3.1.13 Message-ID: <20220331120848.44C4E8608F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14c91f703526fee8e0b09a28018a57b0a835ccdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5ed1baa7e2d20c2b6184db265f398d1c2bb0e2e8) Signed-off-by: Peter Korsgaard --- ...-multiple-def-of-invalid_dircache_entries.patch | 25 ---------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From peter at korsgaard.com Thu Mar 31 12:14:37 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:14:37 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/matio: security bump to version 1.5.22 Message-ID: <20220331120852.DDC1786094@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f93f4dc615414f71eab6fd2d5ea31b527318b37b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fixed heap-based buffer overflows when reading (crafted) MAT file (CVE-2020-36428, CVE-2021-36977) - Update hash of COPYING (year updated and contributors added: https://github.com/tbeu/matio/commit/a3730c09797372a5919140b4618f217bb54bd1a1) https://github.com/tbeu/matio/releases/tag/v1.5.22 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit f33260685bf9dedd76db5b19f2dce0f4b5cbce2b) Signed-off-by: Peter Korsgaard --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee07..4634074ca0 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.22/ +sha512 33fd3991413e94dfc9aba13ffd08b09ddcbdb9dfa579124d981449e195a8c61a3dc95b55e46bba360d48456c117cf36403af1c3448689c26b8aea5fa9cf38323 matio-1.5.22.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9..d282852d37 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.22 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING From peter at korsgaard.com Thu Mar 31 12:17:19 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 14:17:19 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/netatalk: security bump to version 3.1.13 Message-ID: <20220331120852.E83F786097@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc1f28521055045d66fc3218eeee5e891d4d4ddd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x - Fixes CVE-2021-31439, CVE-2022-23121, CVE-2022-23123, CVE-2022-23122, CVE-2022-23125, CVE-2022-23124 and CVE-2022-0194 - Drop second patch (already in version) - Add tarball sha256 - Update indentation in hash file (two spaces) https://sourceforge.net/projects/netatalk/files/netatalk/3.1.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5ed1baa7e2d20c2b6184db265f398d1c2bb0e2e8) Signed-off-by: Peter Korsgaard --- ...-multiple-def-of-invalid_dircache_entries.patch | 25 ---------------------- package/netatalk/netatalk.hash | 7 +++--- package/netatalk/netatalk.mk | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc52553..0000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a005..6dead5457c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ +md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 +sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 # Locally computed +sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316..7cc950beb6 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 +NETATALK_VERSION = 3.1.13 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch From br015 at umbiko.net Thu Mar 31 13:22:19 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 13:22:19 +0000 Subject: [Buildroot] [PATCH 1/1] package/mpd: disable expat explicitly unless target package exists In-Reply-To: <20220330132749.1417115-1-br015@umbiko.net> References: <20220330132749.1417115-1-br015@umbiko.net> Message-ID: <31e6b41904b9d6c1bafeb294d0ca8ffe@umbiko.net> I marked this patch as obsolete. A variant of this failure has come up, and this approach is not feasible anymore. Kind regards, Andreas On 2022-03-30 13:27, Andreas Ziegler wrote: > Background: > During configuration, mpd tries to determine the availability of > optional > dependencies using (host) pkgconfig and CMake. If host and target > architecture > are identical, it locates host-libexpat (CMake dependency) and tries to > incorporate it into the build process. The link step fails > subsequently, because > some dependencies of host binaries come from the build machine, and are > not > present on the target. > > This results in the following build error: > /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > warning: libc.so.6, needed by > /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7, not found (try > using -rpath or -rpath-link) > /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7: undefined > reference to `__errno_location at GLIBC_2.2.5' > > The link step fails, because libexpat was built against the build > machine's C > library. > > The optional expat dependency is disabled, unless the expat target > package is > selected. This is in line with BR2_PACKAGE_MPD_UPNP_* handling logic, > which > selects the target package and needs to enable the expat option. The > grey area > of expat present on the target for other reasons, but not explicitly > needed for > mpd, is accepted to avoid making the logic too complicated. > > Signed-off-by: Andreas Ziegler > --- > package/mpd/mpd.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index 12da36098f..c1ad1bc6c6 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -21,6 +21,11 @@ MPD_CONF_OPTS = \ > -Dpipewire=disabled \ > -Dsnapcast=false > > +# Disable expat explicitly, unless the target package is selected > +ifneq ($(BR2_PACKAGE_EXPAT),y) > +MPD_CONF_OPTS += -Dexpat=disabled > +endif > + > # Zeroconf support depends on libdns_sd from avahi. > ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) > MPD_DEPENDENCIES += avahi > -- > 2.34.1 From br015 at umbiko.net Thu Mar 31 13:22:30 2022 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 31 Mar 2022 15:22:30 +0200 Subject: [Buildroot] [PATCH 1/1] package/mpd: explicitly disable features to avoid collision with host packages Message-ID: <20220331132230.227424-1-br015@umbiko.net> Background During configuration, the meson build system tries to determine the availability of optional dependencies using (host) pkgconfig and cmake in that order. If a library does not exist on the target, pkg-config will fail, but cmake sometimes finds and reports libraries that exist as host packages. This has been observed for host-expat (cmake dependency) and host-zlib. The link step subsequently fails, because necessary files are not present in the target architecture. Unconditionally disable optional features often found in host binaries and modify the menu selection processing in mpd.mk to re-enable them where necessary. Currently this concerns expat and zlib only. This fixes the following build errors: [expat] /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: warning: libc.so.6, needed by /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7, not found (try using -rpath or -rpath-link) /home/data/buildroot.x86_64/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.2.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/data/buildroot.x86_64/host/lib/libexpat.so.1.8.7: undefined reference to `__errno_location at GLIBC_2.2.5' [zlib] http://autobuild.buildroot.net/results/f0a/f0a9e719114f19dc9d20622ed85dd4f8e968c20f/ Signed-off-by: Andreas Ziegler --- package/mpd/mpd.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 12da36098f..4e67c9428c 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -14,6 +14,7 @@ MPD_LICENSE_FILES = COPYING # these refer to the FreeBSD PPP daemon MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466 MPD_SELINUX_MODULES = mpd +# These features are either unwanted or not selectable via the Buildroot menu MPD_CONF_OPTS = \ -Daudiofile=disabled \ -Ddocumentation=disabled \ @@ -21,6 +22,12 @@ MPD_CONF_OPTS = \ -Dpipewire=disabled \ -Dsnapcast=false +# Explicitly disable features where meson's dependency detection picks up host +# libraries. These settings can be overridden through menu options later +MPD_CONF_OPTS += \ + -Dexpat=disabled \ + -Dzlib=disabled + # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) MPD_DEPENDENCIES += avahi @@ -300,11 +307,11 @@ ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y) MPD_DEPENDENCIES += \ expat \ libupnp -MPD_CONF_OPTS += -Dupnp=pupnp +MPD_CONF_OPTS += -Dupnp=pupnp -Dexpat=enabled else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) MPD_DEPENDENCIES += \ libnpupnp -MPD_CONF_OPTS += -Dupnp=npupnp +MPD_CONF_OPTS += -Dupnp=npupnp -Dexpat=enabled else ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y) MPD_CONF_OPTS += -Dupnp=disabled endif -- 2.34.1 From bugzilla at busybox.net Thu Mar 31 14:21:23 2022 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Thu, 31 Mar 2022 14:21:23 +0000 Subject: [Buildroot] [Bug 14731] New: BR2_PACKAGE_IOSTAT Message-ID: https://bugs.busybox.net/show_bug.cgi?id=14731 Bug ID: 14731 Summary: BR2_PACKAGE_IOSTAT Product: buildroot Version: 2022.02 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: w.meganck at televic.com CC: buildroot at uclibc.org Target Milestone: --- Build error when BR2_PACKAGE_IOSTAT=y is in the .config. Makefile.legacy:9: *** "You have legacy configuration in your .config! Please check your configuration.". Stop. Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 When removed start the build. Is this replaced or removed? -- You are receiving this mail because: You are on the CC list for the bug. From Jason at zx2c4.com Thu Mar 31 14:50:53 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 31 Mar 2022 10:50:53 -0400 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: On Wed, Mar 30, 2022 at 1:13 PM Jason A. Donenfeld wrote: > > If this customization is left in, then it should ideally use the > > existing (directory part of) URANDOM_SEED, which used to be how the > > location could be customized for backwards compatibility. > > As mentioned, no tweaks go up to seedrng.git. That's sample code. > > I'm inclined to agree with James' assessment about this, that > Buildroot needs it to be customizable. Happy to send a v4 of this > patch adjusting the defaults to have paths similar to what was there > before. FYI, I just noticed the old code writes to the file /var/lib/random-seed. The directory part is /var/lib. Therefore /var/lib/seedrng/* shares that same directory part. So I think what's there now fits what you want already? I'll leave that change out of v4. From Jason at zx2c4.com Thu Mar 31 14:57:38 2022 From: Jason at zx2c4.com (Jason A. Donenfeld) Date: Thu, 31 Mar 2022 10:57:38 -0400 Subject: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: Message-ID: <20220331145738.119773-1-Jason@zx2c4.com> The RNG can't actually be seeded from a shell script, due to the reliance on ioctls. For this reason, the seedrng project provides a basic script meant to be copy and pasted into projects like buildroot and tweaked as needed: . This commit imports it into buildroot and wires up the init scripts to call it. This also is a significant improvement over the current init script, which doesn't credit entropy and whose hashing in shell scripts is sort of fragile. As seedrng.c is a short tiny C program, we include this here in the package, like a few other packages do. Later we'll investigate adding this to busybox, but for now, this is a good start and a positive step in the right direction. Reviewed-by: James Hilliard Signed-off-by: Jason A. Donenfeld --- Changes v3->v4: - Remove unneeded whitespace. - Remove check for /dev/urandom in script file. - Remove outdated comments and group start and stop commands. - Additionally license under public domain (CC0) and 1-clause BSD, to make bringing this into buildroot's tree as easy as possible. package/urandom-scripts/Config.in | 4 - package/urandom-scripts/S20urandom | 73 +--- package/urandom-scripts/seedrng.c | 457 +++++++++++++++++++++ package/urandom-scripts/urandom-scripts.mk | 6 + 4 files changed, 481 insertions(+), 59 deletions(-) create mode 100644 package/urandom-scripts/seedrng.c diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e22..070ffa5e9a 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_URANDOM_SCRIPTS depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom index c6b2ebd48f..1bdb19979a 100644 --- a/package/urandom-scripts/S20urandom +++ b/package/urandom-scripts/S20urandom @@ -3,66 +3,29 @@ # Preserve the random seed between reboots. See urandom(4). # -# Quietly do nothing if /dev/urandom does not exist -[ -c /dev/urandom ] || exit 0 - -URANDOM_SEED="/var/lib/random-seed" +# The following knobs can be adjusted by placing uncommented modified lines +# into /etc/default/urandom: +# +# Set these to change where the seed and runtime lock file are stored: +# +# export SEEDRNG_SEED_DIR=/var/lib/seedrng +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock +# +# Set this to true only if you do not want seed files to actually credit the +# RNG, for example if you plan to replicate this file system image and do not +# have the wherewithal to first delete the contents of /var/lib/seedrng: +# +# export SEEDRNG_SKIP_CREDIT=false +# # shellcheck source=/dev/null [ -r "/etc/default/urandom" ] && . "/etc/default/urandom" -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -init_rng() { - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -save_random_seed() { - printf 'Saving random seed: ' - status=1 - if touch "$URANDOM_SEED.new" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED.tmp" bs="$pool_size" count=1 2> /dev/null - cat "$URANDOM_SEED" "$URANDOM_SEED.tmp" 2>/dev/null \ - | sha256sum \ - | cut -d ' ' -f 1 > "$URANDOM_SEED.new" && \ - mv "$URANDOM_SEED.new" "$URANDOM_SEED" && status=0 - rm -f "$URANDOM_SEED.tmp" - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - - else - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - case "$1" in - start|restart|reload) - # Carry a random seed from start-up to start-up - # Load and then save the whole entropy pool - init_rng && save_random_seed;; - stop) - # Carry a random seed from shut-down to start-up - # Save the whole entropy pool - save_random_seed;; + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + seedrng || true;; *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 diff --git a/package/urandom-scripts/seedrng.c b/package/urandom-scripts/seedrng.c new file mode 100644 index 0000000000..7793c7338e --- /dev/null +++ b/package/urandom-scripts/seedrng.c @@ -0,0 +1,457 @@ +// SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0 OR MIT OR BSD-1-Clause OR CC0-1.0) +/* + * Copyright (C) 2022 Jason A. Donenfeld . All Rights Reserved. + * + * This is based on code from . + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef GRND_INSECURE +#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ +#endif + +static const char *SEED_DIR; +static const char *LOCK_FILE; +static char *CREDITABLE_SEED; +static char *NON_CREDITABLE_SEED; + +enum blake2s_lengths { + BLAKE2S_BLOCK_LEN = 64, + BLAKE2S_HASH_LEN = 32, + BLAKE2S_KEY_LEN = 32 +}; + +enum seedrng_lengths { + MAX_SEED_LEN = 512, + MIN_SEED_LEN = BLAKE2S_HASH_LEN +}; + +struct blake2s_state { + uint32_t h[8]; + uint32_t t[2]; + uint32_t f[2]; + uint8_t buf[BLAKE2S_BLOCK_LEN]; + unsigned int buflen; + unsigned int outlen; +}; + +#define le32_to_cpup(a) le32toh(*(a)) +#define cpu_to_le32(a) htole32(a) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif +#ifndef DIV_ROUND_UP +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#endif + +static inline void cpu_to_le32_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = cpu_to_le32(*buf); + ++buf; + } +} + +static inline void le32_to_cpu_array(uint32_t *buf, unsigned int words) +{ + while (words--) { + *buf = le32_to_cpup(buf); + ++buf; + } +} + +static inline uint32_t ror32(uint32_t word, unsigned int shift) +{ + return (word >> (shift & 31)) | (word << ((-shift) & 31)); +} + +static const uint32_t blake2s_iv[8] = { + 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, + 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL +}; + +static const uint8_t blake2s_sigma[10][16] = { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, + { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }, + { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, + { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 }, + { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, + { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 }, + { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, + { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 }, + { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, + { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }, +}; + +static void blake2s_set_lastblock(struct blake2s_state *state) +{ + state->f[0] = -1; +} + +static void blake2s_increment_counter(struct blake2s_state *state, const uint32_t inc) +{ + state->t[0] += inc; + state->t[1] += (state->t[0] < inc); +} + +static void blake2s_init_param(struct blake2s_state *state, const uint32_t param) +{ + int i; + + memset(state, 0, sizeof(*state)); + for (i = 0; i < 8; ++i) + state->h[i] = blake2s_iv[i]; + state->h[0] ^= param; +} + +static void blake2s_init(struct blake2s_state *state, const size_t outlen) +{ + blake2s_init_param(state, 0x01010000 | outlen); + state->outlen = outlen; +} + +static void blake2s_compress(struct blake2s_state *state, const uint8_t *block, size_t nblocks, const uint32_t inc) +{ + uint32_t m[16]; + uint32_t v[16]; + int i; + + while (nblocks > 0) { + blake2s_increment_counter(state, inc); + memcpy(m, block, BLAKE2S_BLOCK_LEN); + le32_to_cpu_array(m, ARRAY_SIZE(m)); + memcpy(v, state->h, 32); + v[ 8] = blake2s_iv[0]; + v[ 9] = blake2s_iv[1]; + v[10] = blake2s_iv[2]; + v[11] = blake2s_iv[3]; + v[12] = blake2s_iv[4] ^ state->t[0]; + v[13] = blake2s_iv[5] ^ state->t[1]; + v[14] = blake2s_iv[6] ^ state->f[0]; + v[15] = blake2s_iv[7] ^ state->f[1]; + +#define G(r, i, a, b, c, d) do { \ + a += b + m[blake2s_sigma[r][2 * i + 0]]; \ + d = ror32(d ^ a, 16); \ + c += d; \ + b = ror32(b ^ c, 12); \ + a += b + m[blake2s_sigma[r][2 * i + 1]]; \ + d = ror32(d ^ a, 8); \ + c += d; \ + b = ror32(b ^ c, 7); \ +} while (0) + +#define ROUND(r) do { \ + G(r, 0, v[0], v[ 4], v[ 8], v[12]); \ + G(r, 1, v[1], v[ 5], v[ 9], v[13]); \ + G(r, 2, v[2], v[ 6], v[10], v[14]); \ + G(r, 3, v[3], v[ 7], v[11], v[15]); \ + G(r, 4, v[0], v[ 5], v[10], v[15]); \ + G(r, 5, v[1], v[ 6], v[11], v[12]); \ + G(r, 6, v[2], v[ 7], v[ 8], v[13]); \ + G(r, 7, v[3], v[ 4], v[ 9], v[14]); \ +} while (0) + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + +#undef G +#undef ROUND + + for (i = 0; i < 8; ++i) + state->h[i] ^= v[i] ^ v[i + 8]; + + block += BLAKE2S_BLOCK_LEN; + --nblocks; + } +} + +static void blake2s_update(struct blake2s_state *state, const void *inp, size_t inlen) +{ + const size_t fill = BLAKE2S_BLOCK_LEN - state->buflen; + const uint8_t *in = inp; + + if (!inlen) + return; + if (inlen > fill) { + memcpy(state->buf + state->buflen, in, fill); + blake2s_compress(state, state->buf, 1, BLAKE2S_BLOCK_LEN); + state->buflen = 0; + in += fill; + inlen -= fill; + } + if (inlen > BLAKE2S_BLOCK_LEN) { + const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_LEN); + blake2s_compress(state, in, nblocks - 1, BLAKE2S_BLOCK_LEN); + in += BLAKE2S_BLOCK_LEN * (nblocks - 1); + inlen -= BLAKE2S_BLOCK_LEN * (nblocks - 1); + } + memcpy(state->buf + state->buflen, in, inlen); + state->buflen += inlen; +} + +static void blake2s_final(struct blake2s_state *state, uint8_t *out) +{ + blake2s_set_lastblock(state); + memset(state->buf + state->buflen, 0, BLAKE2S_BLOCK_LEN - state->buflen); + blake2s_compress(state, state->buf, 1, state->buflen); + cpu_to_le32_array(state->h, ARRAY_SIZE(state->h)); + memcpy(out, state->h, state->outlen); +} + +static size_t determine_optimal_seed_len(void) +{ + size_t ret = 0; + char poolsize_str[11] = { 0 }; + int fd = open("/proc/sys/kernel/random/poolsize", O_RDONLY); + + if (fd < 0 || read(fd, poolsize_str, sizeof(poolsize_str) - 1) < 0) { + fprintf(stderr, "WARNING: Unable to determine pool size, falling back to %u bits: %s\n", MIN_SEED_LEN * 8, strerror(errno)); + ret = MIN_SEED_LEN; + } else + ret = DIV_ROUND_UP(strtoul(poolsize_str, NULL, 10), 8); + if (fd >= 0) + close(fd); + if (ret < MIN_SEED_LEN) + ret = MIN_SEED_LEN; + else if (ret > MAX_SEED_LEN) + ret = MAX_SEED_LEN; + return ret; +} + +static int read_new_seed(uint8_t *seed, size_t len, bool *is_creditable) +{ + ssize_t ret; + int urandom_fd; + + *is_creditable = false; + ret = getrandom(seed, len, GRND_NONBLOCK); + if (ret == (ssize_t)len) { + *is_creditable = true; + return 0; + } else if (ret < 0 && errno == ENOSYS) { + struct pollfd random_fd = { + .fd = open("/dev/random", O_RDONLY), + .events = POLLIN + }; + if (random_fd.fd < 0) + return -errno; + *is_creditable = poll(&random_fd, 1, 0) == 1; + close(random_fd.fd); + } else if (getrandom(seed, len, GRND_INSECURE) == (ssize_t)len) + return 0; + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + return -errno; + ret = read(urandom_fd, seed, len); + if (ret == (ssize_t)len) + ret = 0; + else + ret = -errno ? -errno : -EIO; + close(urandom_fd); + return ret; +} + +static int seed_rng(uint8_t *seed, size_t len, bool credit) +{ + struct { + int entropy_count; + int buf_size; + uint8_t buffer[MAX_SEED_LEN]; + } req = { + .entropy_count = credit ? len * 8 : 0, + .buf_size = len + }; + int random_fd, ret; + + if (len > sizeof(req.buffer)) + return -EFBIG; + memcpy(req.buffer, seed, len); + + random_fd = open("/dev/random", O_RDWR); + if (random_fd < 0) + return -errno; + ret = ioctl(random_fd, RNDADDENTROPY, &req); + if (ret) + ret = -errno ? -errno : -EIO; + close(random_fd); + return ret; +} + +static int seed_from_file_if_exists(const char *filename, bool credit, struct blake2s_state *hash) +{ + uint8_t seed[MAX_SEED_LEN]; + ssize_t seed_len; + int fd, dfd, ret = 0; + + fd = open(filename, O_RDONLY); + if (fd < 0 && errno == ENOENT) + return 0; + else if (fd < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to open seed file: %s\n", strerror(errno)); + return ret; + } + dfd = open(SEED_DIR, O_DIRECTORY | O_RDONLY); + if (dfd < 0) { + ret = -errno; + close(fd); + fprintf(stderr, "ERROR: Unable to open seed directory: %s\n", strerror(errno)); + return ret; + } + seed_len = read(fd, seed, sizeof(seed)); + if (seed_len < 0) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to read seed file: %s\n", strerror(errno)); + } + close(fd); + if (ret) { + close(dfd); + return ret; + } + if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { + ret = -errno; + fprintf(stderr, "ERROR: Unable to remove seed after reading, so not seeding: %s\n", strerror(errno)); + } + close(dfd); + if (ret) + return ret; + if (!seed_len) + return 0; + + blake2s_update(hash, &seed_len, sizeof(seed_len)); + blake2s_update(hash, seed, seed_len); + + fprintf(stdout, "Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); + ret = seed_rng(seed, seed_len, credit); + if (ret < 0) + fprintf(stderr, "ERROR: Unable to seed: %s\n", strerror(-ret)); + return ret; +} + +static bool skip_credit(void) +{ + const char *skip = getenv("SEEDRNG_SKIP_CREDIT"); + return skip && (!strcmp(skip, "1") || !strcasecmp(skip, "true") || + !strcasecmp(skip, "yes") || !strcasecmp(skip, "y")); +} + +static void populate_global_paths(void) +{ + SEED_DIR = getenv("SEEDRNG_SEED_DIR"); + if (!SEED_DIR || !*SEED_DIR) + SEED_DIR = "/var/lib/seedrng"; + LOCK_FILE = getenv("SEEDRNG_LOCK_FILE"); + if (!LOCK_FILE || !*LOCK_FILE) + LOCK_FILE = "/var/run/seedrng.lock"; + if (asprintf(&CREDITABLE_SEED, "%s/seed.credit", SEED_DIR) < 0 || + asprintf(&NON_CREDITABLE_SEED, "%s/seed.no-credit", SEED_DIR) < 0) { + fprintf(stderr, "ERROR: Unable to allocate paths: %s\n", strerror(errno)); + exit(1); + } +} + +int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) +{ + static const char seedrng_prefix[] = "SeedRNG v1 Old+New Prefix"; + static const char seedrng_failure[] = "SeedRNG v1 No New Seed Failure"; + int ret, fd = -1, lock, program_ret = 0; + uint8_t new_seed[MAX_SEED_LEN]; + size_t new_seed_len; + bool new_seed_creditable; + struct timespec realtime = { 0 }, boottime = { 0 }; + struct blake2s_state hash; + + umask(0077); + if (getuid()) { + fprintf(stderr, "ERROR: This program requires root\n"); + return 1; + } + + populate_global_paths(); + blake2s_init(&hash, BLAKE2S_HASH_LEN); + blake2s_update(&hash, seedrng_prefix, strlen(seedrng_prefix)); + clock_gettime(CLOCK_REALTIME, &realtime); + clock_gettime(CLOCK_BOOTTIME, &boottime); + blake2s_update(&hash, &realtime, sizeof(realtime)); + blake2s_update(&hash, &boottime, sizeof(boottime)); + + if (mkdir(SEED_DIR, 0700) < 0 && errno != EEXIST) { + fprintf(stderr, "ERROR: Unable to create \"%s\" directory: %s\n", SEED_DIR, strerror(errno)); + return 1; + } + + lock = open(LOCK_FILE, O_WRONLY | O_CREAT, 0000); + if (lock < 0 || flock(lock, LOCK_EX) < 0) { + fprintf(stderr, "ERROR: Unable to open lock file: %s\n", strerror(errno)); + program_ret = 1; + goto out; + } + + ret = seed_from_file_if_exists(NON_CREDITABLE_SEED, false, &hash); + if (ret < 0) + program_ret |= 1 << 1; + ret = seed_from_file_if_exists(CREDITABLE_SEED, !skip_credit(), &hash); + if (ret < 0) + program_ret |= 1 << 2; + + new_seed_len = determine_optimal_seed_len(); + ret = read_new_seed(new_seed, new_seed_len, &new_seed_creditable); + if (ret < 0) { + fprintf(stderr, "ERROR: Unable to read new seed: %s\n", strerror(-ret)); + new_seed_len = BLAKE2S_HASH_LEN; + strncpy((char *)new_seed, seedrng_failure, new_seed_len); + program_ret |= 1 << 3; + } + blake2s_update(&hash, &new_seed_len, sizeof(new_seed_len)); + blake2s_update(&hash, new_seed, new_seed_len); + blake2s_final(&hash, new_seed + new_seed_len - BLAKE2S_HASH_LEN); + + fprintf(stdout, "Saving %zu bits of %s seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "creditable" : "non-creditable"); + fd = open(NON_CREDITABLE_SEED, O_WRONLY | O_CREAT | O_TRUNC, 0400); + if (fd < 0) { + fprintf(stderr, "ERROR: Unable to open seed file for writing: %s\n", strerror(errno)); + program_ret |= 1 << 4; + goto out; + } + if (write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { + fprintf(stderr, "ERROR: Unable to write seed file: %s\n", strerror(errno)); + program_ret |= 1 << 5; + goto out; + } + if (new_seed_creditable && rename(NON_CREDITABLE_SEED, CREDITABLE_SEED) < 0) { + fprintf(stderr, "WARNING: Unable to make new seed creditable: %s\n", strerror(errno)); + program_ret |= 1 << 6; + } +out: + if (fd >= 0) + close(fd); + if (lock >= 0) + close(lock); + return program_ret; +} diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c46..e8526e248a 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -4,7 +4,13 @@ # ################################################################################ +define URANDOM_SCRIPTS_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99 $(TARGET_LDFLAGS) \ + $(URANDOM_SCRIPTS_PKGDIR)/seedrng.c -o $(@D)/seedrng +endef + define URANDOM_SCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(@D)/seedrng $(TARGET_DIR)/sbin/seedrng $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ $(TARGET_DIR)/etc/init.d/S20urandom endef -- 2.35.1 From bernd.kuhls at t-online.de Thu Mar 31 15:08:47 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 31 Mar 2022 17:08:47 +0200 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.8-Matrix Message-ID: <20220331150847.13617-1-bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 15596333f5..d7a8657da0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-Matrix.tar.gz +sha256 2aca8c87b2f6d19fc385a4b5bde45637a4e6f417d0b43e514980d1cf26404ce7 kodi-pvr-mythtv-19.0.8-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 3040f87e14..d3110aed68 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.7-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.8-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.30.2 From David.Laight at ACULAB.COM Thu Mar 31 15:16:05 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 31 Mar 2022 15:16:05 +0000 Subject: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: <20220331145738.119773-1-Jason@zx2c4.com> References: <20220331145738.119773-1-Jason@zx2c4.com> Message-ID: From: Jason A. Donenfeld > Sent: 31 March 2022 15:58 > > The RNG can't actually be seeded from a shell script, due to the > reliance on ioctls. For this reason, the seedrng project provides a > basic script meant to be copy and pasted into projects like buildroot > and tweaked as needed: . > > This commit imports it into buildroot and wires up the init scripts to > call it. This also is a significant improvement over the current init > script, which doesn't credit entropy and whose hashing in shell scripts > is sort of fragile. > > As seedrng.c is a short tiny C program, we include this here in the > package, like a few other packages do. Later we'll investigate adding > this to busybox, but for now, this is a good start and a positive step > in the right direction. > ... > -# Quietly do nothing if /dev/urandom does not exist > -[ -c /dev/urandom ] || exit 0 > - > -URANDOM_SEED="/var/lib/random-seed" > +# The following knobs can be adjusted by placing uncommented modified lines > +# into /etc/default/urandom: > +# > +# Set these to change where the seed and runtime lock file are stored: > +# > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > +# > +# Set this to true only if you do not want seed files to actually credit the > +# RNG, for example if you plan to replicate this file system image and do not > +# have the wherewithal to first delete the contents of /var/lib/seedrng: > +# > +# export SEEDRNG_SKIP_CREDIT=false > +# That quietly breaks anyone who just updates buildroot without noticing that the 'magic' shell variables have changed. I'm also sure you can manage to pass the arguments into the program through argv[] instead of grovelling through the environment. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From bernd.kuhls at t-online.de Thu Mar 31 15:28:16 2022 From: bernd.kuhls at t-online.de (Bernd Kuhls) Date: Thu, 31 Mar 2022 17:28:16 +0200 Subject: [Buildroot] [PATCH 1/1] package/dav1d: bump version to 1.0.0 Message-ID: <20220331152816.245852-1-bernd.kuhls@t-online.de> Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 5e838b0951..35d753fc27 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/0.9.2/dav1d-0.9.2.tar.xz.sha256 -sha256 e3235ab6c43c0135b0db1d131e1923fad4c84db9d85683e30b91b33a52d61c71 dav1d-0.9.2.tar.xz +# From http://download.videolan.org/pub/videolan/dav1d/1.0.0/dav1d-1.0.0.tar.xz.sha256 +sha256 51737db7e4897e599684f873a4725176dd3c779e639411d7c4fce134bb5ebb82 dav1d-1.0.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index ecc4cc55c3..2d42cdcb67 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.9.2 +DAV1D_VERSION = 1.0.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause -- 2.30.2 From David.Laight at ACULAB.COM Thu Mar 31 15:46:25 2022 From: David.Laight at ACULAB.COM (David Laight) Date: Thu, 31 Mar 2022 15:46:25 +0000 Subject: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: References: <20220331145738.119773-1-Jason@zx2c4.com> Message-ID: <4b68f218df884478b709df580e500d46@AcuMS.aculab.com> Resend to just the list - I think Jason's gmail account is rejecting direct mail from me. Which probably means he hasn't seen my earlier messages either. David > -----Original Message----- > From: David Laight > Sent: 31 March 2022 16:16 > To: 'Jason A. Donenfeld' ; Peter Korsgaard ; buildroot > > Cc: James Hilliard > Subject: RE: [Buildroot] [PATCH v4] package/urandom-scripts: actually credit seed files via seedrng > > From: Jason A. Donenfeld > > Sent: 31 March 2022 15:58 > > > > The RNG can't actually be seeded from a shell script, due to the > > reliance on ioctls. For this reason, the seedrng project provides a > > basic script meant to be copy and pasted into projects like buildroot > > and tweaked as needed: . > > > > This commit imports it into buildroot and wires up the init scripts to > > call it. This also is a significant improvement over the current init > > script, which doesn't credit entropy and whose hashing in shell scripts > > is sort of fragile. > > > > As seedrng.c is a short tiny C program, we include this here in the > > package, like a few other packages do. Later we'll investigate adding > > this to busybox, but for now, this is a good start and a positive step > > in the right direction. > > > ... > > -# Quietly do nothing if /dev/urandom does not exist > > -[ -c /dev/urandom ] || exit 0 > > - > > -URANDOM_SEED="/var/lib/random-seed" > > +# The following knobs can be adjusted by placing uncommented modified lines > > +# into /etc/default/urandom: > > +# > > +# Set these to change where the seed and runtime lock file are stored: > > +# > > +# export SEEDRNG_SEED_DIR=/var/lib/seedrng > > +# export SEEDRNG_LOCK_FILE=/var/run/seedrng.lock > > +# > > +# Set this to true only if you do not want seed files to actually credit the > > +# RNG, for example if you plan to replicate this file system image and do not > > +# have the wherewithal to first delete the contents of /var/lib/seedrng: > > +# > > +# export SEEDRNG_SKIP_CREDIT=false > > +# > > That quietly breaks anyone who just updates buildroot without > noticing that the 'magic' shell variables have changed. > > I'm also sure you can manage to pass the arguments into the program > through argv[] instead of grovelling through the environment. > > David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales) From peter at korsgaard.com Thu Mar 31 15:48:13 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:48:13 +0200 Subject: [Buildroot] [PATCH 1/3] package/qt5/qt5base: security bump In-Reply-To: <20220317163823.2913753-1-foss+buildroot@0leil.net> (Quentin Schulz's message of "Thu, 17 Mar 2022 17:38:21 +0100") References: <20220317163823.2913753-1-foss+buildroot@0leil.net> Message-ID: <87tube2kea.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > From: Quentin Schulz > This fixes CVE-2022-25255 and CVE-2022-25634. > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:48:21 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:48:21 +0200 Subject: [Buildroot] [PATCH 3/3] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 In-Reply-To: <20220317163823.2913753-3-foss+buildroot@0leil.net> (Quentin Schulz's message of "Thu, 17 Mar 2022 17:38:23 +0100") References: <20220317163823.2913753-1-foss+buildroot@0leil.net> <20220317163823.2913753-3-foss+buildroot@0leil.net> Message-ID: <87pmm22ke2.fsf@dell.be.48ers.dk> >>>>> "Quentin" == Quentin Schulz writes: > From: Quentin Schulz > The patches aren't in Buildroot anymore but in the qt5base sources > directly, so let's give the commit hash of the fixes instead. > Cc: Quentin Schulz > Signed-off-by: Quentin Schulz Committed to 2022.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:45:52 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:45:52 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: bump to version d16bf02a11953dcac01dca73e6f3778f293adefe Message-ID: <20220331154028.B2E12860AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a43cd47910c37a54903714dd1ab32ffecbd86aed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8d88189202e61653850fe1a6d9b4e4d90ebcb1cf) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff..1b9ff43ab2 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b20bdea7f6..930b012e94 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 From peter at korsgaard.com Thu Mar 31 15:46:45 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:46:45 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: update comment pointing to patches fixing CVE-2021-38593 Message-ID: <20220331154028.C667C860B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ab6120d694c63f2b422d11c25ed0b4d14c7a377 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x The patches aren't in Buildroot anymore but in the qt5base sources directly, so let's give the commit hash of the fixes instead. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit be3f9cde29f1727e264d6a2a023588273410c800) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 17c32c86b5..14b58ba384 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -12,7 +12,9 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# From commits: +# 4ce7053a59 "Avoid processing-intensive painting of high number of tiny dashes" +# e7ea2ed27c "Improve fix for avoiding huge number of tiny dashes" QT5BASE_IGNORE_CVES += CVE-2021-38593 # From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" QT5BASE_IGNORE_CVES += CVE-2022-25255 From peter at korsgaard.com Thu Mar 31 15:46:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:46:34 +0200 Subject: [Buildroot] [git commit branch/2022.02.x] package/qt5/qt5base: security bump Message-ID: <20220331154028.BC95986092@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b6347fca9dc103d272d28792f00d214e1452996 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x This fixes CVE-2022-25255 and CVE-2022-25634. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1cae2aa844f5ad0962ec073f6cac103c0dc6af1f) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 1b9ff43ab2..c031f71c77 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 96b1c96041ae7b5186c94f231979217bd50e3c0a4caeba32982faa8054a6d113 qtbase-d16bf02a11953dcac01dca73e6f3778f293adefe.tar.bz2 +sha256 18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 930b012e94..17c32c86b5 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = d16bf02a11953dcac01dca73e6f3778f293adefe +QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -14,6 +14,10 @@ QT5BASE_SYNC_QT_HEADERS = YES # 0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch QT5BASE_IGNORE_CVES += CVE-2021-38593 +# From commit 2766b2cba6ca4b1c430304df5437e2a6c874b107 "QProcess/Unix: ensure we don't accidentally execute something from CWD" +QT5BASE_IGNORE_CVES += CVE-2022-25255 +# From commit e68ca8e51375d963b2391715f70b42707992dbd8 "Windows: use QSystemLibrary instead of LoadLibrary directly" +QT5BASE_IGNORE_CVES += CVE-2022-25634 # A few comments: # * -no-pch to workaround the issue described at From peter at korsgaard.com Thu Mar 31 15:52:48 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:52:48 +0200 Subject: [Buildroot] [PATCH v2 1/1] package/libzlib: security bump version to 1.2.12 In-Reply-To: <20220330180605.557933-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Wed, 30 Mar 2022 20:06:05 +0200") References: <20220330180605.557933-1-bernd.kuhls@t-online.de> Message-ID: <87lewq2k6n.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes CVE-2018-25032. > Release notes: > http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html > Changelog: https://github.com/madler/zlib/blob/master/ChangeLog > Added upstream patch to fix build error. > Updated license hash due to version bump, reformatted hashes: > https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 > Signed-off-by: Bernd Kuhls > --- > v2: added upstream patch to fix build error Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:53:34 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:53:34 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-paramiko: security bump to version 2.10.3 In-Reply-To: <20220330205829.1380283-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 30 Mar 2022 22:58:29 +0200") References: <20220330205829.1380283-1-fontaine.fabrice@gmail.com> Message-ID: <87h77e2k5d.fsf@dell.be.48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-24302: Creation of new private key files using PKey > subclasses was subject to a race condition between file creation & mode > modification, which could be exploited by an attacker with knowledge of > where the Paramiko-using code would write out such files. > https://github.com/paramiko/paramiko/blob/2.10.3/sites/www/changelog.rst > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 15:53:10 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:53:10 +0200 Subject: [Buildroot] [git commit] package/python-paramiko: security bump to version 2.10.3 Message-ID: <20220331154459.858A585F3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae699d7f9ad3caebe1fb338303f1b7c6ad42f6ac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-24302: Creation of new private key files using PKey subclasses was subject to a race condition between file creation & mode modification, which could be exploited by an attacker with knowledge of where the Paramiko-using code would write out such files. https://github.com/paramiko/paramiko/blob/2.10.3/sites/www/changelog.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b11acf1dbc..951bd8e114 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 44136d79da4cd7619e368018ad022619 paramiko-2.7.2.tar.gz -sha256 7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 paramiko-2.7.2.tar.gz +md5 6e47947882e2c1b81f35b4133e8e62b9 paramiko-2.10.3.tar.gz +sha256 ddb1977853aef82804b35d72a0e597b244fa326c404c350bd00c5b01dbfee71a paramiko-2.10.3.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 3c135cf9b1..46209f5823 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.7.2 +PYTHON_PARAMIKO_VERSION = 2.10.3 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cf/a1/20d00ce559a692911f11cadb7f94737aca3ede1c51de16e002c7d3a888e0 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/d4/93/1a1eb7f214e6774099d56153db9e612f93cb8ffcdfd2eca243fcd5bb3a78 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Mar 31 15:53:54 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:53:54 +0200 Subject: [Buildroot] [git commit] package/kodi-pvr-mythtv: bump version to 19.0.8-Matrix Message-ID: <20220331154459.8FAD3860C8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2120113026cde26f5c9979e9e4aaf82a654d7aca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 15596333f5..d7a8657da0 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-Matrix.tar.gz +sha256 2aca8c87b2f6d19fc385a4b5bde45637a4e6f417d0b43e514980d1cf26404ce7 kodi-pvr-mythtv-19.0.8-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 3040f87e14..d3110aed68 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.7-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.8-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Thu Mar 31 15:50:28 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:50:28 +0200 Subject: [Buildroot] [git commit] package/libzlib: security bump version to 1.2.12 Message-ID: <20220331154459.7BE8C860C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a7fa40a9c1e93c063bbc5c5d4cac0c67493087a7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes CVE-2018-25032. Release notes: http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html Changelog: https://github.com/madler/zlib/blob/master/ChangeLog Added upstream patch to fix build error. Updated license hash due to version bump, reformatted hashes: https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...sue-that-discarded-provided-CC-definition.patch | 28 ++++++++++++++++++++++ package/libzlib/libzlib.hash | 4 ++-- package/libzlib/libzlib.mk | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch new file mode 100644 index 0000000000..398e1c9481 --- /dev/null +++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch @@ -0,0 +1,28 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +Downloaded from upstream commit: +https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d + +Signed-off-by: Bernd Kuhls +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b1011..e6ca974e2f 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d1..933732d6ba 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.12 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib From peter at korsgaard.com Thu Mar 31 15:54:14 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 17:54:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 19.0.8-Matrix In-Reply-To: <20220331150847.13617-1-bernd.kuhls@t-online.de> (Bernd Kuhls's message of "Thu, 31 Mar 2022 17:08:47 +0200") References: <20220331150847.13617-1-bernd.kuhls@t-online.de> Message-ID: <87czi22k49.fsf@dell.be.48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Mar 31 17:11:50 2022 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 31 Mar 2022 19:11:50 +0200 Subject: [Buildroot] [PATCH v3] package/urandom-scripts: actually credit seed files via seedrng In-Reply-To: (Jason A. Donenfeld's message of "Wed, 30 Mar 2022 13:13:08 -0400") References: <20220327202415.1248312-1-Jason@zx2c4.com> <20220329050401.110856-1-Jason@zx2c4.com> <871qyj8kpk.fsf@dell.be.48ers.dk> Message-ID: <87bkxm2gix.fsf@dell.be.48ers.dk> >>>>> "Jason" == Jason A Donenfeld writes: Hi, >> As discussed on IRC, I think it would be nicer to just add a normal >> seedrng package and depend on that from urandom-scripts, so the standard >> version/license info/.. stuff works. I can do that change if needed. >> >> You mentioned something on IRC about this containing differences from >> what it is seedrng.git. Those changes/fixes are presumably not specific >> to Buildroot, will you add those changes to the git repo as well? > Absolutely not. This 100% does not work for me. I have made it > abundantly clear to you that seedrng is code that's meant to be copied > into individual distros and tweaked as needed, which I've done for > Buildroot. Do not attempt to package it from any repos I may have. If > you try to do that, I will intentionally interfere with those > operations server side, and take whatever other adversarial steps to > ensure my server is not misused for that purpose. I also will not > incorporate buildroot-specific tweaks into the sample code repo. > That repo supplies sample code. After Yann's absence, I took the > necessary steps that a maintainer like him would have done to > customize it to Buildroot's needs, incorporating it into the project, > and taking into account James' comments. You now have the result of > that work here, and I think it'd be silly not to take it. > I am offering to maintain this code inside of Buildroot for you. I'm > generally very much on top of things in that regard. I'm not offering > to start and maintain an external project at your request, no matter > how much pressure and conditionalization you apply on this mailing > list or IRC. That's not work I'll do for you. However, again, I am > offering to maintain this for you inside the buildroot repo as this > patch does. > That's my offer; take it or leave it. Then I'm afraid we'll have to leave it. Sorry about that. I do have a lot of respect for your various other open source work, but your aggressive behaviour here is not OK. Not having the entrophy credited by this script is not great, but it has been like this for 20 years already, and it only affects a small subset of users, E.G. people using a combination of writable and persistent /var/lib, the classic initscripts and on a platform without a suitable entrophy source. In the 15+ years that I have been using Buildroot, I have so far never used it. In fact, perhaps we should drop the default y from the package. This can be revisited if something like this ends up in Busybox and/or something similar gets packaged, E.G. https://github.com/jumpnow/rndaddtoentcnt -- Bye, Peter Korsgaard From hrsourabh011 at gmail.com Thu Mar 31 17:55:53 2022 From: hrsourabh011 at gmail.com (Sourabh Hegde) Date: Thu, 31 Mar 2022 19:55:53 +0200 Subject: [Buildroot] Buildroot | ninja build error | /usr/bin/ld:error adding symbols: file in wrong format Message-ID: Hello All, While building casync using ninja build I am facing below errors related to /usr/bin/ld: . . .error adding symbols: file in wrong format I am following "casync" build guideline from https://github.com/systemd/casync#building-casync , it uses "meson " along with ninja build. If build failures persist, run "meson setup --wipe" to rebuild from scratch using the same options as passed when configuring the build. To change option values, run "meson configure" instead. ninja: Entering directory build' [1/31] Linking target casync-http FAILED: casync-http cc -o casync-http casync-http.p/src_casync-http.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm -Wl,--end-group /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcurl.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [2/31] Linking target test-cachunk FAILED: test-cachunk cc -o test-cachunk test-cachunk.p/test_test-cachunk.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [3/31] Linking target test-cachunker FAILED: test-cachunker cc -o test-cachunker test-cachunker.p/test_test-cachunker.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status [4/31] Linking target test-caencoder FAILED: test-caencoder cc -o test-caencoder test-caencoder.p/test_test-caencoder.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-rpath,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath-link,/root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -Wl,--start-group src/libshared.a -lacl /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libselinux.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libzstd.so -lm /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libssl.so /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.so -Wl,--end-group -pthread /usr/bin/ld: /root/raspcm4/sources/output/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/liblzma.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status . . [10/31] Compiling C object test-camatch.p/test_test-camatch.c.o ninja: build stopped: subcommand failed. I am using Buildroot as build system and after following similar post in https://stackoverflow.com/questions/27967802/libstdc-so-error-adding-symbols-file-in-wrong-format I changed the PATH environment like: /root/raspcm4/sources/output/host/bin/:/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/raspcm4/sources/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin But still, I end up getting the same errors Can anyone please let me know how to resolve this issue? Is there any ninja build option to be selected in Buildroot? Your help will be much appreciated. Thanks in advance P.S: Please let me know if any info is missing here -------------- next part -------------- An HTML attachment was scrubbed... URL: From romain.naour at gmail.com Thu Mar 31 20:04:04 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:04:04 +0200 Subject: [Buildroot] [PATCH 1/1] package/python-twisted: security bump to version 22.2.0 In-Reply-To: <87mthbb08q.fsf@dell.be.48ers.dk> References: <20220313114741.1127825-1-fontaine.fabrice@gmail.com> <87mthbb08q.fsf@dell.be.48ers.dk> Message-ID: <397c22c3-8ca6-2300-a049-b8f6fa716699@gmail.com> Hello Peter, Le 27/03/2022 ? 22:37, Peter Korsgaard a ?crit?: >>>>>> "Fabrice" == Fabrice Fontaine writes: > > > Fix CVE-2022-21716: Twisted is an event-based framework for internet > > applications, supporting Python 3.6+. Prior to 22.2.0, Twisted SSH > > client and server implement is able to accept an infinite amount of data > > for the peer's SSH version identifier. This ends up with a buffer using > > all the available memory. The attach is a simple as `nc -rv localhost 22 > > < /dev/zero`. A patch is available in version 22.2.0. There are > > currently no known workarounds. > > > https://github.com/twisted/twisted/releases/tag/twisted-22.2.0 > > > Signed-off-by: Fabrice Fontaine > > Committed to 2021.02.x and 2022.02.x, thanks. > As reported recently, python-twisted and python-treq must use the same version: http://lists.busybox.net/pipermail/buildroot/2022-February/637505.html But this backport requires to update python-treq package: https://git.buildroot.net/buildroot/commit/?id=933447c27c41ebcdb5eb9fa2a374456699ae33f2 Best regards, Romain From ps.report at gmx.net Thu Mar 31 20:12:31 2022 From: ps.report at gmx.net (Peter Seiderer) Date: Thu, 31 Mar 2022 22:12:31 +0200 Subject: [Buildroot] [PATCH v2] package/libcamera-apps: fix X11 preview compile (conversion from Window to EGLNativeWindowType) Message-ID: <20220331201231.26526-1-ps.report@gmx.net> - add 002-preview-fix-egl_preview-compile-conversion-from-Wind.patch Fixes: .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); | ^~~~~~~ | | | Window {aka long unsigned int} Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - add patch with proper type cast instead of '-fpermissive' compiler command line option (suggested by Arnout Vandecappelle) --- ...preview-compile-conversion-from-Wind.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch diff --git a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch new file mode 100644 index 0000000000..cc9069aa86 --- /dev/null +++ b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch @@ -0,0 +1,39 @@ +From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 31 Mar 2022 21:44:22 +0200 +Subject: [PATCH] preview: fix egl_preview compile (conversion from Window to + EGLNativeWindowType) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ?Window? {aka ?long unsigned int?} to ?EGLNativeWindowType? {aka ?fbdev_window*?} [-fpermissive] + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); + | ^~~~~~~ + | | + | Window {aka long unsigned int} + +[Upstream: https://github.com/raspberrypi/libcamera-apps/pull/283] +Signed-off-by: Peter Seiderer +--- + preview/egl_preview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/preview/egl_preview.cpp b/preview/egl_preview.cpp +index b936e57..593583d 100644 +--- a/preview/egl_preview.cpp ++++ b/preview/egl_preview.cpp +@@ -326,7 +326,7 @@ void EglPreview::makeWindow(char const *name) + wm_delete_window_ = XInternAtom(display_, "WM_DELETE_WINDOW", False); + XSetWMProtocols(display_, window_, &wm_delete_window_, 1); + +- egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); ++ egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast(window_), NULL); + if (!egl_surface_) + throw std::runtime_error("eglCreateWindowSurface failed"); + +-- +2.35.1 + -- 2.35.1 From romain.naour at gmail.com Thu Mar 31 20:17:18 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:17:18 +0200 Subject: [Buildroot] [PATCH] package/python-{treq, twisted}: add a comment to use the same version Message-ID: <20220331201718.728570-1-romain.naour@gmail.com> As reported by [1], python-twisted and python-treq must use the same version because its the same project: https://github.com/twisted/twisted https://github.com/twisted/treq We have to update python-treq to version 22.2.0 [2] otherwise we have a runtime issue: Traceback (most recent call last): File "/root/sample_python_treq.py", line 2, in import treq File "/usr/lib/python3.10/site-packages/treq/__init__.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/api.py", line 5, in File "/usr/lib/python3.10/site-packages/treq/client.py", line 11, in ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown location) The comment should avoid forgeting one of them while upgrading or backporting version bump. [1] http://lists.busybox.net/pipermail/buildroot/2022-February/637505.html [2] https://github.com/twisted/treq/releases/tag/release-22.2.0 [3] https://gitlab.com/buildroot.org/buildroot/-/jobs/2179206653 Signed-off-by: Romain Naour Cc: Fabrice Fontaine --- package/python-treq/python-treq.mk | 3 +++ package/python-twisted/python-twisted.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 57dc50ee74..8995bf2cfe 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,6 +4,9 @@ # ################################################################################ +# When bumping this package, make sure to also verify if the +# python-twisted package still works and to update its hash, +# as they share the same version/site variables. PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index e5d643ec05..8a89d3dc82 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,6 +4,9 @@ # ################################################################################ +# When bumping this package, make sure to also verify if the +# python-treq package still works and to update its hash, +# as they share the same version/site variables. PYTHON_TWISTED_VERSION = 22.2.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/40/8b/56e8870d412c550b3ff2d6714ee212c7e80a6634f4e720c3a26a983e7b46 -- 2.35.1 From romain.naour at gmail.com Thu Mar 31 20:38:41 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:38:41 +0200 Subject: [Buildroot] [PATCH v12 05/11] support/misc/toolchainfile.cmake.in: allow variables to be overridden In-Reply-To: <20220322232224.2842266-5-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-5-james.hilliard1@gmail.com> Message-ID: <9c9f7692-3739-a421-1417-be75bb4a2053@gmail.com> Hello James, Le 23/03/2022 ? 00:22, James Hilliard a ?crit?: > Some packages such as libclc need to override cmake toolchain > variables, to avoid errors caused by trying to set overriden > variables ensure that they are not defined before being set. > > This prevents difficult to debug silent dropping of overriden > variables. Actually, it seems using the toolchainfile.cmake itself should be avoided for such case. For now only libclc package seems requires to override cmake toolchain variable, I'm not sure about potential side effect of this change. Best regards, Romain > > Signed-off-by: James Hilliard > --- > support/misc/toolchainfile.cmake.in | 108 +++++++++++++++++++++------- > 1 file changed, 81 insertions(+), 27 deletions(-) > > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > index be575566a4..30c0e63bf2 100644 > --- a/support/misc/toolchainfile.cmake.in > +++ b/support/misc/toolchainfile.cmake.in > @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR > # so that it can find our custom platform description. > list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) > > -set(CMAKE_SYSTEM_NAME Buildroot) > -set(CMAKE_SYSTEM_VERSION 1) > -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > +if(NOT DEFINED CMAKE_SYSTEM_NAME) > + set(CMAKE_SYSTEM_NAME Buildroot) > +endif() > +if(NOT DEFINED CMAKE_SYSTEM_VERSION) > + set(CMAKE_SYSTEM_VERSION 1) > +endif() > +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) > + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > +endif() > > # Set the {C,CXX}FLAGS appended by CMake depending on the build type > # defined by Buildroot. CMake defaults these variables with -g and/or > @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > # Note: > # if the project forces some of these flag variables, Buildroot is > # screwed up and there is nothing Buildroot can do about that :( > -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) > + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > +endif() > +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) > + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > +endif() > > # Build type from the Buildroot configuration > -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > +if(NOT DEFINED CMAKE_BUILD_TYPE) > + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > +endif() > > # Buildroot defaults flags. > # If you are using this toolchainfile.cmake file outside of Buildroot and > @@ -41,33 +53,75 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur > # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... > # * and make sure the project's CMake code extends them like this if needed: > # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") > -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > +if(NOT DEFINED CMAKE_C_FLAGS) > + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > +endif() > +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) > + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > +endif() > +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) > + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > +endif() > +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) > + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > +endif() > > -set(CMAKE_INSTALL_SO_NO_EXE 0) > +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) > + set(CMAKE_INSTALL_SO_NO_EXE 0) > +endif() > > -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > +if(NOT DEFINED CMAKE_PROGRAM_PATH) > + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > +endif() > +if(NOT DEFINED CMAKE_SYSROOT) > + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) > + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) > + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) > + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) > + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > +endif() > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) > + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > +endif() > set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > # This toolchain file can be used both inside and outside Buildroot. > -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > +if(NOT DEFINED CMAKE_C_COMPILER) > + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > +endif() > if(@@TOOLCHAIN_HAS_CXX@@) > - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) > + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > + endif() > + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) > + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > + endif() > + if(NOT DEFINED CMAKE_CXX_FLAGS) > + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > + endif() > + if(NOT DEFINED CMAKE_CXX_COMPILER) > + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > + endif() > endif() > if(@@TOOLCHAIN_HAS_FORTRAN@@) > - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) > + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > + endif() > + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) > + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > + endif() > + if(NOT DEFINED CMAKE_Fortran_FLAGS) > + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > + endif() > + if(NOT DEFINED CMAKE_Fortran_COMPILER) > + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > + endif() > endif() From romain.naour at gmail.com Thu Mar 31 20:50:24 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 22:50:24 +0200 Subject: [Buildroot] [PATCH v12 06/11] package/libclc: bump version to 13.0.1 In-Reply-To: <20220322232224.2842266-6-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-6-james.hilliard1@gmail.com> Message-ID: Hi James, Le 23/03/2022 ? 00:22, James Hilliard a ?crit?: > From: Matt Weber > > * Converts to the cmake pkg type > * Updates download site > * Adds a crosscompile fixups patch > * Allow prepare_builtins utility to be directly called > (it isn't installed into the path when cross compiling) > * Fix file_find() for root search limitation > > Signed-off-by: Matthew Weber > Signed-off-by: James Hilliard > --- > Changes v11 -> v12: > - update to 13.0.1 instead of 11.1.0 libclc is part of llvm project, the same version than llvm/clang should be used here. Ideally, llvm/clang should be updated to 13.0.1 first (or to the latest version if possible). > - pass required host cmake options for C/CXX compilers > --- > .../0001-support-out-of-tree-build.patch | 71 +++++++++++++++++++ > package/libclc/libclc.hash | 2 +- > package/libclc/libclc.mk | 56 +++++++-------- > 3 files changed, 98 insertions(+), 31 deletions(-) > create mode 100644 package/libclc/0001-support-out-of-tree-build.patch > > diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch > new file mode 100644 > index 0000000000..de7207bedb > --- /dev/null > +++ b/package/libclc/0001-support-out-of-tree-build.patch > @@ -0,0 +1,71 @@ > +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 > +From: Matt Weber > +Date: Tue, 9 Mar 2021 15:55:17 -0600 > +Subject: [PATCH] support out of tree build > + > +(1) The package has a prepare_builtins tool which is built > +but not placed in the path for later use in the build. This > +fix allows the later build steps to use the binary in-place. > + > +(2) With cmake, find_file() when used for non-host builds is > +limited by CMAKE_FIND_ROOT_PATH* scope. > + > +In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the > +following target settings for CMAKE_FIND_ROOT_PATH* which > +limit the scope. > +set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") > +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > + > + > +Signed-off-by: Matthew Weber > +--- > + CMakeLists.txt | 2 +- > + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ > + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ > + 3 files changed, 9 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 9472f19..a784519 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > + > + # Add prepare target > + add_custom_command( OUTPUT "${obj_suffix}" > +- COMMAND prepare_builtins -o > ++ COMMAND ./prepare_builtins -o > + "${obj_suffix}" > + "builtins.opt.${obj_suffix}" > + DEPENDS "opt.${obj_suffix}" > +diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake > +index 94d85d9..5de6a48 100644 > +--- a/cmake/CMakeDetermineCLCCompiler.cmake > ++++ b/cmake/CMakeDetermineCLCCompiler.cmake > +@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) > + > + set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") > + set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") > +-find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > ++set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) > + # configure all variables set in this file > + configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) > + mark_as_advanced(clc_comp_in) > +diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake > +index 1c424c7..dd3bfb6 100644 > +--- a/cmake/CMakeDetermineLLAsmCompiler.cmake > ++++ b/cmake/CMakeDetermineLLAsmCompiler.cmake > +@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) > + set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") > + set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") > + set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") > +-find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > ++set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) > + # configure all variables set in this file > + configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) > + mark_as_advanced(ll_comp_in) > +-- > +2.17.1 > + > diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash > index 2af64bc8e8..c496291d81 100644 > --- a/package/libclc/libclc.hash > +++ b/package/libclc/libclc.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz > +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz > sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT > diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk > index 6fe8e10a77..5d246cf4f8 100644 > --- a/package/libclc/libclc.mk > +++ b/package/libclc/libclc.mk > @@ -4,43 +4,39 @@ > # > ################################################################################ > > -# Use the latest commit from release_90 branch. > -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 > -LIBCLC_SITE = https://github.com/llvm-mirror/libclc > -LIBCLC_SITE_METHOD = git > +LIBCLC_VERSION = 13.0.1 > +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) > +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz > LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT > LIBCLC_LICENSE_FILES = LICENSE.TXT > > -LIBCLC_DEPENDENCIES = host-clang host-llvm > +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator > LIBCLC_INSTALL_STAGING = YES > > -# C++ compiler is used to build a small tool (prepare-builtins) for the host. > -# It must be built with the C++ compiler from the host. > +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes > +# llvm-config provided values > +# > +# CMAKE_*_COMPILER has to be set to the host compiler to build a host > +# 'prepare_builtins' tool used during the build process > # > # The headers are installed in /usr/share and not /usr/include, > # because they are needed at runtime on the target to build the OpenCL > # kernels. > LIBCLC_CONF_OPTS = \ > - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ > - --prefix=/usr \ > - --includedir=/usr/share \ > - --pkgconfigdir=/usr/lib/pkgconfig \ > - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) > - > -define LIBCLC_CONFIGURE_CMDS > - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) > -endef > - > -define LIBCLC_BUILD_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > -endef > - > -define LIBCLC_INSTALL_TARGET_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > -endef > - > -define LIBCLC_INSTALL_STAGING_CMDS > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install > -endef > - > -$(eval $(generic-package)) > + -DCMAKE_SYSROOT="" \ > + -DCMAKE_C_COMPILER_FORCED=ON \ > + -DCMAKE_CXX_COMPILER_FORCED=ON \ > + -DCMAKE_CLC_COMPILER_FORCED=ON \ > + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ > + -DCMAKE_INSTALL_DATADIR="share" \ > + -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ > + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ > + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ > + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > + -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > + -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ > + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ > + -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" At least a comment about the issue with the cmake toolchain file is needed. I don't understand the libclc cmake and why this workaround is needed. Best regards, Romain > + > +$(eval $(cmake-package)) From romain.naour at gmail.com Thu Mar 31 21:04:51 2022 From: romain.naour at gmail.com (Romain Naour) Date: Thu, 31 Mar 2022 23:04:51 +0200 Subject: [Buildroot] [PATCH v12 09/11] package/clang: help host-clang to find our external toolchain In-Reply-To: <20220322232224.2842266-9-james.hilliard1@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-9-james.hilliard1@gmail.com> Message-ID: Hi James, Le 23/03/2022 ? 00:22, James Hilliard a ?crit?: > From: Romain Naour > > To build libfuzzer package Matthew Weber noticed that (host) clang > doesn't run on the host without "-B $(HOST_DIR)/opt/ext-toolchain" > option. This option add a new search path for binaries and object > files used implicitly. > > Without -B clang fail to link due to missing crtbeging.o file and libgcc: > output/host/bin/aarch64-linux-gnu-ld: cannot find crtbegin.o: No such file or directory > output/host/bin/aarch64-linux-gnu-ld: cannot find -lgcc > > Indeed, clang search path doesn't include the dafault cross-gcc's search paths: > > $ output/host/bin/clang -print-search-dirs > programs: = output/host/bin:output/host/bin:/..//bin > libraries: = output/host/lib/clang/8.0.0: > output/host/bin/../lib64: > /lib/../lib64: > /usr/lib/../lib64: > output/host/bin/../lib: > /lib:/usr/lib > > Here is the same command for cross-gcc: > > $ output/host/bin/aarch64-linux-gnu-gcc -print-search-dirs > install: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/ > programs: = output/host/opt/ext-toolchain/bin/../libexec/gcc/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../libexec/gcc/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/ > libraries: = output/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../lib/gcc/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/aarch64-linux-gnu/8.3.0/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/../lib64/: > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/aarch64-linux-gnu/8.3.0/: > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/../lib64/: > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/8.3.0/: > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/../lib64/: > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/: > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/: > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/ > > We can see that gcc default search path contains > "output/host/opt/ext-toolchain" directory where the external toolchain > has been extracted. > > Since we want to use clang without additional option like -B, > patch clang in order to use GCC_INSTALL_PREFIX instead of > using automatic detection (which doesn't work for Buildroot). > > We eventually want to relocate the Buildroot SDK containing the clang > cross-compiler, so we provide a relative path to GCC_INSTALL_PREFIX > in order to avoid to hardcode the path to the GCC toolchain. > > Also the path between clang and the GCC external toolchain is not always > the same, we have the following case: > > * Toolchain to be downloaded and installed > The toolchain is extracted into $(HOST_DIR)/opt/ext-toolchain, so the > path is "../opt/ext-toolchain". > > * Pre-installed toolchain > The toolchain is localed somewhere in the host filesystem and > defined by the user using BR2_TOOLCHAIN_EXTERNAL_PATH. > > So, set GCC_INSTALL_PREFIX using realpath: > > -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > When we use a Buildroot's internal toolchain, clang will find theses > crt*.o files and libgcc. > > http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > > Signed-off-by: Romain Naour > Cc: Matthew Weber > Cc: Valentin Korenblit > Tested-by: Matt Weber > --- > Changes v1 -> v2 > [Arnout > - Can't dropped ":PATH" from "-DGCC_INSTALL_PREFIX:PATH=" as suggested, > The string isn't set correctly and results in "cannot find crtbegin.o" > - Attempting to post patch upstream > - I did not address the relative vs absolute path comment. The > current approach seemed correct per my understanding for handling > the two toolchain install location cases > --- > ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 78 +++++++++++++++++++ > package/clang/clang.mk | 7 ++ > 2 files changed, 85 insertions(+) > create mode 100644 package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > new file mode 100644 > index 0000000000..08371154d5 > --- /dev/null > +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > @@ -0,0 +1,78 @@ > +From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 > +From: Romain Naour > +Date: Mon, 5 Aug 2019 16:06:48 +0200 > +Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set > + of prefixes for searching the gcc toolchain > + > +By default, the Gnu Toolchains driver is looking at the parent > +directory while looking for the gcc toolchain when clang is installed > +at "D.InstalledDir" > + > +But this doesn't work with Buildroot since the external > +toolchain is installed in host/opt/ext-toolchain and the sysroot is > +moved to host/-buildroot-linux-gnu/sysroot/ directory. > + > +We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang > +but it doesn't work since we already provide a sysroot [1]. > + > +Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. > + > +Since we want to be able to relocate the clang toolchain, > +allow to use a relative path with GCC_INSTALL_PREFIX. > + > +Buildroot will provide such relative path by using: > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > + > +Doing so allow to use clang without providing additional search > +paths with -B option on the clang's command line. > + > +[1] https://reviews.llvm.org/D49244 > +[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > + > +Signed-off-by: Romain Naour > +Signed-off-by: Matthew Weber > +--- > +Pending, access to llvm mailing lists to submit it is pending. They > +seem to be having issues with their listserv. Sadly, this patch (hack) never reach the upstream project and need to be rebased over llvm/clang releases... Best regards, Romain > +--- > + lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp > +index 2ad45097dc..90d6b5b748 100644 > +--- a/lib/Driver/ToolChains/Gnu.cpp > ++++ b/lib/Driver/ToolChains/Gnu.cpp > +@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( > + > + Prefixes.push_back(GCCToolchainDir); > + } else { > ++ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; > ++ > + // If we have a SysRoot, try that first. > + if (!D.SysRoot.empty()) { > + Prefixes.push_back(D.SysRoot); > +@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( > + // Then look for gcc installed alongside clang. > + Prefixes.push_back(D.InstalledDir + "/.."); > + > ++ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. > ++ if (!GccIinstallPrefix.empty()) > ++ { > ++ if (llvm::sys::path::is_relative(GccIinstallPrefix)) > ++ { > ++ // Use a relative path to gcc from clang install path. > ++ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); > ++ } > ++ else > ++ { > ++ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. > ++ Prefixes.push_back(GCC_INSTALL_PREFIX); > ++ } > ++ } > ++ > + // Next, look for prefix(es) that correspond to distribution-supplied gcc > + // installations. > + if (D.SysRoot.empty()) { > +-- > +2.20.1 > + > diff --git a/package/clang/clang.mk b/package/clang/clang.mk > index d1667d79b6..95b4964be3 100644 > --- a/package/clang/clang.mk > +++ b/package/clang/clang.mk > @@ -105,5 +105,12 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > > +# Help host-clang to find our external toolchain, use a relative path from the clang > +# installation directory to the external toolchain installation directory in order to > +# not hardcode the toolchain absolute path. > +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > +endif > + > $(eval $(cmake-package)) > $(eval $(host-cmake-package)) From fontaine.fabrice at gmail.com Thu Mar 31 21:00:46 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 31 Mar 2022 23:00:46 +0200 Subject: [Buildroot] [PATCH 1/1] package/apr: fix CVE-2021-35940 Message-ID: <20220331210046.35887-1-fontaine.fabrice@gmail.com> An out-of-bounds array read in the apr_time_exp*() functions was fixed in the Apache Portable Runtime 1.6.3 release (CVE-2017-12613). The fix for this issue was not carried forward to the APR 1.7.x branch, and hence version 1.7.0 regressed compared to 1.6.3 and is vulnerable to the same issue. Signed-off-by: Fabrice Fontaine --- .../apr/0004-apr-1.7.0-CVE-2021-35940.patch | 57 +++++++++++++++++++ package/apr/apr.mk | 3 + 2 files changed, 60 insertions(+) create mode 100644 package/apr/0004-apr-1.7.0-CVE-2021-35940.patch diff --git a/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch b/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch new file mode 100644 index 0000000000..b065a3330a --- /dev/null +++ b/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch @@ -0,0 +1,57 @@ + +SECURITY: CVE-2021-35940 (cve.mitre.org) + +Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though +was addressed in 1.6.x in 1.6.3 and later via r1807976. + +The fix was merged back to 1.7.x in r1891198. + +Since this was a regression in 1.7.0, a new CVE name has been assigned +to track this, CVE-2021-35940. + +Thanks to Iveta Cesalova for reporting this issue. + +https://svn.apache.org/viewvc?view=revision&revision=1891198 + +[Retrieved from: +https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch] +Signed-off-by: Fabrice Fontaine + +Index: ./time/unix/time.c +=================================================================== +--- ./time/unix/time.c (revision 1891197) ++++ ./time/unix/time.c (revision 1891198) +@@ -142,6 +142,9 @@ + static const int dayoffset[12] = + {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + ++ if (xt->tm_mon < 0 || xt->tm_mon >= 12) ++ return APR_EBADDATE; ++ + /* shift new year to 1st March in order to make leap year calc easy */ + + if (xt->tm_mon < 2) +Index: ./time/win32/time.c +=================================================================== +--- ./time/win32/time.c (revision 1891197) ++++ ./time/win32/time.c (revision 1891198) +@@ -54,6 +54,9 @@ + static const int dayoffset[12] = + {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; + ++ if (tm->wMonth < 1 || tm->wMonth > 12) ++ return APR_EBADDATE; ++ + /* Note; the caller is responsible for filling in detailed tm_usec, + * tm_gmtoff and tm_isdst data when applicable. + */ +@@ -228,6 +231,9 @@ + static const int dayoffset[12] = + {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + ++ if (xt->tm_mon < 0 || xt->tm_mon >= 12) ++ return APR_EBADDATE; ++ + /* shift new year to 1st March in order to make leap year calc easy */ + + if (xt->tm_mon < 2) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index c45829aacc..74129ed77e 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -16,6 +16,9 @@ APR_INSTALL_STAGING = YES # so we need to autoreconf: APR_AUTORECONF = YES +# 0004-apr-1.7.0-CVE-2021-35940.patch +APR_IGNORE_CVES += CVE-2021-35940 + # avoid apr_hints.m4 by setting apr_preload_done=yes and set # the needed CFLAGS on our own (avoids '-D_REENTRANT' in case # not supported by toolchain and subsequent configure failure) -- 2.35.1 From james.hilliard1 at gmail.com Thu Mar 31 21:29:48 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 31 Mar 2022 15:29:48 -0600 Subject: [Buildroot] [PATCH v12 05/11] support/misc/toolchainfile.cmake.in: allow variables to be overridden In-Reply-To: <9c9f7692-3739-a421-1417-be75bb4a2053@gmail.com> References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-5-james.hilliard1@gmail.com> <9c9f7692-3739-a421-1417-be75bb4a2053@gmail.com> Message-ID: On Thu, Mar 31, 2022 at 2:38 PM Romain Naour wrote: > > Hello James, > > Le 23/03/2022 ? 00:22, James Hilliard a ?crit : > > Some packages such as libclc need to override cmake toolchain > > variables, to avoid errors caused by trying to set overriden > > variables ensure that they are not defined before being set. > > > > This prevents difficult to debug silent dropping of overriden > > variables. > > Actually, it seems using the toolchainfile.cmake itself should be avoided for > such case. Not really IMO, we only want to override some toolchain variables in most cases, rather than all of them, this makes that easy to do. It also prevents difficult to debug errors since accidentally overriding a toolchain variable seems to cause other toolchain variables to fail to apply properly otherwise. > For now only libclc package seems requires to override cmake toolchain variable, > I'm not sure about potential side effect of this change. There's another pending series that this helps, see discussion: https://lore.kernel.org/buildroot/057A8C3C-8DAC-46A3-86AB-2DAA92A9368B at gmail.com/ Since overriding a toolchain variable without this change causes basically everything to break I don't think there should be any side effects. > > Best regards, > Romain > > > > > Signed-off-by: James Hilliard > > --- > > support/misc/toolchainfile.cmake.in | 108 +++++++++++++++++++++------- > > 1 file changed, 81 insertions(+), 27 deletions(-) > > > > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > > index be575566a4..30c0e63bf2 100644 > > --- a/support/misc/toolchainfile.cmake.in > > +++ b/support/misc/toolchainfile.cmake.in > > @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR > > # so that it can find our custom platform description. > > list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) > > > > -set(CMAKE_SYSTEM_NAME Buildroot) > > -set(CMAKE_SYSTEM_VERSION 1) > > -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > +if(NOT DEFINED CMAKE_SYSTEM_NAME) > > + set(CMAKE_SYSTEM_NAME Buildroot) > > +endif() > > +if(NOT DEFINED CMAKE_SYSTEM_VERSION) > > + set(CMAKE_SYSTEM_VERSION 1) > > +endif() > > +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) > > + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > +endif() > > > > # Set the {C,CXX}FLAGS appended by CMake depending on the build type > > # defined by Buildroot. CMake defaults these variables with -g and/or > > @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > # Note: > > # if the project forces some of these flag variables, Buildroot is > > # screwed up and there is nothing Buildroot can do about that :( > > -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > > -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > > +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) > > + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > > +endif() > > +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) > > + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > > +endif() > > > > # Build type from the Buildroot configuration > > -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > > +if(NOT DEFINED CMAKE_BUILD_TYPE) > > + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > > +endif() > > > > # Buildroot defaults flags. > > # If you are using this toolchainfile.cmake file outside of Buildroot and > > @@ -41,33 +53,75 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur > > # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... > > # * and make sure the project's CMake code extends them like this if needed: > > # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") > > -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > > -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > > -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > > -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > > +if(NOT DEFINED CMAKE_C_FLAGS) > > + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > > +endif() > > +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) > > + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > > +endif() > > +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) > > + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > > +endif() > > +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) > > + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > > +endif() > > > > -set(CMAKE_INSTALL_SO_NO_EXE 0) > > +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) > > + set(CMAKE_INSTALL_SO_NO_EXE 0) > > +endif() > > > > -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > > -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > > -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > > -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > > -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > > +if(NOT DEFINED CMAKE_PROGRAM_PATH) > > + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") > > +endif() > > +if(NOT DEFINED CMAKE_SYSROOT) > > + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) > > + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) > > + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) > > + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) > > + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > > +endif() > > +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) > > + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > > +endif() > > set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > > > # This toolchain file can be used both inside and outside Buildroot. > > -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > > +if(NOT DEFINED CMAKE_C_COMPILER) > > + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > > +endif() > > if(@@TOOLCHAIN_HAS_CXX@@) > > - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > > - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > > - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > > - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > > + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) > > + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) > > + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_CXX_FLAGS) > > + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_CXX_COMPILER) > > + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > > + endif() > > endif() > > if(@@TOOLCHAIN_HAS_FORTRAN@@) > > - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > > - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > > - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > > - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > > + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) > > + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) > > + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_Fortran_FLAGS) > > + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") > > + endif() > > + if(NOT DEFINED CMAKE_Fortran_COMPILER) > > + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") > > + endif() > > endif() > From fontaine.fabrice at gmail.com Thu Mar 31 21:29:25 2022 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 31 Mar 2022 23:29:25 +0200 Subject: [Buildroot] [PATCH 1/1] package/ed: bump to version 1.18 Message-ID: <20220331212925.39676-1-fontaine.fabrice@gmail.com> license has been switched back to GPL-2.0+: https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00002.html https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00000.html Signed-off-by: Fabrice Fontaine --- package/ed/ed.hash | 6 +++--- package/ed/ed.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 90d467d1f3..36f9b9c1e4 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2021-01/msg00000.html -sha256 71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54 ed-1.17.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00000.html +sha256 aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f ed-1.18.tar.lz # Locally calculated -sha256 f03a12bef9dfb7281864a0dd965166d4f4ec7a66633df2bc72fa4363e57de02c COPYING +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 975cf3be10..645cfb7696 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,10 +4,10 @@ # ################################################################################ -ED_VERSION = 1.17 +ED_VERSION = 1.18 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz -ED_LICENSE = GPL-3.0+ +ED_LICENSE = GPL-2.0+ ED_LICENSE_FILES = COPYING ED_CPE_ID_VENDOR = gnu -- 2.35.1 From james.hilliard1 at gmail.com Thu Mar 31 21:38:52 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 31 Mar 2022 15:38:52 -0600 Subject: [Buildroot] [PATCH v12 06/11] package/libclc: bump version to 13.0.1 In-Reply-To: References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-6-james.hilliard1@gmail.com> Message-ID: On Thu, Mar 31, 2022 at 2:50 PM Romain Naour wrote: > > Hi James, > > Le 23/03/2022 ? 00:22, James Hilliard a ?crit : > > From: Matt Weber > > > > * Converts to the cmake pkg type > > * Updates download site > > * Adds a crosscompile fixups patch > > * Allow prepare_builtins utility to be directly called > > (it isn't installed into the path when cross compiling) > > * Fix file_find() for root search limitation > > > > Signed-off-by: Matthew Weber > > Signed-off-by: James Hilliard > > --- > > Changes v11 -> v12: > > - update to 13.0.1 instead of 11.1.0 > > libclc is part of llvm project, the same version than llvm/clang should be used > here. Doesn't seem to be required, just needs minimum 3.9.0: https://github.com/llvm/llvm-project/blob/llvmorg-13.0.1/libclc/CMakeLists.txt#L33 > > Ideally, llvm/clang should be updated to 13.0.1 first (or to the latest version > if possible). There were some issues with lld in anything newer than 11.1.0, see: https://lore.kernel.org/buildroot/20220131015937.4113728-1-james.hilliard1 at gmail.com/ https://bugs.llvm.org/show_bug.cgi?id=49228 So I held off on going beyond 11.1.0 for now due to that. > > > - pass required host cmake options for C/CXX compilers > > --- > > .../0001-support-out-of-tree-build.patch | 71 +++++++++++++++++++ > > package/libclc/libclc.hash | 2 +- > > package/libclc/libclc.mk | 56 +++++++-------- > > 3 files changed, 98 insertions(+), 31 deletions(-) > > create mode 100644 package/libclc/0001-support-out-of-tree-build.patch > > > > diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch > > new file mode 100644 > > index 0000000000..de7207bedb > > --- /dev/null > > +++ b/package/libclc/0001-support-out-of-tree-build.patch > > @@ -0,0 +1,71 @@ > > +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 > > +From: Matt Weber > > +Date: Tue, 9 Mar 2021 15:55:17 -0600 > > +Subject: [PATCH] support out of tree build > > + > > +(1) The package has a prepare_builtins tool which is built > > +but not placed in the path for later use in the build. This > > +fix allows the later build steps to use the binary in-place. > > + > > +(2) With cmake, find_file() when used for non-host builds is > > +limited by CMAKE_FIND_ROOT_PATH* scope. > > + > > +In $(HOST_DIR)/share/buildroot/toolchainfile.cmake we set the > > +following target settings for CMAKE_FIND_ROOT_PATH* which > > +limit the scope. > > +set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/aarch64-buildroot-linux-gnu/sysroot") > > +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) > > +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) > > +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) > > +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) > > + > > + > > +Signed-off-by: Matthew Weber > > +--- > > + CMakeLists.txt | 2 +- > > + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ > > + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ > > + 3 files changed, 9 insertions(+), 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 9472f19..a784519 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -279,7 +279,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) > > + > > + # Add prepare target > > + add_custom_command( OUTPUT "${obj_suffix}" > > +- COMMAND prepare_builtins -o > > ++ COMMAND ./prepare_builtins -o > > + "${obj_suffix}" > > + "builtins.opt.${obj_suffix}" > > + DEPENDS "opt.${obj_suffix}" > > +diff --git a/cmake/CMakeDetermineCLCCompiler.cmake b/cmake/CMakeDetermineCLCCompiler.cmake > > +index 94d85d9..5de6a48 100644 > > +--- a/cmake/CMakeDetermineCLCCompiler.cmake > > ++++ b/cmake/CMakeDetermineCLCCompiler.cmake > > +@@ -12,7 +12,7 @@ mark_as_advanced(CMAKE_CLC_ARCHIVE) > > + > > + set(CMAKE_CLC_COMPILER_ENV_VAR "CLC_COMPILER") > > + set(CMAKE_CLC_ARCHIVE_ENV_VAR "CLC_LINKER") > > +-find_file(clc_comp_in CMakeCLCCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > > ++set(clc_comp_in "${CMAKE_MODULE_PATH}/CMakeCLCCompiler.cmake.in" ) > > + # configure all variables set in this file > > + configure_file(${clc_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeCLCCompiler.cmake @ONLY) > > + mark_as_advanced(clc_comp_in) > > +diff --git a/cmake/CMakeDetermineLLAsmCompiler.cmake b/cmake/CMakeDetermineLLAsmCompiler.cmake > > +index 1c424c7..dd3bfb6 100644 > > +--- a/cmake/CMakeDetermineLLAsmCompiler.cmake > > ++++ b/cmake/CMakeDetermineLLAsmCompiler.cmake > > +@@ -18,7 +18,7 @@ mark_as_advanced(CMAKE_LLAsm_ARCHIVE) > > + set(CMAKE_LLAsm_PREPROCESSOR_ENV_VAR "LL_PREPROCESSOR") > > + set(CMAKE_LLAsm_COMPILER_ENV_VAR "LL_ASSEMBLER") > > + set(CMAKE_LLAsm_ARCHIVE_ENV_VAR "LL_LINKER") > > +-find_file(ll_comp_in CMakeLLAsmCompiler.cmake.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH}) > > ++set(ll_comp_in "${CMAKE_MODULE_PATH}/CMakeLLAsmCompiler.cmake.in" ) > > + # configure all variables set in this file > > + configure_file(${ll_comp_in} ${CMAKE_PLATFORM_INFO_DIR}/CMakeLLAsmCompiler.cmake @ONLY) > > + mark_as_advanced(ll_comp_in) > > +-- > > +2.17.1 > > + > > diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash > > index 2af64bc8e8..c496291d81 100644 > > --- a/package/libclc/libclc.hash > > +++ b/package/libclc/libclc.hash > > @@ -1,3 +1,3 @@ > > # locally calculated > > -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz > > +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz > > sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT > > diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk > > index 6fe8e10a77..5d246cf4f8 100644 > > --- a/package/libclc/libclc.mk > > +++ b/package/libclc/libclc.mk > > @@ -4,43 +4,39 @@ > > # > > ################################################################################ > > > > -# Use the latest commit from release_90 branch. > > -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 > > -LIBCLC_SITE = https://github.com/llvm-mirror/libclc > > -LIBCLC_SITE_METHOD = git > > +LIBCLC_VERSION = 13.0.1 > > +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) > > +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz > > LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT > > LIBCLC_LICENSE_FILES = LICENSE.TXT > > > > -LIBCLC_DEPENDENCIES = host-clang host-llvm > > +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator > > LIBCLC_INSTALL_STAGING = YES > > > > -# C++ compiler is used to build a small tool (prepare-builtins) for the host. > > -# It must be built with the C++ compiler from the host. > > +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes > > +# llvm-config provided values > > +# > > +# CMAKE_*_COMPILER has to be set to the host compiler to build a host > > +# 'prepare_builtins' tool used during the build process > > # > > # The headers are installed in /usr/share and not /usr/include, > > # because they are needed at runtime on the target to build the OpenCL > > # kernels. > > LIBCLC_CONF_OPTS = \ > > - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ > > - --prefix=/usr \ > > - --includedir=/usr/share \ > > - --pkgconfigdir=/usr/lib/pkgconfig \ > > - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) > > - > > -define LIBCLC_CONFIGURE_CMDS > > - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) > > -endef > > - > > -define LIBCLC_BUILD_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > > -endef > > - > > -define LIBCLC_INSTALL_TARGET_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install > > -endef > > - > > -define LIBCLC_INSTALL_STAGING_CMDS > > - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install > > -endef > > - > > -$(eval $(generic-package)) > > + -DCMAKE_SYSROOT="" \ > > + -DCMAKE_C_COMPILER_FORCED=ON \ > > + -DCMAKE_CXX_COMPILER_FORCED=ON \ > > + -DCMAKE_CLC_COMPILER_FORCED=ON \ > > + -DCMAKE_LLAsm_COMPILER_FORCED=ON \ > > + -DCMAKE_INSTALL_DATADIR="share" \ > > + -DCMAKE_FIND_ROOT_PATH="$(HOST_DIR)" \ > > + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ > > + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ > > + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > > + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > > + -DCMAKE_MODULE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ > > + -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ > > + -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ > > + -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" > > At least a comment about the issue with the cmake toolchain file is needed. > I don't understand the libclc cmake and why this workaround is needed. The cmake toolchain issue is not libclc specific, it's an issue for anything that needs to override a toolchain variable. The host toolchain being needed for prepare_builtins is basically the same as before it's just that the build system was changed to cmake. > > Best regards, > Romain > > > > + > > +$(eval $(cmake-package)) > From james.hilliard1 at gmail.com Thu Mar 31 21:40:19 2022 From: james.hilliard1 at gmail.com (James Hilliard) Date: Thu, 31 Mar 2022 15:40:19 -0600 Subject: [Buildroot] [PATCH v12 09/11] package/clang: help host-clang to find our external toolchain In-Reply-To: References: <20220322232224.2842266-1-james.hilliard1@gmail.com> <20220322232224.2842266-9-james.hilliard1@gmail.com> Message-ID: On Thu, Mar 31, 2022 at 3:04 PM Romain Naour wrote: > > Hi James, > > Le 23/03/2022 ? 00:22, James Hilliard a ?crit : > > From: Romain Naour > > > > To build libfuzzer package Matthew Weber noticed that (host) clang > > doesn't run on the host without "-B $(HOST_DIR)/opt/ext-toolchain" > > option. This option add a new search path for binaries and object > > files used implicitly. > > > > Without -B clang fail to link due to missing crtbeging.o file and libgcc: > > output/host/bin/aarch64-linux-gnu-ld: cannot find crtbegin.o: No such file or directory > > output/host/bin/aarch64-linux-gnu-ld: cannot find -lgcc > > > > Indeed, clang search path doesn't include the dafault cross-gcc's search paths: > > > > $ output/host/bin/clang -print-search-dirs > > programs: = output/host/bin:output/host/bin:/..//bin > > libraries: = output/host/lib/clang/8.0.0: > > output/host/bin/../lib64: > > /lib/../lib64: > > /usr/lib/../lib64: > > output/host/bin/../lib: > > /lib:/usr/lib > > > > Here is the same command for cross-gcc: > > > > $ output/host/bin/aarch64-linux-gnu-gcc -print-search-dirs > > install: output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/ > > programs: = output/host/opt/ext-toolchain/bin/../libexec/gcc/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../libexec/gcc/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/bin/ > > libraries: = output/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/aarch64-linux-gnu/8.3.0/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/../lib64/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/aarch64-linux-gnu/8.3.0/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/../lib64/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu/8.3.0/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/../lib64/: > > output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/8.3.0/../../../../aarch64-linux-gnu/lib/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/lib/: > > output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/ > > > > We can see that gcc default search path contains > > "output/host/opt/ext-toolchain" directory where the external toolchain > > has been extracted. > > > > Since we want to use clang without additional option like -B, > > patch clang in order to use GCC_INSTALL_PREFIX instead of > > using automatic detection (which doesn't work for Buildroot). > > > > We eventually want to relocate the Buildroot SDK containing the clang > > cross-compiler, so we provide a relative path to GCC_INSTALL_PREFIX > > in order to avoid to hardcode the path to the GCC toolchain. > > > > Also the path between clang and the GCC external toolchain is not always > > the same, we have the following case: > > > > * Toolchain to be downloaded and installed > > The toolchain is extracted into $(HOST_DIR)/opt/ext-toolchain, so the > > path is "../opt/ext-toolchain". > > > > * Pre-installed toolchain > > The toolchain is localed somewhere in the host filesystem and > > defined by the user using BR2_TOOLCHAIN_EXTERNAL_PATH. > > > > So, set GCC_INSTALL_PREFIX using realpath: > > > > -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > > > When we use a Buildroot's internal toolchain, clang will find theses > > crt*.o files and libgcc. > > > > http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > > > > Signed-off-by: Romain Naour > > Cc: Matthew Weber > > Cc: Valentin Korenblit > > Tested-by: Matt Weber > > --- > > Changes v1 -> v2 > > [Arnout > > - Can't dropped ":PATH" from "-DGCC_INSTALL_PREFIX:PATH=" as suggested, > > The string isn't set correctly and results in "cannot find crtbegin.o" > > - Attempting to post patch upstream > > - I did not address the relative vs absolute path comment. The > > current approach seemed correct per my understanding for handling > > the two toolchain install location cases > > --- > > ...hains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 78 +++++++++++++++++++ > > package/clang/clang.mk | 7 ++ > > 2 files changed, 85 insertions(+) > > create mode 100644 package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > > > diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > new file mode 100644 > > index 0000000000..08371154d5 > > --- /dev/null > > +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch > > @@ -0,0 +1,78 @@ > > +From fe21cede3939a435d62efbd5799547fab6af1b0a Mon Sep 17 00:00:00 2001 > > +From: Romain Naour > > +Date: Mon, 5 Aug 2019 16:06:48 +0200 > > +Subject: [PATCH] lib/Driver/ToolChains/Gnu: Use GCC_INSTALL_PREFIX in the set > > + of prefixes for searching the gcc toolchain > > + > > +By default, the Gnu Toolchains driver is looking at the parent > > +directory while looking for the gcc toolchain when clang is installed > > +at "D.InstalledDir" > > + > > +But this doesn't work with Buildroot since the external > > +toolchain is installed in host/opt/ext-toolchain and the sysroot is > > +moved to host/-buildroot-linux-gnu/sysroot/ directory. > > + > > +We tried by setting GCC_INSTALL_PREFIX in clang.mk for host-clang > > +but it doesn't work since we already provide a sysroot [1]. > > + > > +Help the Gnu Toolchains driver by using GCC_INSTALL_PREFIX path. > > + > > +Since we want to be able to relocate the clang toolchain, > > +allow to use a relative path with GCC_INSTALL_PREFIX. > > + > > +Buildroot will provide such relative path by using: > > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > + > > +Doing so allow to use clang without providing additional search > > +paths with -B option on the clang's command line. > > + > > +[1] https://reviews.llvm.org/D49244 > > +[2] http://lists.busybox.net/pipermail/buildroot/2019-August/256204.html > > + > > +Signed-off-by: Romain Naour > > +Signed-off-by: Matthew Weber > > +--- > > +Pending, access to llvm mailing lists to submit it is pending. They > > +seem to be having issues with their listserv. > > Sadly, this patch (hack) never reach the upstream project and need to be rebased > over llvm/clang releases... I didn't bump the llvm/clang version so it still works as is. > > Best regards, > Romain > > > +--- > > + lib/Driver/ToolChains/Gnu.cpp | 17 +++++++++++++++++ > > + 1 file changed, 17 insertions(+) > > + > > +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp > > +index 2ad45097dc..90d6b5b748 100644 > > +--- a/lib/Driver/ToolChains/Gnu.cpp > > ++++ b/lib/Driver/ToolChains/Gnu.cpp > > +@@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init( > > + > > + Prefixes.push_back(GCCToolchainDir); > > + } else { > > ++ StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX; > > ++ > > + // If we have a SysRoot, try that first. > > + if (!D.SysRoot.empty()) { > > + Prefixes.push_back(D.SysRoot); > > +@@ -1734,6 +1736,21 @@ void Generic_GCC::GCCInstallationDetector::init( > > + // Then look for gcc installed alongside clang. > > + Prefixes.push_back(D.InstalledDir + "/.."); > > + > > ++ // Use GCC_INSTALL_PREFIX if provided by the buildsystem. > > ++ if (!GccIinstallPrefix.empty()) > > ++ { > > ++ if (llvm::sys::path::is_relative(GccIinstallPrefix)) > > ++ { > > ++ // Use a relative path to gcc from clang install path. > > ++ Prefixes.push_back(D.InstalledDir + "/" + GccIinstallPrefix.str()); > > ++ } > > ++ else > > ++ { > > ++ // Hardcode the absolute path provided by GCC_INSTALL_PREFIX. > > ++ Prefixes.push_back(GCC_INSTALL_PREFIX); > > ++ } > > ++ } > > ++ > > + // Next, look for prefix(es) that correspond to distribution-supplied gcc > > + // installations. > > + if (D.SysRoot.empty()) { > > +-- > > +2.20.1 > > + > > diff --git a/package/clang/clang.mk b/package/clang/clang.mk > > index d1667d79b6..95b4964be3 100644 > > --- a/package/clang/clang.mk > > +++ b/package/clang/clang.mk > > @@ -105,5 +105,12 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > > HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > > CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all > > > > +# Help host-clang to find our external toolchain, use a relative path from the clang > > +# installation directory to the external toolchain installation directory in order to > > +# not hardcode the toolchain absolute path. > > +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) > > +HOST_CLANG_CONF_OPTS += -DGCC_INSTALL_PREFIX:PATH=`realpath --relative-to=$(HOST_DIR)/bin/ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)` > > +endif > > + > > $(eval $(cmake-package)) > > $(eval $(host-cmake-package)) > From neal.frager at amd.com Thu Mar 31 19:20:30 2022 From: neal.frager at amd.com (Neal Frager) Date: Thu, 31 Mar 2022 13:20:30 -0600 Subject: [Buildroot] [PATCH v1 1/1] configs/zynq_qmtech_defconfig: move post-image.sh to board/qmtech/zynq Message-ID: <20220331192030.3871720-1-neal.frager@amd.com> This patch creates a post-image.sh in the board/qmtech/zynq directory, so that the zynq_qmtech_defconfig can be updated independently from the other zynq defconfigs. Signed-off-by: Neal Frager --- board/qmtech/zynq/genimage.cfg | 27 +++++++++++++++++++++++++++ board/qmtech/zynq/post-image.sh | 13 +++++++++++++ configs/zynq_qmtech_defconfig | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 board/qmtech/zynq/genimage.cfg create mode 100755 board/qmtech/zynq/post-image.sh diff --git a/board/qmtech/zynq/genimage.cfg b/board/qmtech/zynq/genimage.cfg new file mode 100644 index 0000000000..67baca795e --- /dev/null +++ b/board/qmtech/zynq/genimage.cfg @@ -0,0 +1,27 @@ +image boot.vfat { + vfat { + files = { + "boot.bin", + "u-boot.img", + "devicetree.dtb", + "uImage" + } + + file uramdisk.image.gz { + image = "rootfs.cpio.uboot" + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } +} diff --git a/board/qmtech/zynq/post-image.sh b/board/qmtech/zynq/post-image.sh new file mode 100755 index 0000000000..54c5493b4e --- /dev/null +++ b/board/qmtech/zynq/post-image.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +# By default U-Boot loads DTB from a file named "devicetree.dtb", so +# let's use a symlink with that name that points to the *first* +# devicetree listed in the config. + +FIRST_DT=$(sed -n \ + 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ + ${BR2_CONFIG}) + +[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/devicetree.dtb + +support/scripts/genimage.sh -c board/qmtech/zynq/genimage.cfg diff --git a/configs/zynq_qmtech_defconfig b/configs/zynq_qmtech_defconfig index 4db3f68b1f..dc3b22c876 100644 --- a/configs/zynq_qmtech_defconfig +++ b/configs/zynq_qmtech_defconfig @@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qmtech/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2019.2.01)/linux-xilinx-v2019.2.01.tar.gz" -- 2.17.1